Index: /trunk/ippconfig/ctio_mosaic2/camera.config
===================================================================
--- /trunk/ippconfig/ctio_mosaic2/camera.config	(revision 10761)
+++ /trunk/ippconfig/ctio_mosaic2/camera.config	(revision 10762)
@@ -36,8 +36,12 @@
 	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		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
@@ -75,15 +79,15 @@
 
    ### use these entries to get the detrend images from specific files
-   PPIMAGE.MASK       INPUT megacam/mask.{CHIP.NAME}.fits                  {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       MASK     
-   PPIMAGE.BIAS       INPUT path://PAP_ESSENCE/CTIO_MOSAIC2.bias.1.2.fpa.fits {CHIP.NAME} {CELL.NAME} NONE         CELL       IMAGE     
-   PPIMAGE.DARK       INPUT file:///something.fits                       {CHIP.NAME}     {CHIP.NAME}  NONE         CELL       IMAGE     
-   PPIMAGE.FLAT       INPUT file:///something.fits                       {CHIP.NAME}     {CHIP.NAME}  NONE         CELL       IMAGE     
-   PPIMAGE.FRINGE     INPUT file:///something.fits                       {CHIP.NAME}     {CHIP.NAME}  NONE         CELL       FRINGE     
+   #PPIMAGE.MASK      INPUT megacam/mask.{CHIP.NAME}.fits                  {CHIP.NAME}   {CHIP.NAME}  NONE         CHIP       MASK     
+   #PPIMAGE.BIAS       INPUT path://PAP_ESSENCE/CTIO_MOSAIC2.bias.1.2.fpa.fits {CHIP.NAME} {CELL.NAME} NONE         CELL       IMAGE     
+   #PPIMAGE.DARK       INPUT file:///something.fits                       {CHIP.NAME}     {CHIP.NAME}  NONE         CELL       IMAGE     
+   #PPIMAGE.FLAT       INPUT file:///something.fits                       {CHIP.NAME}     {CHIP.NAME}  NONE         CELL       IMAGE     
+   #PPIMAGE.FRINGE     INPUT file:///something.fits                       {CHIP.NAME}     {CHIP.NAME}  NONE         CELL       FRINGE     
 
    ### use these entries to get the detrend images from the database
-   #PPIMAGE.MASK       INPUT @DETDB                       {CHIP.NAME}   {CHIP.NAME}  NONE         CELL       IMAGE
-   #PPIMAGE.BIAS       INPUT @DETDB                        {CHIP.NAME}   {CHIP.NAME}  NONE        CELL       IMAGE
-   #PPIMAGE.DARK       INPUT @DETDB                       {CHIP.NAME}   {CHIP.NAME}  NONE         CELL       IMAGE
-   #PPIMAGE.FLAT       INPUT @DETDB                       {CHIP.NAME}   {CHIP.NAME}  NONE         CELL       IMAGE
+   #PPIMAGE.MASK       INPUT @DETDB                       {CHIP.NAME}   fpa          NONE         CHIP      IMAGE
+   PPIMAGE.BIAS       INPUT @DETDB                        {CHIP.NAME}   fpa          NONE         CHIP      IMAGE
+   PPIMAGE.DARK       INPUT @DETDB                        {CHIP.NAME}   fpa          NONE         CHIP      IMAGE
+   PPIMAGE.FLAT       INPUT @DETDB                        {CHIP.NAME}   fpa          FILTER       CHIP      IMAGE
 
    PSPHOT.INPUT       INPUT @FILES                        {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE     
@@ -104,6 +108,6 @@
    PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.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      CTIO_MOSAIC2_FPA:MOSAIC
-   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.b2.jpg               -greyscale    FRACTION     0.50:2.00     FPA        FPA        JPEG      TRUE      CTIO_MOSAIC2_FPA:MOSAIC
+   PPIMAGE.JPEG1       OUTPUT {OUTPUT}.b1.jpg               -greyscale    RANGE        -5:10         FPA        FPA        JPEG      TRUE      CTIO_MOSAIC2_FPA:MOSAIC
+   PPIMAGE.JPEG2       OUTPUT {OUTPUT}.b2.jpg               -greyscale    RANGE        -5:10         FPA        FPA        JPEG      TRUE      CTIO_MOSAIC2_FPA:MOSAIC
 
    PSPHOT.RESID        OUTPUT {OUTPUT}.res.fits             NONE          {CELL.NAME}  {CELL.NAME}  CHIP       CHIP       IMAGE     TRUE      RAW
Index: /trunk/ippconfig/ctio_mosaic2/ppImage.config
===================================================================
--- /trunk/ippconfig/ctio_mosaic2/ppImage.config	(revision 10761)
+++ /trunk/ippconfig/ctio_mosaic2/ppImage.config	(revision 10762)
@@ -77,5 +77,5 @@
   SHUTTER         BOOL    FALSE            # Shutter correction
   FLAT            BOOL    TRUE            # Flat-field normalisation
-  MASK            BOOL    TRUE            # Mask bad pixels
+  MASK            BOOL    FALSE           # Mask bad pixels
   FRINGE          BOOL    FALSE           # Fringe subtraction
 END
@@ -88,5 +88,5 @@
   SHUTTER         BOOL    FALSE            # Shutter correction
   FLAT            BOOL    TRUE            # Flat-field normalisation
-  MASK            BOOL    TRUE            # Mask bad pixels
+  MASK            BOOL    FALSE            # Mask bad pixels
   FRINGE          BOOL    TRUE            # Fringe subtraction
 END
Index: /trunk/ippconfig/ctio_mosaic2_chip/camera.config
===================================================================
--- /trunk/ippconfig/ctio_mosaic2_chip/camera.config	(revision 10761)
+++ /trunk/ippconfig/ctio_mosaic2_chip/camera.config	(revision 10762)
@@ -35,8 +35,12 @@
 	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
+	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
+	SKYFLAT	LIMITS	*	0		0		0		0		0		0		0		0		3			0		0
+	DOMEFLAT 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
Index: /trunk/ippconfig/ctio_mosaic2_fpa/camera.config
===================================================================
--- /trunk/ippconfig/ctio_mosaic2_fpa/camera.config	(revision 10761)
+++ /trunk/ippconfig/ctio_mosaic2_fpa/camera.config	(revision 10762)
@@ -27,9 +27,13 @@
 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
-	FLAT	MULTI
+	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
+	SKYFLAT	 LIMITS	*	0		0		0		0		0		0		0		0		3			0		0
+	DOMEFLAT 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
Index: /trunk/ippconfig/recipes/ppMerge.config
===================================================================
--- /trunk/ippconfig/recipes/ppMerge.config	(revision 10761)
+++ /trunk/ippconfig/recipes/ppMerge.config	(revision 10762)
@@ -1,5 +1,5 @@
 # Recipe configuration for ppMerge
  
-ROWS            S32     128		# Number of rows to read at once
+ROWS            S32     512		# Number of rows to read at once
 ELECTRONS       F32     100.0           # Minimum number of electrons for useful signal
 SAMPLE          S32     100             # Sampling factor for measuring the background
