Index: /trunk/ippconfig/mcshort_chip/camera.config
===================================================================
--- /trunk/ippconfig/mcshort_chip/camera.config	(revision 8896)
+++ /trunk/ippconfig/mcshort_chip/camera.config	(revision 8897)
@@ -80,22 +80,25 @@
 RECIPES		METADATA
 	# Recipes for ppImage
-        PPIMAGE         STR     mcshort/ppImage.config          # Default: all (normal) options on
-	PPIMAGE_O	STR	mcshort/ppImage_o.config	# Overscan only
-	PPIMAGE_OB	STR	mcshort/ppImage_ob.config	# Overscan, bias only
-	PPIMAGE_OBD	STR	mcshort/ppImage_obd.config	# Overscan, bias, dark only
-	PPIMAGE_OBDF	STR	mcshort/ppImage_obdf.config	# Overscan, bias, dark, flat only
-	PPIMAGE_B	STR	mcshort/ppImage_b.config	# Bias only
-	PPIMAGE_D	STR	mcshort/ppImage_d.config	# Dark only
-	PPIMAGE_F	STR	mcshort/ppImage_f.config	# Flat only
-	PPIMAGE_J	STR	mcshort/ppImage_j.config	# JPEG only
+        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_BIAS	STR	mcshort/ppMerge_bias.config
+        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
-        PPMERGE         STR     ppMerge_template.config         # ppMerge recipe
-        PSPHOT          STR     mcshort/psphot.config           # psphot details
-        PSASTRO         STR     mcshort/psastro.config          # psastro details
-	PPSTATS		STR	mcshort/ppStats.config		# ppStats recipe
-	PPSTATS_PHASE0	STR	mcshort/ppStats_phase0.config	# ppStats recipe for phase 0
+        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
 
@@ -113,7 +116,7 @@
    ### 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.{CHIP.NAME}.fit   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   PPIMAGE.DARK       INPUT dark_mc_1_0.{CHIP.NAME}.fit   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   PPIMAGE.FLAT       INPUT flat_mc_1_0.{CHIP.NAME}.fit   {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
Index: /trunk/ippconfig/mcshort_fpa/camera.config
===================================================================
--- /trunk/ippconfig/mcshort_fpa/camera.config	(revision 8896)
+++ /trunk/ippconfig/mcshort_fpa/camera.config	(revision 8897)
@@ -16,22 +16,25 @@
 RECIPES		METADATA
 	# Recipes for ppImage
-        PPIMAGE         STR     mcshort/ppImage.config          # Default: all (normal) options on
-	PPIMAGE_O	STR	mcshort/ppImage_o.config	# Overscan only
-	PPIMAGE_OB	STR	mcshort/ppImage_ob.config	# Overscan, bias only
-	PPIMAGE_OBD	STR	mcshort/ppImage_obd.config	# Overscan, bias, dark only
-	PPIMAGE_OBDF	STR	mcshort/ppImage_obdf.config	# Overscan, bias, dark, flat only
-	PPIMAGE_B	STR	mcshort/ppImage_b.config	# Bias only
-	PPIMAGE_D	STR	mcshort/ppImage_d.config	# Dark only
-	PPIMAGE_F	STR	mcshort/ppImage_f.config	# Flat only
-	PPIMAGE_J	STR	mcshort/ppImage_j.config	# JPEG only
+        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_BIAS	STR	mcshort/ppMerge_bias.config
+        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
-        PPMERGE         STR     ppMerge_template.config         # ppMerge recipe
-        PSPHOT          STR     mcshort/psphot.config           # psphot details
-        PSASTRO         STR     mcshort/psastro.config          # psastro details
-	PPSTATS		STR	mcshort/ppStats.config		# ppStats recipe
-	PPSTATS_PHASE0	STR	mcshort/ppStats_phase0.config	# ppStats recipe for phase 0
+        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
 
@@ -49,7 +52,7 @@
    ### 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.{CHIP.NAME}.fit   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   PPIMAGE.DARK       INPUT dark_mc_1_0.{CHIP.NAME}.fit   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   PPIMAGE.FLAT       INPUT flat_mc_1_0.{CHIP.NAME}.fit   {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
