Index: /trunk/ippconfig/ctio_mosaic2/camera.config
===================================================================
--- /trunk/ippconfig/ctio_mosaic2/camera.config	(revision 10498)
+++ /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
Index: /trunk/ippconfig/ctio_mosaic2/format.config
===================================================================
--- /trunk/ippconfig/ctio_mosaic2/format.config	(revision 10498)
+++ /trunk/ippconfig/ctio_mosaic2/format.config	(revision 10499)
@@ -1,3 +1,3 @@
-# format file for CTIO Mosaic2 camera used by ESSENCE
+# Format file for CTIO Mosaic2 camera used by ESSENCE
 
 # How to identify this type
@@ -19,42 +19,29 @@
 CONTENTS	METADATA
 	# Extension name, chip name:type
-	amp00		STR	ccd00:LeftAmp:left
-	amp01		STR	ccd00:RightAmp:right
-	amp02		STR	ccd01:LeftAmp:left
-	amp03		STR	ccd01:RightAmp:right
-	amp04		STR	ccd02:LeftAmp:left
-	amp05		STR	ccd02:RightAmp:right
-	amp06		STR	ccd03:LeftAmp:left
-	amp07		STR	ccd03:RightAmp:right
-	amp08		STR	ccd04:LeftAmp:left
-	amp09		STR	ccd04:RightAmp:right
-	amp10		STR	ccd05:LeftAmp:left
-	amp11		STR	ccd05:RightAmp:right
-	amp12		STR	ccd06:LeftAmp:left
-	amp13		STR	ccd06:RightAmp:right
-	amp14		STR	ccd07:LeftAmp:left
-	amp15		STR	ccd07:RightAmp:right
-	amp16		STR	ccd08:LeftAmp:left
+	im1		STR	ccd00:LeftAmp:amp
+	im2		STR	ccd00:RightAmp:amp
+	im3		STR	ccd01:LeftAmp:amp  
+	im4		STR	ccd01:RightAmp:amp
+	im5		STR	ccd02:LeftAmp:amp  
+	im6		STR	ccd02:RightAmp:amp
+	im7		STR	ccd03:LeftAmp:amp  
+	im8		STR	ccd03:RightAmp:amp
+	im9		STR	ccd04:LeftAmp:amp  
+	im10		STR	ccd04:RightAmp:amp
+	im11		STR	ccd05:LeftAmp:amp  
+	im12		STR	ccd05:RightAmp:amp
+	im13		STR	ccd06:LeftAmp:amp  
+	im14		STR	ccd06:RightAmp:amp
+	im15		STR	ccd07:LeftAmp:left  
+	im16		STR	ccd07:RightAmp:amp
 END
 
 # Specify the cell data
 CELLS	METADATA
-	left	METADATA	# Left amplifier
+	amp	METADATA
 		CELL.BIASSEC.SOURCE	STR	HEADER
 		CELL.TRIMSEC.SOURCE	STR	HEADER
 		CELL.BIASSEC		STR	BIASSEC
 		CELL.TRIMSEC		STR	DATASEC
-		CELL.XPARITY		S32	1 # We could have specified this as a DEFAULT, but this works
-		CELL.X0			S32	1
-		CELL.Y0			S32	1
-	END
-	right	METADATA	# Right amplifier
-		CELL.BIASSEC.SOURCE	STR	HEADER
-		CELL.TRIMSEC.SOURCE	STR	HEADER
-		CELL.BIASSEC		STR	BIASSEC
-		CELL.TRIMSEC		STR	DATASEC
-		CELL.XPARITY		S32	-1 # This cell is read out in the opposite direction
-		CELL.X0			S32	2048
-		CELL.Y0			S32	1
 	END
 END
@@ -62,18 +49,13 @@
 # How to translate PS concepts into FITS headers
 TRANSLATION	METADATA
-	FPA.NAME		STR	EXPNUM
 	FPA.AIRMASS		STR	AIRMASS
 	FPA.FILTER		STR	FILTER
-	FPA.POSANGLE		STR	ROTANGLE
 	FPA.RA			STR	RA
 	FPA.DEC			STR	DEC
 	FPA.RADECSYS		STR	RADECSYS
 	FPA.OBSTYPE		STR	OBSTYPE
