Index: /trunk/ippconfig/ctio_mosaic2/psphot.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2/psphot.config (revision 10804) +++ /trunk/ippconfig/ctio_mosaic2/psphot.config (revision 10805) @@ -4,8 +4,8 @@ SAVE.BACKGND BOOL FALSE SAVE.BACKSUB BOOL FALSE -SAVE.RESID BOOL FALSE +SAVE.RESID BOOL TRUE SAVE.PSF BOOL FALSE LOAD.PSF BOOL FALSE -SAVE.PLOTS BOOL FALSE +SAVE.PLOTS BOOL TRUE # the zero point is used to set a basic scale for DVO @@ -16,5 +16,5 @@ BACKGROUND_XBIN S32 128 # size of background superpixels BACKGROUND_YBIN S32 128 # size of background superpixels -IMSTATS_NPIX S32 10000 # number of pixels to use for sky estimate boxes: +IMSTATS_NPIX S32 2000 # number of pixels to use for sky estimate boxes: SKY_BIAS F32 0.0 # offset applied to measured sky (FOR TESTING) @@ -35,5 +35,5 @@ PEAKS_SMOOTH_SIGMA F32 1.0 # smoothing kernel sigma in pixels PEAKS_SMOOTH_NSIGMA F32 2.0 # smoothing kernel width in sigmas -PEAKS_NSIGMA_LIMIT F32 10.0 # peak significance threshold +PEAKS_NSIGMA_LIMIT F32 50.0 # peak significance threshold # parameters to control the selection of the peak in the Sx,Sy plane Index: /trunk/ippconfig/ctio_mosaic2_chip/camera.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2_chip/camera.config (revision 10804) +++ /trunk/ippconfig/ctio_mosaic2_chip/camera.config (revision 10805) @@ -27,5 +27,6 @@ RECIPES METADATA # Recipes for ppImage - PPIMAGE STR ctio_mosaic2/ppImage.config # Default: all (normal) options on + PPIMAGE STR ctio_mosaic2/ppImage.config # Default: all (normal) options on + PSPHOT STR ctio_mosaic2/psphot.config # Default: all (normal) options on END @@ -96,30 +97,33 @@ ### output file definitions - TYPE OUTPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.LEVEL DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE - PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP MASK FALSE NONE - PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP WEIGHT FALSE NONE - PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits {CHIP.NAME} {CHIP.NAME} NONE FPA FPA IMAGE TRUE MOSAIC - PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits {CHIP.NAME} {CHIP.NAME} NONE FPA FPA IMAGE TRUE MOSAIC + TYPE OUTPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.LEVEL DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP MASK FALSE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP WEIGHT FALSE NONE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits {CHIP.NAME} {CHIP.NAME} NONE FPA FPA IMAGE TRUE MOSAIC + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits {CHIP.NAME} {CHIP.NAME} NONE FPA FPA IMAGE TRUE MOSAIC - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE MOSAIC - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE MOSAIC + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE FPA FPA IMAGE TRUE CTIO_MOSAIC2_FPA:MOSAIC - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 FPA FPA JPEG TRUE CTIO_MOSAIC2_FPA:MOSAIC - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE CTIO_MOSAIC2_FPA:MOSAIC + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg -greyscale RANGE -5:20 FPA FPA JPEG TRUE CTIO_MOSAIC2_FPA:MOSAIC + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg -greyscale FRACTION 0.50:2.00 FPA FPA JPEG TRUE CTIO_MOSAIC2_FPA:MOSAIC - PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE SPLICE + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} FPA CHIP IMAGE TRUE MOSAIC + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE MOSAIC + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE MOSAIC + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE MOSAIC - PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} NONE NONE PHU CHIP CHIP RAW TRUE NONE - PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx NONE NONE PHU CHIP CHIP SX TRUE NONE - PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj NONE NONE PHU CHIP CHIP OBJ TRUE NONE - PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf NONE SMPDATA PHU CHIP CHIP CMF TRUE NONE - PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp NONE NONE PHU CHIP CHIP CMP TRUE NONE + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} NONE NONE PHU CHIP CHIP RAW TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx NONE NONE PHU CHIP CHIP SX TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj NONE NONE PHU CHIP CHIP OBJ TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf NONE SMPDATA PHU CHIP CHIP CMF TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp NONE NONE PHU CHIP CHIP CMP TRUE NONE - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp NONE NONE PHU CHIP CHIP CMP TRUE NONE + PSPHOT.MOMENT.PLT OUTPUT {OUTPUT}.mnt.png NONE NONE NONE FPA FPA KAPA TRUE MOSAIC + PSPHOT.PSFMODEL.PLT OUTPUT {OUTPUT}.psf.png NONE NONE NONE FPA FPA KAPA TRUE MOSAIC + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp NONE NONE PHU CHIP CHIP CMP TRUE NONE END Index: /trunk/ippconfig/isp/camera.config =================================================================== --- /trunk/ippconfig/isp/camera.config (revision 10804) +++ /trunk/ippconfig/isp/camera.config (revision 10805) @@ -84,5 +84,5 @@ PSASTRO.INPUT STR PSASTRO.INPUT.CMP PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP - PSPHOT.OUTPUT STR PSPHOT.OUTPUT.RAW + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP ### input file definitions Index: /trunk/ippconfig/isp/psastro.config =================================================================== --- /trunk/ippconfig/isp/psastro.config (revision 10804) +++ /trunk/ippconfig/isp/psastro.config (revision 10805) @@ -33,6 +33,6 @@ # pmAstromMatchFit -PSASTRO.CHIP.NX S32 2 # fit order -PSASTRO.CHIP.NY S32 2 # fit order +PSASTRO.CHIP.NX S32 3 # fit order +PSASTRO.CHIP.NY S32 3 # fit order PSASTRO.CHIP.NITER S32 3 # fit clipping iterations PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas Index: /trunk/ippconfig/isp/psphot.config =================================================================== --- /trunk/ippconfig/isp/psphot.config (revision 10804) +++ /trunk/ippconfig/isp/psphot.config (revision 10805) @@ -32,5 +32,5 @@ PEAKS_SMOOTH_SIGMA F32 1.0 # smoothing kernel sigma in pixels PEAKS_SMOOTH_NSIGMA F32 3.0 # smoothing kernel width in sigmas -PEAKS_NSIGMA_LIMIT F32 2.0 # peak significance threshold +PEAKS_NSIGMA_LIMIT F32 20.0 # peak significance threshold # basic object statistics @@ -93,5 +93,5 @@ # BREAK_POINT may be one of (PEAKS, MOMENTS, PSFMODEL, ENSEMBLE) -BREAK_POINT STR MOMENTS +# BREAK_POINT STR MOMENTS # PEAKS_OUTPUT_FILE STR peaks.dat Index: /trunk/ippconfig/megacam_detrended/psastro.config =================================================================== --- /trunk/ippconfig/megacam_detrended/psastro.config (revision 10804) +++ /trunk/ippconfig/megacam_detrended/psastro.config (revision 10805) @@ -30,6 +30,6 @@ # pmAstromMatchFit -PSASTRO.CHIP.NX S32 1 # fit order -PSASTRO.CHIP.NY S32 1 # fit order +PSASTRO.CHIP.NX S32 3 # fit order +PSASTRO.CHIP.NY S32 3 # fit order PSASTRO.CHIP.NITER S32 3 # fit clipping iterations PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas Index: /trunk/ippconfig/recipes/psastro.config =================================================================== --- /trunk/ippconfig/recipes/psastro.config (revision 10804) +++ /trunk/ippconfig/recipes/psastro.config (revision 10805) @@ -35,2 +35,6 @@ PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas +PSASTRO.MAX.ERROR F32 1.5 # fit clipping sigmas +PSASTRO.MIN.NSTAR S32 10 # min fitted stars in solution + +MAG_MAX F32 15.0 ## XXX change name to PSASTRO.something