Index: /trunk/ippconfig/megacam/camera.config =================================================================== --- /trunk/ippconfig/megacam/camera.config (revision 14806) +++ /trunk/ippconfig/megacam/camera.config (revision 14807) @@ -252,4 +252,5 @@ PPSUB.REF.MASK INPUT @FILES FPA MASK PPSUB.REF.WEIGHT INPUT @FILES FPA WEIGHT + PPSUB.SOURCES INPUT @FILES FPA CMF PPSTACK.INPUT INPUT @FILES FPA IMAGE @@ -318,4 +319,5 @@ PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK FPA TRUE NONE PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PSWARP.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE Index: /trunk/ippconfig/simple/camera.config =================================================================== --- /trunk/ippconfig/simple/camera.config (revision 14806) +++ /trunk/ippconfig/simple/camera.config (revision 14807) @@ -5,5 +5,5 @@ SIMPLE STR simple/format.config END - + # Description of camera --- all the chips and the cells that comprise them FPA METADATA @@ -82,20 +82,20 @@ ### input file definitions - TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE - PPIMAGE.INPUT INPUT none.fits FPA IMAGE - INPUT.MASK INPUT none.fits FPA MASK - INPUT.WEIGHT INPUT none.fits FPA WEIGHT - PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE - PPIMAGE.DARK INPUT @DETDB CHIP IMAGE - PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE - PPIMAGE.MASK INPUT @DETDB CHIP IMAGE - PSPHOT.INPUT INPUT @FILES CHIP IMAGE - PSWARP.INPUT INPUT none.fits FPA IMAGE - PSWARP.SKYCELL INPUT none.fits FPA IMAGE - PSASTRO.INPUT.CMP INPUT none.fits CHIP CMP - PSASTRO.INPUT.CMF INPUT none.fits CHIP CMF - PSPHOT.LOAD INPUT none.fits CHIP IMAGE - PSPHOT.PSF.LOAD INPUT none.fits CHIP PSF - PSPHOT.INPUT.CMF INPUT none.fits CHIP CMF + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + PPIMAGE.INPUT INPUT none.fits FPA IMAGE + INPUT.MASK INPUT none.fits FPA MASK + INPUT.WEIGHT INPUT none.fits FPA WEIGHT + PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE + PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE + PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + PSPHOT.INPUT INPUT @FILES CHIP IMAGE + PSWARP.INPUT INPUT none.fits FPA IMAGE + PSWARP.SKYCELL INPUT none.fits FPA IMAGE + PSASTRO.INPUT.CMP INPUT none.fits CHIP CMP + PSASTRO.INPUT.CMF INPUT none.fits CHIP CMF + PSPHOT.LOAD INPUT none.fits CHIP IMAGE + PSPHOT.PSF.LOAD INPUT none.fits CHIP PSF + PSPHOT.INPUT.CMF INPUT none.fits CHIP CMF PPSUB.INPUT INPUT none.fits FPA IMAGE @@ -105,4 +105,5 @@ PPSUB.REF.MASK INPUT none.fits FPA MASK PPSUB.REF.WEIGHT INPUT none.fits FPA WEIGHT + PPSUB.SOURCES INPUT none.fits FPA CMF PPSTACK.INPUT INPUT none.fits FPA IMAGE @@ -118,10 +119,10 @@ PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE SIMPLE PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE SIMPLE - + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE SIMPLE PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE SIMPLE PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE SIMPLE PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE SIMPLE - + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK FPA TRUE NONE @@ -129,10 +130,10 @@ PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE - + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE FPA TRUE SIMPLE PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE FPA TRUE SIMPLE PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE FPA TRUE SIMPLE PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE FPA TRUE SIMPLE - + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} RAW FPA TRUE NONE PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX FPA TRUE NONE @@ -141,8 +142,12 @@ 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 SIMPLE PSPHOT.PSFMODEL.PLT OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE SIMPLE - + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA FPA TRUE NONE + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP FPA TRUE NONE @@ -162,5 +167,5 @@ # FPA file defines properties of a possible input|output object -# user can set the filename (I|O), filename rules (O), or abstract source (@FILES, @DETDB) (I) +# user can set the filename (I|O), filename rules (O), or abstract source (@FILES, @DETDB) (I) # 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! @@ -169,10 +174,10 @@ EXTNAME.RULES METADATA - CMF.HEAD STR {CHIP.NAME}.hdr - CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT? + CMF.HEAD STR hdr + CMF.DATA STR psf - PSF.HEAD STR {CHIP.NAME}.hdr - PSF.TABLE STR {CHIP.NAME}.psf_model - PSF.RESID STR {CHIP.NAME}.psf_resid + PSF.HEAD STR hdr + PSF.TABLE STR psf_model + PSF.RESID STR psf_resid END