Index: /trunk/ippconfig/cfh12k/camera.config
===================================================================
--- /trunk/ippconfig/cfh12k/camera.config	(revision 13064)
+++ /trunk/ippconfig/cfh12k/camera.config	(revision 13065)
@@ -136,78 +136,94 @@
 
    ### input file definitions
-   TYPE               INPUT FILENAME.RULE                DATA.LEVEL FILE.TYPE 
-   PPIMAGE.INPUT      INPUT @FILES                       CHIP       IMAGE
-
-   ### these IO files are independently defined so we can supply hard-coded names (in place of @DETDB)
-   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     
-
-   # IO files for building the DVO flatfield correction
-   DVOCORR.INPUT      INPUT @FILES                       CHIP       IMAGE     
-   DVOFLAT.INPUT      INPUT @FILES                       CHIP       IMAGE 	
-   DVOCORR.REFHEAD    INPUT @FILES                       CHIP       HEADER     
-   DVOFLAT.CORR       INPUT @DETDB                       CHIP       IMAGE 	
-
-   # psphot input files
-   PSPHOT.LOAD        INPUT @FILES                       CHIP       IMAGE     
-   PSPHOT.INPUT       INPUT @FILES                       CHIP       IMAGE     
-   PSPHOT.MASK        INPUT @FILES                       CHIP       MASK     
-   PSPHOT.WEIGHT      INPUT @FILES                       CHIP       WEIGHT     
-
-   # we should be able to distinguish the inport format from the file
-   PSASTRO.INPUT.CMP  INPUT @FILES                       CHIP       CMP       
-   PSASTRO.INPUT.CMF  INPUT @FILES                       CHIP       CMF       
-   PSPHOT.PSF.LOAD    INPUT @FILES                       CHIP       PSF       
-
-   # why is this "FPA"
-   PSWARP.INPUT       INPUT @FILES                 	 FPA        IMAGE     
-   PSWARP.SKYCELL     INPUT @FILES                 	 FPA        IMAGE     
-   PSWARP.ASTROM      INPUT @FILES                       CHIP       CMF       
+   ### 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       
 
    ### output file definitions
