Index: trunk/ippconfig/megacam/camera.config =================================================================== --- trunk/ippconfig/megacam/camera.config (revision 7258) +++ trunk/ippconfig/megacam/camera.config (revision 7532) @@ -4,7 +4,8 @@ FORMATS METADATA RAW STR megacam/format_raw.config - SPLICE STR megacam/format_spliced.config + MASKS STR megacam/format_spliced_mask.config + SPLICED STR megacam/format_spliced.config + MASK STR megacam/format_split_mask.config SPLIT STR megacam/format_split.config -# MASK STR megacam/format_split_mask.config END @@ -59,185 +60,45 @@ 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 + 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 + TYPE FILERULE FILENAME.RULE FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.DEPTH DATA.DEPTH FILE.TYPE FILE.MODE FILE.FORMAT + PPIMAGE.INPUT FILERULE @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP CHIP IMAGE READ NONE + # PPIMAGE.INPUT FILERULE @FILES {CHIP.NAME} {CELL.NAME} NONE FPA CHIP IMAGE READ NONE - 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 + PPIMAGE.OUTPUT FILERULE {OUTPUT}.{CHIP.NAME}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE NONE + # PPIMAGE.OUTPUT FILERULE {OUTPUT}.{CHIP.NAME}.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE WRITE NONE + PPIMAGE.BIN1 FILERULE {OUTPUT}.{CHIP.NAME}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE SPLIT + PPIMAGE.BIN2 FILERULE {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE SPLIT + PPIMAGE.JPEG1 FILERULE {OUTPUT}.{CHIP.NAME}.b1.jpg -greyscale RANGE -5:20 CHIP CHIP JPEG WRITE SPLIT + PPIMAGE.JPEG2 FILERULE {OUTPUT}.{CHIP.NAME}.b2.jpg -greyscale FRACTION 0.50:2.00 CHIP CHIP JPEG WRITE SPLIT + PPIMAGE.BIAS FILERULE bias.mef.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE READ NONE + PPIMAGE.DARK FILERULE dark.mef.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE READ NONE + PPIMAGE.FLAT FILERULE flat.mef.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE READ NONE + PPIMAGE.MASK FILERULE mask.mef.fits {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE READ NONE - # an indirect rule allows multiple, related output definitions - PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMP -# PSPHOT.OUTPUT STR PSPHOT.OUTPUT.RAW + PSPHOT.INPUT FILERULE @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP CHIP IMAGE WRITE SPLICE + PSPHOT.RESID FILERULE {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SPLICE + PSPHOT.BACKGND FILERULE {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SPLICE + PSPHOT.BACKSUB FILERULE {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SPLICE + PSPHOT.BACKMDL FILERULE {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SPLICE - 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.OUTPUT.RAW FILERULE {OUTPUT}.{CHIP.NAME} NONE NONE PHU CHIP CHIP RAW WRITE NONE + PSPHOT.OUTPUT.SX FILERULE {OUTPUT}.sx NONE NONE PHU CHIP CHIP SX WRITE NONE + PSPHOT.OUTPUT.OBJ FILERULE {OUTPUT}.obj NONE NONE PHU CHIP CHIP OBJ WRITE NONE + PSPHOT.OUTPUT.CMP FILERULE {OUTPUT}.{CHIP.NAME}.{CELL.NAME}.cmp NONE NONE PHU CELL CELL CMP WRITE NONE + PSPHOT.OUTPUT.CMF FILERULE {OUTPUT}.cmf NONE SMPDATA PHU CHIP CHIP CMF WRITE NONE -# 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 FILERULE @FILES NONE NONE PHU CHIP CHIP CMP READ NONE + PSASTRO.INPUT.CMF FILERULE @FILES NONE SMPDATA PHU CHIP CHIP CMF READ NONE + PSASTRO.OUTPUT.CMP FILERULE {OUTPUT}.smp NONE NONE PHU CHIP CHIP CMP WRITE NONE +END - 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 +# PSPHOT.PSF.SAVE FILERULE {OUTPUT}.{CHIP.NAME}.psf.txt {CHIP.NAME} {CELL.NAME} {CELL.NAME} READOUT READOUT PSF WRITE SIMPLE +# PSPHOT.PSF.LOAD FILERULE {OUTPUT}.{CHIP.NAME}.psf.txt {CHIP.NAME} {CELL.NAME} {CELL.NAME} CELL CELL PSF READ NONE +# PPIMAGE.BIAS FILERULE bias.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ SPLIT +# PPIMAGE.DARK FILERULE dark.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ SPLIT +# PPIMAGE.FLAT FILERULE flat.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ SPLIT +# PPIMAGE.MASK FILERULE mask.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ MASK - 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 -END