Index: trunk/ippconfig/megacam/camera.config
===================================================================
--- trunk/ippconfig/megacam/camera.config	(revision 14843)
+++ trunk/ippconfig/megacam/camera.config	(revision 15181)
@@ -187,154 +187,21 @@
 END
 
-FILERULES METADATA
-   ### Redirections
-   PPIMAGE.OUTPUT        STR PPIMAGE.OUTPUT.MEF
-   PPIMAGE.OUTPUT.MASK   STR PPIMAGE.OUT.MK.MEF
-   PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.MEF
-   PPIMAGE.CHIP          STR PPIMAGE.CHIP.MEF
-   PPIMAGE.CHIP.MASK     STR PPIMAGE.CHIP.MK.MEF
-   PPIMAGE.CHIP.WEIGHT   STR PPIMAGE.CHIP.WT.MEF
-   PPIMAGE.OUTPUT.FPA1   STR PPIMAGE.OUTPUT.FPA1.MEF
-   PPIMAGE.OUTPUT.FPA2   STR PPIMAGE.OUTPUT.FPA2.MEF
-   PPIMAGE.BIN1          STR PPIMAGE.BIN1.MEF
-   PPIMAGE.BIN2          STR PPIMAGE.BIN2.MEF
-
-   PSASTRO.INPUT         STR PSASTRO.INPUT.CMF
-   PSASTRO.OUTPUT        STR PSASTRO.OUT.CMF.MEF
-   PSASTRO.OUTPUT.MEF    STR PSASTRO.OUT.CMF.MEF
-   PSPHOT.OUTPUT         STR PSPHOT.OUT.CMF.MEF
-   DVOCORR.OUTPUT        STR DVOCORR.MEF.OUTPUT
-   DVOFLAT.OUTPUT        STR DVOFLAT.MEF.OUTPUT
-
-   ### input file definitions
-   ### use @DETDB entries to get the detrend images from the database
-   ### replace @DETDB with @FILES if you want to require it from the 
-   ### command line, or with an explicit name to require a specific file
-   TYPE               INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE
-
-   ## files used by ppImage
-   PPIMAGE.INPUT      INPUT @FILES        CHIP       IMAGE
-   PPIMAGE.MASK       INPUT @DETDB        CHIP       IMAGE
-   PPIMAGE.BIAS       INPUT @DETDB        CHIP       IMAGE
-   PPIMAGE.DARK       INPUT @DETDB        CHIP       IMAGE
-   PPIMAGE.FLAT       INPUT @DETDB        CHIP       IMAGE
-   PPIMAGE.FRINGE     INPUT @DETDB        CHIP       FRINGE
-   PPIMAGE.SHUTTER    INPUT @DETDB        CHIP       IMAGE     
-
-   ## files used to build and apply the flat-field correction images
-   DVOCORR.INPUT      INPUT @FILES        CHIP       IMAGE
-   DVOCORR.REFHEAD    INPUT @FILES        CHIP       HEADER
-   DVOFLAT.INPUT      INPUT @FILES        CHIP       IMAGE
-   DVOFLAT.CORR       INPUT @DETDB        CHIP       IMAGE
-
-   ## files used by psphot 
-   PSPHOT.LOAD        INPUT @FILES        CHIP       IMAGE
-   PSPHOT.INPUT       INPUT @FILES        CHIP       IMAGE
-   PSPHOT.MASK        INPUT @FILES        CHIP       MASK     
-   PSPHOT.WEIGHT      INPUT @FILES        CHIP       WEIGHT     
-   PSPHOT.PSF.LOAD    INPUT @FILES        CHIP       PSF       
-
-   ## files used by psastro 
-   PSASTRO.INPUT.CMP  INPUT @FILES        CHIP       CMP
-   PSASTRO.INPUT.CMF  INPUT @FILES        CHIP       CMF
-
-   ## files used by pswarp
-   PSWARP.INPUT       INPUT @FILES        CHIP       IMAGE
-   PSWARP.WEIGHT      INPUT @FILES        CHIP       WEIGHT
-   PSWARP.MASK        INPUT @FILES        CHIP       MASK
-   PSWARP.SKYCELL     INPUT @FILES        CHIP       IMAGE
-   PSWARP.ASTROM      INPUT @FILES        CHIP       CMF
-
-   PPSUB.INPUT        INPUT @FILES        FPA	     IMAGE
-   PPSUB.INPUT.MASK   INPUT @FILES        FPA	     MASK
-   PPSUB.INPUT.WEIGHT INPUT @FILES        FPA	     WEIGHT
-   PPSUB.REF          INPUT @FILES        FPA	     IMAGE
-   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
-   PPSTACK.INPUT.MASK INPUT @FILES        FPA	     MASK
-   PPSTACK.INPUT.WEIGHT INPUT @FILES      FPA	     WEIGHT
-   PPSTACK.SOURCES    INPUT @FILES        FPA        CMF
-
-   ### 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
-
-   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.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.STATS 	 OUTPUT  {OUTPUT}.stats                 STATS     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.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     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}.{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.PSF.SAVE       OUTPUT {OUTPUT}.psf                   	PSF       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
-
-   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.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
-
-   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
-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	megacam/filerules-mef.mdc		# File rules appropriate for MEF format
 
 EXTNAME.RULES METADATA
