Index: /trunk/ippconfig/megacam/camera.config =================================================================== --- /trunk/ippconfig/megacam/camera.config (revision 16326) +++ /trunk/ippconfig/megacam/camera.config (revision 16327) @@ -111,4 +111,5 @@ PSPHOT STR megacam/psphot.config # psphot details PSASTRO STR megacam/psastro.config # psastro details + PSWARP STR megacam/pswarp.config # pswarp details PPIMAGE STR megacam/ppImage.config # ppImage recipe REJECTIONS STR megacam/rejections.config # rejection recipe @@ -251,5 +252,6 @@ END - COMPRESSED_POSITIVE METADATA + # Compressed positive image + COMP_IMG METADATA BITPIX S32 16 SCALING STR STDEV_POSITIVE @@ -262,5 +264,7 @@ NOISE S32 8 END - COMPRESSED_MASK METADATA + # Compressed mask + COMP_MASK METADATA + BITPIX S32 8 COMPRESSION STR PLIO TILE.X S32 0 @@ -269,5 +273,18 @@ NOISE S32 8 END - COMPRESSED_SUBTRACTION METADATA + # Compressed weight image + COMP_WT METADATA + BITPIX S32 16 + SCALING STR STDEV_POSITIVE + STDEV.BITS S32 4 + STDEV.NUM F32 10 + COMPRESSION STR RICE + TILE.X S32 0 + TILE.Y S32 1 + TILE.Z S32 1 + NOISE S32 8 + END + # Compressed subtraction image + COMP_SUB METADATA BITPIX S32 16 SCALING STR STDEV_BOTH Index: /trunk/ippconfig/megacam/filerules-mef.mdc =================================================================== --- /trunk/ippconfig/megacam/filerules-mef.mdc (revision 16326) +++ /trunk/ippconfig/megacam/filerules-mef.mdc (revision 16327) @@ -81,20 +81,20 @@ ### output file definitions 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.MEF OUTPUT {OUTPUT}.b0.fits IMAGE COMP_IMG CHIP TRUE MEF +PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK CHIP TRUE MEF +PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT 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 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.MEF OUTPUT {OUTPUT}.ch.fits IMAGE COMP_IMG CHIP TRUE MEF +PPIMAGE.CHIP.MK.MEF OUTPUT {OUTPUT}.ch.mk.fits MASK COMP_MASK CHIP TRUE MEF +PPIMAGE.CHIP.WT.MEF OUTPUT {OUTPUT}.ch.wt.fits WEIGHT COMP_WT 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 NONE FPA TRUE MEF -PPIMAGE.OUTPUT.FPA2.MEF OUTPUT {OUTPUT}.b2.fits IMAGE NONE FPA TRUE MEF +PPIMAGE.OUTPUT.FPA1.MEF OUTPUT {OUTPUT}.b1.fits IMAGE COMP_IMG FPA TRUE MEF +PPIMAGE.OUTPUT.FPA2.MEF OUTPUT {OUTPUT}.b2.fits IMAGE COMP_IMG 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 @@ -102,6 +102,6 @@ PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS NONE FPA TRUE MEF -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.MEF OUTPUT {OUTPUT}.b1c.fits IMAGE COMP_IMG CHIP TRUE MEF +PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE COMP_IMG 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 @@ -138,18 +138,18 @@ PSASTRO.OUT.ASTROM OUTPUT {OUTPUT}.ast ASTROM 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.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE +PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE +PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT 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 +PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE COMP_IMG FPA TRUE NONE +PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE COMP_IMG 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 +PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE +PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE +PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT 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 +PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE +PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK COMP_MASK FPA TRUE NONE +PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT COMP_WT FPA TRUE NONE PPSTAMP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE NONE FPA TRUE NONE @@ -158,6 +158,6 @@ PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE CHIP TRUE SPLIT -PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE NONE CHIP TRUE NONE -PPARITH.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK NONE CHIP TRUE NONE +PPARITH.OUTPUT.IMAGE OUTPUT {OUTPUT}.fits IMAGE COMP_IMG CHIP TRUE NONE +PPARITH.OUTPUT.MASK OUTPUT {OUTPUT}.fits MASK COMP_MASK CHIP TRUE NONE LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT NONE CHIP TRUE NONE Index: /trunk/ippconfig/megacam/pswarp.config =================================================================== --- /trunk/ippconfig/megacam/pswarp.config (revision 16327) +++ /trunk/ippconfig/megacam/pswarp.config (revision 16327) @@ -0,0 +1,3 @@ +### Megacam recipe for pswarp + +ASTROM.SOURCE STR PSASTRO.OUTPUT # Source file rule for astrometry, or NULL