-   TYPE                OUTPUT FILENAME.RULE                    DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT
-   PPIMAGE.OUTPUT.SPL  OUTPUT {OUTPUT}.{CHIP.NAME}.fits        CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.OUTPUT.MEF  OUTPUT {OUTPUT}.fits                    CHIP       IMAGE     TRUE      MEF
-   PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits   CHIP       MASK      FALSE     NONE
-   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits   CHIP       WEIGHT    FALSE     NONE
-   PPIMAGE.BIN1.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits     CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.BIN2.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits     CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.BIN1.MEF    OUTPUT {OUTPUT}.b1.fits                 CHIP       IMAGE     TRUE      MEF
-   PPIMAGE.BIN2.MEF    OUTPUT {OUTPUT}.b2.fits                 CHIP       IMAGE     TRUE      MEF
-   DVOCORR.MEF.OUTPUT  OUTPUT {OUTPUT}.fc.fits                 CHIP       IMAGE     TRUE      MEF
-   DVOCORR.SPL.OUTPUT  OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits     CHIP       IMAGE     TRUE      SPLIT
-   DVOFLAT.MEF.OUTPUT  OUTPUT {OUTPUT}.co.fits                 CHIP       IMAGE     TRUE      MEF
-   DVOFLAT.SPL.OUTPUT  OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits     CHIP       IMAGE     TRUE      SPLIT
-
-   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits   CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits                 FPA        IMAGE     TRUE      MEF
-   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits                 FPA        IMAGE     TRUE      MEF
-
-   PPIMAGE.JPEG1       OUTPUT {OUTPUT}.b1.jpg                  FPA        JPEG      TRUE      NONE
-   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.b2.jpg                  FPA        JPEG      TRUE      NONE
-
-   PSWARP.OUTPUT       OUTPUT   {OUTPUT}.fits      	       FPA        IMAGE     TRUE      NONE
-   PSWARP.BIN1         OUTPUT   {OUTPUT}.b1.fits   	       FPA        IMAGE     TRUE      NONE
-   PSWARP.BIN2         OUTPUT   {OUTPUT}.b2.fits   	       FPA        IMAGE     TRUE      NONE
-
-   PSPHOT.RESID        OUTPUT {OUTPUT}.res.fits                CHIP       IMAGE     TRUE      MEF
-   PSPHOT.BACKGND      OUTPUT {OUTPUT}.bck.fits                CHIP       IMAGE     TRUE      MEF
-   PSPHOT.BACKSUB      OUTPUT {OUTPUT}.sub.fits                CHIP       IMAGE     TRUE      MEF
-   PSPHOT.BACKMDL      OUTPUT {OUTPUT}.mdl.fits                CHIP       IMAGE     TRUE      MEF
-
-   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.PSF.SAVE       OUTPUT {OUTPUT}.psf                   CHIP       PSF       TRUE      MEF
-
-   PSASTRO.OUTPUT.CMF  OUTPUT {OUTPUT}.cmf                     CHIP       CMF       TRUE      NONE
-   PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.cmp         CHIP       CMP       TRUE      NONE
-
+   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       FALSE     SPLIT
+   PPIMAGE.OUT.WT.SPL  	 OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits    WEIGHT    CHIP       FALSE     SPLIT
+   PPIMAGE.OUT.MK.MEF  	 OUTPUT {OUTPUT}.mk.fits                MASK      CHIP       FALSE     MEF
+   PPIMAGE.OUT.WT.MEF  	 OUTPUT {OUTPUT}.wt.fits                WEIGHT    CHIP       FALSE     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.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.OUTPUT.CMF   	 OUTPUT {OUTPUT}.cmf                    CMF       CHIP       TRUE      NONE
+
+   PSPHOT.PSF.SAVE       OUTPUT {OUTPUT}.psf                    PSF       CHIP       TRUE      MEF
+
+   SOURCE.PLOT.MOMENTS   OUTPUT {OUTPUT}.mnt.png                KAPA      CHIP       TRUE      MEF
+   SOURCE.PLOT.PSFMODEL  OUTPUT {OUTPUT}.psf.png                KAPA      CHIP       TRUE      MEF
+
+   PSASTRO.OUTPUT.CMF    OUTPUT {OUTPUT}a.cmf                   CMF       CHIP       TRUE      NONE
+   PSASTRO.OUTPUT.CMP    OUTPUT {OUTPUT}.{CHIP.NAME}.cmp        CMP       CHIP       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
 END
 
Index: /trunk/ippconfig/isp/camera.config
===================================================================
--- /trunk/ippconfig/isp/camera.config	(revision 13064)
+++ /trunk/ippconfig/isp/camera.config	(revision 13065)
@@ -82,5 +82,5 @@
 
 END
-                
+            
 
 FILERULES METADATA
@@ -90,74 +90,93 @@
 
    ### input file definitions
-   TYPE               INPUT    FILENAME.RULE                  DATA.LEVEL FILE.TYPE 
-   PPIMAGE.INPUT      INPUT    none.fits                      FPA        IMAGE     
-   PPIMAGE.BIAS       INPUT    @DETDB                         CHIP       IMAGE     
-   PPIMAGE.DARK       INPUT    @DETDB                         CHIP       IMAGE     
-   PPIMAGE.FLAT       INPUT    @DETDB                         CHIP       IMAGE     
-   PPIMAGE.SHUTTER    INPUT    @DETDB                         CHIP       IMAGE     
-     PPIMAGE.MASK     INPUT    mask.fits                      CHIP       IMAGE     
-   # PPIMAGE.BIAS     INPUT    bias.fits                      CHIP       IMAGE     
-   # PPIMAGE.DARK     INPUT    dark.fits                      CHIP       IMAGE     
-   # PPIMAGE.FLAT     INPUT    flat.fits                      CHIP       IMAGE     
+   ### 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 
 
-   PPARITH.INPUT      INPUT    none.fits                      FPA        IMAGE     
+   ## files used by ppImage
+   PPIMAGE.INPUT      INPUT @FILES        FPA        IMAGE     
+   PPIMAGE.MASK       INPUT mask.fits     FPA        IMAGE     
+   PPIMAGE.BIAS       INPUT @DETDB        FPA        IMAGE     
+   PPIMAGE.DARK       INPUT @DETDB        FPA        IMAGE     
+   PPIMAGE.FLAT       INPUT @DETDB        FPA        IMAGE     
+   PPIMAGE.FRINGE     INPUT @DETDB        FPA        FRINGE
+   PPIMAGE.SHUTTER    INPUT @DETDB        FPA        IMAGE     
 
