Index: trunk/ippconfig/simtest/camera.config
===================================================================
--- trunk/ippconfig/simtest/camera.config	(revision 12366)
+++ trunk/ippconfig/simtest/camera.config	(revision 12525)
@@ -83,55 +83,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     
-   INPUT.MASK         INPUT    none.fits                     NONE          NONE         NONE         FPA        MASK      
-   INPUT.WEIGHT       INPUT    none.fits                     NONE          NONE         NONE         FPA        WEIGHT    
-   INPUT.PSF          INPUT    none.fits                     NONE          NONE         NONE         READOUT	PSF       
-   INPUT.SRC          INPUT    none.fits                     NONE          SMPDATA      PHU          READOUT	CMF       
-   PPIMAGE.BIAS       INPUT    @DETDB                        NONE          fpa          NONE         CHIP       IMAGE     
-   PPIMAGE.DARK       INPUT    @DETDB                        NONE          fpa          NONE         CHIP       IMAGE     
-   PPIMAGE.SHUTTER    INPUT    @DETDB                        NONE          fpa          NONE         CHIP       IMAGE     
-   PPIMAGE.FLAT       INPUT    @DETDB                        NONE          fpa          NONE         CHIP       IMAGE     
-   PPIMAGE.MASK       INPUT    @DETDB                        NONE          fpa          NONE         CHIP       IMAGE     
-   PSPHOT.INPUT       INPUT    none.fits                     NONE          NONE         NONE         CHIP       IMAGE     
-   PSWARP.INPUT       INPUT    none.fits                     NONE          NONE         NONE         FPA        IMAGE     
-   PSWARP.SKYCELL     INPUT    none.fits                     NONE          NONE         NONE         FPA        IMAGE     
-   PSASTRO.INPUT.CMP  INPUT    none.fits                     NONE          NONE         PHU          CHIP       CMP       
-   PSASTRO.INPUT.CMF  INPUT    none.fits                     NONE          SMPDATA      PHU          CHIP       CMF       
-   PSPHOT.PSF.LOAD    INPUT   {OUTPUT}.psf                   NONE          NONE         NONE         CHIP	PSF       
+   TYPE               INPUT    FILENAME.RULE                 DATA.LEVEL FILE.TYPE 
+   PPIMAGE.INPUT      INPUT    none.fits                     FPA        IMAGE     
+   INPUT.MASK         INPUT    none.fits                     FPA        MASK      
+   INPUT.WEIGHT       INPUT    none.fits                     FPA        WEIGHT    
+   INPUT.PSF          INPUT    none.fits                     READOUT	PSF       
+   INPUT.SRC          INPUT    none.fits                     READOUT	CMF       
+   PPIMAGE.BIAS       INPUT    @DETDB                        CHIP       IMAGE     
+   PPIMAGE.DARK       INPUT    @DETDB                        CHIP       IMAGE     
+   PPIMAGE.SHUTTER    INPUT    @DETDB                        CHIP       IMAGE     
+   PPIMAGE.FLAT       INPUT    @DETDB                        CHIP       IMAGE     
+   PPIMAGE.MASK       INPUT    @DETDB                        CHIP       IMAGE     
+   PSPHOT.INPUT       INPUT    none.fits                     CHIP       IMAGE     
+   PSWARP.INPUT       INPUT    none.fits                     FPA        IMAGE     
+   PSWARP.SKYCELL     INPUT    none.fits                     FPA        IMAGE     
+   PSASTRO.INPUT.CMP  INPUT    none.fits                     CHIP       CMP       
+   PSASTRO.INPUT.CMF  INPUT    none.fits                     CHIP       CMF       
+   PSPHOT.PSF.LOAD    INPUT   {OUTPUT}.psf                   CHIP	PSF       
 
    ### 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}.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}.ch.fits   NONE   	 NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-   PPIMAGE.OUTPUT.FPA1 OUTPUT 	{OUTPUT}.b1.fits   NONE   	 NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-   PPIMAGE.OUTPUT.FPA2 OUTPUT 	{OUTPUT}.b2.fits   NONE   	 NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-
