Index: /trunk/ippconfig/isp/camera.config
===================================================================
--- /trunk/ippconfig/isp/camera.config	(revision 11282)
+++ /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
Index: /trunk/ippconfig/isp/ppImage.config
===================================================================
--- /trunk/ippconfig/isp/ppImage.config	(revision 11282)
+++ /trunk/ippconfig/isp/ppImage.config	(revision 11283)
@@ -1,23 +1,3 @@
-### Phase 2 recipe configuration file - only include differences from recipes/ppImage.config
+### ppImage recipe configuration file
 
-# List of tasks to perform
-# turn shutter on when we have a valid shutter correction frame
-SHUTTER		BOOL	FALSE		# Shutter correction
-FRINGE		BOOL	FALSE		# Fringe subtraction
-
-BASE.FITS       BOOL    TRUE            # Save base detrended image?
-CHIP.FITS       BOOL   	TRUE            # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	TRUE            # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	TRUE            # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	FALSE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	FALSE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	FALSE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	FALSE		# Save 2nd binned jpeg?
-
-# binned output image options
-BIN1.XBIN		S32	8
-BIN1.YBIN		S32	8
-BIN2.XBIN		S32	64
-BIN2.YBIN		S32	64
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
+# Inherit everything from the top-level recipe file, except for what's below.
Index: unk/ippconfig/isp/ppImage_b.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_b.config	(revision 11282)
+++ 	(revision )
@@ -1,26 +1,0 @@
-### Phase 2 recipe configuration file
-
-# List of tasks to perform
-OVERSCAN	BOOL	FALSE		# 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
-
-BASE.FITS       BOOL    TRUE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE           # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE           # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE           # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	TRUE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	TRUE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	FALSE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	FALSE		# Save 2nd binned jpeg?
-
-# binned output image options
-BIN1.XBIN		S32	8
-BIN1.YBIN		S32	8
-BIN2.XBIN		S32	64
-BIN2.YBIN		S32	64
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: unk/ippconfig/isp/ppImage_d.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_d.config	(revision 11282)
+++ 	(revision )
@@ -1,83 +1,0 @@
-### Phase 2 recipe configuration file
-
-# List of tasks to perform
-MASK		BOOL	FALSE		# Mask bad pixels
-MASK.VALUE      U8      0xff            # only mask pixels matching this bitmask
-NONLIN		BOOL	FALSE		# Non-linearity correction
-OVERSCAN	BOOL	FALSE		# Overscan subtraction
-BIAS		BOOL	FALSE		# Bias subtraction
-DARK		BOOL	TRUE		# Dark subtraction
-SHUTTER		BOOL	FALSE		# Shutter correction
-FLAT		BOOL	FALSE		# Flat-field normalisation
-FRINGE		BOOL	FALSE		# Fringe subtraction
-PHOTOM		BOOL	FALSE		# Source identification and photometry
-ASTROM.CHIP	BOOL	FALSE
-ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
-
-BASE.FITS       BOOL    TRUE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE           # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE           # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE           # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	TRUE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	TRUE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	FALSE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	FALSE		# Save 2nd binned jpeg?
-
-# Non-linearity correction
-NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
-#NONLIN.DATA		METADATA		# Source of non-linearity data
-#	ccd00		STR	nonlin00.dat	# A lookup table 
-#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd02		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd03		F32	1.2345 		# A polynomial
-#	@ccd04		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd05		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd06		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd07		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd08		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd09		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd11		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd12		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd13		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd14		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd15		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd16		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd17		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd18		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd19		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd21		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd22		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd23		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd24		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd25		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd26		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd27		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd28		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd29		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd30		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd31		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd32		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd33		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd34		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd35		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd36		F32	0.0 1.001 0.001	# A polynomial
-#END
-
-# Overscan subtraction
-OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
-#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.ORDER		S32	5		# Order of polynomial fit
-OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
-
-# binned output image options
-BIN1.XBIN		S32	8
-BIN1.YBIN		S32	8
-BIN2.XBIN		S32	64
-BIN2.YBIN		S32	64
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: unk/ippconfig/isp/ppImage_f.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_f.config	(revision 11282)
+++ 	(revision )
@@ -1,83 +1,0 @@
-### Phase 2 recipe configuration file
-
-# List of tasks to perform
-MASK		BOOL	FALSE		# Mask bad pixels
-MASK.VALUE      U8      0xff            # only mask pixels matching this bitmask
-NONLIN		BOOL	FALSE		# Non-linearity correction
-OVERSCAN	BOOL	FALSE		# Overscan subtraction
-BIAS		BOOL	FALSE		# Bias subtraction
-DARK		BOOL	FALSE		# Dark subtraction
-SHUTTER		BOOL	FALSE		# Shutter correction
-FLAT		BOOL	TRUE		# Flat-field normalisation
-FRINGE		BOOL	FALSE		# Fringe subtraction
-PHOTOM		BOOL	FALSE		# Source identification and photometry
-ASTROM.CHIP	BOOL	FALSE
-ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
-
-BASE.FITS       BOOL    TRUE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE           # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE           # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE           # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	TRUE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	TRUE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	FALSE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	FALSE		# Save 2nd binned jpeg?
-
-# Non-linearity correction
-NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
-#NONLIN.DATA		METADATA		# Source of non-linearity data
-#	ccd00		STR	nonlin00.dat	# A lookup table 
-#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd02		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd03		F32	1.2345 		# A polynomial
-#	@ccd04		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd05		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd06		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd07		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd08		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd09		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd11		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd12		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd13		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd14		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd15		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd16		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd17		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd18		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd19		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd21		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd22		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd23		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd24		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd25		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd26		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd27		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd28		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd29		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd30		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd31		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd32		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd33		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd34		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd35		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd36		F32	0.0 1.001 0.001	# A polynomial
-#END
-
-# Overscan subtraction
-OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
-#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.ORDER		S32	5		# Order of polynomial fit
-OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
-
-# binned output image options
-BIN1.XBIN		S32	8
-BIN1.YBIN		S32	8
-BIN2.XBIN		S32	64
-BIN2.YBIN		S32	64
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: unk/ippconfig/isp/ppImage_j1.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_j1.config	(revision 11282)
+++ 	(revision )
@@ -1,86 +1,0 @@
-### Phase 2 recipe configuration file
-
-### A little bit of a cheat to make a mosaicked binned JPEG from the binned FITS file.
-### Set binning to 1, since the input will already be binned.
-
-# List of tasks to perform
-MASK		BOOL	FALSE		# Mask bad pixels
-MASK.VALUE      U8      0xff            # only mask pixels matching this bitmask
-NONLIN		BOOL	FALSE		# Non-linearity correction
-OVERSCAN	BOOL	FALSE		# 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
-PHOTOM		BOOL	FALSE		# Source identification and photometry
-ASTROM.CHIP	BOOL	FALSE
-ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
-
-BASE.FITS       BOOL    FALSE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE            # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE            # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE            # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	FALSE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	FALSE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	TRUE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	FALSE		# Save 2nd binned jpeg?
-
-# Non-linearity correction
-NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
-#NONLIN.DATA		METADATA		# Source of non-linearity data
-#	ccd00		STR	nonlin00.dat	# A lookup table 
-#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd02		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd03		F32	1.2345 		# A polynomial
-#	@ccd04		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd05		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd06		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd07		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd08		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd09		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd11		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd12		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd13		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd14		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd15		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd16		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd17		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd18		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd19		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd21		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd22		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd23		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd24		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd25		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd26		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd27		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd28		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd29		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd30		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd31		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd32		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd33		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd34		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd35		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd36		F32	0.0 1.001 0.001	# A polynomial
-#END
-
-# Overscan subtraction
-OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
-#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.ORDER		S32	5		# Order of polynomial fit
-OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
-
-# binned output image options
-BIN1.XBIN		S32	1
-BIN1.YBIN		S32	1
-BIN2.XBIN		S32	1
-BIN2.YBIN		S32	1
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: unk/ippconfig/isp/ppImage_j2.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_j2.config	(revision 11282)
+++ 	(revision )
@@ -1,86 +1,0 @@
-### Phase 2 recipe configuration file
-
-### A little bit of a cheat to make a mosaicked binned JPEG from the binned FITS file.
-### Set binning to 1, since the input will already be binned.
-
-# List of tasks to perform
-MASK		BOOL	FALSE		# Mask bad pixels
-MASK.VALUE      U8      0xff            # only mask pixels matching this bitmask
-NONLIN		BOOL	FALSE		# Non-linearity correction
-OVERSCAN	BOOL	FALSE		# 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
-PHOTOM		BOOL	FALSE		# Source identification and photometry
-ASTROM.CHIP	BOOL	FALSE
-ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
-
-BASE.FITS       BOOL    FALSE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE            # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE            # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE            # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	FALSE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	FALSE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	FALSE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	TRUE		# Save 2nd binned jpeg?
-
-# Non-linearity correction
-NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
-#NONLIN.DATA		METADATA		# Source of non-linearity data
-#	ccd00		STR	nonlin00.dat	# A lookup table 
-#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd02		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd03		F32	1.2345 		# A polynomial
-#	@ccd04		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd05		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd06		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd07		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd08		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd09		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd11		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd12		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd13		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd14		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd15		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd16		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd17		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd18		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd19		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd21		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd22		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd23		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd24		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd25		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd26		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd27		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd28		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd29		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd30		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd31		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd32		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd33		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd34		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd35		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd36		F32	0.0 1.001 0.001	# A polynomial
-#END
-
-# Overscan subtraction
-OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
-#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.ORDER		S32	5		# Order of polynomial fit
-OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
-
-# binned output image options
-BIN1.XBIN		S32	1
-BIN1.YBIN		S32	1
-BIN2.XBIN		S32	1
-BIN2.YBIN		S32	1
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: unk/ippconfig/isp/ppImage_n.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_n.config	(revision 11282)
+++ 	(revision )
@@ -1,83 +1,0 @@
-### Phase 2 recipe configuration file
-
-# List of tasks to perform
-MASK		BOOL	FALSE		# Mask bad pixels
-MASK.VALUE      U8      0x10            # only mask pixels matching this bitmask
-NONLIN		BOOL	FALSE		# Non-linearity correction
-OVERSCAN	BOOL	FALSE		# 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
-PHOTOM		BOOL	FALSE		# Source identification and photometry
-ASTROM.CHIP	BOOL	FALSE
-ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
-
-BASE.FITS       BOOL    TRUE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE           # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE           # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE           # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	TRUE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	TRUE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	FALSE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	FALSE		# Save 2nd binned jpeg?
-
-# Non-linearity correction
-NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
-#NONLIN.DATA		METADATA		# Source of non-linearity data
-#	ccd00		STR	nonlin00.dat	# A lookup table 
-#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd02		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd03		F32	1.2345 		# A polynomial
-#	@ccd04		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd05		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd06		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd07		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd08		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd09		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd11		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd12		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd13		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd14		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd15		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd16		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd17		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd18		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd19		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd21		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd22		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd23		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd24		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd25		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd26		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd27		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd28		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd29		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd30		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd31		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd32		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd33		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd34		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd35		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd36		F32	0.0 1.001 0.001	# A polynomial
-#END
-
-# Overscan subtraction
-OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
-#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.ORDER		S32	5		# Order of polynomial fit
-OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
-
-# binned output image options
-BIN1.XBIN		S32	8
-BIN1.YBIN		S32	8
-BIN2.XBIN		S32	64
-BIN2.YBIN		S32	64
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: unk/ippconfig/isp/ppImage_o.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_o.config	(revision 11282)
+++ 	(revision )
@@ -1,83 +1,0 @@
-### Phase 2 recipe configuration file
-
-# List of tasks to perform
-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
-PHOTOM		BOOL	FALSE		# Source identification and photometry
-ASTROM.CHIP	BOOL	FALSE
-ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
-
-BASE.FITS       BOOL    TRUE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE           # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE           # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE           # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	TRUE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	TRUE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	FALSE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	FALSE		# Save 2nd binned jpeg?
-
-# Non-linearity correction
-NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
-#NONLIN.DATA		METADATA		# Source of non-linearity data
-#	ccd00		STR	nonlin00.dat	# A lookup table 
-#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd02		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd03		F32	1.2345 		# A polynomial
-#	@ccd04		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd05		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd06		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd07		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd08		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd09		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd11		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd12		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd13		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd14		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd15		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd16		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd17		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd18		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd19		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd21		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd22		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd23		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd24		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd25		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd26		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd27		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd28		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd29		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd30		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd31		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd32		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd33		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd34		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd35		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd36		F32	0.0 1.001 0.001	# A polynomial
-#END
-
-# Overscan subtraction
-OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
-#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.ORDER		S32	5		# Order of polynomial fit
-OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
-
-# binned output image options
-BIN1.XBIN		S32	8
-BIN1.YBIN		S32	8
-BIN2.XBIN		S32	64
-BIN2.YBIN		S32	64
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: unk/ippconfig/isp/ppImage_ob.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_ob.config	(revision 11282)
+++ 	(revision )
@@ -1,83 +1,0 @@
-### Phase 2 recipe configuration file
-
-# List of tasks to perform
-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
-PHOTOM		BOOL	FALSE		# Source identification and photometry
-ASTROM.CHIP	BOOL	FALSE
-ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
-
-BASE.FITS       BOOL    TRUE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE           # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE           # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE           # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	TRUE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	TRUE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	FALSE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	FALSE		# Save 2nd binned jpeg?
-
-# Non-linearity correction
-NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
-#NONLIN.DATA		METADATA		# Source of non-linearity data
-#	ccd00		STR	nonlin00.dat	# A lookup table 
-#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd02		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd03		F32	1.2345 		# A polynomial
-#	@ccd04		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd05		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd06		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd07		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd08		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd09		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd11		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd12		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd13		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd14		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd15		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd16		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd17		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd18		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd19		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd21		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd22		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd23		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd24		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd25		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd26		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd27		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd28		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd29		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd30		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd31		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd32		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd33		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd34		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd35		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd36		F32	0.0 1.001 0.001	# A polynomial
-#END
-
-# Overscan subtraction
-OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
-#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.ORDER		S32	5		# Order of polynomial fit
-OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
-
-# binned output image options
-BIN1.XBIN		S32	8
-BIN1.YBIN		S32	8
-BIN2.XBIN		S32	64
-BIN2.YBIN		S32	64
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: unk/ippconfig/isp/ppImage_obd.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_obd.config	(revision 11282)
+++ 	(revision )
@@ -1,83 +1,0 @@
-### Phase 2 recipe configuration file
-
-# List of tasks to perform
-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
-PHOTOM		BOOL	FALSE		# Source identification and photometry
-ASTROM.CHIP	BOOL	FALSE
-ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
-
-BASE.FITS       BOOL    TRUE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE           # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE           # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE           # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	TRUE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	TRUE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	FALSE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	FALSE		# Save 2nd binned jpeg?
-
-# Non-linearity correction
-NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
-#NONLIN.DATA		METADATA		# Source of non-linearity data
-#	ccd00		STR	nonlin00.dat	# A lookup table 
-#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd02		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd03		F32	1.2345 		# A polynomial
-#	@ccd04		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd05		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd06		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd07		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd08		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd09		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd11		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd12		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd13		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd14		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd15		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd16		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd17		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd18		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd19		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd21		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd22		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd23		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd24		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd25		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd26		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd27		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd28		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd29		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd30		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd31		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd32		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd33		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd34		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd35		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd36		F32	0.0 1.001 0.001	# A polynomial
-#END
-
-# Overscan subtraction
-OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
-#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.ORDER		S32	5		# Order of polynomial fit
-OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
-
-# binned output image options
-BIN1.XBIN		S32	8
-BIN1.YBIN		S32	8
-BIN2.XBIN		S32	64
-BIN2.YBIN		S32	64
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: unk/ippconfig/isp/ppImage_obds.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_obds.config	(revision 11282)
+++ 	(revision )
@@ -1,83 +1,0 @@
-### Phase 2 recipe configuration file
-
-# List of tasks to perform
-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
-PHOTOM		BOOL	FALSE		# Source identification and photometry
-ASTROM.CHIP	BOOL	FALSE
-ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
-
-BASE.FITS       BOOL    TRUE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE           # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE           # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE           # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	TRUE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	TRUE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	FALSE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	FALSE		# Save 2nd binned jpeg?
-
-# Non-linearity correction
-NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
-#NONLIN.DATA		METADATA		# Source of non-linearity data
-#	ccd00		STR	nonlin00.dat	# A lookup table 
-#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd02		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd03		F32	1.2345 		# A polynomial
-#	@ccd04		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd05		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd06		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd07		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd08		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd09		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd11		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd12		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd13		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd14		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd15		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd16		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd17		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd18		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd19		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd21		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd22		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd23		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd24		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd25		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd26		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd27		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd28		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd29		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd30		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd31		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd32		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd33		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd34		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd35		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd36		F32	0.0 1.001 0.001	# A polynomial
-#END
-
-# Overscan subtraction
-OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
-#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.ORDER		S32	5		# Order of polynomial fit
-OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
-
-# binned output image options
-BIN1.XBIN		S32	8
-BIN1.YBIN		S32	8
-BIN2.XBIN		S32	64
-BIN2.YBIN		S32	64
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: unk/ippconfig/isp/ppImage_obdsf.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_obdsf.config	(revision 11282)
+++ 	(revision )
@@ -1,83 +1,0 @@
-### Phase 2 recipe configuration file
-
-# List of tasks to perform
-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
-PHOTOM		BOOL	FALSE		# Source identification and photometry
-ASTROM.CHIP	BOOL	FALSE
-ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
-
-BASE.FITS       BOOL    TRUE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE           # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE           # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE           # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	TRUE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	TRUE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	FALSE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	FALSE		# Save 2nd binned jpeg?
-
-# Non-linearity correction
-NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
-#NONLIN.DATA		METADATA		# Source of non-linearity data
-#	ccd00		STR	nonlin00.dat	# A lookup table 
-#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd02		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd03		F32	1.2345 		# A polynomial
-#	@ccd04		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd05		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd06		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd07		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd08		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd09		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd11		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd12		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd13		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd14		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd15		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd16		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd17		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd18		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd19		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd21		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd22		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd23		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd24		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd25		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd26		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd27		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd28		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd29		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd30		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd31		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd32		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd33		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd34		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd35		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd36		F32	0.0 1.001 0.001	# A polynomial
-#END
-
-# Overscan subtraction
-OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
-#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.ORDER		S32	5		# Order of polynomial fit
-OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
-
-# binned output image options
-BIN1.XBIN		S32	8
-BIN1.YBIN		S32	8
-BIN2.XBIN		S32	64
-BIN2.YBIN		S32	64
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: unk/ippconfig/isp/ppImage_obdsfp.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_obdsfp.config	(revision 11282)
+++ 	(revision )
@@ -1,83 +1,0 @@
-### Phase 2 recipe configuration file
-
-# List of tasks to perform
-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
-PHOTOM		BOOL	TRUE		# Source identification and photometry
-ASTROM.CHIP	BOOL	FALSE
-ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
-
-BASE.FITS       BOOL    TRUE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE           # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE           # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE           # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	TRUE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	TRUE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	FALSE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	FALSE		# Save 2nd binned jpeg?
-
-# Non-linearity correction
-NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
-#NONLIN.DATA		METADATA		# Source of non-linearity data
-#	ccd00		STR	nonlin00.dat	# A lookup table 
-#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd02		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd03		F32	1.2345 		# A polynomial
-#	@ccd04		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd05		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd06		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd07		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd08		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd09		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd11		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd12		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd13		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd14		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd15		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd16		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd17		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd18		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd19		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd21		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd22		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd23		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd24		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd25		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd26		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd27		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd28		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd29		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd30		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd31		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd32		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd33		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd34		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd35		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd36		F32	0.0 1.001 0.001	# A polynomial
-#END
-
-# Overscan subtraction
-OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
-#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.ORDER		S32	5		# Order of polynomial fit
-OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
-
-# binned output image options
-BIN1.XBIN		S32	8
-BIN1.YBIN		S32	8
-BIN2.XBIN		S32	64
-BIN2.YBIN		S32	64
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: unk/ippconfig/isp/ppImage_pa.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_pa.config	(revision 11282)
+++ 	(revision )
@@ -1,48 +1,0 @@
-### Phase 2 recipe configuration file
-
-# List of tasks to perform
-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
-PHOTOM		BOOL	TRUE		# Source identification and photometry
-ASTROM.CHIP	BOOL	TRUE
-ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
-
-BASE.FITS       BOOL    TRUE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE           # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE           # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE           # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	FALSE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	FALSE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	TRUE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	TRUE		# Save 2nd binned jpeg?
-
-# Non-linearity correction
-NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
-#NONLIN.DATA		METADATA		# Source of non-linearity data
-#	ccd00		STR	nonlin00.dat	# A lookup table 
-#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-#END
-
-# Overscan subtraction
-OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
-#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.ORDER		S32	5		# Order of polynomial fit
-OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
-
-# binned output image options
-BIN1.XBIN		S32	8
-BIN1.YBIN		S32	8
-BIN2.XBIN		S32	64
-BIN2.YBIN		S32	64
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: unk/ippconfig/isp/ppImage_s.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_s.config	(revision 11282)
+++ 	(revision )
@@ -1,83 +1,0 @@
-### Phase 2 recipe configuration file
-
-# List of tasks to perform
-MASK		BOOL	FALSE		# Mask bad pixels
-MASK.VALUE      U8      0xff            # only mask pixels matching this bitmask
-NONLIN		BOOL	FALSE		# Non-linearity correction
-OVERSCAN	BOOL	FALSE		# 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
-PHOTOM		BOOL	FALSE		# Source identification and photometry
-ASTROM.CHIP	BOOL	FALSE
-ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
-
-BASE.FITS       BOOL    TRUE            # Save base detrended image?
-CHIP.FITS       BOOL   	FALSE           # Save chip-mosaic-ed image? 
-FPA1.FITS       BOOL   	FALSE           # Save 1st binned fpa image? 
-FPA2.FITS       BOOL   	FALSE           # Save 2nd binned fpa image? 
-BIN1.FITS	BOOL	TRUE		# Save 1st binned chip image?
-BIN2.FITS	BOOL	TRUE		# Save 2nd binned chip image?
-BIN1.JPEG	BOOL	FALSE		# Save 1st binned jpeg?
-BIN2.JPEG	BOOL	FALSE		# Save 2nd binned jpeg?
-
-# Non-linearity correction
-NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
-#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
-NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
-#NONLIN.DATA		METADATA		# Source of non-linearity data
-#	ccd00		STR	nonlin00.dat	# A lookup table 
-#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd02		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd03		F32	1.2345 		# A polynomial
-#	@ccd04		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd05		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd06		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd07		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd08		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd09		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd11		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd12		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd13		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd14		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd15		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd16		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd17		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd18		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd19		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd10		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd21		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd22		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd23		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd24		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd25		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd26		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd27		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd28		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd29		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd30		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd31		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd32		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd33		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd34		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd35		F32	0.0 1.001 0.001	# A polynomial
-#	@ccd36		F32	0.0 1.001 0.001	# A polynomial
-#END
-
-# Overscan subtraction
-OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
-#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
-OVERSCAN.ORDER		S32	5		# Order of polynomial fit
-OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
-
-# binned output image options
-BIN1.XBIN		S32	8
-BIN1.YBIN		S32	8
-BIN2.XBIN		S32	64
-BIN2.YBIN		S32	64
-
-PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: /trunk/ippconfig/isp/ppMerge.config
===================================================================
--- /trunk/ippconfig/isp/ppMerge.config	(revision 11283)
+++ /trunk/ippconfig/isp/ppMerge.config	(revision 11283)
@@ -0,0 +1,3 @@
+### ppImage recipe configuration file
+
+# Inherit everything from the top-level recipe file, except for what's below.
Index: unk/ippconfig/isp/ppMerge_bias.config
===================================================================
--- /trunk/ippconfig/isp/ppMerge_bias.config	(revision 11282)
+++ 	(revision )
@@ -1,17 +1,0 @@
-# Recipe configuration for ppMerge
- 
-ROWS            S32     128		# 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
-REJ		F32	3.0		# Rejection threshold (sigma)
-ITER		S32	1		# Number of rejection iterations
-FRACHIGH	F32	0.3		# Fraction of high pixels to reject immediately
-FRACLOW		F32	0.1		# Fraction of low pixels to reject immediately
-NKEEP		S32	5		# Minimum number of pixels in stack to keep
-SHUTTER.SIZE	S32	128		# Size for shutter measurement regions
-SHUTTER.ITER	S32	2		# Number of iterations for shutter measurement
-SHUTTER.REJECT	F32	3		# Rejection limit for shutter measurement
-MASKVAL		S32	0xff		# Mask value for input data
-COMBINE		STR	MEAN		# Statistic to use for combination: 
-MEAN		STR	ROBUST_MEDIAN	# Statistic to use to measure the mean
-STDEV		STR	ROBUST_STDEV	# Statistic to use to measure the stdev
Index: unk/ippconfig/isp/ppMerge_dark.config
===================================================================
--- /trunk/ippconfig/isp/ppMerge_dark.config	(revision 11282)
+++ 	(revision )
@@ -1,17 +1,0 @@
-# Recipe configuration for ppMerge
- 
-ROWS            S32     128		# 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
-REJ		F32	3.0		# Rejection threshold (sigma)
-ITER		S32	1		# Number of rejection iterations
-FRACHIGH	F32	0.3		# Fraction of high pixels to reject immediately
-FRACLOW		F32	0.1		# Fraction of low pixels to reject immediately
-NKEEP		S32	5		# Minimum number of pixels in stack to keep
-SHUTTER.SIZE	S32	128		# Size for shutter measurement regions
-SHUTTER.ITER	S32	2		# Number of iterations for shutter measurement
-SHUTTER.REJECT	F32	3		# Rejection limit for shutter measurement
-MASKVAL		S32	0xff		# Mask value for input data
-COMBINE		STR	MEAN		# Statistic to use for combination: 
-MEAN		STR	ROBUST_MEDIAN	# Statistic to use to measure the mean
-STDEV		STR	ROBUST_STDEV	# Statistic to use to measure the stdev
Index: unk/ippconfig/isp/ppMerge_flat.config
===================================================================
--- /trunk/ippconfig/isp/ppMerge_flat.config	(revision 11282)
+++ 	(revision )
@@ -1,17 +1,0 @@
-# Recipe configuration for ppMerge
- 
-ROWS            S32     128		# 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
-REJ		F32	3.0		# Rejection threshold (sigma)
-ITER		S32	1		# Number of rejection iterations
-FRACHIGH	F32	0.3		# Fraction of high pixels to reject immediately
-FRACLOW		F32	0.1		# Fraction of low pixels to reject immediately
-NKEEP		S32	5		# Minimum number of pixels in stack to keep
-SHUTTER.SIZE	S32	128		# Size for shutter measurement regions
-SHUTTER.ITER	S32	2		# Number of iterations for shutter measurement
-SHUTTER.REJECT	F32	3		# Rejection limit for shutter measurement
-MASKVAL		S32	0xff		# Mask value for input data
-COMBINE		STR	MEAN		# Statistic to use for combination: 
-MEAN		STR	ROBUST_MEDIAN	# Statistic to use to measure the mean
-STDEV		STR	ROBUST_STDEV	# Statistic to use to measure the stdev
Index: unk/ippconfig/isp/ppMerge_shutter.config
===================================================================
--- /trunk/ippconfig/isp/ppMerge_shutter.config	(revision 11282)
+++ 	(revision )
@@ -1,17 +1,0 @@
-# Recipe configuration for ppMerge
- 
-ROWS            S32     128		# 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
-REJ		F32	3.0		# Rejection threshold (sigma)
-ITER		S32	1		# Number of rejection iterations
-FRACHIGH	F32	0.3		# Fraction of high pixels to reject immediately
-FRACLOW		F32	0.1		# Fraction of low pixels to reject immediately
-NKEEP		S32	5		# Minimum number of pixels in stack to keep
-SHUTTER.SIZE	S32	512		# Size for shutter measurement regions
-SHUTTER.ITER	S32	3		# Number of iterations for shutter measurement
-SHUTTER.REJECT	F32	2.0		# Rejection limit for shutter measurement
-MASKVAL		S32	0xff		# Mask value for input data
-COMBINE		STR	MEAN		# Statistic to use for combination: 
-MEAN		STR	ROBUST_MEDIAN	# Statistic to use to measure the mean
-STDEV		STR	ROBUST_STDEV	# Statistic to use to measure the stdev
