Index: trunk/ippconfig/megacam/camera.config =================================================================== --- trunk/ippconfig/megacam/camera.config (revision 12797) +++ trunk/ippconfig/megacam/camera.config (revision 12803) @@ -71,10 +71,10 @@ NB920 STR NB920 - B2F STR B2F - Bj STR Bj - Vj STR Vj - Rj STR Rj - Ij STR Ij - Hb STR Hb + B2F STR B2F + Bj STR Bj + Vj STR Vj + Rj STR Rj + Ij STR Ij + Hb STR Hb HbOff STR HbOff END @@ -141,5 +141,5 @@ END - + FILERULES METADATA @@ -155,20 +155,20 @@ ### input file definitions - TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + 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 IMAGE - DVOCORR.REFHEAD INPUT @FILES CHIP HEADER - - DVOFLAT.INPUT INPUT @FILES CHIP IMAGE - DVOFLAT.CORR INPUT @DETDB CHIP IMAGE + + ## can we just use PPIMAGE.INPUT as the pmFPAfile name? + DVOCORR.INPUT INPUT @FILES CHIP IMAGE + DVOCORR.REFHEAD INPUT @FILES CHIP HEADER + + DVOFLAT.INPUT INPUT @FILES CHIP IMAGE + DVOFLAT.CORR INPUT @DETDB CHIP IMAGE ### use these entries to get the detrend images from specific files - #PPIMAGE.MASK INPUT megacam/mask.{CHIP.NAME}.fits CHIP MASK - #PPIMAGE.BIAS INPUT megacam/bias/MEGACAM.bias.norm.1.0.{CHIP.NAME}.fits CHIP IMAGE - #PPIMAGE.DARK INPUT megacam/MEGACAM.dark.norm.2.0.{CHIP.NAME}.fits CHIP IMAGE - #PPIMAGE.FLAT INPUT megacam/MEGACAM.flat.norm.3.0.{CHIP.NAME}.fits CHIP IMAGE - #PPIMAGE.FRINGE INPUT megacam/MEGACAM.fringe.norm.4.0.{CHIP.NAME}.fits CHIP FRINGE + #PPIMAGE.MASK INPUT megacam/mask.{CHIP.NAME}.fits CHIP MASK + #PPIMAGE.BIAS INPUT megacam/bias/MEGACAM.bias.norm.1.0.{CHIP.NAME}.fits CHIP IMAGE + #PPIMAGE.DARK INPUT megacam/MEGACAM.dark.norm.2.0.{CHIP.NAME}.fits CHIP IMAGE + #PPIMAGE.FLAT INPUT megacam/MEGACAM.flat.norm.3.0.{CHIP.NAME}.fits CHIP IMAGE + #PPIMAGE.FRINGE INPUT megacam/MEGACAM.fringe.norm.4.0.{CHIP.NAME}.fits CHIP FRINGE ### use these entries to get the detrend images from the database @@ -177,59 +177,63 @@ PPIMAGE.DARK INPUT @DETDB CHIP IMAGE PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE - PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE - - PSPHOT.LOAD INPUT @FILES CHIP IMAGE - PSPHOT.INPUT INPUT @FILES CHIP IMAGE - PSASTRO.INPUT.CMP INPUT @FILES CHIP CMP - PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF - - PSWARP.INPUT INPUT @FILES CHIP IMAGE - PSWARP.SKYCELL INPUT @FILES CHIP IMAGE - PSWARP.ASTROM INPUT @FILES CHIP CMF + PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE + + PSPHOT.LOAD INPUT @FILES CHIP IMAGE + PSPHOT.INPUT INPUT @FILES CHIP IMAGE + PSASTRO.INPUT.CMP INPUT @FILES CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF + + PSWARP.INPUT INPUT @FILES CHIP IMAGE + PSWARP.WEIGHT INPUT @FILES CHIP WEIGHT + PSWARP.MASK INPUT @FILES CHIP MASK + PSWARP.SKYCELL INPUT @FILES CHIP IMAGE + PSWARP.ASTROM INPUT @FILES CHIP CMF ### output file definitions - TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT - PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE SPLICED - PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits MASK CHIP FALSE NONE - PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP FALSE NONE - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits IMAGE CHIP TRUE SPLIT - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE SPLICED - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE SPLICED - - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE - - PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE CHIP TRUE SPLIT - PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE CHIP TRUE SPLIT - PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1.fits IMAGE CHIP TRUE SPLICED - PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2.fits IMAGE CHIP TRUE SPLICED - - DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE CHIP TRUE SPLICED - DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE SPLIT - DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE CHIP TRUE SPLICED - DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE CHIP TRUE SPLIT - - PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE CHIP TRUE SPLICED - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE CHIP TRUE SPLICED - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE CHIP TRUE SPLICED - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE CHIP TRUE SPLICED - - PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW CHIP TRUE NONE - PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX CHIP TRUE NONE - PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ CHIP TRUE NONE - PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF CHIP TRUE SPLICED - PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP CHIP TRUE NONE - - PSPHOT.MOMENT.PLT OUTPUT {OUTPUT}.mnt.png KAPA FPA TRUE NONE - PSPHOT.PSFMODEL.PLT OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE NONE - - PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}a.cmf CMF CHIP TRUE NONE - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP CHIP TRUE NONE - PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}a.cmf CMF CHIP TRUE NONE - - PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE - PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE +<<<<<<< camera.config + TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE SPLICED + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits MASK CHIP FALSE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP FALSE NONE + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE SPLICED + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE SPLICED + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE + + PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1.fits IMAGE CHIP TRUE SPLICED + PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2.fits IMAGE CHIP TRUE SPLICED + + DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE CHIP TRUE SPLICED + DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE SPLIT + DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE CHIP TRUE SPLICED + DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE CHIP TRUE SPLIT + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE CHIP TRUE SPLICED + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE CHIP TRUE SPLICED + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE CHIP TRUE SPLICED + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE CHIP TRUE SPLICED + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW CHIP TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX CHIP TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ CHIP TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF CHIP TRUE SPLICED + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP CHIP TRUE NONE + + PSPHOT.MOMENT.PLT OUTPUT {OUTPUT}.mnt.png KAPA FPA TRUE NONE + PSPHOT.PSFMODEL.PLT OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE NONE + + PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}a.cmf CMF CHIP TRUE NONE + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP CHIP TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE END