Index: branches/eam_branch_20081230/ippconfig/recipes/ppSim.config
===================================================================
--- trunk/ippconfig/recipes/ppSim.config	(revision 20886)
+++ branches/eam_branch_20081230/ippconfig/recipes/ppSim.config	(revision 21072)
@@ -69,4 +69,6 @@
 BADPIX.SEED	U64	123456789	# Seed for RNG in creating deterministic bad pixels
 BADPIX.FRAC	F32	0.0001		# Fraction of bad pixels
+BADPIX.SIZE	S32	0		# Size of bad pixels
+BADPIX.MODE	STR	RANDOM		# Mode for bad pixels: RANDOM|NAN
 
 ### The following options are used if not defined by the concepts (e.g., usually read from headers)
@@ -176,2 +178,9 @@
 TESTDATA  METADATA
 END
+
+# Overrides for creating large holes in the image
+LARGEHOLES	METADATA
+    BADPIX.FRAC	F32	3.0e-7		# Fraction of bad pixels
+    BADPIX.SIZE	S32	256		# Size of bad pixels
+    BADPIX.MODE	STR	NAN		# Mode for bad pixels: RANDOM|NAN
+END
Index: branches/eam_branch_20081230/ippconfig/recipes/ppStack.config
===================================================================
--- trunk/ippconfig/recipes/ppStack.config	(revision 20886)
+++ branches/eam_branch_20081230/ippconfig/recipes/ppStack.config	(revision 21072)
@@ -23,8 +23,33 @@
 RENORM.WIDTH	F32	2.2		# Gaussian width for normalisation
 
-SOURCE.RADIUS	F32	1.0		# Radius (pixels) for matching sources
-SOURCE.MIN	S32	15		# Minimum number of sources for merging source lists
-SOURCE.ITER	S32	2		# Number of rejection iterations for magnitude difference
-SOURCE.REJ	F32	2.0		# Rejection limit (sigma) for magnitude difference
+### The PHOT mode is intended as a quick and dirty stopgap; it should disappear soon.
+PHOT		BOOL	FALSE		# Calculate ZP using own photometry?
+PHOT.RADIUS	S32	30		# Photometry radius (pixels)
+PHOT.SIGMA	F32	5		# Photometry gaussian sigma for weight (pixels)
+PHOT.FRAC	F32	0.9		# Minimum fraction of good pixels
+
+ZP.RADIUS	F32	1.0		# Radius (pixels) for matching sources
+ZP.ITER		S32	1000		# Maximum iterations for zero point
+ZP.TOL		F32	1.0e-6		# Tolerance for zero point iterations
+ZP.TRANS.ITER	S32	2		# Iterations for transparency determination
+ZP.TRANS.REJ	F32	3.0		# Rejection threshold for transparency determination
+ZP.TRANS.THRESH	F32	1.0		# Threshold for transparency determination
+ZP.STAR.REJ	F32	3.0		# Rejection threshold for stars
+ZP.STAR.LIMIT	F32	1.0e-2		# Limit on star rejection fraction for successful iteration
+ZP.STAR.SYS	F32	0.05		# Estimated systematic error
+ZP.AIRMASS	METADATA		# Airmass terms by filter
+	g	F32	0.0
+	r	F32	0.0
+	i	F32	0.0
+	z	F32	0.0
+	y	F32	0.0
+END
+	
+
+### The following is obsolete
+#SOURCE.RADIUS	F32	1.0		# Radius (pixels) for matching sources
+#SOURCE.MIN	S32	15		# Minimum number of sources for merging source lists
+#SOURCE.ITER	S32	2		# Number of rejection iterations for magnitude difference
+#SOURCE.REJ	F32	2.0		# Rejection limit (sigma) for magnitude difference
 
 PSF.INSTANCES	S32	15		# Number of instances for PSF generation
@@ -39,9 +64,4 @@
 TEMP.DELETE	BOOL	TRUE		# Delete temporary files on completion?
 
-ZP		BOOL	TRUE		# Calculate ZP using own photometry?
-ZP.RADIUS	S32	7		# Photometry radius (pixels)
-ZP.SIGMA	F32	2		# Photometry gaussian sigma for weight (pixels)
-ZP.FRAC		F32	0.9		# Minimum fraction of good pixels
-
 # Recipe overrides for STACK
 STACK	METADATA