Index: trunk/ippconfig/cfh12k/camera.config
===================================================================
--- trunk/ippconfig/cfh12k/camera.config	(revision 12563)
+++ trunk/ippconfig/cfh12k/camera.config	(revision 12586)
@@ -139,12 +139,5 @@
    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 the database
+   ### 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
@@ -153,10 +146,23 @@
    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       
 
-   PSWARP.INPUT       INPUT    none.fits                 FPA        IMAGE     
-   PSWARP.SKYCELL     INPUT    none.fits                 FPA        IMAGE     
+   # why is this "FPA"
+   PSWARP.INPUT       INPUT @FILES                 	 FPA        IMAGE     
+   PSWARP.SKYCELL     INPUT @FILES                 	 FPA        IMAGE     
    PSWARP.ASTROM      INPUT @FILES                       CHIP       CMF       
 
@@ -198,6 +204,6 @@
    PSPHOT.OUTPUT.CMP   OUTPUT {OUTPUT}.{CHIP.NAME}.cmp         CHIP       CMP       TRUE      NONE
 
-   PSASTRO.OUTPUT.CMF  OUTPUT {OUTPUT}.smf                     CHIP       CMF       TRUE      NONE
-   PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp         CHIP       CMP       TRUE      NONE
+   PSASTRO.OUTPUT.CMF  OUTPUT {OUTPUT}.cmf                     CHIP       CMF       TRUE      NONE
+   PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.cmp         CHIP       CMP       TRUE      NONE
 
 END