-   PSPHOT.INPUT       INPUT    none.fits                      CHIP       IMAGE     
-   PSPHOT.PSF.LOAD    INPUT    none.psf                       CHIP       PSF       
+   ## files used to build and apply the flat-field correction images
+   DVOCORR.INPUT      INPUT @FILES        FPA        IMAGE
+   DVOCORR.REFHEAD    INPUT @FILES        FPA        HEADER
+   DVOFLAT.INPUT      INPUT @FILES        FPA        IMAGE
+   DVOFLAT.CORR       INPUT @DETDB        FPA        IMAGE
 
-   PSASTRO.INPUT.CMP  INPUT    none.fits                      FPA        CMP       
-   PSASTRO.INPUT.CMF  INPUT    none.fits                      FPA        CMF       
+   ## files used by psphot 
+   PSPHOT.LOAD        INPUT @FILES        FPA        IMAGE
+   PSPHOT.INPUT       INPUT @FILES        FPA        IMAGE     
+   PSPHOT.MASK        INPUT @FILES        FPA        MASK     
+   PSPHOT.WEIGHT      INPUT @FILES        FPA        WEIGHT     
+   PSPHOT.PSF.LOAD    INPUT @FILES        FPA        PSF       
+
+   ## files used by psastro 
+   PSASTRO.INPUT.CMP  INPUT @FILES        FPA        CMP       
+   PSASTRO.INPUT.CMF  INPUT @FILES        FPA        CMF       
+
+   ## files used by pswarp
+   PSWARP.INPUT       INPUT @FILES        FPA        IMAGE
+   PSWARP.WEIGHT      INPUT @FILES        FPA        WEIGHT
+   PSWARP.MASK        INPUT @FILES        FPA        MASK
+   PSWARP.SKYCELL     INPUT @FILES        FPA        IMAGE
+   PSWARP.ASTROM      INPUT @FILES        FPA        CMF
 
    ### output file definitions
-   TYPE                OUTPUT   FILENAME.RULE        DATA.LEVEL FILE.SAVE FILE.FORMAT
-   PPIMAGE.OUTPUT      OUTPUT   {OUTPUT}.isp.fits    FPA        TRUE      NONE
-   PPIMAGE.OUTPUT.MASK OUTPUT   {OUTPUT}.mask.fits   FPA        FALSE     NONE
-   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits     FPA        FALSE     NONE
-   PPIMAGE.OUTPUT.CHIP OUTPUT   {OUTPUT}.chip.fits   FPA        TRUE      ISP
-   PPIMAGE.OUTPUT.FPA1 OUTPUT   {OUTPUT}.b1.fits     FPA        TRUE      ISP
-   PPIMAGE.OUTPUT.FPA2 OUTPUT   {OUTPUT}.b2.fits     FPA        TRUE      ISP
+   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        FALSE     NONE
+   PPIMAGE.OUTPUT.WEIGHT OUTPUT  {OUTPUT}.wt.fits     WEIGHT    FPA        FALSE     NONE
+   PPIMAGE.OUTPUT.CHIP 	 OUTPUT  {OUTPUT}.chip.fits   IMAGE     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.BIN1        OUTPUT   {OUTPUT}.b1.fits     FPA        TRUE      ISP
-   PPIMAGE.BIN2        OUTPUT   {OUTPUT}.b2.fits     FPA        TRUE      ISP
-   PPIMAGE.JPEG1       OUTPUT   {OUTPUT}.b1.jpg      FPA        TRUE      ISP
-   PPIMAGE.JPEG2       OUTPUT   {OUTPUT}.b2.jpg      FPA        TRUE      ISP
+   PPIMAGE.BIN1        	 OUTPUT  {OUTPUT}.b1c.fits    IMAGE     FPA        TRUE      NONE
+   PPIMAGE.BIN2        	 OUTPUT  {OUTPUT}.b2c.fits    IMAGE     FPA        TRUE      NONE
 
