Index: /trunk/ippconfig/megacam/camera.config
===================================================================
--- /trunk/ippconfig/megacam/camera.config	(revision 7745)
+++ /trunk/ippconfig/megacam/camera.config	(revision 7746)
@@ -2,65 +2,65 @@
 
 # File formats that we know about (these are relative to PATH)
-FORMATS		METADATA
-	RAW	STR	megacam/format_raw.config
-	MASKS	STR	megacam/format_spliced_mask.config
-	SPLICED	STR	megacam/format_spliced.config
-	MASK	STR	megacam/format_split_mask.config
-	SPLIT	STR	megacam/format_split.config
+FORMATS         METADATA
+        RAW     STR     megacam/format_raw.config
+        MASKS   STR     megacam/format_spliced_mask.config
+        SPLICED STR     megacam/format_spliced.config
+        MASK    STR     megacam/format_split_mask.config
+        SPLIT   STR     megacam/format_split.config
 END
 
 
 # Description of camera --- all the chips and the cells that comprise them
-FPA	METADATA
-	ccd00	STR	LeftAmp RightAmp
-	ccd01	STR	LeftAmp RightAmp
-	ccd02	STR	LeftAmp RightAmp
-	ccd03	STR	LeftAmp RightAmp
-	ccd04	STR	LeftAmp RightAmp
-	ccd05	STR	LeftAmp RightAmp
-	ccd06	STR	LeftAmp RightAmp
-	ccd07	STR	LeftAmp RightAmp
-	ccd08	STR	LeftAmp RightAmp
-	ccd09	STR	LeftAmp RightAmp
-	ccd10	STR	LeftAmp RightAmp
-	ccd11	STR	LeftAmp RightAmp
-	ccd12	STR	LeftAmp RightAmp
-	ccd13	STR	LeftAmp RightAmp
-	ccd14	STR	LeftAmp RightAmp
-	ccd15	STR	LeftAmp RightAmp
-	ccd16	STR	LeftAmp RightAmp
-	ccd17	STR	LeftAmp RightAmp
-	ccd18	STR	LeftAmp RightAmp
-	ccd19	STR	LeftAmp RightAmp
-	ccd20	STR	LeftAmp RightAmp
-	ccd21	STR	LeftAmp RightAmp
-	ccd22	STR	LeftAmp RightAmp
-	ccd23	STR	LeftAmp RightAmp
-	ccd24	STR	LeftAmp RightAmp
-	ccd25	STR	LeftAmp RightAmp
-	ccd26	STR	LeftAmp RightAmp
-	ccd27	STR	LeftAmp RightAmp
-	ccd28	STR	LeftAmp RightAmp
-	ccd29	STR	LeftAmp RightAmp
-	ccd30	STR	LeftAmp RightAmp
-	ccd31	STR	LeftAmp RightAmp
-	ccd32	STR	LeftAmp RightAmp
-	ccd33	STR	LeftAmp RightAmp
-	ccd34	STR	LeftAmp RightAmp
-	ccd35	STR	LeftAmp RightAmp
+FPA     METADATA
+        ccd00   STR     LeftAmp RightAmp
+        ccd01   STR     LeftAmp RightAmp
+        ccd02   STR     LeftAmp RightAmp
+        ccd03   STR     LeftAmp RightAmp
+        ccd04   STR     LeftAmp RightAmp
+        ccd05   STR     LeftAmp RightAmp
+        ccd06   STR     LeftAmp RightAmp
+        ccd07   STR     LeftAmp RightAmp
+        ccd08   STR     LeftAmp RightAmp
+        ccd09   STR     LeftAmp RightAmp
+        ccd10   STR     LeftAmp RightAmp
+        ccd11   STR     LeftAmp RightAmp
+        ccd12   STR     LeftAmp RightAmp
+        ccd13   STR     LeftAmp RightAmp
+        ccd14   STR     LeftAmp RightAmp
+        ccd15   STR     LeftAmp RightAmp
+        ccd16   STR     LeftAmp RightAmp
+        ccd17   STR     LeftAmp RightAmp
+        ccd18   STR     LeftAmp RightAmp
+        ccd19   STR     LeftAmp RightAmp
+        ccd20   STR     LeftAmp RightAmp
+        ccd21   STR     LeftAmp RightAmp
+        ccd22   STR     LeftAmp RightAmp
+        ccd23   STR     LeftAmp RightAmp
+        ccd24   STR     LeftAmp RightAmp
+        ccd25   STR     LeftAmp RightAmp
+        ccd26   STR     LeftAmp RightAmp
+        ccd27   STR     LeftAmp RightAmp
+        ccd28   STR     LeftAmp RightAmp
+        ccd29   STR     LeftAmp RightAmp
+        ccd30   STR     LeftAmp RightAmp
+        ccd31   STR     LeftAmp RightAmp
+        ccd32   STR     LeftAmp RightAmp
+        ccd33   STR     LeftAmp RightAmp
+        ccd34   STR     LeftAmp RightAmp
+        ccd35   STR     LeftAmp RightAmp
 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
+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
 
@@ -74,19 +74,19 @@
    NB920        STR NB920
 
-   B2F          STR B2F	
-   Bj		STR Bj	
-   Vj		STR Vj	
-   Rj		STR Rj	
-   Ij		STR Ij	
-   Hb		STR Hb	
-   HbOff	STR HbOff
+   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
-	PHASE2		STR	megacam/phase2.config		# Phase 2 recipe details
-	PPMERGE		STR	ppMerge_template.config		# ppMerge recipe
-	PSPHOT		STR	megacam/psphot.config		# psphot details
-	PSASTRO		STR	megacam/psastro.config		# psastro details
+RECIPES         METADATA
+        PHASE2          STR     megacam/phase2.config           # Phase 2 recipe details
+        PPMERGE         STR     ppMerge_template.config         # ppMerge recipe
+        PSPHOT          STR     megacam/psphot.config           # psphot details
+        PSASTRO         STR     megacam/psastro.config          # psastro details
 END
 
@@ -103,13 +103,13 @@
    ### use these entries to get the detrend images from specific files
    PPIMAGE.MASK       INPUT mask.mef.fits                 {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   PPIMAGE.BIAS       INPUT bias.mef.fits                {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
+   PPIMAGE.BIAS       INPUT bias.mef.fits                 {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
    PPIMAGE.DARK       INPUT dark.mef.fits                 {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   PPIMAGE.FLAT       INPUT flat.mef.fits                {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
+   PPIMAGE.FLAT       INPUT flat.mef.fits                 {CHIP.NAME}   {CHIP.NAME}  NONE         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.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     
 
    PSPHOT.INPUT       INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE     
@@ -124,9 +124,9 @@
 
    PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.mos.fit  {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
-   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit               {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        FPA        IMAGE     TRUE      MEGACAM_FPA:MOSAIC
-   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit               {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        FPA        IMAGE     TRUE      MEGACAM_FPA:MOSAIC
+   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit               NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      MEGACAM_FPA:MOSAIC
+   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit               NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      MEGACAM_FPA:MOSAIC
 
-   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.BIN1        OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit   NONE          NONE         NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
+   PPIMAGE.BIN2        OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit   NONE          NONE         NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP: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
@@ -145,2 +145,8 @@
    PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp      NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
 END
+
+# split version of mosaiced-chip output:
+#    PPIMAGE.OUTPUT.CHIP.SPLIT OUTPUT {OUTPUT}.{CHIP.NAME}.mos.fit  {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
+
+# mef version of mosaiced-chip output:
+#  PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fit               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