-	FPA.OBJECT		STR	CMMTOBS
+	FPA.OBJECT		STR	OBJECT
 	FPA.TIME		STR	MJD-OBS
-	FPA.TIMESYS		STR	TIMESYS
-	FPA.ALT			STR	TELALT
-	FPA.AZ			STR	TELAZ
-	CHIP.TEMP		STR	DETTEM
+	CHIP.TEMP		STR	CCDTEM
 	CELL.EXPOSURE		STR	EXPTIME
 	CELL.DARKTIME		STR	DARKTIME
@@ -82,133 +64,27 @@
 	CELL.SATURATION		STR	SATURATE
 	CELL.TIME		STR	MJD-OBS
-	CELL.TIMESYS		STR	TIMESYS
-	CELL.XBIN		STR	CCDBIN1
-	CELL.YBIN		STR	CCDBIN2
+	CELL.XBIN		STR	CCDSUM
+	CELL.YBIN		STR	CCDSUM
+
+	CHIP.XPARITY		STR	DTM1_1
+	CHIP.YPARITY		STR	DTM2_2
+	CHIP.X0			STR	DTV1
+	CHIP.Y0			STR	DTV2
+
+	CELL.XPARITY		STR	ATM1_1
+	CELL.YPARITY		STR	ATM2_2
+	CELL.X0			STR	ATV1
+	CELL.Y0			STR	ATV2
 END
 
 # Default PS concepts that may be specified by value
 DEFAULTS	METADATA
+	FPA.POSANGLE		F32	0.0
+	FPA.TIMESYS		STR	UTC		# Header says "UTC approximate"
+	FPA.ALT			F32	0.0		# Not present in header
+	FPA.AZ			F32	0.0		# Not present in header
+	CELL.TIMESYS		STR	UTC		# Header says "UTC approximate"
 	CELL.READDIR		S32	1		# Cell is read in x direction
 	CELL.BAD		S32	0
-	CELL.YPARITY		S32	1
-
-	CHIP.X0.DEPEND		STR	CHIP.NAME
-	CHIP.X0		METADATA
-		ccd00	S32	0
-		ccd01	S32	2048
-		ccd02	S32	4096
-		ccd03	S32	6144
-		ccd04	S32	8192
-		ccd05	S32	10240
-		ccd06	S32	12288
-		ccd07	S32	14336
-		ccd08	S32	16384
-		ccd09	S32	0
-		ccd10	S32	2048
-		ccd11	S32	4096
-		ccd12	S32	6144
-		ccd13	S32	8192
-		ccd14	S32	10240
-		ccd15	S32	12288
-		ccd16	S32	14336
-		ccd17	S32	16384
-		ccd18	S32	0
-		ccd19	S32	2048
-		ccd20	S32	4096
-		ccd21	S32	6144
-		ccd22	S32	8192
-		ccd23	S32	10240
-		ccd24	S32	12288
-		ccd25	S32	14336
-		ccd26	S32	16384
-		ccd27	S32	0
-		ccd28	S32	2048
-		ccd29	S32	4096
-		ccd30	S32	6144
-		ccd31	S32	8192
-		ccd32	S32	10240
-		ccd33	S32	12288
-		ccd34	S32	14336
-		ccd35	S32	16384
-	END
-	CHIP.Y0.DEPEND		STR	CHIP.NAME
-	CHIP.Y0		METADATA
-		ccd00	S32	18447
-		ccd01	S32	18447
-		ccd02	S32	18447
-		ccd03	S32	18447
-		ccd04	S32	18447
-		ccd05	S32	18447
-		ccd06	S32	18447
-		ccd07	S32	18447
-		ccd08	S32	18447
-		ccd09	S32	13835
-		ccd10	S32	13835
-		ccd11	S32	13835
-		ccd12	S32	13835
-		ccd13	S32	13835
-		ccd14	S32	13835
-		ccd15	S32	13835
-		ccd16	S32	13835
-		ccd17	S32	13835
-		ccd18	S32	13835
-		ccd19	S32	4612
-		ccd20	S32	4612
-		ccd21	S32	4612
-		ccd22	S32	4612
-		ccd23	S32	4612
-		ccd24	S32	4612
-		ccd25	S32	4612
-		ccd26	S32	4612
-		ccd27	S32	0
-		ccd28	S32	0
-		ccd29	S32	0
-		ccd30	S32	0
-		ccd31	S32	0
-		ccd32	S32	0
-		ccd33	S32	0
-		ccd34	S32	0
-		ccd35	S32	0
-	END
-	CHIP.XPARITY	S32	1
-	CHIP.YPARITY.DEPEND	STR	CHIP.NAME
-	CHIP.YPARITY	METADATA
-		ccd00	S32	-1
-		ccd01	S32	-1
-		ccd02	S32	-1
-		ccd03	S32	-1
-		ccd04	S32	-1
-		ccd05	S32	-1
-		ccd06	S32	-1
-		ccd07	S32	-1
-		ccd08	S32	-1
-		ccd09	S32	-1
-		ccd10	S32	-1
-		ccd11	S32	-1
-		ccd12	S32	-1
-		ccd13	S32	-1
-		ccd14	S32	-1
-		ccd15	S32	-1
-		ccd16	S32	-1
-		ccd17	S32	-1
-		ccd18	S32	1
-		ccd19	S32	1
-		ccd20	S32	1
-		ccd21	S32	1
-		ccd22	S32	1
-		ccd23	S32	1
-		ccd24	S32	1
-		ccd25	S32	1
-		ccd26	S32	1
-		ccd27	S32	1
-		ccd28	S32	1
-		ccd29	S32	1
-		ccd30	S32	1
-		ccd31	S32	1
-		ccd32	S32	1
-		ccd33	S32	1
-		ccd34	S32	1
-		ccd35	S32	1
-	END
 END
 
