Index: trunk/ippconfig/isp/camera.config
===================================================================
--- trunk/ippconfig/isp/camera.config	(revision 12376)
+++ trunk/ippconfig/isp/camera.config	(revision 12525)
@@ -90,55 +90,55 @@
 
    ### input file definitions
-   TYPE               INPUT    FILENAME.RULE                  FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA DATA.LEVEL FILE.TYPE 
-   PPIMAGE.INPUT      INPUT    none.fits                      NONE          NONE         NONE         FPA        IMAGE     
-   PPIMAGE.BIAS       INPUT    @DETDB                         NONE          NONE         NONE         CHIP       IMAGE     
-   PPIMAGE.DARK       INPUT    @DETDB                         NONE          NONE         NONE         CHIP       IMAGE     
-   PPIMAGE.FLAT       INPUT    @DETDB                         NONE          NONE         NONE         CHIP       IMAGE     
-   PPIMAGE.SHUTTER    INPUT    @DETDB                         NONE          NONE         NONE         CHIP       IMAGE     
-     PPIMAGE.MASK     INPUT    mask.fits                      NONE          NONE         NONE         CHIP       IMAGE     
-   # PPIMAGE.BIAS     INPUT    bias.fits                      NONE          NONE         NONE         CHIP       IMAGE     
-   # PPIMAGE.DARK     INPUT    dark.fits                      NONE          NONE         NONE         CHIP       IMAGE     
-   # PPIMAGE.FLAT     INPUT    flat.fits                      NONE          NONE         NONE         CHIP       IMAGE     
+   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     
 
-   PPARITH.INPUT      INPUT    none.fits                      NONE          NONE         NONE         FPA        IMAGE     
+   PPARITH.INPUT      INPUT    none.fits                      FPA        IMAGE     
 
-   PSPHOT.INPUT       INPUT    none.fits                      NONE          NONE         NONE         CHIP       IMAGE     
-   PSPHOT.PSF.LOAD    INPUT    none.psf                       NONE          NONE         NONE         CHIP       PSF       
+   PSPHOT.INPUT       INPUT    none.fits                      CHIP       IMAGE     
+   PSPHOT.PSF.LOAD    INPUT    none.psf                       CHIP       PSF       
 
-   PSASTRO.INPUT.CMP  INPUT    none.fits                      NONE          NONE         PHU          FPA        CMP       
-   PSASTRO.INPUT.CMF  INPUT    none.fits                      NONE          SMPDATA      PHU          FPA        CMF       
+   PSASTRO.INPUT.CMP  INPUT    none.fits                      FPA        CMP       
+   PSASTRO.INPUT.CMF  INPUT    none.fits                      FPA        CMF       
 
    ### output file definitions
-   TYPE                OUTPUT   FILENAME.RULE        FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE FILE.LEVEL DATA.LEVEL FILE.SAVE FILE.FORMAT
-   PPIMAGE.OUTPUT      OUTPUT   {OUTPUT}.isp.fits    NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-   PPIMAGE.OUTPUT.MASK OUTPUT   {OUTPUT}.mask.fits   NONE          NONE         NONE         MASK      FPA        FPA       FALSE     NONE
-   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits     NONE          NONE         NONE         WEIGHT    FPA        FPA       FALSE     NONE
-   PPIMAGE.OUTPUT.CHIP OUTPUT   {OUTPUT}.chip.fits   NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
-   PPIMAGE.OUTPUT.FPA1 OUTPUT   {OUTPUT}.b1.fits     NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
-   PPIMAGE.OUTPUT.FPA2 OUTPUT   {OUTPUT}.b2.fits     NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
+   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
 
-   PPIMAGE.BIN1        OUTPUT   {OUTPUT}.b1.fits     NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
-   PPIMAGE.BIN2        OUTPUT   {OUTPUT}.b2.fits     NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
-   PPIMAGE.JPEG1       OUTPUT   {OUTPUT}.b1.jpg      NONE          NONE         NONE         JPEG      FPA        FPA        TRUE      ISP
-   PPIMAGE.JPEG2       OUTPUT   {OUTPUT}.b2.jpg      NONE          NONE         NONE         JPEG      FPA        FPA        TRUE      ISP
+   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
 
-   PPARITH.OUTPUT      OUTPUT   {OUTPUT}             NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
+   PPARITH.OUTPUT      OUTPUT   {OUTPUT}             FPA        TRUE      NONE
 
-   PSPHOT.RESID        OUTPUT   {OUTPUT}.res.fits    NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
-   PSPHOT.BACKGND      OUTPUT   {OUTPUT}.bck.fits    NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
-   PSPHOT.BACKSUB      OUTPUT   {OUTPUT}.sub.fits    NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
-   PSPHOT.BACKMDL      OUTPUT   {OUTPUT}.mdl.fits    NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
-   PSPHOT.OUTPUT.RAW   OUTPUT   {OUTPUT}             NONE          NONE         NONE         RAW       FPA        FPA        TRUE      NONE
-   PSPHOT.OUTPUT.SX    OUTPUT   {OUTPUT}.sx          NONE          NONE         NONE         SX        FPA        FPA        TRUE      NONE
-   PSPHOT.OUTPUT.OBJ   OUTPUT   {OUTPUT}.obj         NONE          NONE         NONE         OBJ       FPA        FPA        TRUE      NONE
-   PSPHOT.OUTPUT.CMP   OUTPUT   {OUTPUT}.cmp         NONE          NONE         NONE         CMP       FPA        FPA        TRUE      NONE
-   PSPHOT.OUTPUT.CMF   OUTPUT   {OUTPUT}.cmf         NONE          SMPDATA      PHU          CMF       FPA        FPA        TRUE      NONE
-   PSPHOT.PSF.SAVE     OUTPUT   {OUTPUT}.psf         NONE          NONE         NONE         PSF       FPA        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
 
-   SOURCE.PLOT.MOMENTS  OUTPUT   {OUTPUT}.mnt.png    NONE          NONE         NONE         KAPA      FPA        FPA        TRUE      NONE
-   SOURCE.PLOT.PSFMODEL OUTPUT   {OUTPUT}.psf.png    NONE          NONE         NONE         KAPA      FPA        FPA        TRUE      ISP
+   SOURCE.PLOT.MOMENTS  OUTPUT   {OUTPUT}.mnt.png    FPA        TRUE      NONE
+   SOURCE.PLOT.PSFMODEL OUTPUT   {OUTPUT}.psf.png    FPA        TRUE      ISP
 
-   PSASTRO.OUTPUT.CMP   OUTPUT   {OUTPUT}.smp        NONE          NONE         NONE         CMP       FPA        FPA        TRUE      NONE
-   PSASTRO.OUTPUT.CMF   OUTPUT   {OUTPUT}.smf        NONE          SMPDATA      PHU          CMF       FPA        FPA        TRUE      NONE
+   PSASTRO.OUTPUT.CMP   OUTPUT   {OUTPUT}.smp        FPA        TRUE      NONE
+   PSASTRO.OUTPUT.CMF   OUTPUT   {OUTPUT}.smf        FPA        TRUE      NONE
 END
 
