Index: /trunk/ippconfig/megacam_chipmosaic/camera.config
===================================================================
--- /trunk/ippconfig/megacam_chipmosaic/camera.config	(revision 10086)
+++ /trunk/ippconfig/megacam_chipmosaic/camera.config	(revision 10087)
@@ -1,3 +1,3 @@
-# Camera configuration file for MegaCam: describes the camera
+# Camera configuration file for MegaCam (chip-mosaicked): describes the camera
 
 # File formats that we know about (these are relative to PATH)
@@ -81,11 +81,36 @@
 # 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
+	# Recipes for ppImage
+        PPIMAGE         STR     megacam/ppImage.config          # Default: all (normal) options on
+	PPIMAGE_O	STR	megacam/ppImage_o.config	# Overscan
+	PPIMAGE_OB	STR	megacam/ppImage_ob.config	# Overscan, bias
+	PPIMAGE_OBD	STR	megacam/ppImage_obd.config	# Overscan, bias, dark
+	PPIMAGE_OBDS	STR	megacam/ppImage_obds.config	# Overscan, bias, dark, shutter, flat
+	PPIMAGE_OBDSF	STR	megacam/ppImage_obdsf.config	# Overscan, bias, dark, shutter, flat
+	PPIMAGE_OBDSFR	STR	megacam/ppImage_obdsfr.config	# Overscan, bias, dark, shutter, flat, fringe
+	PPIMAGE_B	STR	megacam/ppImage_b.config	# Bias only
+	PPIMAGE_D	STR	megacam/ppImage_d.config	# Dark only
+	PPIMAGE_S	STR	megacam/ppImage_n.config	# NOTHING --- no need for shutter yet
+	PPIMAGE_F	STR	megacam/ppImage_f.config	# Flat only
+	PPIMAGE_R	STR	megacam/ppImage_r.config	# Fringe only
+	PPIMAGE_J1	STR	megacam/ppImage_j1.config	# JPEG only; binning 1
+	PPIMAGE_J2	STR	megacam/ppImage_j2.config	# JPEG only; binning 2
+	PPIMAGE_N	STR	megacam/ppImage_n.config	# Nothing significant; binning 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
+	PPMERGE_FRINGE	STR	megacam/ppMerge_fringe.config
+
+	# Other recipes
+        PSPHOT          STR     megacam/psphot.config           # psphot details
+        PSASTRO         STR     megacam/psastro.config          # psastro details
+	PPSTATS		STR	megacam/ppStats.config		# ppStats recipe
 END
 
 FILERULES METADATA
-   PPIMAGE.OUTPUT.RAW STR PPIMAGE.OUTPUT.SPL
+   ### Redirections
    PSASTRO.INPUT      STR PSASTRO.INPUT.CMP
    PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.CMP
@@ -94,17 +119,17 @@
    ### 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     
+   PPIMAGE.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.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.BIAS       INPUT bias_{CHIP.NAME}_1_0.fits      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
+   PPIMAGE.DARK       INPUT dark_{CHIP.NAME}_2_0.fits      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
+   PPIMAGE.FLAT       INPUT flat_{CHIP.NAME}_3_0.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     
@@ -114,27 +139,28 @@
 
    ### 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}.fit                  {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      NONE
+   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}.fits     {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      NONE
+   PPIMAGE.BIN1        OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits  {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MOSAIC
+   PPIMAGE.BIN2        OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits  {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MOSAIC
 
-   PPIMAGE.OUTPUT.CHP OUTPUT {OUTPUT}.fit                  {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      MEGACAM_CHIP:SPLIT
-   PPIMAGE.OUTPUT.FPA OUTPUT {OUTPUT}.fit                  {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      MEGACAM_FPA:SPLIT
+   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      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.BIN1       OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.BIN2       OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.JPEG1      OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg   -greyscale    RANGE        -5:20        CHIP       CHIP       JPEG      TRUE      SPLIT
-   PPIMAGE.JPEG2      OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg   -greyscale    FRACTION     0.50:2.00    CHIP       CHIP       JPEG      TRUE      SPLIT
+   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
-   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.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}.{CELL.NAME}.cmp NONE   NONE         PHU          CELL       CELL       CMP       TRUE      NONE
+   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}.smp                  NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
+   PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp      NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
+
 END
