Index: branches/tap_branches/ippconfig/recipes/ppStack.config
===================================================================
--- branches/tap_branches/ippconfig/recipes/ppStack.config	(revision 25900)
+++ branches/tap_branches/ippconfig/recipes/ppStack.config	(revision 27835)
@@ -2,14 +2,21 @@
 
 CONVOLVE	BOOL	TRUE		# Convolve images when stacking?
-ITER		S32	1		# Number of rejection iterations
+MATCH.ZERO.POINTS BOOL	TRUE		# Convolve images when stacking?
+
+COMBINE.ITER	F32	0.5		# Number of rejection iterations per input
 COMBINE.REJ	F32	2.5		# Rejection threshold in combination (sigma)
-COMBINE.SYS	F32	0.03		# Relative systematic error in combination
+COMBINE.SYS	F32	0.1		# Relative systematic error in combination
 COMBINE.DISCARD	F32	0.2		# Discard fraction for Olympic weighted mean
-MASK.VAL	STR	MASK.VALUE,CONV.BAD	# Mask value of input bad pixels
+
+# XXX which of these is right?
+MASK.VAL	STR	MASK.VALUE,CONV.BAD,GHOST	# Mask value of input bad pixels
+MASK.IN		STR	MASK.VALUE,CONV.BAD,GHOST	# Mask value of input bad pixels
+
+MASK.SUSPECT	STR	SUSPECT,CONV.POOR	# Mask value of suspect pixels
 MASK.BAD	STR	BLANK		# Mask value to give bad pixels
 MASK.POOR	STR	CONV.POOR	# Mask value to give poor pixels
-POOR.FRACTION	F32	0.01		# Maximum fraction of bad variance for poor pixels
+POOR.FRACTION	F32	0.25		# Maximum fraction of bad variance for poor pixels
 THRESHOLD.MASK	F32	0.5		# Threshold for mask deconvolution (0..1)
-DECONV.LIMIT	F32	1.3		# Deconvolution fraction for rejecting entire image
+DECONV.LIMIT	F32	2.0		# Deconvolution fraction for rejecting entire image
 IMAGE.REJ	F32	0.1		# Rejected pixel fraction threshold for rejecting entire image
 MATCH.REJ	F32	3.0		# Rejection threshold for chi^2 values from matching
@@ -17,4 +24,5 @@
 VARIANCE	BOOL	TRUE		# Use variance in rejection?
 SAFE		BOOL	TRUE		# Play safe when combining small number of values?
+WEIGHTS		BOOL	TRUE		# Use 1/noise^2 weighting?
 BIN1		S32	4		# Binning factor for first level
 BIN2		S32	4		# Binning factor for second level
@@ -33,5 +41,6 @@
 PHOT.FRAC	F32	0.9		# Minimum fraction of good pixels
 
-ZP.RADIUS	F32	1.0		# Radius (pixels) for matching sources
+ZP		BOOL	TRUE		# Match zero points?
+ZP.RADIUS	F32	4.0		# Radius (pixels) for matching sources
 ZP.ITER.1	S32	5		# Iterations for zero point; pass 1
 ZP.ITER.2	S32	1000		# Iterations for zero point; pass 2
@@ -53,11 +62,17 @@
 	y	F32	0.0
 END
-	
+ZP.TARGET	METADATA		# Target zero point by filter
+	g	F32	25.0
+	r	F32	25.0
+	i	F32	25.0
+	z	F32	25.0
+	y	F32	25.0
+END
+
 PSF.INSTANCES	S32	15		# Number of instances for PSF generation
 PSF.RADIUS	F32	20.0		# Radius for PSF generation
 PSF.ORDER	S32	1		# Order of spatial variation for PSF generation
-PSF.MODEL	STR	PS_MODEL_PS1_V1	# Model for PSF generation
+PSF.MODEL	STR	PS_MODEL_GAUSS	# Model for PSF generation
 
-TEMP.DIR	STR	/tmp	        # Directory for temporary images
 TEMP.IMAGE	STR	conv.im.fits	# Suffix for temporary convolved images
 TEMP.MASK	STR	conv.mk.fits	# Suffix for temporary convolved masks
@@ -72,5 +87,4 @@
 # Debugging
 DEBUG	METADATA
-	TEMP.DIR	STR	./		# Directory for temporary images
 	TEMP.DELETE	BOOL	FALSE		# Delete temporary files on completion?
 END
@@ -78,6 +92,9 @@
 # Faster processing for PR images
 PR	METADATA
-	CONVOLVE	BOOL	FALSE
-	IMAGE.REJ	F32	0.5	
-	SKIP.BG.SUB	BOOL	FALSE
+	IMAGE.REJ	    F32	  0.5
+	WEIGHTS		    BOOL  FALSE
+	CONVOLVE	    BOOL  FALSE
+	SKIP.BG.SUB	    BOOL  FALSE
+        MATCH.ZERO.POINTS   BOOL  FALSE
+        PHOTOMETRY          BOOL  FALSE           # Do basic photometry?
 END