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