Index: trunk/ippconfig/isp/camera.config
===================================================================
--- trunk/ippconfig/isp/camera.config	(revision 10885)
+++ trunk/ippconfig/isp/camera.config	(revision 11283)
@@ -1,3 +1,3 @@
-# Camera configuration file for drop-dead boring camera, consisting of a single chip with single cell.
+# Camera configuration file for the Pan-STARRS Imaging Sky Probe
 
 # File formats that we know about
@@ -15,38 +15,8 @@
 # Recipe options
 RECIPES         METADATA
-        PHASE2          STR     isp/phase2.config               # Phase 2 recipe details
         PSPHOT          STR     isp/psphot.config               # psphot details
         PSASTRO         STR     isp/psastro.config              # psastro details
-
-        # Recipes for ppImage
-        PPIMAGE         STR     isp/ppImage.config          # Default: all (normal) options on
-        PPIMAGE_O       STR     isp/ppImage_o.config        # Overscan only
-        PPIMAGE_OB      STR     isp/ppImage_ob.config       # Overscan, bias only
-        PPIMAGE_OBD     STR     isp/ppImage_obd.config      # Overscan, bias, dark only
-        PPIMAGE_OBDS    STR     isp/ppImage_obd.config      # Overscan, bias, dark only
-        # PPIMAGE_OBDS  STR     isp/ppImage_obds.config     # Overscan, bias, dark, shutter only
-        PPIMAGE_OBDSF   STR     isp/ppImage_obdsf.config    # Overscan, bias, dark, shutter, flat only
-        PPIMAGE_OBDSFP  STR     isp/ppImage_obdsfp.config   # Overscan, bias, dark, shutter, flat, psphot
-        PPIMAGE_PA      STR     isp/ppImage_pa.config       # psphot, psastro
-        PPIMAGE_B       STR     isp/ppImage_b.config        # Bias only
-        PPIMAGE_D       STR     isp/ppImage_d.config        # Dark only
-        PPIMAGE_S       STR     isp/ppImage_s.config        # Shutter only
-        PPIMAGE_F       STR     isp/ppImage_f.config        # Flat only
-        PPIMAGE_J1      STR     isp/ppImage_j1.config       # JPEG only
-        PPIMAGE_J2      STR     isp/ppImage_j2.config       # JPEG only
-        PPIMAGE_N       STR     isp/ppImage_n.config        # Nothing except binning
-
-        # Recipes for ppMerge
-        PPMERGE_BIAS    STR     isp/ppMerge_bias.config
-        PPMERGE_DARK    STR     isp/ppMerge_dark.config
-        PPMERGE_FLAT    STR     isp/ppMerge_flat.config
-        PPMERGE_SHUTTER STR     isp/ppMerge_shutter.config
-
-        # Recipes for ppStats
-        PPSTATS         STR     isp/ppStats.config       # ppStats recipe 
-
-        # Other recipes
-#        PSPHOT          STR     isp/psphot.config        # psphot details
-#        PSASTRO         STR     isp/psastro.config       # psastro details
+        PPIMAGE         STR     isp/ppImage.config		# Recipes for ppImage
+	PPMERGE		STR	isp/ppMerge.config		# Recipes for ppMerge
 END
 
@@ -54,26 +24,29 @@
 # 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
+	TYPE	LIMITS	FILTER	EXPECTED	IMFILE.MEAN	IMFILE.STDEV	EXP.MEAN	EXP.STDEV	EXP.MEANSTDEV	ENSEMBLE.MEAN	ENSEMBLE.STDEV	ENSEMBLE.MEANSTDEV	IMFILE.SN	EXP.SN
 	FLAT	MULTI
 
