Index: /trunk/ippconfig/megacam/camera.config
===================================================================
--- /trunk/ippconfig/megacam/camera.config	(revision 10085)
+++ /trunk/ippconfig/megacam/camera.config	(revision 10086)
@@ -1,53 +1,53 @@
 # Camera configuration file for MegaCam: describes the camera
 
-# 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
-END
-
+# File formats that we know about
+FORMATS		METADATA
+	RAW	STR	megacam/format_raw.config
+	SPLICE	STR	megacam/format_spliced.config
+	SPLIT	STR	megacam/format_split.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
-END
+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
@@ -130,4 +130,5 @@
 #	FLAT	LIMITS	i	0		0		0		0		0		0		0		0		0
 #	FLAT	LIMITS	z	0		0		0		0		0		0		0		0		0
+	FRINGE	LIMITS	*	0		0		0		0		0		0		0		0		0
 
 # FILTER is an additional qualifier, and may be "*" (or absent!), in which case it matches everything
@@ -147,21 +148,22 @@
 
 FILERULES METADATA
-   PPIMAGE.OUTPUT     STR PPIMAGE.OUTPUT.MEF
-   PPIMAGE.BIN1	      STR PPIMAGE.BIN1.MEF
-   PPIMAGE.BIN2	      STR PPIMAGE.BIN2.MEF
+   ### Redirections
    PSASTRO.INPUT      STR PSASTRO.INPUT.CMP
    PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.CMP
    PSPHOT.OUTPUT      STR PSPHOT.OUTPUT.CMF
+   PPIMAGE.OUTPUT     STR PPIMAGE.OUTPUT.SPL
+   PPIMAGE.BIN1       STR PPIMAGE.BIN1.SPL
+   PPIMAGE.BIN2       STR PPIMAGE.BIN2.SPL
 
    ### 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
-   PPARITH.INPUT      INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE
 
    ### 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_mc_1_0.fit               {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.MASK       INPUT megacam/mask.{CHIP.NAME}.fits                  {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       MASK     
+   PPIMAGE.BIAS       INPUT megacam/MEGACAM.bias.norm.1.0.{CHIP.NAME}.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
+   PPIMAGE.DARK       INPUT megacam/MEGACAM.dark.norm.2.0.{CHIP.NAME}.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
+   PPIMAGE.FLAT       INPUT megacam/MEGACAM.flat.norm.3.0.{CHIP.NAME}.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
+   PPIMAGE.FRINGE     INPUT megacam/MEGACAM.fringe.norm.4.0.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME}  NONE         CHIP       FRINGE     
 
    ### use these entries to get the detrend images from the database
@@ -178,15 +180,17 @@
    ### 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.SPL  OUTPUT {OUTPUT}.{CHIP.NAME}.fit      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      NONE
-   PPIMAGE.OUTPUT.MEF  OUTPUT {OUTPUT}.mc.fit               {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      NONE
-
-   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               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.SPL        OUTPUT {OUTPUT}.mc.b1.fit   NONE          NONE         NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
-   PPIMAGE.BIN2.SPL        OUTPUT {OUTPUT}.mc.b2.fit   NONE          NONE         NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
-   PPIMAGE.BIN1.MEF        OUTPUT {OUTPUT}.mc.b1.fit   NONE          NONE         NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
-   PPIMAGE.BIN2.MEF        OUTPUT {OUTPUT}.mc.b2.fit   NONE          NONE         NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
+   PPIMAGE.OUTPUT.SPL  OUTPUT {OUTPUT}.{CHIP.NAME}.fits      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      NONE
+   PPIMAGE.OUTPUT.MEF  OUTPUT {OUTPUT}.fits                  {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      NONE
+   PPIMAGE.OUTPUT      OUTPUT {OUTPUT}.{CHIP.NAME}.fits      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     FALSE      NONE
+   PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       MASK      FALSE      NONE
+   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       WEIGHT    TRUE      NONE
+   PPIMAGE.BIN1.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
+   PPIMAGE.BIN2.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
+   PPIMAGE.BIN1.MEF    OUTPUT {OUTPUT}.b1.fits               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
+   PPIMAGE.BIN2.MEF    OUTPUT {OUTPUT}.b2.fits               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
+
+   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
+   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits               NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      MEGACAM_FPA:MOSAIC
+   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits               NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      MEGACAM_FPA:MOSAIC
 
    PPIMAGE.JPEG1       OUTPUT {OUTPUT}.b1.jpg               -greyscale    RANGE        -5:20        FPA        FPA        JPEG      TRUE      MEGACAM_FPA:MOSAIC
@@ -206,11 +210,8 @@
    PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp      NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
 
-   PPARITH.OUTPUT      OUTPUT {OUTPUT}.{CHIP.NAME}.fit      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     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
-
+#   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
+#   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fit               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
+
+END
