Index: trunk/ippconfig/simple/camera.config
===================================================================
--- trunk/ippconfig/simple/camera.config	(revision 7584)
+++ trunk/ippconfig/simple/camera.config	(revision 7722)
@@ -22,21 +22,16 @@
    PSASTRO.INPUT      STR PSASTRO.INPUT.CMP
    PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.CMP
-   PSPHOT.OUTPUT      STR PSPHOT.OUTPUT.CMP
+   PSPHOT.OUTPUT      STR PSPHOT.OUTPUT.CMF
 
    ### input file definitions
    TYPE               INPUT    FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE DATA.LEVEL 
-   PPIMAGE.INPUT      INPUT    none.fits                     {CHIP.NAME}   {CELL.NAME}  NONE         IMAGE     FPA        
+   PPIMAGE.INPUT      INPUT    none.fits                     NONE          NONE         NONE         IMAGE     FPA        
 
-   PPIMAGE.BIAS       INPUT    bias.fits                     {CHIP.NAME}   {CHIP.NAME}  NONE         IMAGE     CHIP       
-   PPIMAGE.DARK       INPUT    dark.fits                     {CHIP.NAME}   {CHIP.NAME}  NONE         IMAGE     CHIP       
-   PPIMAGE.FLAT       INPUT    flat.fits                     {CHIP.NAME}   {CHIP.NAME}  NONE         IMAGE     CHIP       
-   PPIMAGE.MASK       INPUT    mask.fits                     {CHIP.NAME}   {CHIP.NAME}  NONE         IMAGE     CHIP       
+   PPIMAGE.BIAS       INPUT    bias.fits                     NONE          NONE         NONE         IMAGE     CHIP       
+   PPIMAGE.DARK       INPUT    dark.fits                     NONE          NONE         NONE         IMAGE     CHIP       
+   PPIMAGE.FLAT       INPUT    flat.fits                     NONE          NONE         NONE         IMAGE     CHIP       
+   PPIMAGE.MASK       INPUT    mask.fits                     NONE          NONE         NONE         IMAGE     CHIP       
 
-   #PPIMAGE.BIAS       INPUT    none.fits                     {CHIP.NAME}   {CHIP.NAME}  NONE         IMAGE     CHIP       
-   #PPIMAGE.DARK       INPUT    none.fits                     {CHIP.NAME}   {CHIP.NAME}  NONE         IMAGE     CHIP       
-   #PPIMAGE.FLAT       INPUT    none.fits                     {CHIP.NAME}   {CHIP.NAME}  NONE         IMAGE     CHIP       
-   #PPIMAGE.MASK       INPUT    none.fits                     {CHIP.NAME}   {CHIP.NAME}  NONE         IMAGE     CHIP       
-
-   PSPHOT.INPUT       INPUT    none.fits                     {CHIP.NAME}   {CELL.NAME}  NONE         IMAGE     CHIP       
+   PSPHOT.INPUT       INPUT    none.fits                     NONE          NONE         NONE         IMAGE     CHIP       
 
    PSASTRO.INPUT.CMP  INPUT    none.fits                     NONE          NONE         PHU          CMP       CHIP       
@@ -44,26 +39,27 @@
 
    ### 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}.fit      	     {CHIP.NAME}   {CHIP.NAME}  NONE         IMAGE     FPA        FPA        TRUE      -
-   PPIMAGE.BIN1       OUTPUT   {OUTPUT}.b1.fit   	     {CHIP.NAME}   {CHIP.NAME}  NONE         IMAGE     FPA        FPA        FALSE     SIMPLE
-   PPIMAGE.BIN2       OUTPUT   {OUTPUT}.b2.fit   	     {CHIP.NAME}   {CHIP.NAME}  NONE         IMAGE     FPA        FPA        FALSE     SIMPLE
-   PPIMAGE.JPEG1      OUTPUT   {OUTPUT}.b1.jpg   	     -greyscale    RANGE        -5:20        JPEG      CHIP       CHIP       TRUE      SIMPLE
-   PPIMAGE.JPEG2      OUTPUT   {OUTPUT}.b2.jpg   	     -greyscale    FRACTION     0.50:2.00    JPEG      CHIP       CHIP       TRUE      SIMPLE
+   TYPE                OUTPUT   FILENAME.RULE      FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE FILE.LEVEL DATA.LEVEL FILE.SAVE FILE.FORMAT
+   PPIMAGE.OUTPUT      OUTPUT   {OUTPUT}.fit       NONE   	 NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
+   PPIMAGE.OUTPUT.CHIP OUTPUT 	{OUTPUT}.ch.fit    NONE   	 NONE         NONE         IMAGE     FPA        FPA        TRUE      SIMPLE
+   PPIMAGE.OUTPUT.FPA1 OUTPUT 	{OUTPUT}.b1.fit    NONE   	 NONE         NONE         IMAGE     FPA        FPA        TRUE      SIMPLE
+   PPIMAGE.OUTPUT.FPA2 OUTPUT 	{OUTPUT}.b2.fit    NONE   	 NONE         NONE         IMAGE     FPA        FPA        TRUE      SIMPLE
 
