Index: trunk/ippconfig/cfh12k/camera.config
===================================================================
--- trunk/ippconfig/cfh12k/camera.config	(revision 13037)
+++ 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
 
