Index: /trunk/ippconfig/megacam/camera.config =================================================================== --- /trunk/ippconfig/megacam/camera.config (revision 7592) +++ /trunk/ippconfig/megacam/camera.config (revision 7593) @@ -88,24 +88,27 @@ ### 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}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE - PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE + 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}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE - PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT - PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg -greyscale RANGE -5:20 CHIP CHIP JPEG TRUE SPLIT - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg -greyscale FRACTION 0.50:2.00 CHIP CHIP JPEG TRUE SPLIT + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.mos.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE MEGACAM_CHIP:MOSAIC + PPIMAGE.OUTPUT.FPA OUTPUT {OUTPUT}.mos.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE MEGACAM_FPAMOSAIC: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 + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg -greyscale RANGE -5:20 CHIP CHIP JPEG TRUE SPLIT + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg -greyscale FRACTION 0.50:2.00 CHIP CHIP JPEG TRUE SPLIT - 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}.{CELL.NAME}.cmp NONE NONE PHU CELL CELL CMP TRUE NONE + 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 - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp 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}.{CELL.NAME}.cmp NONE NONE PHU CELL CELL CMP TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp NONE NONE PHU CHIP CHIP CMP TRUE NONE END Index: /trunk/ippconfig/megacam/phase2.config =================================================================== --- /trunk/ippconfig/megacam/phase2.config (revision 7592) +++ /trunk/ippconfig/megacam/phase2.config (revision 7593) @@ -6,12 +6,12 @@ NONLIN BOOL FALSE # Non-linearity correction -OVERSCAN BOOL TRUE # Overscan subtraction -BIAS BOOL TRUE # Bias subtraction +OVERSCAN BOOL FALSE # Overscan subtraction +BIAS BOOL FALSE # Bias subtraction DARK BOOL FALSE # Dark subtraction -FLAT BOOL TRUE # Flat-field normalisation +FLAT BOOL FALSE # Flat-field normalisation FRINGE BOOL FALSE # Fringe subtraction PHOTOM BOOL FALSE # Source identification and photometry ASTROM BOOL FALSE # Astrometry -BIN1.FITS BOOL TRUE +BIN1.FITS BOOL FALSE BIN2.FITS BOOL FALSE BIN1.JPEG BOOL FALSE Index: /trunk/ippconfig/megacam_chipmosaic/camera.config =================================================================== --- /trunk/ippconfig/megacam_chipmosaic/camera.config (revision 7592) +++ /trunk/ippconfig/megacam_chipmosaic/camera.config (revision 7593) @@ -56,185 +56,54 @@ FILERULES METADATA - PPIMAGE.INPUT METADATA - FILENAME.RULE STR @FILES - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR READ - END - PPIMAGE.OUTPUT METADATA - FILENAME.RULE STR {OUTPUT}.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - END - PPIMAGE.BIN1 METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.bin1.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - FILE.FORMAT STR SPLIT - END - PPIMAGE.BIN2 METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.bin2.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - FILE.FORMAT STR SPLIT - END + PPIMAGE.OUTPUT.RAW STR PPIMAGE.OUTPUT.SPL + PSASTRO.INPUT STR PSASTRO.INPUT.CMP + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP - PPIMAGE.BIAS METADATA - FILENAME.RULE STR bias.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR READ - END - PPIMAGE.DARK METADATA - FILENAME.RULE STR dark.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR READ - END - PPIMAGE.FLAT METADATA - FILENAME.RULE STR flat.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR READ - END - PPIMAGE.MASK METADATA - FILENAME.RULE STR mask.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CHIP.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR READ - END + ### 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 - PSPHOT.INPUT METADATA - FILENAME.RULE STR @FILES - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR NONE - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR READ - END + ### use these entries to get the detrend images from specific files + PPIMAGE.MASK INPUT mask.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + #PPIMAGE.BIAS INPUT bias.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + PPIMAGE.DARK INPUT dark.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + #PPIMAGE.FLAT INPUT flat.mef.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE - # an indirect rule allows multiple, related output definitions - PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP -# PSPHOT.OUTPUT STR PSPHOT.OUTPUT.RAW + ### use these entries to get the detrend images from the database + #PPIMAGE.MASK INPUT @DETDB {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + PPIMAGE.BIAS INPUT @DETDB fpa fpa NONE CHIP IMAGE + #PPIMAGE.DARK INPUT @DETDB {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + PPIMAGE.FLAT INPUT @DETDB {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE - PSPHOT.RESID METADATA - FILENAME.RULE STR {OUTPUT}.res.fits - FILENAME.XTRA STR NONE - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR {CELL.NAME} - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - END + PSPHOT.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE -# PSPHOT.BACKSUB METADATA -# FILENAME.RULE STR {OUTPUT}.sub.fits -# FILENAME.XTRA STR {CHIP.NAME} -# EXTNAME.RULE STR {CELL.NAME} -# EXTNAME.XTRA STR {CELL.NAME} -# OPEN.DEPTH STR CELL -# WRITE.DEPTH STR CELL -# FILETYPE STR IMAGE -# END + PSASTRO.INPUT.CMP INPUT @FILES NONE NONE PHU CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES NONE SMPDATA PHU CHIP CMF - PSPHOT.BACKGND METADATA - FILENAME.RULE STR {OUTPUT}.bck.fits - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR {CELL.NAME} - OPEN.DEPTH STR CELL - WRITE.DEPTH STR CELL - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - FILE.FORMAT STR SPLIT - END + ### 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}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE - PSPHOT.OUTPUT.RAW METADATA - FILENAME.RULE STR {OUTPUT} - FILENAME.XTRA STR NONE - EXTNAME.RULE STR NONE - EXTNAME.XTRA STR PHU - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR RAW - FILE.MODE STR WRITE - END - PSPHOT.OUTPUT.SX METADATA - FILENAME.RULE STR {OUTPUT}.sx - FILENAME.XTRA STR NONE - EXTNAME.RULE STR NONE - EXTNAME.XTRA STR PHU - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR SX - FILE.MODE STR WRITE - END - PSPHOT.OUTPUT.OBJ METADATA - FILENAME.RULE STR {OUTPUT}.obj - FILENAME.XTRA STR NONE - EXTNAME.RULE STR NONE - EXTNAME.XTRA STR PHU - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR OBJ - FILE.MODE STR WRITE - END - PSPHOT.OUTPUT.CMP METADATA - FILENAME.RULE STR {OUTPUT}.cmp - FILENAME.XTRA STR NONE - EXTNAME.RULE STR NONE - EXTNAME.XTRA STR PHU - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR CMP - FILE.MODE STR WRITE - END - PSPHOT.OUTPUT.CMF METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.cmf - FILENAME.XTRA STR NONE - EXTNAME.RULE STR SMPDATA - EXTNAME.XTRA STR PHU - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR CMF - FILE.MODE STR WRITE - END + PPIMAGE.OUTPUT.CHP OUTPUT {OUTPUT}.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE MEGACAM_CHIP:SPLIT + PPIMAGE.OUTPUT.FPA OUTPUT {OUTPUT}.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE MEGACAM_FPA:SPLIT + + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE SPLIT + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg -greyscale RANGE -5:20 CHIP CHIP JPEG TRUE SPLIT + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg -greyscale FRACTION 0.50:2.00 CHIP CHIP JPEG TRUE SPLIT + + 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.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}.{CELL.NAME}.cmp NONE NONE PHU CELL CELL CMP TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp NONE NONE PHU CHIP CHIP CMP TRUE NONE END