Index: /branches/pap_branch_070920/ippconfig/cfh12k/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/camera.config (revision 15119) +++ /branches/pap_branch_070920/ippconfig/cfh12k/camera.config (revision 15120) @@ -187,62 +187,62 @@ ### output file definitions - TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE CHIP TRUE SPLIT - PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE CHIP TRUE MEF - PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK CHIP TRUE SPLIT - PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP TRUE SPLIT - PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK CHIP TRUE MEF - PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT CHIP TRUE MEF - PPIMAGE.CHIP OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE MEF - PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.mk.fits MASK CHIP TRUE MEF - PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT CHIP TRUE MEF - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE MEF - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE MEF - - 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}.b1c.fits IMAGE CHIP TRUE MEF - PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE CHIP TRUE MEF - - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE - - DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE CHIP TRUE MEF - DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE SPLIT - DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE CHIP TRUE MEF - DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE CHIP TRUE SPLIT - - PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE CHIP TRUE MEF - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE CHIP TRUE MEF - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE CHIP TRUE MEF - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE CHIP TRUE MEF - - 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.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP CHIP TRUE NONE - PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF CHIP TRUE NONE - PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE - - PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF CHIP TRUE MEF - - 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}.{CHIP.NAME}.smp CMP CHIP TRUE NONE - PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF CHIP TRUE NONE - PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE - - PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.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 - - PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT - - LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE - LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE + TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE NONE CHIP TRUE SPLIT + PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE NONE CHIP TRUE MEF + PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK NONE CHIP TRUE SPLIT + PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT NONE CHIP TRUE SPLIT + PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK NONE CHIP TRUE MEF + PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT NONE CHIP TRUE MEF + PPIMAGE.CHIP OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE MEF + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE CHIP TRUE MEF + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE CHIP TRUE MEF + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE MEF + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE MEF + + PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE NONE CHIP TRUE SPLIT + PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE CHIP TRUE SPLIT + PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1c.fits IMAGE NONE CHIP TRUE MEF + PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE NONE CHIP TRUE MEF + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE + + DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE CHIP TRUE MEF + DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE NONE CHIP TRUE SPLIT + DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE CHIP TRUE MEF + DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE NONE CHIP TRUE SPLIT + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE CHIP TRUE MEF + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE CHIP TRUE MEF + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE CHIP TRUE MEF + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE CHIP TRUE MEF + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW NONE CHIP TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX NONE CHIP TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ NONE CHIP TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP NONE CHIP TRUE NONE + PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF NONE CHIP TRUE NONE + PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE CHIP TRUE MEF + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA NONE FPA TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA NONE FPA TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP NONE CHIP TRUE NONE + PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF NONE CHIP TRUE NONE + PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF NONE FPA TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE SPLIT + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE END Index: /branches/pap_branch_070920/ippconfig/ctio_mosaic2/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ctio_mosaic2/camera.config (revision 15119) +++ /branches/pap_branch_070920/ippconfig/ctio_mosaic2/camera.config (revision 15120) @@ -139,64 +139,64 @@ ### output file definitions - TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE CHIP TRUE SPLIT - PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE CHIP TRUE MEF - PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK CHIP TRUE SPLIT - PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP TRUE SPLIT - PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK CHIP TRUE MEF - PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT CHIP TRUE MEF - - PPIMAGE.CHIP OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE MEF - PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.mk.fits MASK CHIP TRUE MEF - PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT CHIP TRUE MEF - - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE MEF - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE MEF - - 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}.b1c.fits IMAGE CHIP TRUE MEF - PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE CHIP TRUE MEF - - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE - - DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE CHIP TRUE MEF - DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE SPLIT - DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE CHIP TRUE MEF - DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE CHIP TRUE SPLIT - - PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE CHIP TRUE MEF - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE CHIP TRUE MEF - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE CHIP TRUE MEF - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE CHIP TRUE MEF - - 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.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP CHIP TRUE NONE - PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF CHIP TRUE NONE - PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE - - PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF CHIP TRUE MEF - - 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}.{CHIP.NAME}.smp CMP CHIP TRUE NONE - PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF CHIP TRUE NONE - PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE - - PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.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 - - PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT - - LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE - LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE + TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE NONE CHIP TRUE SPLIT + PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE NONE CHIP TRUE MEF + PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK NONE CHIP TRUE SPLIT + PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT NONE CHIP TRUE SPLIT + PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK NONE CHIP TRUE MEF + PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT NONE CHIP TRUE MEF + + PPIMAGE.CHIP OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE MEF + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE CHIP TRUE MEF + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE CHIP TRUE MEF + + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE MEF + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE MEF + + PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE NONE CHIP TRUE SPLIT + PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE CHIP TRUE SPLIT + PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1c.fits IMAGE NONE CHIP TRUE MEF + PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE NONE CHIP TRUE MEF + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE + + DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE CHIP TRUE MEF + DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE NONE CHIP TRUE SPLIT + DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE CHIP TRUE MEF + DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE NONE CHIP TRUE SPLIT + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE CHIP TRUE MEF + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE CHIP TRUE MEF + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE CHIP TRUE MEF + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE CHIP TRUE MEF + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW NONE CHIP TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX NONE CHIP TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ NONE CHIP TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP NONE CHIP TRUE NONE + PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF NONE CHIP TRUE NONE + PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE CHIP TRUE MEF + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA NONE FPA TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA NONE FPA TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP NONE CHIP TRUE NONE + PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF NONE CHIP TRUE NONE + PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF NONE FPA TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE SPLIT + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE END Index: /branches/pap_branch_070920/ippconfig/gpc1/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/gpc1/camera.config (revision 15119) +++ /branches/pap_branch_070920/ippconfig/gpc1/camera.config (revision 15120) @@ -222,63 +222,63 @@ ### output file definitions - TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE NONE - PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK CHIP TRUE NONE - PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP TRUE NONE - - PPIMAGE.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE CHIP TRUE NONE - PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK CHIP TRUE NONE - PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT CHIP 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}.{CHIP.NAME}.b1.fits IMAGE CHIP TRUE NONE - PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE CHIP TRUE NONE - - DVOCORR.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE NONE - DVOFLAT.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE CHIP TRUE NONE - - PSPHOT.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits IMAGE CHIP TRUE NONE - PSPHOT.BACKGND OUTPUT {OUTPUT}.{CHIP.NAME}.bck.fits IMAGE CHIP TRUE NONE - PSPHOT.BACKSUB OUTPUT {OUTPUT}.{CHIP.NAME}.sub.fits IMAGE CHIP TRUE NONE - PSPHOT.BACKMDL OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits IMAGE CHIP TRUE NONE - - PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW CHIP TRUE NONE - PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.{CHIP.NAME}.sx SX CHIP TRUE NONE - PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.{CHIP.NAME}.obj OBJ CHIP TRUE NONE - PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP CHIP TRUE NONE - PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF CHIP TRUE NONE - PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE - - PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF FPA TRUE NONE - - SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png KAPA CHIP TRUE NONE - SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.{CHIP.NAME}.psf.png KAPA CHIP TRUE NONE - SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.{CHIP.NAME}.dap.png KAPA CHIP TRUE NONE - - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP CHIP TRUE NONE - PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF CHIP TRUE NONE - PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF FPA 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 - - PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE - PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE - - PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE - - PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE SIMTEST - - LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE - LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE + TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK NONE CHIP TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT NONE CHIP TRUE NONE + + PPIMAGE.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE NONE + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK NONE CHIP TRUE NONE + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT NONE CHIP TRUE NONE + + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE NONE CHIP TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE CHIP TRUE NONE + + DVOCORR.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE NONE CHIP TRUE NONE + DVOFLAT.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE NONE CHIP TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits IMAGE NONE CHIP TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.{CHIP.NAME}.bck.fits IMAGE NONE CHIP TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.{CHIP.NAME}.sub.fits IMAGE NONE CHIP TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits IMAGE NONE CHIP TRUE NONE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW NONE CHIP TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.{CHIP.NAME}.sx SX NONE CHIP TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.{CHIP.NAME}.obj OBJ NONE CHIP TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP NONE CHIP TRUE NONE + PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF NONE CHIP TRUE NONE + PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE FPA TRUE NONE + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png KAPA NONE CHIP TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.{CHIP.NAME}.psf.png KAPA NONE CHIP TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.{CHIP.NAME}.dap.png KAPA NONE CHIP TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP NONE CHIP TRUE NONE + PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF NONE CHIP TRUE NONE + PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF NONE FPA TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE + + PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + + PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMTEST + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE END Index: /branches/pap_branch_070920/ippconfig/isp/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/camera.config (revision 15119) +++ /branches/pap_branch_070920/ippconfig/isp/camera.config (revision 15120) @@ -166,55 +166,55 @@ ### output file definitions - TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT OUTPUT {OUTPUT}.isp.fits IMAGE FPA TRUE NONE - PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE - PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE - PPIMAGE.CHIP OUTPUT {OUTPUT}.chip.fits IMAGE FPA TRUE NONE - PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.chip.mask.fits MASK FPA TRUE NONE - PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.chip.wt.fits WEIGHT 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.STATS OUTPUT {OUTPUT}.stats STATS FPA TRUE NONE - - PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1c.fits IMAGE FPA TRUE NONE - PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2c.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 - - 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 - - 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 - PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF FPA 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 - - PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE ISP - PPSIM.SOURCES OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE - - LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE - LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE + TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.isp.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + PPIMAGE.CHIP OUTPUT {OUTPUT}.chip.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.chip.mask.fits MASK NONE FPA TRUE NONE + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.chip.wt.fits WEIGHT NONE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE + + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1c.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2c.fits IMAGE NONE FPA TRUE NONE + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE + + DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE FPA TRUE NONE + DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE FPA TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE FPA TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE FPA TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE FPA TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE FPA TRUE NONE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} RAW NONE FPA TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX NONE FPA TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ NONE FPA TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp CMP NONE FPA TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE FPA TRUE NONE + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA NONE FPA TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA NONE FPA TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP NONE FPA TRUE NONE + PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF NONE FPA TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE ISP + PPSIM.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE + + LOG.IMFILE OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE END Index: /branches/pap_branch_070920/ippconfig/megacam/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/camera.config (revision 15119) +++ /branches/pap_branch_070920/ippconfig/megacam/camera.config (revision 15120) @@ -187,6 +187,21 @@ END -FILERULES STR megacam/filerules-spliced.mdc # File rules appropriate for MEF format - +FITS METADATA +# BITPIX is the bits per pixel for writing the output data +# COMPRESSION = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm +# TILE.[XYZ] are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows +# NOISE [0..16] is the number of "noise bits" to preserve when quantising floating point data; 16 for no loss +# HSCALE is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression +# HSMOOTH is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none + TYPE FITS BITPIX COMPRESSION TILE.X TILE.Y TILE.Z NOISE HSCALE HSMOOTH + DET_IMAGE FITS -32 RICE 0 1 1 16 0 0 + DET_MASK FITS 8 PLIO 0 1 1 0 0 0 + DET_WEIGHT FITS -32 RICE 0 1 1 16 0 0 + SKY_IMAGE FITS -32 RICE 0 1 1 16 0 0 + SKY_MASK FITS 8 PLIO 0 1 1 0 0 0 + SKY_WEIGHT FITS -32 RICE 0 1 1 16 0 0 +END + +FILERULES STR megacam/filerules-mef.mdc # File rules appropriate for MEF format EXTNAME.RULES METADATA Index: /branches/pap_branch_070920/ippconfig/megacam/filerules-mef.mdc =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/filerules-mef.mdc (revision 15119) +++ /branches/pap_branch_070920/ippconfig/megacam/filerules-mef.mdc (revision 15120) @@ -73,79 +73,78 @@ ### output file definitions -TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT -PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE CHIP TRUE MEF -PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK CHIP TRUE MEF -PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT CHIP TRUE MEF -PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE CHIP TRUE SPLIT -PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK CHIP TRUE SPLIT -PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP TRUE SPLIT +TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT +PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE NONE CHIP TRUE MEF +PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK NONE CHIP TRUE MEF +PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT NONE CHIP TRUE MEF +PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE NONE CHIP TRUE SPLIT +PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK NONE CHIP TRUE SPLIT +PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT NONE CHIP TRUE SPLIT -PPIMAGE.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE CHIP TRUE MEF -PPIMAGE.CHIP.MK.MEF OUTPUT {OUTPUT}.ch.mk.fits MASK CHIP TRUE MEF -PPIMAGE.CHIP.WT.MEF OUTPUT {OUTPUT}.ch.wt.fits WEIGHT CHIP TRUE MEF -PPIMAGE.CHIP.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE CHIP TRUE SPLIT -PPIMAGE.CHIP.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK CHIP TRUE SPLIT -PPIMAGE.CHIP.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT CHIP TRUE SPLIT +PPIMAGE.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE NONE CHIP TRUE MEF +PPIMAGE.CHIP.MK.MEF OUTPUT {OUTPUT}.ch.mk.fits MASK NONE CHIP TRUE MEF +PPIMAGE.CHIP.WT.MEF OUTPUT {OUTPUT}.ch.wt.fits WEIGHT NONE CHIP TRUE MEF +PPIMAGE.CHIP.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE SPLIT +PPIMAGE.CHIP.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK NONE CHIP TRUE SPLIT +PPIMAGE.CHIP.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT NONE CHIP TRUE SPLIT -PPIMAGE.OUTPUT.FPA1.MEF OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE MEF -PPIMAGE.OUTPUT.FPA2.MEF OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE MEF -PPIMAGE.OUTPUT.FPA1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE FPA TRUE SPLIT -PPIMAGE.OUTPUT.FPA2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE FPA TRUE SPLIT +PPIMAGE.OUTPUT.FPA1.MEF OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE MEF +PPIMAGE.OUTPUT.FPA2.MEF OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE MEF +PPIMAGE.OUTPUT.FPA1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE NONE FPA TRUE SPLIT +PPIMAGE.OUTPUT.FPA2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE FPA TRUE SPLIT -PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS FPA TRUE MEF +PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE MEF -PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1c.fits IMAGE CHIP TRUE MEF -PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE CHIP TRUE MEF -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}.b1c.fits IMAGE NONE CHIP TRUE MEF +PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE NONE CHIP TRUE MEF +PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE NONE CHIP TRUE SPLIT +PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE CHIP TRUE SPLIT -PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE -PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE +PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE +PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE -DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE CHIP TRUE MEF -DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE SPLIT -DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE CHIP TRUE MEF -DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE CHIP TRUE SPLIT +DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE CHIP TRUE MEF +DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE NONE CHIP TRUE SPLIT +DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE CHIP TRUE MEF +DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE NONE CHIP TRUE SPLIT -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.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE FPA TRUE NONE +PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE FPA TRUE NONE +PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE FPA TRUE NONE +PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE FPA TRUE NONE -PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW CHIP 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}.{CHIP.NAME}.cmp CMP CHIP TRUE NONE -PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF CHIP TRUE SPLIT -PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF CHIP TRUE NONE +PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW NONE CHIP TRUE NONE +PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX NONE FPA TRUE NONE +PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ NONE FPA TRUE NONE +PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP NONE CHIP TRUE NONE +PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF NONE CHIP TRUE SPLIT +PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE NONE -PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF CHIP TRUE NONE +PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE CHIP TRUE NONE -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 +SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE NONE +SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA NONE FPA TRUE NONE +SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA NONE FPA TRUE NONE -PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP CHIP TRUE NONE -PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF CHIP TRUE NONE -PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE +PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP NONE CHIP TRUE NONE +PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF NONE CHIP TRUE NONE +PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF NONE FPA TRUE NONE -PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE -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 +PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE FPA TRUE NONE +PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE +PSWARP.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE +PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE +PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE -PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE -PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK FPA TRUE NONE -PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE +PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE FPA TRUE NONE +PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE -PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE -PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK FPA TRUE NONE -PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE +PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE FPA TRUE NONE +PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE -PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT +PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE SPLIT -LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHI TRUE NONE -LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE - +LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE +LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE Index: /branches/pap_branch_070920/ippconfig/sdss/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/camera.config (revision 15119) +++ /branches/pap_branch_070920/ippconfig/sdss/camera.config (revision 15120) @@ -118,62 +118,62 @@ ### output file definitions - TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT OUTPUT {OUTPUT}.sdss.fits IMAGE FPA TRUE NONE - PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE - PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE - PPIMAGE.CHIP OUTPUT {OUTPUT}.chip.fits IMAGE FPA TRUE NONE - PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.chip.mask.fits MASK FPA TRUE NONE - PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.chip.wt.fits WEIGHT 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.STATS OUTPUT {OUTPUT}.stats STATS FPA TRUE NONE + TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.sdss.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + PPIMAGE.CHIP OUTPUT {OUTPUT}.chip.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.chip.mask.fits MASK NONE FPA TRUE NONE + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.chip.wt.fits WEIGHT NONE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE - PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1c.fits IMAGE FPA TRUE NONE - PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2c.fits IMAGE FPA TRUE NONE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1c.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2c.fits IMAGE NONE FPA TRUE NONE - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE - DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE FPA TRUE NONE - DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE FPA TRUE NONE + DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE FPA TRUE NONE + DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE 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.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE FPA TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE FPA TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE FPA TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE 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.OUTPUT.RAW OUTPUT {OUTPUT} RAW NONE FPA TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX NONE FPA TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ NONE FPA TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp CMP NONE FPA TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE - PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF FPA TRUE NONE + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE FPA TRUE NONE - 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 + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA NONE FPA TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA NONE FPA TRUE NONE - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP FPA TRUE NONE - PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP NONE FPA TRUE NONE + PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF NONE FPA 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 + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE - PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE - PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE - PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE - PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT FPA TRUE NONE + PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT NONE FPA TRUE NONE - PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE - LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE - LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE END Index: /branches/pap_branch_070920/ippconfig/simmosaic/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simmosaic/camera.config (revision 15119) +++ /branches/pap_branch_070920/ippconfig/simmosaic/camera.config (revision 15120) @@ -181,63 +181,63 @@ ### output file definitions - TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT - PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits MASK CHIP TRUE SPLIT - PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP TRUE SPLIT - PPIMAGE.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE CHIP TRUE SPLIT - PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mask.fits MASK CHIP TRUE SPLIT - PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT CHIP TRUE SPLIT - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fits IMAGE FPA TRUE NONE - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fits IMAGE FPA TRUE NONE - PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS 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}.{CHIP.NAME}.b1.fits IMAGE CHIP TRUE SPLIT - PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE CHIP TRUE SPLIT - - DVOCORR.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE NONE - DVOFLAT.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE CHIP TRUE NONE - - PSPHOT.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits IMAGE CHIP TRUE NONE - PSPHOT.BACKGND OUTPUT {OUTPUT}.{CHIP.NAME}.bck.fits IMAGE CHIP TRUE NONE - PSPHOT.BACKSUB OUTPUT {OUTPUT}.{CHIP.NAME}.sub.fits IMAGE CHIP TRUE NONE - PSPHOT.BACKMDL OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits IMAGE CHIP TRUE NONE - PSPHOT.BACKMDL.STDEV OUTPUT {OUTPUT}.{CHIP.NAME}.mdd.fits IMAGE CHIP TRUE NONE - - PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW CHIP TRUE NONE - PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.{CHIP.NAME}.sx SX CHIP TRUE NONE - PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.{CHIP.NAME}.obj OBJ CHIP TRUE NONE - PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF CHIP TRUE NONE - PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE - - PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.{CHIP.NAME}.psf PSF CHIP TRUE NONE - - SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png KAPA CHIP TRUE NONE - SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.{CHIP.NAME}.psf.png KAPA CHIP TRUE NONE - SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.{CHIP.NAME}.dap.png KAPA CHIP TRUE NONE - - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP CHIP TRUE SPLIT - PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF CHIP TRUE SPLIT - PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF FPA TRUE TOGETHER - - 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 - - PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE - PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE - - PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE - PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT FPA TRUE NONE - - PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT - - LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE - LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE + TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE SPLIT + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits MASK NONE CHIP TRUE SPLIT + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT NONE CHIP TRUE SPLIT + PPIMAGE.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE NONE CHIP TRUE SPLIT + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mask.fits MASK NONE CHIP TRUE SPLIT + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT NONE CHIP TRUE SPLIT + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE NONE + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE NONE CHIP TRUE SPLIT + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE CHIP TRUE SPLIT + + DVOCORR.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE NONE CHIP TRUE NONE + DVOFLAT.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE NONE CHIP TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits IMAGE NONE CHIP TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.{CHIP.NAME}.bck.fits IMAGE NONE CHIP TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.{CHIP.NAME}.sub.fits IMAGE NONE CHIP TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits IMAGE NONE CHIP TRUE NONE + PSPHOT.BACKMDL.STDEV OUTPUT {OUTPUT}.{CHIP.NAME}.mdd.fits IMAGE NONE CHIP TRUE NONE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW NONE CHIP TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.{CHIP.NAME}.sx SX NONE CHIP TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.{CHIP.NAME}.obj OBJ NONE CHIP TRUE NONE + PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF NONE CHIP TRUE NONE + PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.{CHIP.NAME}.psf PSF NONE CHIP TRUE NONE + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png KAPA NONE CHIP TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.{CHIP.NAME}.psf.png KAPA NONE CHIP TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.{CHIP.NAME}.dap.png KAPA NONE CHIP TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP NONE CHIP TRUE SPLIT + PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF NONE CHIP TRUE SPLIT + PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF NONE FPA TRUE TOGETHER + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE + + PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + + PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT NONE FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE SPLIT + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE END Index: /branches/pap_branch_070920/ippconfig/simple/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simple/camera.config (revision 15119) +++ /branches/pap_branch_070920/ippconfig/simple/camera.config (revision 15120) @@ -113,56 +113,56 @@ ### output file definitions - 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 TRUE NONE - PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE FPA TRUE SIMPLE - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE SIMPLE - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE SIMPLE + TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE NONE FPA TRUE SIMPLE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE SIMPLE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE 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 + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE SIMPLE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE SIMPLE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE SIMPLE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE SIMPLE - PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.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 + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK NONE FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE 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.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE FPA TRUE SIMPLE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE FPA TRUE SIMPLE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE FPA TRUE SIMPLE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE FPA TRUE SIMPLE - 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.OUTPUT.RAW OUTPUT {OUTPUT} RAW NONE FPA TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX NONE FPA TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ NONE FPA TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp CMP NONE FPA TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE 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 + PSPHOT.MOMENT.PLT OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE SIMPLE + PSPHOT.PSFMODEL.PLT OUTPUT {OUTPUT}.psf.png KAPA NONE 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 + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA NONE FPA TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA NONE FPA TRUE NONE - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP FPA TRUE NONE + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP NONE FPA TRUE NONE - PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA FALSE NONE - PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA FALSE NONE + PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA FALSE NONE + PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA FALSE NONE - PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE - PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT FPA TRUE NONE + PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT NONE FPA TRUE NONE - PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE SIMTEST + PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMTEST - LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE - LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE + LOG.IMFILE OUTPUT {OUTPUT}.log TEXT NONE CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE END Index: /branches/pap_branch_070920/ippconfig/simtest/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simtest/camera.config (revision 15119) +++ /branches/pap_branch_070920/ippconfig/simtest/camera.config (revision 15120) @@ -117,4 +117,20 @@ END +FITS METADATA +# BITPIX is the bits per pixel for writing the output data +# COMPRESSION = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm +# TILE.[XYZ] are the tile sizes. 0 means entire the dimension, so (0,1,1) forms tiles from rows +# NOISE [0..16] is the number of "noise bits" to preserve when quantising floating point data; 16 for no loss +# HSCALE is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression +# HSMOOTH is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none + TYPE FITS BITPIX COMPRESSION TILE.X TILE.Y TILE.Z NOISE HSCALE HSMOOTH + DET_IMAGE FITS -32 RICE 0 1 1 16 0 0 + DET_MASK FITS 8 PLIO 0 1 1 0 0 0 + DET_WEIGHT FITS -32 RICE 0 1 1 16 0 0 + SKY_IMAGE FITS -32 RICE 0 1 1 16 0 0 + SKY_MASK FITS 8 PLIO 0 1 1 0 0 0 + SKY_WEIGHT FITS -32 RICE 0 1 1 16 0 0 +END + FILERULES STR simtest/filerules.mdc Index: /branches/pap_branch_070920/ippconfig/simtest/filerules.mdc =================================================================== --- /branches/pap_branch_070920/ippconfig/simtest/filerules.mdc (revision 15119) +++ /branches/pap_branch_070920/ippconfig/simtest/filerules.mdc (revision 15120) @@ -47,59 +47,59 @@ ### output file definitions -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 TRUE NONE -PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE -PPIMAGE.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE FPA TRUE NONE -PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.ch.mask.fits MASK FPA TRUE NONE -PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.ch.wt.fits WEIGHT 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.STATS OUTPUT {OUTPUT}.stats STATS FPA TRUE NONE +TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT +PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE +PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE +PPIMAGE.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE NONE FPA TRUE NONE +PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.ch.mask.fits MASK NONE FPA TRUE NONE +PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.ch.wt.fits WEIGHT NONE FPA TRUE NONE +PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE +PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE +PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE 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 +PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE +PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE +PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE +PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE -DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE FPA TRUE NONE -DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE FPA TRUE NONE +DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE FPA TRUE NONE +DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE 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.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE FPA TRUE NONE +PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE FPA TRUE NONE +PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE FPA TRUE NONE +PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE 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.OUTPUT.RAW OUTPUT {OUTPUT} RAW NONE FPA TRUE NONE +PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX NONE FPA TRUE NONE +PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ NONE FPA TRUE NONE +PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp CMP NONE FPA TRUE NONE +PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE +PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE FPA TRUE NONE -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 +SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE NONE +SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA NONE FPA TRUE NONE +SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA NONE FPA TRUE NONE -PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP FPA TRUE NONE -PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE +PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP NONE FPA TRUE NONE +PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF NONE FPA 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 +PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE +PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE +PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE +PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE -PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE -PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE -PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE +PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE +PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE -PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE -PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE -PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT FPA TRUE NONE +PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE +PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE +PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT NONE FPA TRUE NONE -PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE SIMTEST -PPSIM.SOURCES OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE +PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE SIMTEST +PPSIM.SOURCES OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE -LOG.IMFILE OUTPUT {OUTPUT}.imfile.log TEXT FPA TRUE NONE -LOG.EXP OUTPUT {OUTPUT}.exp.log TEXT FPA TRUE NONE +LOG.IMFILE OUTPUT {OUTPUT}.imfile.log TEXT NONE FPA TRUE NONE +LOG.EXP OUTPUT {OUTPUT}.exp.log TEXT NONE FPA TRUE NONE Index: /branches/pap_branch_070920/ippconfig/tc3/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tc3/camera.config (revision 15119) +++ /branches/pap_branch_070920/ippconfig/tc3/camera.config (revision 15120) @@ -97,36 +97,36 @@ ### output file definitions - TYPE OUTPUT FILENAME.RULE DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits CHIP IMAGE TRUE NONE - PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits CHIP MASK TRUE NONE - PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits CHIP WEIGHT TRUE NONE - PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits CHIP IMAGE TRUE NONE - PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits CHIP IMAGE TRUE NONE - DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits CHIP IMAGE TRUE NONE - DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits CHIP IMAGE TRUE NONE - DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits CHIP IMAGE TRUE NONE - DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits CHIP IMAGE TRUE NONE + TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits MASK NONE CHIP TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT NONE CHIP TRUE NONE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE NONE CHIP TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE NONE CHIP TRUE NONE + DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE CHIP TRUE NONE + DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE NONE CHIP TRUE NONE + DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE CHIP TRUE NONE + DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE NONE CHIP TRUE NONE - PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits CHIP IMAGE TRUE NONE - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits FPA IMAGE TRUE NONE - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits FPA IMAGE TRUE NONE + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits IMAGE NONE CHIP TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg FPA JPEG TRUE NONE - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg FPA JPEG TRUE NONE + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE - PSPHOT.RESID OUTPUT {OUTPUT}.res.fits CHIP IMAGE TRUE NONE - PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits CHIP IMAGE TRUE NONE - PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits CHIP IMAGE TRUE NONE - PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits CHIP IMAGE TRUE NONE + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE CHIP TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE CHIP TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE CHIP TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE CHIP 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 + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW NONE CHIP TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX NONE CHIP TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ NONE CHIP TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP NONE CHIP TRUE NONE - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CHIP CMP TRUE NONE + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP NONE CHIP TRUE NONE - LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE - LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE END Index: /branches/pap_branch_070920/ippconfig/tek/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tek/camera.config (revision 15119) +++ /branches/pap_branch_070920/ippconfig/tek/camera.config (revision 15120) @@ -110,59 +110,59 @@ ### output file definitions - TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT - PPIMAGE.OUTPUT OUTPUT {OUTPUT}.tek.fits IMAGE FPA TRUE NONE - PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE - PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE - PPIMAGE.CHIP OUTPUT {OUTPUT}.chip.fits IMAGE FPA TRUE NONE - PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.chip.mk.fits MASK FPA TRUE NONE - PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.chip.wt.fits WEIGHT FPA TRUE NONE + TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.tek.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + PPIMAGE.CHIP OUTPUT {OUTPUT}.chip.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.chip.mk.fits MASK NONE FPA TRUE NONE + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.chip.wt.fits WEIGHT NONE 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.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE - PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1c.fits IMAGE FPA TRUE NONE - PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2c.fits IMAGE FPA TRUE NONE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1c.fits IMAGE NONE FPA TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2c.fits IMAGE NONE FPA TRUE NONE - PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE - PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE - DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE FPA TRUE NONE - DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE FPA TRUE NONE + DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE NONE FPA TRUE NONE + DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE NONE 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.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE FPA TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE FPA TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE FPA TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE 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.OUTPUT.RAW OUTPUT {OUTPUT} RAW NONE FPA TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX NONE FPA TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ NONE FPA TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp CMP NONE FPA TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE - PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF FPA TRUE NONE + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF NONE FPA TRUE NONE - SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA FPA TRUE NONE - SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE NONE + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA NONE FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA NONE FPA TRUE NONE - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP FPA TRUE NONE - PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP NONE FPA TRUE NONE + PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF NONE FPA 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 - PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE - PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE NONE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE NONE + PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE + PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT NONE FPA TRUE NONE - PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE - PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE + PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK NONE FPA TRUE NONE - PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE - LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE - LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE + LOG.IMFILE OUTPUT {OUTPUT}.log TEXT NONE CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE END Index: /branches/pap_branch_070920/ippconfig/ucam/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/camera.config (revision 15119) +++ /branches/pap_branch_070920/ippconfig/ucam/camera.config (revision 15120) @@ -80,32 +80,29 @@ ### output file definitions - 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 + TYPE OUTPUT FILENAME.RULE FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fit IMAGE NONE CHIP TRUE NONE + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fit IMAGE NONE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fit IMAGE NONE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fit IMAGE NONE FPA 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 + PPIMAGE.BIN1.OUTPUT OUTPUT {OUTPUT}.b1.fit IMAGE NONE FPA TRUE NONE + PPIMAGE.BIN2.OUTPUT OUTPUT {OUTPUT}.b2.fit IMAGE NONE FPA TRUE NONE + PPIMAGE.JPEG1.OUTPUT OUTPUT {OUTPUT}.b1.jpg JPEG NONE FPA TRUE NONE + PPIMAGE.JPEG2.OUTPUT OUTPUT {OUTPUT}.b2.jpg JPEG NONE FPA TRUE NONE - 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.RESID OUTPUT {OUTPUT}.res.fits IMAGE NONE CHIP TRUE RAW + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE NONE CHIP TRUE RAW + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE NONE CHIP TRUE RAW + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE NONE CHIP TRUE RAW - 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 + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW NONE CHIP TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX NONE CHIP TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ NONE CHIP TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF NONE CHIP TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP NONE CHIP TRUE NONE - PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CHIP CMP TRUE NONE + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP NONE CHIP TRUE NONE - PPARITH.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fit CHIP IMAGE TRUE NONE - - - LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE - LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT NONE FPA TRUE NONE END