Index: /trunk/ippconfig/megacam/camera.config =================================================================== --- /trunk/ippconfig/megacam/camera.config (revision 12537) +++ /trunk/ippconfig/megacam/camera.config (revision 12538) @@ -183,39 +183,45 @@ PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF - ### output file definitions - 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 SPLICED - 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 SPLICED - PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2.fits CHIP IMAGE TRUE SPLICED - DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits CHIP IMAGE TRUE SPLICED - DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits CHIP IMAGE TRUE SPLIT - DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits CHIP IMAGE TRUE SPLICED - DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits CHIP IMAGE TRUE SPLIT - - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits CHIP IMAGE TRUE SPLIT - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits FPA IMAGE TRUE SPLICED - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits FPA IMAGE TRUE SPLICED - - 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 CHIP IMAGE TRUE SPLICED - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits CHIP IMAGE TRUE SPLICED - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits CHIP IMAGE TRUE SPLICED - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits CHIP IMAGE TRUE SPLICED - - 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 CHIP CMP TRUE NONE - -END + 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 NONE + 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.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP 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 +END Index: /trunk/ippconfig/simtest/camera.config =================================================================== --- /trunk/ippconfig/simtest/camera.config (revision 12537) +++ /trunk/ippconfig/simtest/camera.config (revision 12538) @@ -102,36 +102,40 @@ ### output file definitions - TYPE OUTPUT FILENAME.RULE DATA.LEVEL FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fits FPA TRUE NONE - PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits FPA FALSE NONE - PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits FPA FALSE NONE - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fits FPA TRUE NONE - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits FPA TRUE NONE - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits FPA TRUE NONE - - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg FPA TRUE NONE - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg FPA TRUE NONE - PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits FPA TRUE NONE - PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits FPA TRUE NONE - - PSWARP.OUTPUT OUTPUT {OUTPUT}.fits FPA TRUE NONE - PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits FPA TRUE NONE - PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits FPA TRUE NONE - - PSPHOT.RESID OUTPUT {OUTPUT}.res.fits FPA TRUE NONE - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits FPA TRUE NONE - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits FPA TRUE NONE - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits FPA TRUE NONE - PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} FPA TRUE NONE - PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx FPA TRUE NONE - PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj FPA TRUE NONE - PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp FPA TRUE NONE - PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf FPA TRUE NONE - PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf FPA TRUE NONE - - PSPHOT.MOMENT.PLT OUTPUT {OUTPUT}.mnt.png FPA TRUE NONE - PSPHOT.PSFMODEL.PLT OUTPUT {OUTPUT}.psf.png FPA TRUE NONE - - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp FPA TRUE NONE + TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA FALSE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA FALSE NONE + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE FPA TRUE NONE + DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE FPA TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE FPA TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE FPA TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE FPA TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE FPA TRUE NONE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} RAW FPA TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX FPA TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ FPA TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp CMP FPA TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF FPA 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.CMP OUTPUT {OUTPUT}.smp CMP FPA 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 END @@ -140,5 +144,4 @@ # user can set the extension name, if used # user can set the file type (IMAGE, JPEG, RAW, SX, OBJ, CMP, CMF) : but these are not variable in most cases! -# user can set the file mode (READ, WRITE), but these must be set by the programmer # user can set the file depth: only valid for output files # user can set the data depth: must be >= file depth @@ -146,15 +149,2 @@ # user can set the colormap, scaling method, scaling range (JPEG only) # user can set the extension name for the data and header segments (CMF only) - -# known uses of the filename.xtra, extname.rule, and extname.xtra: -# extname.rule: used to construct output EXTNAME keys (CMF DATA) -# extname.xtra: used to construct output EXTNAME keys (CMF HEAD) - -# extname.rule: used to carry classID to DetDB -# filename.xtra: used to carry detID to DetDB (internal) - -# filename.xtra: used to carry arglist name (internal) - -# filename.xtra: used to define the JPEG colormap -# extname.rule: used to define the JPEG scaling method -# extname.xtra: used to carry arguments of JPEG scaling method