@@ -238,4 +114,6 @@
 	FPA.TIME	STR	MJD
 	CELL.TIME	STR	MJD
+	CHIP.X0		STR	FORTRAN
+	CHIP.Y0		STR	FORTRAN
 	CELL.X0		STR	FORTRAN
 	CELL.Y0		STR	FORTRAN
Index: /trunk/ippconfig/ctio_mosaic2/ppImage.config
===================================================================
--- /trunk/ippconfig/ctio_mosaic2/ppImage.config	(revision 10498)
+++ /trunk/ippconfig/ctio_mosaic2/ppImage.config	(revision 10499)
@@ -1,6 +1,5 @@
-### Phase 2 recipe configuration file
+### ppImage recipe configuration file for CTIO MOSAIC2
 
 # List of tasks to perform
-NONLIN          BOOL    FALSE           # Non-linearity correction
 SHUTTER         BOOL    FALSE           # Shutter correction
 
@@ -14,64 +13,2 @@
 BIN2.XBIN               S32     64
 BIN2.YBIN               S32     64
-
-# the following entries define alternate recipe values loaded symbollically
-PPIMAGE_O         METADATA
-  MASK            BOOL    FALSE           # Mask bad pixels
-  MASK.VALUE      U8      0xff            # only mask pixels matching this bitmask
-  NONLIN          BOOL    FALSE           # Non-linearity correction
-  OVERSCAN        BOOL    TRUE            # Overscan subtraction
-  BIAS            BOOL    FALSE           # Bias subtraction
-  DARK            BOOL    FALSE           # Dark subtraction
-  SHUTTER         BOOL    FALSE           # Shutter correction
-  FLAT            BOOL    FALSE           # Flat-field normalisation
-  FRINGE          BOOL    FALSE           # Fringe subtraction
-END
-
-PPIMAGE_OB        METADATA
-  MASK            BOOL    FALSE           # Mask bad pixels
-  MASK.VALUE      U8      0xff            # only mask pixels matching this bitmask
-  NONLIN          BOOL    FALSE           # Non-linearity correction
-  OVERSCAN        BOOL    TRUE            # Overscan subtraction
-  BIAS            BOOL    TRUE            # Bias subtraction
-  DARK            BOOL    FALSE           # Dark subtraction
-  SHUTTER         BOOL    FALSE           # Shutter correction
-  FLAT            BOOL    FALSE           # Flat-field normalisation
-  FRINGE          BOOL    FALSE           # Fringe subtraction
-END
-
-PPIMAGE_OBD      METADATA
-  MASK            BOOL    FALSE           # Mask bad pixels
-  MASK.VALUE      U8      0xff            # only mask pixels matching this bitmask
-  NONLIN          BOOL    FALSE           # Non-linearity correction
-  OVERSCAN        BOOL    TRUE            # Overscan subtraction
-  BIAS            BOOL    TRUE            # Bias subtraction
-  DARK            BOOL    TRUE            # Dark subtraction
-  SHUTTER         BOOL    FALSE           # Shutter correction
-  FLAT            BOOL    FALSE           # Flat-field normalisation
-  FRINGE          BOOL    FALSE           # Fringe subtraction
-END
-
-PPIMAGE_OBDS      METADATA
-  MASK            BOOL    FALSE           # Mask bad pixels
-  MASK.VALUE      U8      0xff            # only mask pixels matching this bitmask
-  NONLIN          BOOL    FALSE           # Non-linearity correction
-  OVERSCAN        BOOL    TRUE            # Overscan subtraction
-  BIAS            BOOL    TRUE            # Bias subtraction
-  DARK            BOOL    TRUE            # Dark subtraction
-  SHUTTER         BOOL    FALSE           # Shutter correction
-  FLAT            BOOL    FALSE           # Flat-field normalisation
-  FRINGE          BOOL    FALSE           # Fringe subtraction
-END
-
-PPIMAGE_OBDSF     METADATA
-  MASK            BOOL    FALSE           # Mask bad pixels
-  MASK.VALUE      U8      0xff            # only mask pixels matching this bitmask
-  NONLIN          BOOL    FALSE           # Non-linearity correction
-  OVERSCAN        BOOL    TRUE            # Overscan subtraction
-  BIAS            BOOL    TRUE            # Bias subtraction
-  DARK            BOOL    TRUE            # Dark subtraction
-  SHUTTER         BOOL    FALSE           # Shutter correction
-  FLAT            BOOL    TRUE            # Flat-field normalisation
-  FRINGE          BOOL    FALSE           # Fringe subtraction
-END
-
Index: /trunk/ippconfig/ipprc.config
===================================================================
--- /trunk/ippconfig/ipprc.config	(revision 10498)
+++ /trunk/ippconfig/ipprc.config	(revision 10499)
@@ -18,21 +18,25 @@
 ### Setups for each camera system
 CAMERAS		METADATA