-   PPARITH.OUTPUT      OUTPUT   {OUTPUT}             FPA        TRUE      NONE
+   PPIMAGE.JPEG1       	 OUTPUT  {OUTPUT}.b1.jpg      JPEG      FPA        TRUE      NONE
+   PPIMAGE.JPEG2       	 OUTPUT  {OUTPUT}.b2.jpg      JPEG      FPA        TRUE      NONE
 
-   PSPHOT.RESID        OUTPUT   {OUTPUT}.res.fits    FPA        TRUE      ISP
-   PSPHOT.BACKGND      OUTPUT   {OUTPUT}.bck.fits    FPA        TRUE      ISP
-   PSPHOT.BACKSUB      OUTPUT   {OUTPUT}.sub.fits    FPA        TRUE      ISP
-   PSPHOT.BACKMDL      OUTPUT   {OUTPUT}.mdl.fits    FPA        TRUE      ISP
-   PSPHOT.OUTPUT.RAW   OUTPUT   {OUTPUT}             FPA        TRUE      NONE
-   PSPHOT.OUTPUT.SX    OUTPUT   {OUTPUT}.sx          FPA        TRUE      NONE
-   PSPHOT.OUTPUT.OBJ   OUTPUT   {OUTPUT}.obj         FPA        TRUE      NONE
-   PSPHOT.OUTPUT.CMP   OUTPUT   {OUTPUT}.cmp         FPA        TRUE      NONE
-   PSPHOT.OUTPUT.CMF   OUTPUT   {OUTPUT}.cmf         FPA        TRUE      NONE
-   PSPHOT.PSF.SAVE     OUTPUT   {OUTPUT}.psf         FPA        TRUE      NONE
+   DVOCORR.OUTPUT    	 OUTPUT  {OUTPUT}.fc.fits     IMAGE     FPA        TRUE      NONE
+   DVOFLAT.OUTPUT    	 OUTPUT  {OUTPUT}.co.fits     IMAGE     FPA        TRUE      NONE
 
-   SOURCE.PLOT.MOMENTS  OUTPUT   {OUTPUT}.mnt.png    FPA        TRUE      NONE
-   SOURCE.PLOT.PSFMODEL OUTPUT   {OUTPUT}.psf.png    FPA        TRUE      ISP
+   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
 
-   PSASTRO.OUTPUT.CMP   OUTPUT   {OUTPUT}.smp        FPA        TRUE      NONE
-   PSASTRO.OUTPUT.CMF   OUTPUT   {OUTPUT}.smf        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
+
+   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      NONE
 END
 
-# FPA file defines properties of a possible input|output object
-# user can set the filename (I|O), filename rules (O), or abstract source (@FILES, @DETDB) (I) 
-# user can set the extension name, if used
-# user can set the file type (IMAGE, JPEG, RAW, SX, OBJ, CMP, CMF) : but these are not variable in most cases!
-# user can set the file mode (READ, WRITE), but these must be set by the programmer
-# user can set the file depth: only valid for output files
-# user can set the data depth: must be >= file depth
-# user can set the file format: only valid for newly created FPAs
-# user can set the colormap, scaling method, scaling range (JPEG only)
-# user can set the extension name for the data and header segments (CMF only)
+EXTNAME.RULES METADATA
+  CMF.HEAD STR {CHIP.NAME}.hdr
+  CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT?
 
-# known uses of the filename.xtra, extname.rule, and extname.xtra:
-# extname.rule: used to construct output EXTNAME keys (CMF DATA)
-# extname.xtra: used to construct output EXTNAME keys (CMF HEAD)
-
-# extname.rule: used to carry classID to DetDB (internal)
-# filename.xtra: used to carry detID to DetDB (internal)
-
-# filename.xtra: used to carry arglist name (internal)
+  PSF.TABLE STR {CHIP.NAME}.psf_model
+  PSF.RESID STR {CHIP.NAME}.psf_resid
+END
Index: /trunk/ippconfig/megacam/camera.config
===================================================================
--- /trunk/ippconfig/megacam/camera.config	(revision 13064)
+++ /trunk/ippconfig/megacam/camera.config	(revision 13065)
@@ -2,48 +2,48 @@
 
 # File formats that we know about
