Index: /trunk/ippconfig/cfh12k/camera.config =================================================================== --- /trunk/ippconfig/cfh12k/camera.config (revision 12515) +++ /trunk/ippconfig/cfh12k/camera.config (revision 12516) @@ -125,6 +125,6 @@ FILERULES METADATA ### Redirections - PSASTRO.INPUT STR PSASTRO.INPUT.CMP - PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP + PSASTRO.INPUT STR PSASTRO.INPUT.CMF + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMF PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.MEF @@ -135,60 +135,74 @@ ### input file definitions - TYPE INPUT FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA DATA.LEVEL FILE.TYPE - PPIMAGE.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + PPIMAGE.INPUT INPUT @FILES CHIP IMAGE ## can we just use PPIMAGE.INPUT as the pmFPAfile name? - DVOCORR.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE - DVOCORR.REFHEAD INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP HEADER - - DVOFLAT.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE - DVOFLAT.CORR INPUT @DETDB NONE NONE NONE CHIP IMAGE + DVOCORR.INPUT INPUT @FILES CHIP IMAGE + DVOCORR.REFHEAD INPUT @FILES CHIP HEADER + + DVOFLAT.INPUT INPUT @FILES CHIP IMAGE + DVOFLAT.CORR INPUT @DETDB CHIP IMAGE ### use these entries to get the detrend images from the database - PPIMAGE.MASK INPUT @DETDB NONE NONE NONE CHIP IMAGE - PPIMAGE.BIAS INPUT @DETDB NONE NONE NONE CHIP IMAGE - PPIMAGE.DARK INPUT @DETDB NONE NONE NONE CHIP IMAGE - PPIMAGE.FLAT INPUT @DETDB NONE NONE NONE CHIP IMAGE - PPIMAGE.FRINGE INPUT @DETDB NONE NONE NONE CHIP FRINGE - - PSPHOT.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE - PSASTRO.INPUT.CMP INPUT @FILES NONE NONE PHU CHIP CMP - PSASTRO.INPUT.CMF INPUT @FILES NONE SMPDATA PHU CHIP CMF - + PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE + PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE + PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE + + PSPHOT.INPUT INPUT @FILES CHIP IMAGE + PSASTRO.INPUT.CMP INPUT @FILES CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF + + PSWARP.INPUT INPUT none.fits FPA IMAGE + PSWARP.SKYCELL INPUT none.fits FPA IMAGE + PSWARP.ASTROM INPUT @FILES CHIP CMF ### 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.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT - PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE MEF - PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP MASK FALSE NONE - PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP WEIGHT FALSE NONE - PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT - PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT - PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1.fits NONE NONE NONE FPA CHIP IMAGE TRUE MEF - PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2.fits NONE NONE NONE FPA CHIP IMAGE TRUE MEF - DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits NONE NONE NONE FPA CHIP IMAGE TRUE MEF - DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits NONE NONE NONE FPA CHIP IMAGE TRUE SPLIT - DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits NONE NONE NONE FPA CHIP IMAGE TRUE MEF - DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits NONE NONE NONE FPA CHIP IMAGE TRUE SPLIT - - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits NONE NONE NONE FPA FPA IMAGE TRUE MEF - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits NONE NONE NONE FPA FPA IMAGE TRUE MEF - - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg NONE NONE NONE FPA FPA JPEG TRUE NONE - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg NONE NONE NONE FPA FPA JPEG TRUE NONE - - PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE MEF - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE MEF - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE MEF - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE MEF - - 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 - -END + TYPE OUTPUT FILENAME.RULE DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fits CHIP IMAGE TRUE SPLIT + PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.fits CHIP IMAGE TRUE MEF + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits CHIP MASK FALSE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits CHIP WEIGHT FALSE NONE + PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits CHIP IMAGE TRUE SPLIT + PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits CHIP IMAGE TRUE SPLIT + PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1.fits CHIP IMAGE TRUE MEF + PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2.fits CHIP IMAGE TRUE MEF + DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits CHIP IMAGE TRUE MEF + DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits CHIP IMAGE TRUE SPLIT + DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits CHIP IMAGE TRUE MEF + DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits CHIP IMAGE TRUE SPLIT + + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits CHIP IMAGE TRUE SPLIT + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits FPA IMAGE TRUE MEF + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits FPA IMAGE TRUE MEF + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg FPA JPEG TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg FPA JPEG TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits FPA IMAGE TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits FPA IMAGE TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits FPA IMAGE TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits CHIP IMAGE TRUE MEF + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits CHIP IMAGE TRUE MEF + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits CHIP IMAGE TRUE MEF + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits CHIP IMAGE TRUE MEF + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} CHIP RAW TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx CHIP SX TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj CHIP OBJ TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CHIP CMF TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CHIP CMP TRUE NONE + + PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CHIP CMF TRUE NONE + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CHIP CMP TRUE NONE + +END + +EXTNAME.RULES METADATA + CMF.HEAD STR {CHIP.NAME}.hdr + CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT? +END + Index: /trunk/ippconfig/cfh12k/format_mef.config =================================================================== --- /trunk/ippconfig/cfh12k/format_mef.config (revision 12515) +++ /trunk/ippconfig/cfh12k/format_mef.config (revision 12516) @@ -88,5 +88,5 @@ CELL.READNOISE F32 10.0 CELL.READDIR S32 1 # Cell is read in x direction - CELL.BAD S32 0 + CELL.BAD S32 1600 CELL.XPARITY S32 1 CELL.YPARITY S32 1 @@ -94,47 +94,47 @@ CHIP.X0.DEPEND STR CHIP.NAME CHIP.X0 METADATA - chip00 S32 0 - chip01 S32 2048 - chip02 S32 4096 - chip03 S32 6144 - chip04 S32 8192 - chip05 S32 10240 - chip06 S32 0 - chip07 S32 2048 - chip08 S32 4096 - chip09 S32 6144 - chip10 S32 8192 - chip11 S32 10240 + ccd00 S32 10 + ccd01 S32 2048 + ccd02 S32 4096 + ccd03 S32 6144 + ccd04 S32 8192 + ccd05 S32 10240 + ccd06 S32 0 + ccd07 S32 2048 + ccd08 S32 4096 + ccd09 S32 6144 + ccd10 S32 8192 + ccd11 S32 10240 END CHIP.Y0.DEPEND STR CHIP.NAME CHIP.Y0 METADATA - chip00 S32 0 - chip01 S32 0 - chip02 S32 0 - chip03 S32 0 - chip04 S32 0 - chip05 S32 0 - chip06 S32 4128 - chip07 S32 4128 - chip08 S32 4128 - chip09 S32 4128 - chip10 S32 4128 - chip11 S32 4128 + ccd00 S32 10 + ccd01 S32 10 + ccd02 S32 10 + ccd03 S32 10 + ccd04 S32 10 + ccd05 S32 10 + ccd06 S32 4128 + ccd07 S32 4128 + ccd08 S32 4128 + ccd09 S32 4128 + ccd10 S32 4128 + ccd11 S32 4128 END CHIP.XPARITY S32 1 CHIP.YPARITY.DEPEND STR CHIP.NAME CHIP.YPARITY METADATA - chip00 S32 +1 - chip01 S32 +1 - chip02 S32 +1 - chip03 S32 +1 - chip04 S32 +1 - chip05 S32 +1 - chip06 S32 -1 - chip07 S32 -1 - chip08 S32 -1 - chip09 S32 -1 - chip10 S32 -1 - chip11 S32 -1 + ccd00 S32 +1 + ccd01 S32 +1 + ccd02 S32 +1 + ccd03 S32 +1 + ccd04 S32 +1 + ccd05 S32 +1 + ccd06 S32 -1 + ccd07 S32 -1 + ccd08 S32 -1 + ccd09 S32 -1 + ccd10 S32 -1 + ccd11 S32 -1 END END Index: /trunk/ippconfig/cfh12k/psastro.config =================================================================== --- /trunk/ippconfig/cfh12k/psastro.config (revision 12515) +++ /trunk/ippconfig/cfh12k/psastro.config (revision 12516) @@ -2,20 +2,19 @@ # astrometry matching parameters -# nominal plate scale (microns / pixel) -# PSASTRO.PLATE.SCALE F32 13.5 -PSASTRO.PLATE.SCALE F32 1.0 +# nominal plate scale (mm / pixel) +PSASTRO.PIXEL.SCALE F32 0.0135 # pmAstromGridMatch: -PSASTRO.GRID.MIN.ANGLE F32 -0.0851 -PSASTRO.GRID.MAX.ANGLE F32 +0.0851 -PSASTRO.GRID.DEL.ANGLE F32 0.0170 +PSASTRO.GRID.SEARCH BOOL TRUE +PSASTRO.GRID.MIN.ANGLE F32 -2.0 +PSASTRO.GRID.MAX.ANGLE F32 +2.0 +PSASTRO.GRID.DEL.ANGLE F32 0.5 +PSASTRO.GRID.MIN.SIGMA F32 5.0 # pmAstromGridAngle # max grid offset in FP units (microns) # use plate-scale to make this in pixels? -# PSASTRO.GRID.OFFSET F32 10000. -# PSASTRO.GRID.SCALE F32 500. -PSASTRO.GRID.OFFSET F32 1000. -PSASTRO.GRID.SCALE F32 50 +PSASTRO.GRID.OFFSET F32 10000 +PSASTRO.GRID.SCALE F32 500 # these tweak are in FP units (pixels, currently) @@ -30,7 +29,11 @@ # pmAstromMatchFit -PSASTRO.CHIP.NX S32 1 # fit order -PSASTRO.CHIP.NY S32 1 # fit order +PSASTRO.CHIP.ORDER S32 1 # fit order PSASTRO.CHIP.NITER S32 3 # fit clipping iterations PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas +PSASTRO.MAX.ERROR F32 10.0 # max error in pixels +PSASTRO.MIN.NSTAR S32 10 # min fitted stars in solution + +MAG_MAX F32 20 +DVO.CATDIR STR /data/alala.0/ipp/ippRefs/catdir.2mass Index: /trunk/ippconfig/cfh12k/psphot.config =================================================================== --- /trunk/ippconfig/cfh12k/psphot.config (revision 12515) +++ /trunk/ippconfig/cfh12k/psphot.config (revision 12516) @@ -8,5 +8,5 @@ #LOAD.PSF BOOL FALSE -IMSTATS_NPIX S32 1000 # number of pixels to use for sky estimate boxes: +IMSTATS_NPIX S32 5000 # number of pixels to use for sky estimate boxes: PSF_SN_LIM F32 100 # minimum S/N for stars used for PSF model @@ -26,2 +26,11 @@ FULL_FIT_SN_LIM F32 50.0 AP_MIN_SN F32 25.0 + +# SKY_STAT STR ROBUST_MEDIAN # statistic used to measure background +SKY_STAT STR FITTED_MEAN_V3 # statistic used to measure background +# SAMPLE_MEAN, SAMPLE_MEDIAN, CLIPPED_MEAN, ROBUST_MEAN, ROBUST_QUARTILE, FITTED_MEAN +# FITTED_MEAN_V2, FITTED_MEAN_V3 +SKY_CLIP_SIGMA F32 2.0 # statistic used to measure background + +# BREAK_POINT may be one of (PEAKS, MOMENTS, PSFMODEL, ENSEMBLE) +BREAK_POINT STR ENSEMBLE