-   PSPHOT.RESID       OUTPUT   {OUTPUT}.res.fits             NONE          {CELL.NAME}  {CELL.NAME}  IMAGE     CHIP       CHIP       TRUE      SIMPLE
-   PSPHOT.BACKGND     OUTPUT   {OUTPUT}.bck.fits             NONE          {CELL.NAME}  {CELL.NAME}  IMAGE     CHIP       CHIP       TRUE      SIMPLE
-   PSPHOT.BACKSUB     OUTPUT   {OUTPUT}.sub.fits             NONE          {CELL.NAME}  {CELL.NAME}  IMAGE     CHIP       CHIP       TRUE      SIMPLE
-   PSPHOT.BACKMDL     OUTPUT   {OUTPUT}.mdl.fits             NONE          {CELL.NAME}  {CELL.NAME}  IMAGE     CHIP       CHIP       TRUE      SIMPLE
-   PSPHOT.OUTPUT.RAW  OUTPUT   {OUTPUT}.{CHIP.NAME}          NONE          NONE         PHU          RAW       CHIP       CHIP       TRUE      -
-   PSPHOT.OUTPUT.SX   OUTPUT   {OUTPUT}.sx                   NONE          NONE         PHU          SX        CHIP       CHIP       TRUE      -
-   PSPHOT.OUTPUT.OBJ  OUTPUT   {OUTPUT}.obj                  NONE          NONE         PHU          OBJ       CHIP       CHIP       TRUE      -
-   PSPHOT.OUTPUT.CMP  OUTPUT   {OUTPUT}.cmp                  NONE          NONE         PHU          CMP       CELL       CELL       TRUE      -
-   PSPHOT.OUTPUT.CMF  OUTPUT   {OUTPUT}.cmf                  NONE          SMPDATA      PHU          CMF       CHIP       CHIP       TRUE      -
+   PPIMAGE.BIN1        OUTPUT   {OUTPUT}.B1.fit    NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      SIMPLE
+   PPIMAGE.BIN2        OUTPUT   {OUTPUT}.B2.fit    NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      SIMPLE
+   PPIMAGE.JPEG1       OUTPUT   {OUTPUT}.b1.jpg    -greyscale    RANGE        -5:20        JPEG      FPA        FPA        TRUE      SIMPLE
+   PPIMAGE.JPEG2       OUTPUT   {OUTPUT}.b2.jpg    -greyscale    FRACTION     0.50:2.00    JPEG      FPA        FPA        TRUE      SIMPLE
 
-   PSASTRO.OUTPUT.CMP OUTPUT   {OUTPUT}.smp                  NONE          NONE         PHU          CMP       CHIP       CHIP       TRUE      -
+   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
+
+   PSASTRO.OUTPUT.CMP  OUTPUT   {OUTPUT}.smp       NONE          NONE         NONE         CMP       FPA       	FPA        TRUE      NONE
 END
-
-#  PSPHOT.PSF.SAVE    INPUT    {OUTPUT}.{CHIP.NAME}.psf.txt  {CHIP.NAME}   {CELL.NAME}  {CELL.NAME}  PSF       READOUT    READOUT    WRITE    SIMPLE
-#  PSPHOT.PSF.LOAD    OUTPUT   {OUTPUT}.{CHIP.NAME}.psf.txt  {CHIP.NAME}   {CELL.NAME}  {CELL.NAME}  PSF       CELL       CELL       -        NONE
 
 # FPA file defines properties of a possible input|output object
@@ -78,2 +74,14 @@
 # user can set the extension name for the data and header segments (CMF only)
 
+# known uses of the filename.xtra, extname.rule, and extname.xtra:
+# extname.rule: used to construct output EXTNAME keys (CMF DATA)
+# extname.xtra: used to construct output EXTNAME keys (CMF HEAD)
+
+# extname.rule: used to carry classID to DetDB
+# filename.xtra: used to carry detID to DetDB (internal)
+
+# filename.xtra: used to carry arglist name (internal)
+
+# filename.xtra: used to define the JPEG colormap
+# extname.rule: used to define the JPEG scaling method
+# extname.xtra: used to carry arguments of JPEG scaling method
