Index: trunk/ippconfig/ucam/camera.config =================================================================== --- trunk/ippconfig/ucam/camera.config (revision 12301) +++ trunk/ippconfig/ucam/camera.config (revision 12525) @@ -97,51 +97,51 @@ ### 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 - PPARITH.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + PPIMAGE.INPUT INPUT @FILES CHIP IMAGE + PPARITH.INPUT INPUT @FILES CHIP IMAGE ### use these entries to get the detrend images from specific files - PPIMAGE.MASK INPUT mask.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE - PPIMAGE.BIAS INPUT bias.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE - PPIMAGE.DARK INPUT dark.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE - PPIMAGE.FLAT INPUT flat.fits {CHIP.NAME} {CHIP.NAME} NONE CHIP IMAGE + PPIMAGE.MASK INPUT mask.fits CHIP IMAGE + PPIMAGE.BIAS INPUT bias.fit CHIP IMAGE + PPIMAGE.DARK INPUT dark.fits CHIP IMAGE + PPIMAGE.FLAT INPUT flat.fits CHIP IMAGE ### 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 + #PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + #PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE + #PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + #PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE - PSPHOT.INPUT INPUT @FILES {CHIP.NAME} {CELL.NAME} NONE CHIP IMAGE + PSPHOT.INPUT INPUT @FILES CHIP IMAGE - PSASTRO.INPUT.CMP INPUT @FILES NONE NONE PHU CHIP CMP - PSASTRO.INPUT.CMF INPUT @FILES NONE SMPDATA PHU CHIP CMF + 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 OUTPUT {OUTPUT}.fit {CHIP.NAME} {CHIP.NAME} NONE FPA CHIP IMAGE TRUE NONE - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fit {CHIP.NAME} {CHIP.NAME} NONE FPA FPA IMAGE TRUE NONE - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fit NONE NONE NONE FPA FPA IMAGE TRUE NONE - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fit NONE NONE NONE FPA FPA IMAGE TRUE NONE + TYPE OUTPUT FILENAME.RULE DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fit CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fit FPA IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fit FPA IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fit FPA IMAGE TRUE NONE - PPIMAGE.BIN1.OUTPUT OUTPUT {OUTPUT}.b1.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP FPA IMAGE TRUE NONE - PPIMAGE.BIN2.OUTPUT OUTPUT {OUTPUT}.b2.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP FPA IMAGE TRUE NONE - PPIMAGE.JPEG1.OUTPUT OUTPUT {OUTPUT}.b1.jpg NONE NONE NONE FPA FPA JPEG TRUE NONE - PPIMAGE.JPEG2.OUTPUT OUTPUT {OUTPUT}.b2.jpg NONE NONE NONE FPA FPA JPEG TRUE NONE + PPIMAGE.BIN1.OUTPUT OUTPUT {OUTPUT}.b1.fit FPA IMAGE TRUE NONE + PPIMAGE.BIN2.OUTPUT OUTPUT {OUTPUT}.b2.fit FPA IMAGE TRUE NONE + PPIMAGE.JPEG1.OUTPUT OUTPUT {OUTPUT}.b1.jpg FPA JPEG TRUE NONE + PPIMAGE.JPEG2.OUTPUT OUTPUT {OUTPUT}.b2.jpg FPA JPEG TRUE NONE - PSPHOT.RESID OUTPUT {OUTPUT}.res.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE RAW - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE RAW - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE RAW - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits NONE {CELL.NAME} {CELL.NAME} CHIP CHIP IMAGE TRUE RAW + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits CHIP IMAGE TRUE RAW + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits CHIP IMAGE TRUE RAW + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits CHIP IMAGE TRUE RAW + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits CHIP IMAGE TRUE RAW - 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 - PPARITH.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fit {CHIP.NAME} {CHIP.NAME} NONE CHIP CHIP IMAGE TRUE NONE + PPARITH.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fit CHIP IMAGE TRUE NONE END