-   PPIMAGE.JPEG1       OUTPUT   {OUTPUT}.b1.jpg    NONE          NONE         NONE         JPEG      FPA        FPA        TRUE      NONE
-   PPIMAGE.JPEG2       OUTPUT   {OUTPUT}.b2.jpg    NONE          NONE         NONE         JPEG      FPA        FPA        TRUE      NONE
-   PPIMAGE.BIN1        OUTPUT   {OUTPUT}.b1.fits   NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-   PPIMAGE.BIN2        OUTPUT   {OUTPUT}.b2.fits   NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-
-   PSWARP.OUTPUT       OUTPUT   {OUTPUT}.fits      NONE   	 NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-   PSWARP.BIN1         OUTPUT   {OUTPUT}.b1.fits   NONE   	 NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-   PSWARP.BIN2         OUTPUT   {OUTPUT}.b2.fits   NONE   	 NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-
-   PSPHOT.RESID        OUTPUT   {OUTPUT}.res.fits  NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-   PSPHOT.BACKGND      OUTPUT   {OUTPUT}.bck.fits  NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-   PSPHOT.BACKSUB      OUTPUT   {OUTPUT}.sub.fits  NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-   PSPHOT.BACKMDL      OUTPUT   {OUTPUT}.mdl.fits  NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-   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.MOMENT.PLT   OUTPUT   {OUTPUT}.mnt.png   NONE          NONE         NONE         KAPA      FPA        FPA        TRUE      NONE
-   PSPHOT.PSFMODEL.PLT OUTPUT   {OUTPUT}.psf.png   NONE          NONE         NONE         KAPA      FPA        FPA        TRUE      NONE
-
-   PSASTRO.OUTPUT.CMP  OUTPUT   {OUTPUT}.smp       NONE          NONE         NONE         CMP       FPA       	FPA        TRUE      NONE
+   TYPE                OUTPUT   FILENAME.RULE              DATA.LEVEL FILE.SAVE FILE.FORMAT
+   PPIMAGE.OUTPUT      OUTPUT   {OUTPUT}.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}.ch.fits           FPA        TRUE      NONE
+   PPIMAGE.OUTPUT.FPA1 OUTPUT 	{OUTPUT}.b1.fits           FPA        TRUE      NONE
+   PPIMAGE.OUTPUT.FPA2 OUTPUT 	{OUTPUT}.b2.fits           FPA        TRUE      NONE
+						           
+   PPIMAGE.JPEG1       OUTPUT   {OUTPUT}.b1.jpg            FPA        TRUE      NONE
+   PPIMAGE.JPEG2       OUTPUT   {OUTPUT}.b2.jpg            FPA        TRUE      NONE
+   PPIMAGE.BIN1        OUTPUT   {OUTPUT}.b1.fits           FPA        TRUE      NONE
+   PPIMAGE.BIN2        OUTPUT   {OUTPUT}.b2.fits           FPA        TRUE      NONE
+						           
+   PSWARP.OUTPUT       OUTPUT   {OUTPUT}.fits              FPA        TRUE      NONE
+   PSWARP.BIN1         OUTPUT   {OUTPUT}.b1.fits           FPA        TRUE      NONE
+   PSWARP.BIN2         OUTPUT   {OUTPUT}.b2.fits           FPA        TRUE      NONE
+						           
+   PSPHOT.RESID        OUTPUT   {OUTPUT}.res.fits          FPA        TRUE      NONE
+   PSPHOT.BACKGND      OUTPUT   {OUTPUT}.bck.fits          FPA        TRUE      NONE
+   PSPHOT.BACKSUB      OUTPUT   {OUTPUT}.sub.fits          FPA        TRUE      NONE
+   PSPHOT.BACKMDL      OUTPUT   {OUTPUT}.mdl.fits          FPA        TRUE      NONE
+   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
+						           
+   PSPHOT.MOMENT.PLT   OUTPUT   {OUTPUT}.mnt.png           FPA        TRUE      NONE
+   PSPHOT.PSFMODEL.PLT OUTPUT   {OUTPUT}.psf.png           FPA        TRUE      NONE
+						           
+   PSASTRO.OUTPUT.CMP  OUTPUT   {OUTPUT}.smp               FPA        TRUE      NONE
 END
 
