Index: trunk/ippconfig/megacam_detrended/camera.config
===================================================================
--- trunk/ippconfig/megacam_detrended/camera.config	(revision 11060)
+++ trunk/ippconfig/megacam_detrended/camera.config	(revision 11330)
@@ -48,4 +48,36 @@
 END
 
+# move this elsewhere?  we need a lookup table to go from filter ID to abstract name
+FILTER.ID       METADATA
+   u.MP9301     STR u
+   g.MP9401     STR g
+   r.MP9601     STR r
+   i.MP9701     STR i
+   z.MP9801     STR z
+   Zp           STR z
+   Zprime       STR z
+   Ha.MP7605    STR Ha
+   Halpha       STR Ha
+   Haalpha.on   STR Ha
+   HaOFF.MP7604 STR HaOff
+
+   CN.MP780     STR CN
+   cn.MP7803    STR CN
+   CN.MP7803    STR CN
+
+   TiO.MP77     STR TiO
+   tio.MP7701   STR TiO
+   TiO.MP7701   STR TiO
+   NB920        STR NB920
+
+   B2F          STR B2F 
+   Bj           STR Bj  
+   Vj           STR Vj  
+   Rj           STR Rj  
+   Ij           STR Ij  
+   Hb           STR Hb  
+   HbOff        STR HbOff
+END
+
 # Recipe options
 RECIPES		METADATA
@@ -56,41 +88,50 @@
 FILERULES METADATA
    # filerule aliases: select the version you prefer for the given type
-   PSPHOT.OUTPUT      STR PSPHOT.OUTPUT.CMP
-   PSASTRO.INPUT      STR PSASTRO.INPUT.CMP
-   PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.MEF.CMF
+   PSPHOT.OUTPUT      STR PSPHOT.SPL.CMF
+   # PSPHOT.OUTPUT      STR PSPHOT.CMP
+
+   PSASTRO.INPUT      STR PSASTRO.SPL.CMF
+   PSASTRO.OUTPUT     STR PSASTRO.MEF.CMF
 
    ### 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    
