Index: trunk/ippconfig/mcshort/camera.config
===================================================================
--- trunk/ippconfig/mcshort/camera.config	(revision 7453)
+++ trunk/ippconfig/mcshort/camera.config	(revision 8893)
@@ -6,6 +6,6 @@
 	RAW	STR	mcshort/format_raw.config
 	SPLICE	STR	mcshort/format_spliced.config
+	SPLIT	STR	mcshort/format_split.config
 END
-
 
 # Description of camera --- all the chips and the cells that comprise them
@@ -50,8 +50,118 @@
 
 
+# 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
-	PHASE2		STR	phase2_template.config	# Phase 2 recipe details
-	PSPHOT		STR	psphot_template.config	# psphot details
-	PPMERGE		STR	ppMerge_template.config	# ppMerge
+	# Recipes for ppImage
+        PPIMAGE         STR     megacam/ppImage.config          # Default: all (normal) options on
+	PPIMAGE_O	STR	megacam/ppImage_o.config	# Overscan only
+	PPIMAGE_OB	STR	megacam/ppImage_ob.config	# Overscan, bias only
+	PPIMAGE_OBD	STR	megacam/ppImage_obd.config	# Overscan, bias, dark only
+	PPIMAGE_OBDF	STR	megacam/ppImage_obdf.config	# Overscan, bias, dark, flat only
+	PPIMAGE_B	STR	megacam/ppImage_b.config	# Bias only
+	PPIMAGE_D	STR	megacam/ppImage_d.config	# Dark only
+	PPIMAGE_F	STR	megacam/ppImage_f.config	# Flat only
+	PPIMAGE_J	STR	megacam/ppImage_j.config	# JPEG only
+
+	# Recipes for ppMerge
+        PPMERGE         STR     ppMerge_template.config         # ppMerge recipe
+	PPMERGE_BIAS	STR	megacam/ppMerge_bias.config
+	PPMERGE_DARK	STR	megacam/ppMerge_dark.config
+	PPMERGE_FLAT	STR	megacam/ppMerge_flat.config
+
+	# Other recipes
+        PSPHOT          STR     megacam/psphot.config           # psphot details
+        PSASTRO         STR     megacam/psastro.config          # psastro details
+	PPSTATS		STR	megacam/ppStats.config		# ppStats recipe
+	PPSTATS_PHASE0	STR	megacam/ppStats_phase0.config	# ppStats recipe for phase 0
 END
+
+FILERULES METADATA
+   ### Redirections
+   PSASTRO.INPUT      STR PSASTRO.INPUT.CMP
+   PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.CMP
+   PSPHOT.OUTPUT      STR PSPHOT.OUTPUT.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
+   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_{CHIP.NAME}_1_0.fit      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
+   PPIMAGE.DARK       INPUT dark_{CHIP.NAME}_2_0.fit      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
+   PPIMAGE.FLAT       INPUT flat_{CHIP.NAME}_3_0.fit      {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     
+
+   PSPHOT.INPUT       INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE     
+
+   PSASTRO.INPUT.CMP  INPUT @FILES                        NONE          NONE         PHU          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      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      NONE
+   PPIMAGE.BIN1        OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MCSHORT_CHIP:MOSAIC
+   PPIMAGE.BIN2        OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MCSHORT_CHIP:MOSAIC
+
+   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fit {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MCSHORT_CHIP:MOSAIC
+   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit               NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      MCSHORT_FPA:MOSAIC
+   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit               NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      MCSHORT_FPA:MOSAIC
+
+   PPIMAGE.JPEG1       OUTPUT {OUTPUT}.b1.jpg               -greyscale    RANGE        -5:20        FPA        FPA        JPEG      TRUE      MCSHORT_FPA:MOSAIC
+   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.b2.jpg               -greyscale    FRACTION     0.50:2.00    FPA        FPA        JPEG      TRUE      MCSHORT_FPA:MOSAIC
+
+   PSPHOT.RESID        OUTPUT {OUTPUT}.res.fits             NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      SPLICE
+   PSPHOT.BACKGND      OUTPUT {OUTPUT}.bck.fits             NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      SPLICE
+   PSPHOT.BACKSUB      OUTPUT {OUTPUT}.sub.fits             NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      SPLICE
+   PSPHOT.BACKMDL      OUTPUT {OUTPUT}.mdl.fits             NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      SPLICE
+
+   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}.cmp      NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
+
+   PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp      NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
+
+   PPARITH.OUTPUT      OUTPUT {OUTPUT}                      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      NONE
+
+END
