Index: /trunk/ippconfig/mcshort/camera.config
===================================================================
--- /trunk/ippconfig/mcshort/camera.config	(revision 11178)
+++ /trunk/ippconfig/mcshort/camera.config	(revision 11179)
@@ -73,10 +73,10 @@
    NB920        STR NB920
 
-   B2F          STR B2F 
-   Bj           STR Bj  
-   Vj           STR Vj  
-   Rj           STR Rj  
-   Ij           STR Ij  
-   Hb           STR Hb  
+   B2F          STR B2F
+   Bj           STR Bj
+   Vj           STR Vj
+   Rj           STR Rj
+   Ij           STR Ij
+   Hb           STR Hb
    HbOff        STR HbOff
 END
@@ -85,32 +85,4 @@
 # Recipe options
 RECIPES		METADATA
-	# 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
 
@@ -118,16 +90,20 @@
 # Rejection levels for detrend creation
 REJECTION	METADATA
-	TYPE	LIMITS	FILTER	EXPECTED	IMFILE.MEAN	IMFILE.STDEV	EXP.MEAN	EXP.STDEV	EXP.MEANSTDEV	ENSEMBLE.MEAN	ENSEMBLE.STDEV	ENSEMBLE.MEANSTDEV	IMFILE.SN	EXP.SN
+	TYPE	LIMITS	FILTER	EXPECTED	IMFILE.MEAN	IMFILE.STDEV	EXP.MEAN	EXP.STDEV	EXP.MEANSTDEV	ENSEMBLE.MEAN	ENSEMBLE.STDEV	ENSEMBLE.MEANSTDEV	IMFILE.SN	EXP.SN	IMFILE.MEANSTDEV
 	FLAT	MULTI
+	SKYFLAT	 MULTI
+	DOMEFLAT MULTI
 
-	BIAS	LIMITS	*	0		1		5		0.5		3		0.5		3		3		0			0		0
-	DARK	LIMITS	*	0		1		5		0.5		3		0.5		3		3		0			0		0
-	FLAT	LIMITS	*	0		0		0		0		0		0		0		0		3			0		0
-#	FLAT	LIMITS	u	0		0		0		0		0		0		0		0		3			0		0
-#	FLAT	LIMITS	g	0		0		0		0		0		0		0		0		3			0		0
-#	FLAT	LIMITS	r	0		0		0		0		0		0		0		0		3			0		0
-#	FLAT	LIMITS	i	0		0		0		0		0		0		0		0		3			0		0
-#	FLAT	LIMITS	z	0		0		0		0		0		0		0		0		3			0		0
-	FRINGE	LIMITS	*	0		0		0		0		0		0		0		0		0			0		0
+	BIAS	LIMITS	*	0		1		4		0.5		4		0		3		4		0			0		0	0.5
+	DARK	LIMITS	*	0		1		4		0.5		4		0		3		4		0			0		0	0.5
+	FLAT	LIMITS	*	0		0		0		0		0		0		0		0		3			0		0	0
+	SKYFLAT	 LIMITS	*	0		0		0		0		0		0		0		0		3			0		0	0
+	DOMEFLAT LIMITS	*	0		0		0		0		0		0		0		0		3			0		0	0
+#	FLAT	LIMITS	u	0		0		0		0		0		0		0		0		3			0		0	0
+#	FLAT	LIMITS	g	0		0		0		0		0		0		0		0		3			0		0	0
+#	FLAT	LIMITS	r	0		0		0		0		0		0		0		0		3			0		0	0
+#	FLAT	LIMITS	i	0		0		0		0		0		0		0		0		3			0		0	0
+#	FLAT	LIMITS	z	0		0		0		0		0		0		0		0		3			0		0	0
+	FRINGE	LIMITS	*	0		0		0		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
@@ -146,5 +122,5 @@
 
 END
-		
+
 
 FILERULES METADATA
@@ -155,24 +131,24 @@
 
    ### input file definitions
-   TYPE               INPUT FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA DATA.LEVEL FILE.TYPE 
+   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
 
    ### use these entries to get the detrend images from specific files
-   PPIMAGE.MASK       INPUT mcshort/mask.{CHIP.NAME}.fits                  {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       MASK     
-   PPIMAGE.BIAS       INPUT megacam/bias/MEGACAM.bias.norm.1.0.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME} NONE       CHIP       IMAGE     
-   PPIMAGE.DARK       INPUT megacam/dark/MCSHORT.dark.norm.2.1.{CHIP.NAME}.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   PPIMAGE.FLAT       INPUT mcshort/MCSHORT.flat.norm.3.0.{CHIP.NAME}.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       IMAGE     
-   PPIMAGE.FRINGE     INPUT mcshort/MCSHORT.fringe.norm.4.0.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME}  NONE         CHIP       FRINGE     
+#   PPIMAGE.MASK       INPUT mcshort/mask.{CHIP.NAME}.fits                  {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       MASK
+   PPIMAGE.BIAS       INPUT file:///data/alala/price/megacam/bias/MCSHORT.bias.norm.1.2.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME} NONE       CHIP       IMAGE
+   PPIMAGE.DARK       INPUT file:///data/alala/price/megacam/bias/MCSHORT.dark.norm.2.1.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME} NONE       CHIP       IMAGE
+   PPIMAGE.FLAT       INPUT file:///data/alala/price/megacam/flats/MCSHORT.flat.norm.3.1.{CHIP.NAME}.fits {CHIP.NAME} {CHIP.NAME} NONE      CHIP       IMAGE
+   PPIMAGE.FRINGE     INPUT file:///fringe.fits	          {CHIP.NAME} {CHIP.NAME} NONE   CHIP       FRINGE
 
    ### 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     
+   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       
+   PSASTRO.INPUT.CMP  INPUT @FILES                        NONE          NONE         PHU          CHIP       CMP
+   PSASTRO.INPUT.CMF  INPUT @FILES                        NONE          SMPDATA      PHU          CHIP       CMF
 
    ### output file definitions