-	MCSHORT		STR	mcshort/camera.config
-	MCSHORT_CHIP	STR	mcshort_chip/camera.config
-	MCSHORT_FPA	STR	mcshort_fpa/camera.config
+	# CTIO MOSAIC2 camera, for ESSENCE
+	CTIO_MOSAIC2		STR	ctio_mosaic2/camera.config
+	CTIO_MOSAIC2_CHIP	STR	ctio_mosaic2_chip/camera.config
+	CTIO_MOSAIC2_FPA	STR	ctio_mosaic2_fpa/camera.config
 
-	MEGACAM		STR	megacam/camera.config
-	MEGACAM_CHIP	STR	megacam_chipmosaic/camera.config
-	MEGACAM_FPA	STR	megacam_fpamosaic/camera.config
-	MEGACAM_DET	STR	megacam_detrended/camera.config
-	UCAM		STR	ucam/camera.config
-	UCAM_MOSAIC	STR	ucam_mosaic/camera.config
-	GPC1		STR	gpc1/camera.config
-	LRIS_BLUE	STR	lris_blue/camera.config
-	LRIS_RED	STR	lris_red/camera.config
-	ISP      	STR	isp/camera.config
-	SIMPLE		STR	simple/camera.config
+	MEGACAM			STR	megacam/camera.config
+	MEGACAM_CHIP		STR	megacam_chipmosaic/camera.config
+	MEGACAM_FPA		STR	megacam_fpamosaic/camera.config
+	MEGACAM_DET		STR	megacam_detrended/camera.config
+	UCAM			STR	ucam/camera.config
+	UCAM_MOSAIC		STR	ucam_mosaic/camera.config
+	GPC1			STR	gpc1/camera.config
+	LRIS_BLUE		STR	lris_blue/camera.config
+	LRIS_RED		STR	lris_red/camera.config
+	ISP      		STR	isp/camera.config
+	SIMPLE			STR	simple/camera.config
 
 	# move the MCSHORTs to the top to force its selection 
+	MCSHORT			STR	mcshort/camera.config
+	MCSHORT_CHIP		STR	mcshort_chip/camera.config
+	MCSHORT_FPA		STR	mcshort_fpa/camera.config
 END
 