-   PSPHOT.INPUT       INPUT @FILES         {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE    
-   PSASTRO.INPUT.CMP  INPUT @FILES         NONE          NONE         PHU          CHIP       CMP      
+   PPIMAGE.INPUT      INPUT none.fits      {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE    
+   PSPHOT.INPUT       INPUT none.fits      {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE    
+   PSPHOT.MASK        INPUT none.fits      NONE          NONE         NONE         FPA        MASK
+   PSPHOT.WEIGHT      INPUT none.fits      NONE          NONE         NONE         FPA        WEIGHT
+   PSPHOT.PSF         INPUT none.fits      NONE          NONE         NONE         FPA        PSF
+   PSPHOT.SRC         INPUT none.fits      NONE          NONE         NONE         CHIP       CMF
+   PSASTRO.INPUT.CMP  INPUT none.fits      NONE          NONE         NONE         CHIP       CMP      
+
    PSASTRO.INPUT.CMF  INPUT @FILES         NONE          SMPDATA      PHU          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}.{CHIP.NAME}.fit      NONE          NONE         NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fit   NONE   	  NONE         NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit    	    NONE   	  NONE         NONE         FPA        FPA        IMAGE     TRUE      SPLIT
-   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit    	    NONE   	  NONE         NONE         FPA        FPA        IMAGE     TRUE      SPLIT
+   TYPE                OUTPUT FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE 	 EXTNAME.XTRA 	 FILE.LEVEL DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT
+   PPIMAGE.OUTPUT      OUTPUT {OUTPUT}.{CHIP.NAME}.fit      NONE          NONE         	 NONE         	 CHIP       CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fit   NONE   	  NONE         	 NONE         	 CHIP       CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit    	    NONE   	  NONE         	 NONE         	 FPA        FPA        IMAGE     TRUE      SPLIT
+   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit    	    NONE   	  NONE         	 NONE         	 FPA        FPA        IMAGE     TRUE      SPLIT
 
-   PPIMAGE.BIN1       OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit    NONE          NONE         NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.BIN2       OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit    NONE   	  NONE         NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.JPEG1      OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg    NONE   	  NONE         NONE         FPA        CHIP       JPEG      TRUE      SPLIT
-   PPIMAGE.JPEG2      OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg    NONE   	  NONE         NONE         FPA        CHIP       JPEG      TRUE      SPLIT
+   PPIMAGE.BIN1       OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit    NONE          NONE         	 NONE         	 CHIP       CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.BIN2       OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit    NONE   	  NONE         	 NONE         	 CHIP       CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.JPEG1      OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg    NONE   	  NONE         	 NONE         	 FPA        CHIP       JPEG      TRUE      SPLIT
+   PPIMAGE.JPEG2      OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg    NONE   	  NONE         	 NONE         	 FPA        CHIP       JPEG      TRUE      SPLIT
 
-   PSPHOT.RESID       OUTPUT {OUTPUT}.res.fits             {CHIP.NAME}   {CELL.NAME}  {CELL.NAME}   CHIP       CHIP       IMAGE     TRUE      SPLICED
-   PSPHOT.BACKGND     OUTPUT {OUTPUT}.bck.fits             {CHIP.NAME}   {CELL.NAME}  {CELL.NAME}   CHIP       CHIP       IMAGE     TRUE      SPLICED
-   PSPHOT.BACKSUB     OUTPUT {OUTPUT}.sub.fits             {CHIP.NAME}   {CELL.NAME}  {CELL.NAME}   CHIP       CHIP       IMAGE     TRUE      SPLICED
-   PSPHOT.BACKMDL     OUTPUT {OUTPUT}.mdl.fits             {CHIP.NAME}   {CELL.NAME}  {CELL.NAME}   CHIP       CHIP       IMAGE     TRUE      SPLICED
+   PSPHOT.RESID       OUTPUT {OUTPUT}.res.fits             {CHIP.NAME}   {CELL.NAME}  	 {CELL.NAME}   	 CHIP       CHIP       IMAGE     TRUE      SPLICED
+   PSPHOT.BACKGND     OUTPUT {OUTPUT}.bck.fits             {CHIP.NAME}   {CELL.NAME}  	 {CELL.NAME}   	 CHIP       CHIP       IMAGE     TRUE      SPLICED
+   PSPHOT.BACKSUB     OUTPUT {OUTPUT}.sub.fits             {CHIP.NAME}   {CELL.NAME}  	 {CELL.NAME}   	 CHIP       CHIP       IMAGE     TRUE      SPLICED
+   PSPHOT.BACKMDL     OUTPUT {OUTPUT}.mdl.fits             {CHIP.NAME}   {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}.{CELL.NAME}.cmp NONE   NONE         PHU           CELL       CELL       CMP       TRUE      NONE
+   # various options for saving the psphot output in different formats
+   PSPHOT.RAW  	      OUTPUT {OUTPUT}.{CHIP.NAME}          NONE          NONE         	 PHU           	 CHIP       CHIP       RAW       TRUE      NONE
+   PSPHOT.SX   	      OUTPUT {OUTPUT}.sx                   NONE          NONE         	 PHU           	 CHIP       CHIP       SX        TRUE      NONE
+   PSPHOT.OBJ  	      OUTPUT {OUTPUT}.obj                  NONE          NONE         	 PHU           	 CHIP       CHIP       OBJ       TRUE      NONE
+   PSPHOT.CMP         OUTPUT {OUTPUT}{CHIP.N}.cmp          NONE          NONE         	 PHU           	 CHIP       CHIP       CMP       TRUE      NONE
+   PSPHOT.SPL.CMF     OUTPUT {OUTPUT}{CHIP.N}.cmf          NONE          SMPDATA      	 {CHIP.NAME}   	 CHIP       CHIP       CMF       TRUE      NONE
+   PSPHOT.MEF.CMF     OUTPUT {OUTPUT}.cmf                  NONE          {CHIP.NAME}.cmf {CHIP.NAME}     FPA        CHIP       CMF       TRUE      NONE
 
-   PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.xmp      NONE          NONE         PHU           FPA        CHIP       CMP       TRUE      NONE
-   PSASTRO.OUTPUT.SPL.CMF OUTPUT {OUTPUT}.{CHIP.NAME}.xmp  NONE          SMPDATA      PHU           CHIP       CHIP       CMF       TRUE      NONE
-   PSASTRO.OUTPUT.MEF.CMF OUTPUT {OUTPUT}.xmp              NONE          {CHIP.NAME}.cmf {CHIP.NAME}.hdr FPA    CHIP       CMF       TRUE      NONE
+   PSASTRO.CMP        OUTPUT {OUTPUT}{CHIP.N}.xmp      	   NONE          NONE         	 PHU           	 CHIP       CHIP       CMP       TRUE      NONE
+   PSASTRO.SPL.CMF    OUTPUT {OUTPUT}{CHIP.N}.xmf      	   NONE          SMPDATA      	 PHU           	 CHIP       CHIP       CMF       TRUE      SPLIT
+   PSASTRO.MEF.CMF    OUTPUT {OUTPUT}.xmf             	   NONE          {CHIP.NAME}.cmf {CHIP.NAME}     FPA        CHIP       CMF       TRUE      SPLICED
 END
 
@@ -103,6 +144,2 @@
 
 # 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
