Index: trunk/ippconfig/tc3/camera.config =================================================================== --- trunk/ippconfig/tc3/camera.config (revision 12514) +++ trunk/ippconfig/tc3/camera.config (revision 12525) @@ -102,60 +102,60 @@ ### 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 + DVOCORR.INPUT INPUT @FILES CHIP IMAGE + DVOCORR.REFHEAD INPUT @FILES CHIP HEADER - DVOFLAT.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE - DVOFLAT.CORR INPUT @DETDB NONE NONE NONE CHIP IMAGE + 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 + 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.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 + PSPHOT.INPUT INPUT @FILES CHIP IMAGE + PSASTRO.INPUT.CMP INPUT @FILES CHIP CMP + PSASTRO.INPUT.CMF 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 + 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.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.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 NONE NONE NONE FPA FPA JPEG TRUE NONE - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg NONE NONE NONE FPA FPA JPEG TRUE NONE + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg FPA JPEG TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg 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.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} 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} 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.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp NONE NONE PHU CHIP CHIP CMP TRUE NONE + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CHIP CMP TRUE NONE END