Index: trunk/ippconfig/ctio_mosaic2/camera.config
===================================================================
--- trunk/ippconfig/ctio_mosaic2/camera.config	(revision 12376)
+++ 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