-FORMATS		METADATA
-	RAW	STR	megacam/format_raw.config
-	SPLICED	STR	megacam/format_spliced.config
-	SPLIT	STR	megacam/format_split.config
+FORMATS         METADATA
+        RAW     STR     megacam/format_raw.config
+        SPLICED STR     megacam/format_spliced.config
+        SPLIT   STR     megacam/format_split.config
 END
 
 # Description of camera --- all the chips and the cells that comprise them
-FPA	METADATA
-	ccd00	STR	LeftAmp RightAmp
-	ccd01	STR	LeftAmp RightAmp
-	ccd02	STR	LeftAmp RightAmp
-	ccd03	STR	LeftAmp RightAmp
-	ccd04	STR	LeftAmp RightAmp
-	ccd05	STR	LeftAmp RightAmp
-	ccd06	STR	LeftAmp RightAmp
-	ccd07	STR	LeftAmp RightAmp
-	ccd08	STR	LeftAmp RightAmp
-	ccd09	STR	LeftAmp RightAmp
-	ccd10	STR	LeftAmp RightAmp
-	ccd11	STR	LeftAmp RightAmp
-	ccd12	STR	LeftAmp RightAmp
-	ccd13	STR	LeftAmp RightAmp
-	ccd14	STR	LeftAmp RightAmp
-	ccd15	STR	LeftAmp RightAmp
-	ccd16	STR	LeftAmp RightAmp
-	ccd17	STR	LeftAmp RightAmp
-	ccd18	STR	LeftAmp RightAmp
-	ccd19	STR	LeftAmp RightAmp
-	ccd20	STR	LeftAmp RightAmp
-	ccd21	STR	LeftAmp RightAmp
-	ccd22	STR	LeftAmp RightAmp
-	ccd23	STR	LeftAmp RightAmp
-	ccd24	STR	LeftAmp RightAmp
-	ccd25	STR	LeftAmp RightAmp
-	ccd26	STR	LeftAmp RightAmp
-	ccd27	STR	LeftAmp RightAmp
-	ccd28	STR	LeftAmp RightAmp
-	ccd29	STR	LeftAmp RightAmp
-	ccd30	STR	LeftAmp RightAmp
-	ccd31	STR	LeftAmp RightAmp
-	ccd32	STR	LeftAmp RightAmp
-	ccd33	STR	LeftAmp RightAmp
-	ccd34	STR	LeftAmp RightAmp
-	ccd35	STR	LeftAmp RightAmp
+FPA     METADATA
+        ccd00   STR     LeftAmp RightAmp
+        ccd01   STR     LeftAmp RightAmp
+        ccd02   STR     LeftAmp RightAmp
+        ccd03   STR     LeftAmp RightAmp
+        ccd04   STR     LeftAmp RightAmp
+        ccd05   STR     LeftAmp RightAmp
+        ccd06   STR     LeftAmp RightAmp
+        ccd07   STR     LeftAmp RightAmp
+        ccd08   STR     LeftAmp RightAmp
+        ccd09   STR     LeftAmp RightAmp
+        ccd10   STR     LeftAmp RightAmp
+        ccd11   STR     LeftAmp RightAmp
+        ccd12   STR     LeftAmp RightAmp
+        ccd13   STR     LeftAmp RightAmp
+        ccd14   STR     LeftAmp RightAmp
+        ccd15   STR     LeftAmp RightAmp
+        ccd16   STR     LeftAmp RightAmp
+        ccd17   STR     LeftAmp RightAmp
+        ccd18   STR     LeftAmp RightAmp
+        ccd19   STR     LeftAmp RightAmp
+        ccd20   STR     LeftAmp RightAmp
+        ccd21   STR     LeftAmp RightAmp
+        ccd22   STR     LeftAmp RightAmp
+        ccd23   STR     LeftAmp RightAmp
+        ccd24   STR     LeftAmp RightAmp
+        ccd25   STR     LeftAmp RightAmp
+        ccd26   STR     LeftAmp RightAmp
+        ccd27   STR     LeftAmp RightAmp
+        ccd28   STR     LeftAmp RightAmp
+        ccd29   STR     LeftAmp RightAmp
+        ccd30   STR     LeftAmp RightAmp
+        ccd31   STR     LeftAmp RightAmp
+        ccd32   STR     LeftAmp RightAmp
+        ccd33   STR     LeftAmp RightAmp
+        ccd34   STR     LeftAmp RightAmp
+        ccd35   STR     LeftAmp RightAmp
 END
 
