Index: /trunk/ippconfig/ctio_mosaic2/camera.config
===================================================================
--- /trunk/ippconfig/ctio_mosaic2/camera.config	(revision 12524)
+++ /trunk/ippconfig/ctio_mosaic2/camera.config	(revision 12525)
@@ -94,52 +94,44 @@
 
    ### input file definitions
-   TYPE               INPUT FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA DATA.LEVEL FILE.TYPE 
-   PPIMAGE.INPUT      INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CELL       IMAGE
+   TYPE               INPUT FILENAME.RULE                 DATA.LEVEL FILE.TYPE 
+   PPIMAGE.INPUT      INPUT @FILES                        CELL       IMAGE
 
-   ### use these entries to get the detrend images from specific files
-   #PPIMAGE.MASK      INPUT megacam/mask.{CHIP.NAME}.fits                  {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       MASK     
-   #PPIMAGE.BIAS       INPUT path://PAP_ESSENCE/CTIO_MOSAIC2.bias.1.2.fpa.fits {CHIP.NAME} {CELL.NAME} NONE         CELL       IMAGE     
-   #PPIMAGE.DARK       INPUT file:///something.fits                       {CHIP.NAME}     {CHIP.NAME}  NONE         CELL       IMAGE     
-   #PPIMAGE.FLAT       INPUT file:///something.fits                       {CHIP.NAME}     {CHIP.NAME}  NONE         CELL       IMAGE     
-   #PPIMAGE.FRINGE     INPUT file:///something.fits                       {CHIP.NAME}     {CHIP.NAME}  NONE         CELL       FRINGE     
+   PPIMAGE.MASK       INPUT @DETDB                        CHIP      IMAGE
+   PPIMAGE.BIAS       INPUT @DETDB                        CHIP      IMAGE
+   PPIMAGE.DARK       INPUT @DETDB                        CHIP      IMAGE
+   PPIMAGE.FLAT       INPUT @DETDB                        CHIP      IMAGE
 
-   ### use these entries to get the detrend images from the database
-   #PPIMAGE.MASK       INPUT @DETDB                       NONE          NONE         NONE         CHIP      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         FILTER       CHIP      IMAGE
+   PSPHOT.INPUT       INPUT @FILES                        CHIP       IMAGE     
 
-   PSPHOT.INPUT       INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE     
-
-   PSASTRO.INPUT.CMP  INPUT @FILES                        NONE          NONE         PHU          CHIP       CMP       
-   PSASTRO.INPUT.CMF  INPUT @FILES                        NONE          SMPDATA      PHU          CHIP       CMF       
+   PSASTRO.INPUT.CMP  INPUT @FILES                        CHIP       CMP       
+   PSASTRO.INPUT.CMF  INPUT @FILES                        CHIP       CMF       
 
    ### output file definitions
