Index: trunk/ippconfig/megacam_fpamosaic/camera.config
===================================================================
--- trunk/ippconfig/megacam_fpamosaic/camera.config	(revision 7484)
+++ trunk/ippconfig/megacam_fpamosaic/camera.config	(revision 10091)
@@ -15,191 +15,89 @@
 # 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.INPUT  METADATA
-         FILENAME.RULE   STR @FILES
-         FILENAME.XTRA   STR {CHIP.NAME}
-         EXTNAME.RULE    STR {CELL.NAME}
-         EXTNAME.XTRA    STR NONE
-         FILE.DEPTH      STR CHIP
-	 DATA.DEPTH      STR CHIP
-         FILE.TYPE       STR IMAGE
-	 FILE.MODE       STR READ
-   END
-   PPIMAGE.OUTPUT  METADATA
-         FILENAME.RULE   STR {OUTPUT}.fits
-         FILENAME.XTRA   STR {CHIP.NAME}
-         EXTNAME.RULE    STR {CHIP.NAME}
-         EXTNAME.XTRA    STR NONE
-         FILE.DEPTH      STR CHIP
-	 DATA.DEPTH      STR CHIP
-         FILE.TYPE       STR IMAGE
-	 FILE.MODE       STR WRITE
-   END
-   PPIMAGE.BIN1  METADATA
-         FILENAME.RULE   STR {OUTPUT}.{CHIP.NAME}.bin1.fits
-         FILENAME.XTRA   STR {CHIP.NAME}
-         EXTNAME.RULE    STR {CHIP.NAME}
-         EXTNAME.XTRA    STR NONE
-         FILE.DEPTH      STR CHIP 
-	 DATA.DEPTH      STR CHIP
-         FILE.TYPE       STR IMAGE
-	 FILE.MODE       STR WRITE
-	 FILE.FORMAT     STR SPLIT
-   END
-   PPIMAGE.BIN2  METADATA
-         FILENAME.RULE   STR {OUTPUT}.{CHIP.NAME}.bin2.fits
-         FILENAME.XTRA   STR {CHIP.NAME}
-         EXTNAME.RULE    STR {CHIP.NAME}
-         EXTNAME.XTRA    STR NONE
-         FILE.DEPTH      STR CHIP 
-	 DATA.DEPTH      STR CHIP
-         FILE.TYPE       STR IMAGE
-	 FILE.MODE       STR WRITE
-	 FILE.FORMAT     STR SPLIT
-   END
+   ### Redirections
+   PSASTRO.INPUT      STR PSASTRO.INPUT.CMP
+   PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.CMP
+   PSPHOT.OUTPUT      STR PSPHOT.OUTPUT.CMF
 
-   PPIMAGE.BIAS  METADATA
-         FILENAME.RULE   STR bias.fits
-         FILENAME.XTRA   STR {CHIP.NAME}
-         EXTNAME.RULE    STR {CHIP.NAME}
-         EXTNAME.XTRA    STR NONE
-         FILE.DEPTH      STR CHIP
-	 DATA.DEPTH      STR CHIP
-         FILE.TYPE       STR IMAGE
-	 FILE.MODE       STR READ
-   END
-   PPIMAGE.DARK  METADATA
-         FILENAME.RULE   STR dark.fits
-         FILENAME.XTRA   STR {CHIP.NAME}
-         EXTNAME.RULE    STR {CHIP.NAME}
-         EXTNAME.XTRA    STR NONE
-         FILE.DEPTH      STR CHIP
-	 DATA.DEPTH      STR CHIP
-         FILE.TYPE       STR IMAGE
-	 FILE.MODE       STR READ
-   END
-   PPIMAGE.FLAT  METADATA
-         FILENAME.RULE   STR flat.fits
-         FILENAME.XTRA   STR {CHIP.NAME}
-         EXTNAME.RULE    STR {CHIP.NAME}
-         EXTNAME.XTRA    STR NONE
-         FILE.DEPTH      STR CHIP
-	 DATA.DEPTH      STR CHIP
-         FILE.TYPE       STR IMAGE
-	 FILE.MODE       STR READ
-   END
-   PPIMAGE.MASK  METADATA
-         FILENAME.RULE   STR mask.fits
-         FILENAME.XTRA   STR {CHIP.NAME}
-         EXTNAME.RULE    STR {CHIP.NAME}
-         EXTNAME.XTRA    STR NONE
-         FILE.DEPTH      STR CHIP
-	 DATA.DEPTH      STR CHIP
-         FILE.TYPE       STR IMAGE
-	 FILE.MODE       STR READ
-   END
+   ### 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
 
-   PSPHOT.INPUT  METADATA
-         FILENAME.RULE   STR @FILES
-         FILENAME.XTRA   STR {CHIP.NAME}
-         EXTNAME.RULE    STR {CELL.NAME}
-         EXTNAME.XTRA    STR NONE
-         FILE.DEPTH      STR CHIP 
-	 DATA.DEPTH      STR CHIP
-         FILE.TYPE       STR IMAGE
-	 FILE.MODE       STR READ
-   END
+   ### 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     
 