@@ -80,19 +80,19 @@
 END
 
-DVO.CAMERADIR	STR	megacam		# Camera directory for DVO
+DVO.CAMERADIR   STR     megacam         # Camera directory for DVO
 
 # Table of strings to use for the class identifier (see ippdb) according to the file level.
-CLASSID		METADATA
-	FPA	STR	fpa
-	CHIP	STR	{CHIP.NAME}
-	CELL	STR	{CHIP.NAME}:{CELL.NAME}
+CLASSID         METADATA
+        FPA     STR     fpa
+        CHIP    STR     {CHIP.NAME}
+        CELL    STR     {CHIP.NAME}:{CELL.NAME}
 END
 
 # convert supplied FPA.OBSTYPE values to abstract exptype names
 OBSTYPE.TABLE METADATA
-  bias 	   STR BIAS
-  zero 	   STR BIAS
-  dark 	   STR DARK
-  flat 	   STR SKYFLAT
+  bias     STR BIAS
+  zero     STR BIAS
+  dark     STR DARK
+  flat     STR SKYFLAT
   skyflat  STR SKYFLAT
   domeflat STR DOMEFLAT
@@ -102,27 +102,27 @@
 
 # Recipe options
-RECIPES		METADATA
-	# Other recipes
+RECIPES         METADATA
+        # Other recipes
         PSPHOT          STR     megacam/psphot.config           # psphot details
         PSASTRO         STR     megacam/psastro.config          # psastro details
-	PPSTATS		STR	megacam/ppStats.config		# ppStats recipe
-	PPIMAGE         STR     megacam/ppImage.config		# ppImage recipe
+        PPSTATS         STR     megacam/ppStats.config          # ppStats recipe
+        PPIMAGE         STR     megacam/ppImage.config          # ppImage recipe
 END
 
 
 # Rejection levels for detrend creation
-REJECTION	METADATA
-	TYPE	LIMITS	FILTER	EXPECTED	IMFILE.MEAN	IMFILE.STDEV	EXP.MEAN	EXP.STDEV	EXP.MEANSTDEV	ENSEMBLE.MEAN	ENSEMBLE.STDEV	ENSEMBLE.MEANSTDEV	IMFILE.SN	EXP.SN	IMFILE.MEANSTDEV
-	FLAT	MULTI
-
-	BIAS	LIMITS	*	0		1		5		0.5		3		0.5		3		3		0			0		0	0
-	DARK	LIMITS	*	0		1		5		0.5		3		0.5		3		3		0			0		0	0
-	FLAT	LIMITS	*	0		0		0		0		0		0		0		0		3			0		0	0
-#	FLAT	LIMITS	u	0		0		0		0		0		0		0		0		3			0		0	0
-#	FLAT	LIMITS	g	0		0		0		0		0		0		0		0		3			0		0	0
-#	FLAT	LIMITS	r	0		0		0		0		0		0		0		0		3			0		0	0
-#	FLAT	LIMITS	i	0		0		0		0		0		0		0		0		3			0		0	0
-#	FLAT	LIMITS	z	0		0		0		0		0		0		0		0		3			0		0	0
-	FRINGE	LIMITS	*	0		0		0		0		0		0		0		0		0			0		0	0
+REJECTION       METADATA
+        TYPE    LIMITS  FILTER  EXPECTED        IMFILE.MEAN     IMFILE.STDEV    EXP.MEAN        EXP.STDEV       EXP.MEANSTDEV   ENSEMBLE.MEAN   ENSEMBLE.STDEV  ENSEMBLE.MEANSTDEV      IMFILE.SN       EXP.SN  IMFILE.MEANSTDEV
+        FLAT    MULTI
+
+        BIAS    LIMITS  *       0               1               5               0.5             3               0.5             3               3               0                       0               0       0
+        DARK    LIMITS  *       0               1               5               0.5             3               0.5             3               3               0                       0               0       0
+        FLAT    LIMITS  *       0               0               0               0               0               0               0               0               3                       0               0       0
+#       FLAT    LIMITS  u       0               0               0               0               0               0               0               0               3                       0               0       0
+#       FLAT    LIMITS  g       0               0               0               0               0               0               0               0               3                       0               0       0
+#       FLAT    LIMITS  r       0               0               0               0               0               0               0               0               3                       0               0       0
+#       FLAT    LIMITS  i       0               0               0               0               0               0               0               0               3                       0               0       0
+#       FLAT    LIMITS  z       0               0               0               0               0               0               0               0               3                       0               0       0
+        FRINGE  LIMITS  *       0               0               0               0               0               0               0               0               0                       0               0       0
 
 # FILTER is an additional qualifier, and may be "*" (or absent!), in which case it matches everything
