Index: trunk/ippconfig/isp/camera.config
===================================================================
--- trunk/ippconfig/isp/camera.config	(revision 11295)
+++ trunk/ippconfig/isp/camera.config	(revision 11330)
@@ -68,24 +68,22 @@
 
    ### input file definitions
-   TYPE               INPUT    FILENAME.RULE                  FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE DATA.LEVEL 
-   PPIMAGE.INPUT      INPUT    none.fits                      NONE          NONE         NONE         IMAGE     FPA        
-   PPARITH.INPUT      INPUT    none.fits                      NONE          NONE         NONE         IMAGE     FPA
+   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          {CAMERA}     NONE         CHIP       IMAGE     
+   PPIMAGE.DARK       INPUT    @DETDB                         NONE          {CAMERA}     NONE         CHIP       IMAGE     
+   PPIMAGE.FLAT       INPUT    @DETDB                         NONE          {CAMERA}     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.SHUTTER  INPUT    shutter.fits                   NONE          NONE         NONE         CHIP	 IMAGE     
+   # PPIMAGE.FLAT     INPUT    flat.fits                      NONE          NONE         NONE         CHIP       IMAGE     
 
-   # XXX should we have a fallback option for these?
-   PPIMAGE.BIAS       INPUT    @DETDB                         NONE          {CAMERA}     NONE         IMAGE     CHIP       
-   PPIMAGE.DARK       INPUT    @DETDB                         NONE          {CAMERA}     NONE         IMAGE     CHIP       
-   PPIMAGE.FLAT       INPUT    @DETDB                         NONE          {CAMERA}     NONE         IMAGE     CHIP       
+   PPARITH.INPUT      INPUT    none.fits                      NONE          NONE         NONE         FPA	 IMAGE     
 
-     PPIMAGE.MASK     INPUT    mask.fits                      NONE          NONE         NONE         IMAGE     CHIP       
-   # PPIMAGE.BIAS     INPUT    bias.fits                      NONE          NONE         NONE         IMAGE     CHIP       
-   # PPIMAGE.DARK     INPUT    dark.fits                      NONE          NONE         NONE         IMAGE     CHIP       
-   # PPIMAGE.SHUTTER  INPUT    shutter.fits                   NONE          NONE         NONE         IMAGE     CHIP
-   # PPIMAGE.FLAT     INPUT    flat.fits                      NONE          NONE         NONE         IMAGE     CHIP       
+   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                      NONE          NONE         NONE         IMAGE     CHIP       
-   PSPHOT.PSF.LOAD    INPUT    none.psf                       NONE          NONE         NONE         PSF       CHIP
-
-   PSASTRO.INPUT.CMP  INPUT    none.fits                      NONE          NONE         PHU          CMP       FPA       
-   PSASTRO.INPUT.CMF  INPUT    none.fits                      NONE          SMPDATA      PHU          CMF       FPA       
+   PSASTRO.INPUT.CMP  INPUT    none.fits                      NONE          NONE         PHU          FPA        CMP       
+   PSASTRO.INPUT.CMF  INPUT    none.fits                      NONE          SMPDATA      PHU          FPA        CMF       
 
    ### output file definitions