Index: /trunk/ippconfig/cfh12k/camera.config =================================================================== --- /trunk/ippconfig/cfh12k/camera.config (revision 13932) +++ /trunk/ippconfig/cfh12k/camera.config (revision 13933) @@ -113,5 +113,4 @@ PPIMAGE.OUTPUT.MASK STR PPIMAGE.OUT.MK.MEF PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.MEF - PPIMAGE.OUTPUT.CHIP STR PPIMAGE.OUT.CHIP.MEF ### input file definitions @@ -163,6 +162,9 @@ 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.OUT.CHIP.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT - PPIMAGE.OUT.CHIP.MEF OUTPUT {OUTPUT}.fits IMAGE 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.CHIP.MEF OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE MEF + PPIMAGE.CHIP.MEF OUTPUT {OUTPUT}.fits IMAGE 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 Index: /trunk/ippconfig/ctio_mosaic2/camera.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2/camera.config (revision 13932) +++ /trunk/ippconfig/ctio_mosaic2/camera.config (revision 13933) @@ -66,5 +66,4 @@ PPIMAGE.OUTPUT.MASK STR PPIMAGE.OUT.MK.MEF PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.MEF - PPIMAGE.OUTPUT.CHIP STR PPIMAGE.OUT.CHIP.MEF ### input file definitions @@ -116,6 +115,9 @@ 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.OUT.CHIP.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT - PPIMAGE.OUT.CHIP.MEF OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE MEF + + PPIMAGE.CHIP OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE MEF + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.mk.fits IMAGE CHIP TRUE MEF + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.wt.fits IMAGE 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 Index: /trunk/ippconfig/megacam/camera.config =================================================================== --- /trunk/ippconfig/megacam/camera.config (revision 13932) +++ /trunk/ippconfig/megacam/camera.config (revision 13933) @@ -4,5 +4,5 @@ FORMATS METADATA RAW STR megacam/format_raw.config - SPLICED STR megacam/format_spliced.config + MEF STR megacam/format_spliced.config SPLIT STR megacam/format_split.config END @@ -116,5 +116,4 @@ ### Redirections PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.MEF - PPIMAGE.OUTPUT.CHIP STR PPIMAGE.OUT.CHIP.MEF PPIMAGE.OUTPUT.MASK STR PPIMAGE.OUT.MK.MEF PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.MEF @@ -170,31 +169,32 @@ 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 SPLICED + 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 SPLICED - PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT CHIP TRUE SPLICED - PPIMAGE.OUT.CHIP.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT - PPIMAGE.OUT.CHIP.MEF OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE SPLICED - PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE SPLICED - PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE SPLICED + 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 SPLICED - PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE CHIP TRUE SPLICED + 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 SPLICED + 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 SPLICED + 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 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.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 @@ -202,8 +202,8 @@ 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 SPLICED - PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF FPA TRUE SPLICED - - PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF CHIP TRUE SPLICED + PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF CHIP TRUE MEF + PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF FPA TRUE MEF + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF CHIP TRUE MEF SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA CHIP TRUE NONE