Index: trunk/ippconfig/ctio_mosaic2/camera.config
===================================================================
--- trunk/ippconfig/ctio_mosaic2/camera.config	(revision 10461)
+++ trunk/ippconfig/ctio_mosaic2/camera.config	(revision 10499)
@@ -29,25 +29,4 @@
 	# Recipes for ppImage
         PPIMAGE         STR     ctio_mosaic2/ppImage.config          # Default: all (normal) options on
-	#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     ctio_mosaic2/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
 
@@ -55,27 +34,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
-	FRINGE	LIMITS	*	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.
 
@@ -88,7 +69,4 @@
    PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.CMP
    PSPHOT.OUTPUT      STR PSPHOT.OUTPUT.CMF
-   PPIMAGE.OUTPUT     STR PPIMAGE.OUTPUT.SPL
-   PPIMAGE.BIN1       STR PPIMAGE.BIN1.SPL
-   PPIMAGE.BIN2       STR PPIMAGE.BIN2.SPL
 
    ### input file definitions
@@ -116,19 +94,16 @@
    ### 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}.fits      {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      NONE
-   PPIMAGE.OUTPUT.MEF  OUTPUT {OUTPUT}.fits                  {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      NONE
-   PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       MASK      FALSE      NONE
-   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       WEIGHT    FALSE      NONE
-   PPIMAGE.BIN1.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
-   PPIMAGE.BIN2.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits   {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
-   PPIMAGE.BIN1.MEF    OUTPUT {OUTPUT}.b1.fits               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
-   PPIMAGE.BIN2.MEF    OUTPUT {OUTPUT}.b2.fits               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
+   PPIMAGE.OUTPUT      OUTPUT {OUTPUT}.fits                  {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CELL       IMAGE     TRUE      NONE
+   PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits             {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CELL       MASK      FALSE     NONE
+   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits             {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CELL       WEIGHT    FALSE     NONE
+   PPIMAGE.BIN1        OUTPUT {OUTPUT}.b1.fits               {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      CTIO_MOSAIC2_CHIP:MOSAIC
+   PPIMAGE.BIN2        OUTPUT {OUTPUT}.b2.fits               {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      CTIO_MOSAIC2_CHIP:MOSAIC
 
-   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP: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.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fits             {CHIP.NAME}   {CHIP.NAME}  NONE         FPA        CHIP       IMAGE     TRUE      CTIO_MOSAIC2_CHIP:MOSAIC
+   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits               NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      CTIO_MOSAIC2_FPA:MOSAIC
+   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits               NONE          NONE         NONE         FPA        FPA        IMAGE     TRUE      CTIO_MOSAIC2_FPA:MOSAIC
 
-   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
+   PPIMAGE.JPEG1       OUTPUT {OUTPUT}.b1.jpg               -greyscale    RANGE        -5:20         FPA        FPA        JPEG      TRUE      CTIO_MOSAIC2_FPA:MOSAIC
+   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.b2.jpg               -greyscale    FRACTION     0.50:2.00     FPA        FPA        JPEG      TRUE      CTIO_MOSAIC2_FPA:MOSAIC
 
    PSPHOT.RESID        OUTPUT {OUTPUT}.res.fits             NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      SPLICE
@@ -145,8 +120,3 @@
    PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp      NONE          NONE         PHU          CHIP       CHIP       CMP       TRUE      NONE
 
-# split version of mosaiced-chip output:
-#   PPIMAGE.OUTPUT.CHIP.SPLIT OUTPUT {OUTPUT}.{CHIP.NAME}.mos.fit  {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
-# mef version of mosaiced-chip output:
-#   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fit               NONE          NONE         NONE         FPA        CHIP       IMAGE     TRUE      MEGACAM_CHIP:MOSAIC
-
 END