@@ -145,105 +145,107 @@
 FILERULES METADATA
    ### 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        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
-   PPIMAGE.BIN1        	 STR PPIMAGE.BIN1.MEF
-   PPIMAGE.BIN2        	 STR PPIMAGE.BIN2.MEF
-   PSASTRO.INPUT       	 STR PSASTRO.INPUT.CMF
-   PSASTRO.OUTPUT      	 STR PSASTRO.OUTPUT.CMF
-   PSPHOT.OUTPUT       	 STR PSPHOT.OUTPUT.CMF
-   DVOCORR.OUTPUT      	 STR DVOCORR.MEF.OUTPUT
-   DVOFLAT.OUTPUT      	 STR DVOFLAT.MEF.OUTPUT
+   PPIMAGE.BIN1          STR PPIMAGE.BIN1.MEF
+   PPIMAGE.BIN2          STR PPIMAGE.BIN2.MEF
+   PSASTRO.INPUT         STR PSASTRO.INPUT.CMF
+   PSASTRO.OUTPUT        STR PSASTRO.OUTPUT.CMF
+   PSPHOT.OUTPUT         STR PSPHOT.OUTPUT.CMF
+   DVOCORR.OUTPUT        STR DVOCORR.MEF.OUTPUT
+   DVOFLAT.OUTPUT        STR DVOFLAT.MEF.OUTPUT
 
    ### input file definitions
-   TYPE               INPUT FILENAME.RULE                         DATA.LEVEL FILE.TYPE
-   PPIMAGE.INPUT      INPUT @FILES                                CHIP       IMAGE
-
-   ## can we just use PPIMAGE.INPUT as the pmFPAfile name?
-   DVOCORR.INPUT      INPUT @FILES                                CHIP       IMAGE
-   DVOCORR.REFHEAD    INPUT @FILES                                CHIP       HEADER
-
-   DVOFLAT.INPUT      INPUT @FILES                                CHIP       IMAGE
-   DVOFLAT.CORR       INPUT @DETDB                                CHIP       IMAGE
-
-   ### use these entries to get the detrend images from specific files
-   #PPIMAGE.MASK       INPUT megacam/mask.{CHIP.NAME}.fits                         CHIP       MASK
-   #PPIMAGE.BIAS       INPUT megacam/bias/MEGACAM.bias.norm.1.0.{CHIP.NAME}.fits   CHIP       IMAGE
-   #PPIMAGE.DARK       INPUT megacam/MEGACAM.dark.norm.2.0.{CHIP.NAME}.fits        CHIP       IMAGE
-   #PPIMAGE.FLAT       INPUT megacam/MEGACAM.flat.norm.3.0.{CHIP.NAME}.fits        CHIP       IMAGE
-   #PPIMAGE.FRINGE     INPUT megacam/MEGACAM.fringe.norm.4.0.{CHIP.NAME}.fits      CHIP       FRINGE
-
-   ### use these entries to get the detrend images from the database
-   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
-
-   PSPHOT.LOAD        INPUT @FILES                       CHIP       IMAGE
-   PSPHOT.INPUT       INPUT @FILES                       CHIP       IMAGE
-   PSASTRO.INPUT.CMP  INPUT @FILES                       CHIP       CMP
-   PSASTRO.INPUT.CMF  INPUT @FILES                       CHIP       CMF
-   PSPHOT.PSF.LOAD    INPUT @FILES                       CHIP       PSF       
-
-   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
+   ### 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
 
    ### 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      SPLICED