-   # an indirect rule allows multiple, related output definitions
-   PSPHOT.OUTPUT	 STR PSPHOT.OUTPUT.CMP
-#   PSPHOT.OUTPUT	 STR PSPHOT.OUTPUT.RAW
+   ### 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.RESID  METADATA
-         FILENAME.RULE   STR {OUTPUT}.res.fits
-         FILENAME.XTRA   STR NONE
-         EXTNAME.RULE    STR {CELL.NAME}
-         EXTNAME.XTRA    STR {CELL.NAME}
-         FILE.DEPTH 	 STR CHIP
-	 DATA.DEPTH 	 STR CHIP
-	 FILE.TYPE       STR IMAGE
-	 FILE.MODE       STR WRITE
-   END
+   PSPHOT.INPUT       INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE     
 
-#   PSPHOT.BACKSUB  METADATA
-#         FILENAME.RULE   STR {OUTPUT}.sub.fits
-#         FILENAME.XTRA   STR {CHIP.NAME}
-#         EXTNAME.RULE    STR {CELL.NAME}
-#         EXTNAME.XTRA    STR {CELL.NAME}
-#         OPEN.DEPTH 	 STR CELL 
-#	 WRITE.DEPTH 	 STR CELL
-#	 FILETYPE            STR IMAGE
-#   END
+   PSASTRO.INPUT.CMP  INPUT @FILES                        NONE          NONE         PHU          CHIP       CMP       
+   PSASTRO.INPUT.CMF  INPUT @FILES                        NONE          SMPDATA      PHU          CHIP       CMF       
 
-   PSPHOT.BACKGND  METADATA
-        FILENAME.RULE   STR {OUTPUT}.bck.fits
-        FILENAME.XTRA   STR {CHIP.NAME}
-        EXTNAME.RULE    STR {CELL.NAME}
-        EXTNAME.XTRA    STR {CELL.NAME}
-        OPEN.DEPTH      STR CELL 
-  	WRITE.DEPTH 	STR CELL
-	FILE.TYPE       STR IMAGE
-	FILE.MODE	STR WRITE
-	FILE.FORMAT	STR SPLIT
-   END
+   ### 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      NONE
+   PPIMAGE.BIN2        OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      NONE
 
-   PSPHOT.OUTPUT.RAW  METADATA
-         FILENAME.RULE   STR {OUTPUT}
-         FILENAME.XTRA   STR NONE
-         EXTNAME.RULE    STR NONE
-         EXTNAME.XTRA    STR PHU
-         FILE.DEPTH 	 STR CHIP
-	 DATA.DEPTH 	 STR CHIP
-	 FILE.TYPE       STR RAW
-	 FILE.MODE       STR WRITE
-   END
-   PSPHOT.OUTPUT.SX   METADATA
-         FILENAME.RULE   STR {OUTPUT}.sx
-         FILENAME.XTRA   STR NONE
-         EXTNAME.RULE    STR NONE
-         EXTNAME.XTRA    STR PHU
-         FILE.DEPTH 	 STR CHIP
-	 DATA.DEPTH 	 STR CHIP
-	 FILE.TYPE       STR SX
-	 FILE.MODE       STR WRITE
-   END
-   PSPHOT.OUTPUT.OBJ  METADATA
-         FILENAME.RULE   STR {OUTPUT}.obj
-         FILENAME.XTRA   STR NONE
-         EXTNAME.RULE    STR NONE
-         EXTNAME.XTRA    STR PHU
-         FILE.DEPTH 	 STR CHIP
-	 DATA.DEPTH 	 STR CHIP
-	 FILE.TYPE       STR OBJ
-	 FILE.MODE       STR WRITE
-   END
-   PSPHOT.OUTPUT.CMP  METADATA
-         FILENAME.RULE   STR {OUTPUT}.cmp
-         FILENAME.XTRA   STR NONE
-         EXTNAME.RULE    STR NONE
-         EXTNAME.XTRA    STR PHU
-         FILE.DEPTH 	 STR CHIP
-	 DATA.DEPTH 	 STR CHIP
-	 FILE.TYPE       STR CMP
-	 FILE.MODE       STR WRITE
-   END
-   PSPHOT.OUTPUT.CMF  METADATA
-         FILENAME.RULE   STR {OUTPUT}.{CHIP.NAME}.cmf
-         FILENAME.XTRA   STR NONE
-         EXTNAME.RULE    STR SMPDATA
-         EXTNAME.XTRA    STR PHU
-         FILE.DEPTH 	 STR CHIP
-	 DATA.DEPTH 	 STR CHIP
-	 FILE.TYPE       STR CMF
-	 FILE.MODE       STR WRITE
-   END
+   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fit {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MOSAIC
+   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit               NONE          NONE         NONE         FPA        FPA        IMAGE     FALSE      MOSAIC
+   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit               NONE          NONE         NONE         FPA        FPA        IMAGE     FALSE      MOSAIC
+
+   PPIMAGE.JPEG1       OUTPUT {OUTPUT}.b1.jpg               -greyscale    RANGE        -5:20        FPA        FPA        JPEG      TRUE      NONE
+   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.b2.jpg               -greyscale    FRACTION     0.50:2.00    FPA        FPA        JPEG      TRUE      NONE
+
+   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}.fit      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      NONE
+
 END
