Index: trunk/ippconfig/simple/camera.config =================================================================== --- trunk/ippconfig/simple/camera.config (revision 7334) +++ trunk/ippconfig/simple/camera.config (revision 7532) @@ -16,281 +16,42 @@ PHASE2 STR simple/phase2.config # Phase 2 recipe details PSPHOT STR simple/psphot.config # psphot details + PSASTRO STR simple/psastro.config # psastro details END 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 FPA - DATA.DEPTH STR FPA - FILE.TYPE STR IMAGE - FILE.MODE STR READ - END - PPIMAGE.OUTPUT METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.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.JPEG1 METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.bin1.jpg - FILENAME.XTRA STR -greyscale - EXTNAME.RULE STR RANGE - EXTNAME.XTRA STR -5:20 - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR JPEG - FILE.MODE STR WRITE - FILE.FORMAT STR SPLIT - END - PPIMAGE.JPEG2 METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.bin2.jpg - FILENAME.XTRA STR rainbow - EXTNAME.RULE STR FRACTION - EXTNAME.XTRA STR 0.50:2.00 - FILE.DEPTH STR CHIP - DATA.DEPTH STR CHIP - FILE.TYPE STR JPEG - 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 FPA - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - 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 FPA - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - 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 FPA - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - 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 FPA - DATA.DEPTH STR CHIP - FILE.TYPE STR IMAGE - FILE.MODE STR WRITE - 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 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 FPA - DATA.DEPTH STR FPA - 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.BIN1 FILERULE {OUTPUT}.{CHIP.NAME}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE SIMPLE + PPIMAGE.BIN2 FILERULE {OUTPUT}.{CHIP.NAME}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE WRITE SIMPLE + PPIMAGE.JPEG1 FILERULE {OUTPUT}.{CHIP.NAME}.b1.jpg -greyscale RANGE -5:20 CHIP CHIP JPEG WRITE SIMPLE + PPIMAGE.JPEG2 FILERULE {OUTPUT}.{CHIP.NAME}.b2.jpg -greyscale FRACTION 0.50:2.00 CHIP CHIP JPEG WRITE SIMPLE + PPIMAGE.BIAS FILERULE bias.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ NONE + PPIMAGE.DARK FILERULE dark.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ NONE + PPIMAGE.FLAT FILERULE flat.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ NONE + PPIMAGE.MASK FILERULE mask.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE READ NONE - # an indirect rule allows multiple, related output definitions -# PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF - 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 SIMPLE + PSPHOT.RESID FILERULE {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SIMPLE + PSPHOT.BACKGND FILERULE {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SIMPLE + PSPHOT.BACKSUB FILERULE {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SIMPLE + PSPHOT.BACKMDL FILERULE {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE WRITE SIMPLE - 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.BACKGND METADATA - FILENAME.RULE STR {OUTPUT}.bck.fits - FILENAME.XTRA STR {CHIP.NAME} - 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 - FILE.FORMAT STR SPLIT - 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.BACKSUB METADATA - FILENAME.RULE STR {OUTPUT}.sub.fits - FILENAME.XTRA STR {CHIP.NAME} - 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 - FILE.FORMAT STR SPLIT - END - - PSPHOT.BACKMDL METADATA - FILENAME.RULE STR {OUTPUT}.mdl.fits - FILENAME.XTRA STR {CHIP.NAME} - 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 - FILE.FORMAT STR SPLIT - END - - PSPHOT.PSF.SAVE METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.psf.txt - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR {CELL.NAME} - FILE.DEPTH STR READOUT - DATA.DEPTH STR READOUT - FILE.TYPE STR PSF - FILE.MODE STR WRITE - END - PSPHOT.PSF.LOAD METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME}.psf.txt - FILENAME.XTRA STR {CHIP.NAME} - EXTNAME.RULE STR {CELL.NAME} - EXTNAME.XTRA STR {CELL.NAME} - FILE.DEPTH STR CELL - DATA.DEPTH STR CELL - FILE.TYPE STR PSF - FILE.MODE STR READ - END - - PSPHOT.OUTPUT.RAW METADATA - FILENAME.RULE STR {OUTPUT}.{CHIP.NAME} - 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}.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 - - PSASTRO.INPUT STR PSASTRO.INPUT.CMP - PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP - - PSASTRO.INPUT.CMP METADATA - FILENAME.RULE STR @FILES - 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 READ - END - PSASTRO.INPUT.CMF METADATA - FILENAME.RULE STR @FILES - 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 READ - END - - PSASTRO.OUTPUT.CMP METADATA - FILENAME.RULE STR {OUTPUT}.smp - 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 -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