-   PPIMAGE.OUT.MK.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits MASK       CHIP       FALSE     SPLIT
-   PPIMAGE.OUT.WT.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits   WEIGHT     CHIP       FALSE     SPLIT
-   PPIMAGE.OUT.MK.MEF    OUTPUT {OUTPUT}.mk.fits               MASK       CHIP       FALSE     SPLICED
-   PPIMAGE.OUT.WT.MEF    OUTPUT {OUTPUT}.wt.fits               WEIGHT     CHIP       FALSE     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.JPEG1         OUTPUT {OUTPUT}.b1.jpg                JPEG       FPA        TRUE      NONE
-   PPIMAGE.JPEG2         OUTPUT {OUTPUT}.b2.jpg                JPEG       FPA        TRUE      NONE
-
-   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}.b1.fits               IMAGE      CHIP       TRUE      SPLICED
-   PPIMAGE.BIN2.MEF      OUTPUT {OUTPUT}.b2.fits               IMAGE      CHIP       TRUE      SPLICED
-
-   DVOCORR.MEF.OUTPUT    OUTPUT {OUTPUT}.fc.fits               IMAGE      CHIP       TRUE      SPLICED
-   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.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.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.CMF     OUTPUT {OUTPUT}.cmf                   CMF        CHIP       TRUE      SPLICED
-   PSPHOT.OUTPUT.CMP     OUTPUT {OUTPUT}.{CHIP.NAME}.cmp       CMP        CHIP       TRUE      NONE
-
-   PSPHOT.PSF.SAVE       OUTPUT {OUTPUT}.psf                   PSF        CHIP       TRUE      SPLICED
-
-   PSPHOT.MOMENT.PLT     OUTPUT {OUTPUT}.mnt.png               KAPA       FPA        TRUE      NONE
-   PSPHOT.PSFMODEL.PLT   OUTPUT {OUTPUT}.psf.png               KAPA       FPA        TRUE      NONE
-
-   PSASTRO.OUTPUT.CMF    OUTPUT {OUTPUT}a.cmf                  CMF        CHIP       TRUE      NONE
-   PSASTRO.OUTPUT.CMP    OUTPUT {OUTPUT}.{CHIP.NAME}.smp       CMP        CHIP       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}.{CHIP.NAME}.fits      IMAGE      CHIP       TRUE      SPLIT
+   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.OUT.MK.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits   	MASK      CHIP       FALSE     SPLIT
+   PPIMAGE.OUT.WT.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits   	WEIGHT    CHIP       FALSE     SPLIT
+   PPIMAGE.OUT.MK.MEF    OUTPUT {OUTPUT}.mk.fits               	MASK      CHIP       FALSE     SPLICED
+   PPIMAGE.OUT.WT.MEF    OUTPUT {OUTPUT}.wt.fits               	WEIGHT    CHIP       FALSE     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.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.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.SPL.OUTPUT    OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits   	IMAGE     CHIP       TRUE      SPLIT
+   DVOFLAT.MEF.OUTPUT    OUTPUT {OUTPUT}.co.fits               	IMAGE     CHIP       TRUE      SPLICED
+   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.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.OUTPUT.CMF     OUTPUT {OUTPUT}.cmf                   	CMF       CHIP       TRUE      SPLICED
+
+   PSPHOT.PSF.SAVE       OUTPUT {OUTPUT}.psf                   	PSF       CHIP       TRUE      SPLICED
+
+   SOURCE.PLOT.MOMENTS   OUTPUT {OUTPUT}.mnt.png              	KAPA      CHIP       TRUE      NONE
+   SOURCE.PLOT.PSFMODEL  OUTPUT {OUTPUT}.psf.png              	KAPA      CHIP       TRUE      NONE
+
+   PSASTRO.OUTPUT.CMF    OUTPUT {OUTPUT}a.cmf                  	CMF       CHIP       TRUE      NONE
+   PSASTRO.OUTPUT.CMP    OUTPUT {OUTPUT}.{CHIP.NAME}.smp       	CMP       CHIP       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
 END
 