-	BIAS	LIMITS	*	0		0		15		0		15		0		0		0		0
-	DARK	LIMITS	*	0		0		0		0		0		0		0		0		0
-	FLAT	LIMITS	*	0		0		0		0		0		0		0		0		0
-#	FLAT	LIMITS	u	0		0		0		0		0		0		0		0		0
-#	FLAT	LIMITS	g	0		0		0		0		0		0		0		0		0
-#	FLAT	LIMITS	r	0		0		0		0		0		0		0		0		0
-#	FLAT	LIMITS	i	0		0		0		0		0		0		0		0		0
-#	FLAT	LIMITS	z	0		0		0		0		0		0		0		0		0
+	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
 
 # FILTER is an additional qualifier, and may be "*" (or absent!), in which case it matches everything
 # EXPECTED is the expected mean value
-# IMFILE.MEAN is the maximum permitted mean value for an imfile
+# IMFILE.MEAN is the maximum permitted mean value for an imfile, relative to the standard deviation
 # IMFILE.STDEV is the maximum permitted standard deviation for an imfile
-# EXP.MEAN is the maximum permitted mean value for an exposure
+# EXP.MEAN is the maximum permitted mean value for an exposure, relative to the standard deviation
 # EXP.STDEV is the maximum permitted standard deviation for an exposure
-# EXP.MEANSTDEV is the maximum permitted mean standard deviation for an exposure
+# EXP.MEANSTDEV is the maximum permitted mean standard deviation for an exposure relative to the mean
 # ENSEMBLE.MEAN is the maximum permitted mean for an ensemble of exposures
 # ENSEMBLE.STDEV is the maximum permitted standard deviation for an ensemble of exposures
 # ENSEMBLE.MEANSTDEV is the maximum permitted mean standard deviation for an ensemble of exposures
+# IMFILE.SN is the minimum permitted signal-to-noise for an imfile
+# EXP.SN is the minimum permitted signal-to-noise for an exposure
 # These values (all except FILTER) may be zero, in which case no clipping is applied.
 
@@ -111,12 +84,12 @@
    TYPE                OUTPUT   FILENAME.RULE        FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE FILE.LEVEL DATA.LEVEL FILE.SAVE FILE.FORMAT
    PPIMAGE.OUTPUT      OUTPUT   {OUTPUT}.isp.fits    NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
-   PPIMAGE.OUTPUT.MASK OUTPUT   {OUTPUT}.mask.fits   NONE          NONE         NONE         MASK      FPA        FPA       FALSE     NONE
-   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits     NONE          NONE         NONE         WEIGHT    FPA        FPA       FALSE     NONE
-   PPIMAGE.OUTPUT.CHIP OUTPUT   {OUTPUT}.ch.fits     NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
+#   PPIMAGE.OUTPUT.MASK OUTPUT   {OUTPUT}.mask.fits   NONE          NONE         NONE         MASK      FPA        FPA       FALSE     NONE
+#   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits     NONE          NONE         NONE         WEIGHT    FPA        FPA       FALSE     NONE
+   PPIMAGE.OUTPUT.CHIP OUTPUT   {OUTPUT}.chip.fits   NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
    PPIMAGE.OUTPUT.FPA1 OUTPUT   {OUTPUT}.b1.fits     NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
    PPIMAGE.OUTPUT.FPA2 OUTPUT   {OUTPUT}.b2.fits     NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
 
-   PPIMAGE.BIN1        OUTPUT   {OUTPUT}.isp.b1.fits NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
-   PPIMAGE.BIN2        OUTPUT   {OUTPUT}.isp.b2.fits NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
+   PPIMAGE.BIN1        OUTPUT   {OUTPUT}.b1.fits NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
+   PPIMAGE.BIN2        OUTPUT   {OUTPUT}.b2.fits NONE          NONE         NONE         IMAGE     FPA        FPA        TRUE      ISP
    PPIMAGE.JPEG1       OUTPUT   {OUTPUT}.b1.jpg      NONE          NONE         NONE         JPEG      FPA        FPA        TRUE      ISP
    PPIMAGE.JPEG2       OUTPUT   {OUTPUT}.b2.jpg      NONE          NONE         NONE         JPEG      FPA        FPA        TRUE      ISP
