Index: /trunk/ippconfig/simtest/camera.config
===================================================================
--- /trunk/ippconfig/simtest/camera.config	(revision 13059)
+++ /trunk/ippconfig/simtest/camera.config	(revision 13060)
@@ -79,6 +79,6 @@
 
 FILERULES METADATA
-   PSASTRO.INPUT      STR PSASTRO.INPUT.CMP
-   PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.CMP
+   PSASTRO.INPUT      STR PSASTRO.INPUT.CMF
+   PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.CMF
    PSPHOT.OUTPUT      STR PSPHOT.OUTPUT.CMF
 
@@ -95,4 +95,7 @@
    PPIMAGE.FLAT       INPUT    @DETDB                        CHIP       IMAGE     
    PPIMAGE.MASK       INPUT    @DETDB                        CHIP       IMAGE     
+
+   ## files used by psphot 
+   PSPHOT.LOAD        INPUT    @FILES                        CHIP       IMAGE
    PSPHOT.INPUT       INPUT    none.fits                     CHIP       IMAGE     
    PSWARP.INPUT       INPUT    none.fits                     FPA        IMAGE     
@@ -100,5 +103,5 @@
    PSASTRO.INPUT.CMP  INPUT    none.fits                     CHIP       CMP       
    PSASTRO.INPUT.CMF  INPUT    none.fits                     CHIP       CMF       
-   PSPHOT.PSF.LOAD    INPUT   {OUTPUT}.psf                   CHIP	PSF       
+   PSPHOT.PSF.LOAD    INPUT    none.psf                      CHIP	PSF       
 
    ### output file definitions
@@ -135,4 +138,5 @@
 
    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
@@ -143,17 +147,9 @@
 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 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?
+
+  PSF.TABLE STR {CHIP.NAME}.psf_model
+  PSF.RESID STR {CHIP.NAME}.psf_resid
 END
-