Index: trunk/ippconfig/megacam/camera.config
===================================================================
--- trunk/ippconfig/megacam/camera.config	(revision 7640)
+++ trunk/ippconfig/megacam/camera.config	(revision 7724)
@@ -51,4 +51,35 @@
 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
@@ -64,5 +95,5 @@
    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
@@ -98,6 +129,6 @@
    PPIMAGE.BIN1        OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
    PPIMAGE.BIN2        OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
-   PPIMAGE.JPEG1       OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg   -greyscale    RANGE        -5:20        CHIP       CHIP       JPEG      TRUE      MEGACAM_FPA:MOSAIC
-   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg   -greyscale    FRACTION     0.50:2.00    CHIP       CHIP       JPEG      TRUE      MEGACAM_FPA:MOSAIC
+   PPIMAGE.JPEG1       OUTPUT {OUTPUT}.b1.jpg               -greyscale    RANGE        -5:20        FPA        FPA        JPEG      TRUE      MEGACAM_FPA:MOSAIC
+   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.b2.jpg               -greyscale    FRACTION     0.50:2.00    FPA        FPA        JPEG      TRUE      MEGACAM_FPA:MOSAIC
 
    PSPHOT.RESID        OUTPUT {OUTPUT}.res.fits             NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      SPLICE