-   TYPE                OUTPUT FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.LEVEL DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT
-   PPIMAGE.OUTPUT      OUTPUT {OUTPUT}.fits                  {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CELL       IMAGE     TRUE      NONE
-   PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits             {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CELL       MASK      FALSE     NONE
-   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits             {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CELL       WEIGHT    FALSE     NONE
-   PPIMAGE.BIN1        OUTPUT {OUTPUT}.b1.fits               {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      NONE
-   PPIMAGE.BIN2        OUTPUT {OUTPUT}.b2.fits               {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      NONE
+   TYPE                OUTPUT FILENAME.RULE                  DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT
+   PPIMAGE.OUTPUT      OUTPUT {OUTPUT}.fits                  CELL       IMAGE     TRUE      NONE
+   PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits             CELL       MASK      FALSE     NONE
+   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits             CELL       WEIGHT    FALSE     NONE
+   PPIMAGE.BIN1        OUTPUT {OUTPUT}.b1.fits               CHIP       IMAGE     TRUE      NONE
+   PPIMAGE.BIN2        OUTPUT {OUTPUT}.b2.fits               CHIP       IMAGE     TRUE      NONE
 
-   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fits             {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      NONE
-   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fits             NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      NONE
-   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fits             NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      NONE
+   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fits             CHIP       IMAGE     TRUE      NONE
+   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fits             FPA        IMAGE     TRUE      NONE
+   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fits             FPA        IMAGE     TRUE      NONE
 
-   PPIMAGE.JPEG1       OUTPUT {OUTPUT}.b1.jpg                NONE          NONE         NONE         FPA        FPA        JPEG      TRUE      NONE
-   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.b2.jpg                NONE          NONE         NONE         FPA        FPA        JPEG      TRUE      NONE
+   PPIMAGE.JPEG1       OUTPUT {OUTPUT}.b1.jpg                FPA        JPEG      TRUE      NONE
+   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.b2.jpg                FPA        JPEG      TRUE      NONE
 
-   PSPHOT.RESID        OUTPUT {OUTPUT}.res.fits              NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      RAW
-   PSPHOT.BACKGND      OUTPUT {OUTPUT}.bck.fits              NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      RAW
-   PSPHOT.BACKSUB      OUTPUT {OUTPUT}.sub.fits              NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      RAW
-   PSPHOT.BACKMDL      OUTPUT {OUTPUT}.mdl.fits              NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      RAW
+   PSPHOT.RESID        OUTPUT {OUTPUT}.res.fits              CHIP       IMAGE     TRUE      RAW
+   PSPHOT.BACKGND      OUTPUT {OUTPUT}.bck.fits              CHIP       IMAGE     TRUE      RAW
+   PSPHOT.BACKSUB      OUTPUT {OUTPUT}.sub.fits              CHIP       IMAGE     TRUE      RAW
+   PSPHOT.BACKMDL      OUTPUT {OUTPUT}.mdl.fits              CHIP       IMAGE     TRUE      RAW
 
-   PSPHOT.OUTPUT.RAW   OUTPUT {OUTPUT}.{CHIP.NAME}           NONE          NONE         PHU          CHIP       CHIP       RAW       TRUE      NONE
-   PSPHOT.OUTPUT.SX    OUTPUT {OUTPUT}.sx                    NONE          NONE         PHU          CHIP       CHIP       SX        TRUE      NONE
-   PSPHOT.OUTPUT.OBJ   OUTPUT {OUTPUT}.obj                   NONE          NONE         PHU          CHIP       CHIP       OBJ       TRUE      NONE
-   PSPHOT.OUTPUT.CMF   OUTPUT {OUTPUT}.cmf                   NONE          SMPDATA      PHU          CHIP       CHIP       CMF       TRUE      NONE
-   PSPHOT.OUTPUT.CMP   OUTPUT {OUTPUT}.{CHIP.NAME}.cmp       NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
+   PSPHOT.OUTPUT.RAW   OUTPUT {OUTPUT}.{CHIP.NAME}           CHIP       RAW       TRUE      NONE
+   PSPHOT.OUTPUT.SX    OUTPUT {OUTPUT}.sx                    CHIP       SX        TRUE      NONE
+   PSPHOT.OUTPUT.OBJ   OUTPUT {OUTPUT}.obj                   CHIP       OBJ       TRUE      NONE
+   PSPHOT.OUTPUT.CMF   OUTPUT {OUTPUT}.cmf                   CHIP       CMF       TRUE      NONE
+   PSPHOT.OUTPUT.CMP   OUTPUT {OUTPUT}.{CHIP.NAME}.cmp       CHIP       CMP       TRUE      NONE
 
-   PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp       NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
+   PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp       CHIP       CMP       TRUE      NONE
 
 END
Index: /trunk/ippconfig/isp/camera.config
===================================================================
--- /trunk/ippconfig/isp/camera.config	(revision 12524)
+++ /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
 
Index: /trunk/ippconfig/megacam/camera.config
===================================================================
--- /trunk/ippconfig/megacam/camera.config	(revision 12524)
+++ /trunk/ippconfig/megacam/camera.config	(revision 12525)
@@ -155,67 +155,67 @@
 
    ### input file definitions
-   TYPE               INPUT FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA DATA.LEVEL FILE.TYPE 
-   PPIMAGE.INPUT      INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE
-
-   ## can we just use PPIMAGE.INPUT as the pmFPAfile name?
-   DVOCORR.INPUT      INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE     
-   DVOCORR.REFHEAD    INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       HEADER     
-
-   DVOFLAT.INPUT      INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE 	
-   DVOFLAT.CORR       INPUT @DETDB                        NONE          NONE         NONE         CHIP       IMAGE 	
+   TYPE               INPUT FILENAME.RULE                         DATA.LEVEL FILE.TYPE 
+   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 specific files
-   #PPIMAGE.MASK       INPUT megacam/mask.{CHIP.NAME}.fits                  {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       MASK     
-   #PPIMAGE.BIAS       INPUT megacam/bias/MEGACAM.bias.norm.1.0.{CHIP.NAME}.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   #PPIMAGE.DARK       INPUT megacam/MEGACAM.dark.norm.2.0.{CHIP.NAME}.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   #PPIMAGE.FLAT       INPUT megacam/MEGACAM.flat.norm.3.0.{CHIP.NAME}.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   #PPIMAGE.FRINGE     INPUT megacam/MEGACAM.fringe.norm.4.0.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME}  NONE         CHIP       FRINGE     
+   #PPIMAGE.MASK       INPUT megacam/mask.{CHIP.NAME}.fits                         CHIP       MASK     
+   #PPIMAGE.BIAS       INPUT megacam/bias/MEGACAM.bias.norm.1.0.{CHIP.NAME}.fits   CHIP       IMAGE     
+   #PPIMAGE.DARK       INPUT megacam/MEGACAM.dark.norm.2.0.{CHIP.NAME}.fits        CHIP       IMAGE     
+   #PPIMAGE.FLAT       INPUT megacam/MEGACAM.flat.norm.3.0.{CHIP.NAME}.fits        CHIP       IMAGE     
+   #PPIMAGE.FRINGE     INPUT megacam/MEGACAM.fringe.norm.4.0.{CHIP.NAME}.fits      CHIP       FRINGE     
 
    ### use these entries to get the detrend images from the database
-   PPIMAGE.MASK       INPUT @DETDB                       NONE          NONE         NONE         CHIP       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.FRINGE     INPUT @DETDB                       NONE          NONE         NONE         CHIP       FRINGE     
-
-   PSPHOT.INPUT       INPUT @FILES                       {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE     
-   PSASTRO.INPUT.CMP  INPUT @FILES                        NONE          NONE        PHU          CHIP       CMP       
-   PSASTRO.INPUT.CMF  INPUT @FILES                        NONE          SMPDATA     PHU          CHIP       CMF       
+   PPIMAGE.MASK       INPUT @DETDB                       CHIP       IMAGE
+   PPIMAGE.BIAS       INPUT @DETDB                       CHIP       IMAGE
+   PPIMAGE.DARK       INPUT @DETDB                       CHIP       IMAGE
+   PPIMAGE.FLAT       INPUT @DETDB                       CHIP       IMAGE
+   PPIMAGE.FRINGE     INPUT @DETDB                       CHIP       FRINGE     
+
+   PSPHOT.INPUT       INPUT @FILES                       CHIP       IMAGE     
+   PSASTRO.INPUT.CMP  INPUT @FILES                       CHIP       CMP       
+   PSASTRO.INPUT.CMF  INPUT @FILES                       CHIP       CMF       
 
 
    ### output file definitions
-   TYPE                OUTPUT FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.LEVEL DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT
-   PPIMAGE.OUTPUT.SPL  OUTPUT {OUTPUT}.{CHIP.NAME}.fits      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.OUTPUT.MEF  OUTPUT {OUTPUT}.fits                  {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      SPLICED
-   PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       MASK      FALSE     NONE
-   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       WEIGHT    FALSE     NONE
-   PPIMAGE.BIN1.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.BIN2.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.BIN1.MEF    OUTPUT {OUTPUT}.b1.fits               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      SPLICED
-   PPIMAGE.BIN2.MEF    OUTPUT {OUTPUT}.b2.fits               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      SPLICED
-   DVOCORR.MEF.OUTPUT  OUTPUT {OUTPUT}.fc.fits               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      SPLICED
-   DVOCORR.SPL.OUTPUT  OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits   NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      SPLIT
-   DVOFLAT.MEF.OUTPUT  OUTPUT {OUTPUT}.co.fits               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      SPLICED
-   DVOFLAT.SPL.OUTPUT  OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits   NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      SPLIT
-
-   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits               NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      SPLICED
-   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits               NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      SPLICED
-
-   PPIMAGE.JPEG1       OUTPUT {OUTPUT}.b1.jpg                NONE          NONE         NONE         FPA        FPA        JPEG      TRUE      NONE
-   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.b2.jpg                NONE          NONE         NONE         FPA        FPA        JPEG      TRUE      NONE
-
-   PSPHOT.RESID        OUTPUT {OUTPUT}.res.fits              NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      SPLICED
-   PSPHOT.BACKGND      OUTPUT {OUTPUT}.bck.fits              NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      SPLICED
-   PSPHOT.BACKSUB      OUTPUT {OUTPUT}.sub.fits              NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      SPLICED
-   PSPHOT.BACKMDL      OUTPUT {OUTPUT}.mdl.fits              NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      SPLICED
-
-   PSPHOT.OUTPUT.RAW   OUTPUT {OUTPUT}.{CHIP.NAME}           NONE          NONE         PHU          CHIP       CHIP       RAW       TRUE      NONE
-   PSPHOT.OUTPUT.SX    OUTPUT {OUTPUT}.sx                    NONE          NONE         PHU          CHIP       CHIP       SX        TRUE      NONE
-   PSPHOT.OUTPUT.OBJ   OUTPUT {OUTPUT}.obj                   NONE          NONE         PHU          CHIP       CHIP       OBJ       TRUE      NONE
-   PSPHOT.OUTPUT.CMF   OUTPUT {OUTPUT}.cmf                   NONE          SMPDATA      PHU          CHIP       CHIP       CMF       TRUE      NONE
-   PSPHOT.OUTPUT.CMP   OUTPUT {OUTPUT}.{CHIP.NAME}.cmp       NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
-
-   PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp       NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
-
-END
+   TYPE                OUTPUT FILENAME.RULE                  DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT
+   PPIMAGE.OUTPUT.SPL  OUTPUT {OUTPUT}.{CHIP.NAME}.fits      CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.OUTPUT.MEF  OUTPUT {OUTPUT}.fits                  CHIP       IMAGE     TRUE      SPLICED
+   PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits CHIP       MASK      FALSE     NONE
+   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits CHIP       WEIGHT    FALSE     NONE
+   PPIMAGE.BIN1.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits   CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.BIN2.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits   CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.BIN1.MEF    OUTPUT {OUTPUT}.b1.fits               CHIP       IMAGE     TRUE      SPLICED
+   PPIMAGE.BIN2.MEF    OUTPUT {OUTPUT}.b2.fits               CHIP       IMAGE     TRUE      SPLICED
+   DVOCORR.MEF.OUTPUT  OUTPUT {OUTPUT}.fc.fits               CHIP       IMAGE     TRUE      SPLICED
+   DVOCORR.SPL.OUTPUT  OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits   CHIP       IMAGE     TRUE      SPLIT
+   DVOFLAT.MEF.OUTPUT  OUTPUT {OUTPUT}.co.fits               CHIP       IMAGE     TRUE      SPLICED
+   DVOFLAT.SPL.OUTPUT  OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits   CHIP       IMAGE     TRUE      SPLIT
+
+   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits               FPA        IMAGE     TRUE      SPLICED
+   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits               FPA        IMAGE     TRUE      SPLICED
+
+   PPIMAGE.JPEG1       OUTPUT {OUTPUT}.b1.jpg                FPA        JPEG      TRUE      NONE
+   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.b2.jpg                FPA        JPEG      TRUE      NONE
+
+   PSPHOT.RESID        OUTPUT {OUTPUT}.res.fits              CHIP       IMAGE     TRUE      SPLICED
+   PSPHOT.BACKGND      OUTPUT {OUTPUT}.bck.fits              CHIP       IMAGE     TRUE      SPLICED
+   PSPHOT.BACKSUB      OUTPUT {OUTPUT}.sub.fits              CHIP       IMAGE     TRUE      SPLICED
+   PSPHOT.BACKMDL      OUTPUT {OUTPUT}.mdl.fits              CHIP       IMAGE     TRUE      SPLICED
+
+   PSPHOT.OUTPUT.RAW   OUTPUT {OUTPUT}.{CHIP.NAME}           CHIP       RAW       TRUE      NONE
+   PSPHOT.OUTPUT.SX    OUTPUT {OUTPUT}.sx                    CHIP       SX        TRUE      NONE
+   PSPHOT.OUTPUT.OBJ   OUTPUT {OUTPUT}.obj                   CHIP       OBJ       TRUE      NONE
+   PSPHOT.OUTPUT.CMF   OUTPUT {OUTPUT}.cmf                   CHIP       CMF       TRUE      NONE
+   PSPHOT.OUTPUT.CMP   OUTPUT {OUTPUT}.{CHIP.NAME}.cmp       CHIP       CMP       TRUE      NONE
+
+   PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp       CHIP       CMP       TRUE      NONE
+
+END
Index: /trunk/ippconfig/simple/camera.config
===================================================================
--- /trunk/ippconfig/simple/camera.config	(revision 12524)
+++ /trunk/ippconfig/simple/camera.config	(revision 12525)
@@ -82,54 +82,54 @@
 
    ### 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.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.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      SIMPLE
-   PPIMAGE.OUTPUT.FPA1 OUTPUT 	{OUTPUT}.b1.fits   NONE   	 NONE         NONE         IMAGE     FPA        FPA        TRUE      SIMPLE
-   PPIMAGE.OUTPUT.FPA2 OUTPUT 	{OUTPUT}.b2.fits   NONE   	 NONE         NONE         IMAGE     FPA        FPA        TRUE      SIMPLE
-
-   PPIMAGE.JPEG1       OUTPUT   {OUTPUT}.b1.jpg    NONE          NONE         NONE         JPEG      FPA        FPA        TRUE      SIMPLE
-   PPIMAGE.JPEG2       OUTPUT   {OUTPUT}.b2.jpg    NONE          NONE         NONE         JPEG      FPA        FPA        TRUE      SIMPLE
-   PPIMAGE.BIN1        OUTPUT   {OUTPUT}.b1.fits   NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      SIMPLE
-   PPIMAGE.BIN2        OUTPUT   {OUTPUT}.b2.fits   NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      SIMPLE
-
-   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      SIMPLE
-   PSPHOT.BACKGND      OUTPUT   {OUTPUT}.bck.fits  NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      SIMPLE
-   PSPHOT.BACKSUB      OUTPUT   {OUTPUT}.sub.fits  NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      SIMPLE
-   PSPHOT.BACKMDL      OUTPUT   {OUTPUT}.mdl.fits  NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      SIMPLE
-   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      SIMPLE
-   PSPHOT.PSFMODEL.PLT OUTPUT   {OUTPUT}.psf.png   NONE          NONE         NONE         KAPA      FPA        FPA        TRUE      SIMPLE
-
-   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      SIMPLE
+   PPIMAGE.OUTPUT.FPA1 OUTPUT 	{OUTPUT}.b1.fits           FPA        TRUE      SIMPLE
+   PPIMAGE.OUTPUT.FPA2 OUTPUT 	{OUTPUT}.b2.fits           FPA        TRUE      SIMPLE
+						           
+   PPIMAGE.JPEG1       OUTPUT   {OUTPUT}.b1.jpg            FPA        TRUE      SIMPLE
+   PPIMAGE.JPEG2       OUTPUT   {OUTPUT}.b2.jpg            FPA        TRUE      SIMPLE
+   PPIMAGE.BIN1        OUTPUT   {OUTPUT}.b1.fits           FPA        TRUE      SIMPLE
+   PPIMAGE.BIN2        OUTPUT   {OUTPUT}.b2.fits           FPA        TRUE      SIMPLE
+						           
+   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      SIMPLE
+   PSPHOT.BACKGND      OUTPUT   {OUTPUT}.bck.fits          FPA        TRUE      SIMPLE
+   PSPHOT.BACKSUB      OUTPUT   {OUTPUT}.sub.fits          FPA        TRUE      SIMPLE
+   PSPHOT.BACKMDL      OUTPUT   {OUTPUT}.mdl.fits          FPA        TRUE      SIMPLE
+   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      SIMPLE
+   PSPHOT.PSFMODEL.PLT OUTPUT   {OUTPUT}.psf.png           FPA        TRUE      SIMPLE
+						           
+   PSASTRO.OUTPUT.CMP  OUTPUT   {OUTPUT}.smp               FPA        TRUE      NONE
 END
 
Index: /trunk/ippconfig/simtest/camera.config
===================================================================
--- /trunk/ippconfig/simtest/camera.config	(revision 12524)
+++ /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
 
Index: /trunk/ippconfig/tc3/camera.config
===================================================================
--- /trunk/ippconfig/tc3/camera.config	(revision 12524)
+++ /trunk/ippconfig/tc3/camera.config	(revision 12525)
@@ -102,60 +102,60 @@
 
    ### input file definitions
-   TYPE               INPUT FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA DATA.LEVEL FILE.TYPE 
-   PPIMAGE.INPUT      INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE
+   TYPE               INPUT FILENAME.RULE                 DATA.LEVEL FILE.TYPE 
+   PPIMAGE.INPUT      INPUT @FILES                        CHIP       IMAGE
 
    ## can we just use PPIMAGE.INPUT as the pmFPAfile name?
-   DVOCORR.INPUT      INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE     
-   DVOCORR.REFHEAD    INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       HEADER     
+   DVOCORR.INPUT      INPUT @FILES                        CHIP       IMAGE     
+   DVOCORR.REFHEAD    INPUT @FILES                        CHIP       HEADER     
 
-   DVOFLAT.INPUT      INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE 	
-   DVOFLAT.CORR       INPUT @DETDB                        NONE          NONE         NONE         CHIP       IMAGE 	
+   DVOFLAT.INPUT      INPUT @FILES                        CHIP       IMAGE 	
+   DVOFLAT.CORR       INPUT @DETDB                        CHIP       IMAGE 	
 
    ### use these entries to get the detrend images from the database
-   PPIMAGE.MASK       INPUT @DETDB                       NONE          NONE         NONE         CHIP       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.FRINGE     INPUT @DETDB                       NONE          NONE         NONE         CHIP       FRINGE     
+   PPIMAGE.MASK       INPUT @DETDB                        CHIP       IMAGE
+   PPIMAGE.BIAS       INPUT @DETDB                        CHIP       IMAGE
+   PPIMAGE.DARK       INPUT @DETDB                        CHIP       IMAGE
+   PPIMAGE.FLAT       INPUT @DETDB                        CHIP       IMAGE
+   PPIMAGE.FRINGE     INPUT @DETDB                        CHIP       FRINGE     
 
-   PSPHOT.INPUT       INPUT @FILES                       {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE     
-   PSASTRO.INPUT.CMP  INPUT @FILES                        NONE          NONE        PHU          CHIP       CMP       
-   PSASTRO.INPUT.CMF  INPUT @FILES                        NONE          SMPDATA     PHU          CHIP       CMF       
+   PSPHOT.INPUT       INPUT @FILES                        CHIP       IMAGE     
+   PSASTRO.INPUT.CMP  INPUT @FILES                        CHIP       CMP       
+   PSASTRO.INPUT.CMF  INPUT @FILES                        CHIP       CMF       
 
 
    ### output file definitions
-   TYPE                OUTPUT FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.LEVEL DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT
-   PPIMAGE.OUTPUT.SPL  OUTPUT {OUTPUT}.{CHIP.NAME}.fits      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.OUTPUT.MEF  OUTPUT {OUTPUT}.fits                  {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      MEF
-   PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       MASK      FALSE     NONE
-   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       WEIGHT    FALSE     NONE
-   PPIMAGE.BIN1.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.BIN2.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.BIN1.MEF    OUTPUT {OUTPUT}.b1.fits               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      MEF
-   PPIMAGE.BIN2.MEF    OUTPUT {OUTPUT}.b2.fits               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      MEF
-   DVOCORR.MEF.OUTPUT  OUTPUT {OUTPUT}.fc.fits               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      MEF
-   DVOCORR.SPL.OUTPUT  OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits   NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      SPLIT
-   DVOFLAT.MEF.OUTPUT  OUTPUT {OUTPUT}.co.fits               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      MEF
-   DVOFLAT.SPL.OUTPUT  OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits   NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      SPLIT
+   TYPE                OUTPUT FILENAME.RULE                  DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT
+   PPIMAGE.OUTPUT.SPL  OUTPUT {OUTPUT}.{CHIP.NAME}.fits      CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.OUTPUT.MEF  OUTPUT {OUTPUT}.fits                  CHIP       IMAGE     TRUE      MEF
+   PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits CHIP       MASK      FALSE     NONE
+   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits CHIP       WEIGHT    FALSE     NONE
+   PPIMAGE.BIN1.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits   CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.BIN2.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits   CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.BIN1.MEF    OUTPUT {OUTPUT}.b1.fits               CHIP       IMAGE     TRUE      MEF
+   PPIMAGE.BIN2.MEF    OUTPUT {OUTPUT}.b2.fits               CHIP       IMAGE     TRUE      MEF
+   DVOCORR.MEF.OUTPUT  OUTPUT {OUTPUT}.fc.fits               CHIP       IMAGE     TRUE      MEF
+   DVOCORR.SPL.OUTPUT  OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits   CHIP       IMAGE     TRUE      SPLIT
+   DVOFLAT.MEF.OUTPUT  OUTPUT {OUTPUT}.co.fits               CHIP       IMAGE     TRUE      MEF
+   DVOFLAT.SPL.OUTPUT  OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits   CHIP       IMAGE     TRUE      SPLIT
 
-   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits               NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      MEF
-   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits               NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      MEF
+   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits               FPA        IMAGE     TRUE      MEF
+   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits               FPA        IMAGE     TRUE      MEF
 
-   PPIMAGE.JPEG1       OUTPUT {OUTPUT}.b1.jpg                NONE          NONE         NONE         FPA        FPA        JPEG      TRUE      NONE
-   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.b2.jpg                NONE          NONE         NONE         FPA        FPA        JPEG      TRUE      NONE
+   PPIMAGE.JPEG1       OUTPUT {OUTPUT}.b1.jpg                FPA        JPEG      TRUE      NONE
+   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.b2.jpg                FPA        JPEG      TRUE      NONE
 
-   PSPHOT.RESID        OUTPUT {OUTPUT}.res.fits              NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      MEF
-   PSPHOT.BACKGND      OUTPUT {OUTPUT}.bck.fits              NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      MEF
-   PSPHOT.BACKSUB      OUTPUT {OUTPUT}.sub.fits              NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      MEF
-   PSPHOT.BACKMDL      OUTPUT {OUTPUT}.mdl.fits              NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      MEF
+   PSPHOT.RESID        OUTPUT {OUTPUT}.res.fits              CHIP       IMAGE     TRUE      MEF
+   PSPHOT.BACKGND      OUTPUT {OUTPUT}.bck.fits              CHIP       IMAGE     TRUE      MEF
+   PSPHOT.BACKSUB      OUTPUT {OUTPUT}.sub.fits              CHIP       IMAGE     TRUE      MEF
+   PSPHOT.BACKMDL      OUTPUT {OUTPUT}.mdl.fits              CHIP       IMAGE     TRUE      MEF
 
-   PSPHOT.OUTPUT.RAW   OUTPUT {OUTPUT}.{CHIP.NAME}           NONE          NONE         PHU          CHIP       CHIP       RAW       TRUE      NONE
-   PSPHOT.OUTPUT.SX    OUTPUT {OUTPUT}.sx                    NONE          NONE         PHU          CHIP       CHIP       SX        TRUE      NONE
-   PSPHOT.OUTPUT.OBJ   OUTPUT {OUTPUT}.obj                   NONE          NONE         PHU          CHIP       CHIP       OBJ       TRUE      NONE
-   PSPHOT.OUTPUT.CMF   OUTPUT {OUTPUT}.cmf                   NONE          SMPDATA      PHU          CHIP       CHIP       CMF       TRUE      NONE
-   PSPHOT.OUTPUT.CMP   OUTPUT {OUTPUT}.{CHIP.NAME}.cmp       NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
+   PSPHOT.OUTPUT.RAW   OUTPUT {OUTPUT}.{CHIP.NAME}           CHIP       RAW       TRUE      NONE
+   PSPHOT.OUTPUT.SX    OUTPUT {OUTPUT}.sx                    CHIP       SX        TRUE      NONE
+   PSPHOT.OUTPUT.OBJ   OUTPUT {OUTPUT}.obj                   CHIP       OBJ       TRUE      NONE
+   PSPHOT.OUTPUT.CMF   OUTPUT {OUTPUT}.cmf                   CHIP       CMF       TRUE      NONE
+   PSPHOT.OUTPUT.CMP   OUTPUT {OUTPUT}.{CHIP.NAME}.cmp       CHIP       CMP       TRUE      NONE
 
-   PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp       NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
+   PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp       CHIP       CMP       TRUE      NONE
 
 END
Index: /trunk/ippconfig/ucam/camera.config
===================================================================
--- /trunk/ippconfig/ucam/camera.config	(revision 12524)
+++ /trunk/ippconfig/ucam/camera.config	(revision 12525)
@@ -97,51 +97,51 @@
 
    ### input file definitions
-   TYPE               INPUT FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA DATA.LEVEL FILE.TYPE 
-   PPIMAGE.INPUT      INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE
-   PPARITH.INPUT      INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE
+   TYPE               INPUT FILENAME.RULE                 DATA.LEVEL FILE.TYPE 
+   PPIMAGE.INPUT      INPUT @FILES                        CHIP       IMAGE
+   PPARITH.INPUT      INPUT @FILES                        CHIP       IMAGE
 
    ### use these entries to get the detrend images from specific files
-   PPIMAGE.MASK       INPUT mask.fits                     {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE
-   PPIMAGE.BIAS       INPUT bias.fit                      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   PPIMAGE.DARK       INPUT dark.fits                     {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   PPIMAGE.FLAT       INPUT flat.fits                     {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
+   PPIMAGE.MASK       INPUT mask.fits                     CHIP       IMAGE
+   PPIMAGE.BIAS       INPUT bias.fit                      CHIP       IMAGE     
+   PPIMAGE.DARK       INPUT dark.fits                     CHIP       IMAGE     
+   PPIMAGE.FLAT       INPUT flat.fits                     CHIP       IMAGE     
 
    ### use these entries to get the detrend images from the database
-   #PPIMAGE.MASK       INPUT @DETDB                       {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   #PPIMAGE.BIAS       INPUT @DETDB                       fpa           fpa          NONE         CHIP       IMAGE     
-   #PPIMAGE.DARK       INPUT @DETDB                       {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   #PPIMAGE.FLAT       INPUT @DETDB                       {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
+   #PPIMAGE.MASK       INPUT @DETDB                       CHIP       IMAGE     
+   #PPIMAGE.BIAS       INPUT @DETDB                       CHIP       IMAGE     
+   #PPIMAGE.DARK       INPUT @DETDB                       CHIP       IMAGE     
+   #PPIMAGE.FLAT       INPUT @DETDB                       CHIP       IMAGE     
 
-   PSPHOT.INPUT       INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE     
+   PSPHOT.INPUT       INPUT @FILES                        CHIP       IMAGE     
 
-   PSASTRO.INPUT.CMP  INPUT @FILES                        NONE          NONE         PHU          CHIP       CMP       
-   PSASTRO.INPUT.CMF  INPUT @FILES                        NONE          SMPDATA      PHU          CHIP       CMF       
+   PSASTRO.INPUT.CMP  INPUT @FILES                        CHIP       CMP       
+   PSASTRO.INPUT.CMF  INPUT @FILES                        CHIP       CMF       
 
    ### output file definitions
-   TYPE                OUTPUT FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.LEVEL DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT
-   PPIMAGE.OUTPUT      OUTPUT     {OUTPUT}.fit              {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      NONE
-  PPIMAGE.OUTPUT.CHIP OUTPUT     {OUTPUT}.chip.fit          {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        FPA        IMAGE     TRUE      NONE
-   PPIMAGE.OUTPUT.FPA1 OUTPUT     {OUTPUT}.fpa1.fit         NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      NONE
-   PPIMAGE.OUTPUT.FPA2 OUTPUT     {OUTPUT}.fpa2.fit         NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      NONE
+   TYPE                OUTPUT FILENAME.RULE                 DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT
+   PPIMAGE.OUTPUT      OUTPUT     {OUTPUT}.fit              CHIP       IMAGE     TRUE      NONE
+  PPIMAGE.OUTPUT.CHIP OUTPUT     {OUTPUT}.chip.fit          FPA        IMAGE     TRUE      NONE
+   PPIMAGE.OUTPUT.FPA1 OUTPUT     {OUTPUT}.fpa1.fit         FPA        IMAGE     TRUE      NONE
+   PPIMAGE.OUTPUT.FPA2 OUTPUT     {OUTPUT}.fpa2.fit         FPA        IMAGE     TRUE      NONE
 
-   PPIMAGE.BIN1.OUTPUT OUTPUT {OUTPUT}.b1.fit               {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       FPA       IMAGE     TRUE       NONE
-   PPIMAGE.BIN2.OUTPUT OUTPUT {OUTPUT}.b2.fit               {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       FPA       IMAGE     TRUE       NONE
-   PPIMAGE.JPEG1.OUTPUT OUTPUT {OUTPUT}.b1.jpg              NONE          NONE         NONE         FPA        FPA       JPEG      TRUE       NONE
-   PPIMAGE.JPEG2.OUTPUT OUTPUT {OUTPUT}.b2.jpg              NONE          NONE         NONE         FPA        FPA       JPEG      TRUE       NONE
+   PPIMAGE.BIN1.OUTPUT OUTPUT {OUTPUT}.b1.fit               FPA       IMAGE     TRUE       NONE
+   PPIMAGE.BIN2.OUTPUT OUTPUT {OUTPUT}.b2.fit               FPA       IMAGE     TRUE       NONE
+   PPIMAGE.JPEG1.OUTPUT OUTPUT {OUTPUT}.b1.jpg              FPA       JPEG      TRUE       NONE
+   PPIMAGE.JPEG2.OUTPUT OUTPUT {OUTPUT}.b2.jpg              FPA       JPEG      TRUE       NONE
 
-   PSPHOT.RESID        OUTPUT {OUTPUT}.res.fits             NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      RAW
-   PSPHOT.BACKGND      OUTPUT {OUTPUT}.bck.fits             NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      RAW
-   PSPHOT.BACKSUB      OUTPUT {OUTPUT}.sub.fits             NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      RAW
-   PSPHOT.BACKMDL      OUTPUT {OUTPUT}.mdl.fits             NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      RAW
+   PSPHOT.RESID        OUTPUT {OUTPUT}.res.fits             CHIP       IMAGE     TRUE      RAW
+   PSPHOT.BACKGND      OUTPUT {OUTPUT}.bck.fits             CHIP       IMAGE     TRUE      RAW
+   PSPHOT.BACKSUB      OUTPUT {OUTPUT}.sub.fits             CHIP       IMAGE     TRUE      RAW
+   PSPHOT.BACKMDL      OUTPUT {OUTPUT}.mdl.fits             CHIP       IMAGE     TRUE      RAW
 
-   PSPHOT.OUTPUT.RAW   OUTPUT {OUTPUT}.{CHIP.NAME}          NONE          NONE         PHU          CHIP       CHIP       RAW       TRUE      NONE
-   PSPHOT.OUTPUT.SX    OUTPUT {OUTPUT}.sx                   NONE          NONE         PHU          CHIP       CHIP       SX        TRUE      NONE
-   PSPHOT.OUTPUT.OBJ   OUTPUT {OUTPUT}.obj                  NONE          NONE         PHU          CHIP       CHIP       OBJ       TRUE      NONE
-   PSPHOT.OUTPUT.CMF   OUTPUT {OUTPUT}.cmf                  NONE          SMPDATA      PHU          CHIP       CHIP       CMF       TRUE      NONE
-   PSPHOT.OUTPUT.CMP   OUTPUT {OUTPUT}.{CHIP.NAME}.cmp      NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
+   PSPHOT.OUTPUT.RAW   OUTPUT {OUTPUT}.{CHIP.NAME}          CHIP       RAW       TRUE      NONE
+   PSPHOT.OUTPUT.SX    OUTPUT {OUTPUT}.sx                   CHIP       SX        TRUE      NONE
+   PSPHOT.OUTPUT.OBJ   OUTPUT {OUTPUT}.obj                  CHIP       OBJ       TRUE      NONE
+   PSPHOT.OUTPUT.CMF   OUTPUT {OUTPUT}.cmf                  CHIP       CMF       TRUE      NONE
+   PSPHOT.OUTPUT.CMP   OUTPUT {OUTPUT}.{CHIP.NAME}.cmp      CHIP       CMP       TRUE      NONE
 
-   PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp      NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
+   PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp      CHIP       CMP       TRUE      NONE
 
-   PPARITH.OUTPUT      OUTPUT {OUTPUT}.{CHIP.NAME}.fit      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      NONE
+   PPARITH.OUTPUT      OUTPUT {OUTPUT}.{CHIP.NAME}.fit      CHIP       IMAGE     TRUE      NONE
 
 END
