Index: branches/eam_branches/ipp-20110213/ippconfig/gpc1/ppStack.config
===================================================================
--- branches/eam_branches/ipp-20110213/ippconfig/gpc1/ppStack.config	(revision 30708)
+++ branches/eam_branches/ipp-20110213/ippconfig/gpc1/ppStack.config	(revision 30767)
@@ -37,2 +37,7 @@
     OUTPUT.LOGFLUX  BOOL    TRUE
 END
+
+# Recipe overrides for STACK
+STACKPHOT METADATA
+  PSF.MODEL	STR	PS_MODEL_QGAUSS	# Model for PSF match
+END
Index: branches/eam_branches/ipp-20110213/ippconfig/recipes/ppStack.config
===================================================================
--- branches/eam_branches/ipp-20110213/ippconfig/recipes/ppStack.config	(revision 30708)
+++ branches/eam_branches/ipp-20110213/ippconfig/recipes/ppStack.config	(revision 30767)
@@ -97,4 +97,7 @@
 END
 
+# Recipe overrides for STACK
+STACKPHOT METADATA
+END
 
 # Debugging
Index: branches/eam_branches/ipp-20110213/ippconfig/recipes/ppSub.config
===================================================================
--- branches/eam_branches/ipp-20110213/ippconfig/recipes/ppSub.config	(revision 30708)
+++ branches/eam_branches/ipp-20110213/ippconfig/recipes/ppSub.config	(revision 30767)
@@ -125,4 +125,12 @@
 END
 
+# Difference of two stacks : uses SINGLE not DUAL convolution
+STACKPHOT	METADATA
+	DUAL		BOOL	FALSE	# Dual convolution?
+	INVERSE		BOOL	FALSE   # Generate inverse subtraction?
+	PHOTOMETRY	BOOL	TRUE	# Perform photometry?
+	CONVOLVE.TARGET STR     SINGLE2	# convolution direction
+END
+
 # Difference of warp - stack
 WARPSTACK_FORCED     METADATA
Index: branches/eam_branches/ipp-20110213/ippconfig/recipes/psphot.config
===================================================================
--- branches/eam_branches/ipp-20110213/ippconfig/recipes/psphot.config	(revision 30708)
+++ branches/eam_branches/ipp-20110213/ippconfig/recipes/psphot.config	(revision 30767)
@@ -328,17 +328,4 @@
 
 # Extended source fit parameters
-STACKPHOT_TEST                       METADATA
-  EXTENDED_SOURCE_ANALYSIS            BOOL  TRUE  # perform any of the aperture-like measurements?
-  EXTENDED_SOURCE_SN_LIM              F32   20.0
-  EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
-  EXTENDED_SOURCE_ISOPHOTAL           BOOL  FALSE
-  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
-  EXTENDED_SOURCE_KRON                BOOL  FALSE
-  PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
-  PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
-  PSPHOT.STACK.TARGET.PSF.FWHM        F32   4.5  # FWHM of target PSF (if NOT AUTO sized; pixels)
-END
-
-# Extended source fit parameters
 STACKPHOT                             METADATA
   EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform any of the aperture-like measurements?
@@ -356,5 +343,25 @@
 
   EXT_FIT_MAX_RADIUS                  F32   50.0
-  PSF_MODEL                           STR   PS_MODEL_GAUSS 
+  PSF_MODEL                           STR   PS_MODEL_QGAUSS 
+  EXT_MODEL                           STR   PS_MODEL_SERSIC
+END
+
+# Extended source fit parameters
+STACKPHOT_TEST                        METADATA
+  EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform any of the aperture-like measurements?
+  EXTENDED_SOURCE_ANALYSIS            BOOL  TRUE  # perform any of the aperture-like measurements?
+  EXTENDED_SOURCE_SN_LIM              F32   20.0
+  EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
+  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
+  PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
+  PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
+  PSPHOT.STACK.USE.RAW                BOOL  F    # perform photometry & morphology analysis on the raw image
+  @PSPHOT.STACK.TARGET.PSF.FWHM       F32   8.0 10.0 # FWHM of target PSF (if NOT AUTO sized; pixels)
+  RADIAL_APERTURES                    BOOL  T    # calculate flux in circular radial apertures?
+  RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation
+  OUTPUT.FORMAT                       STR   PS1_SV1
+
+  EXT_FIT_MAX_RADIUS                  F32   50.0
+  PSF_MODEL                           STR   PS_MODEL_QGAUSS 
   EXT_MODEL                           STR   PS_MODEL_SERSIC
 END
Index: branches/eam_branches/ipp-20110213/ippconfig/recipes/reductionClasses.mdc
===================================================================
--- branches/eam_branches/ipp-20110213/ippconfig/recipes/reductionClasses.mdc	(revision 30708)
+++ branches/eam_branches/ipp-20110213/ippconfig/recipes/reductionClasses.mdc	(revision 30767)
@@ -144,18 +144,20 @@
 # basic science analysis
 DEFAULT		METADATA
-	CHIP_PPIMAGE	STR	CHIP
-	CHIP_PSPHOT	STR	CHIP
-	WARP_PSWARP	STR	WARP
-	STACK_PPSTACK	STR	STACK
-	STACK_PPSUB	STR	STACK
-	STACK_PSPHOT	STR	STACK
-	DIFF_PPSUB	STR	DIFF
-	DIFF_PSPHOT	STR	DIFF
-	JPEG_BIN1	STR	PPIMAGE_J1
-	JPEG_BIN2	STR	PPIMAGE_J2
-	FAKEPHOT	STR	FAKEPHOT
-	ADDSTAR		STR	ADDSTAR
-	PSASTRO		STR	DEFAULT_RECIPE
-	STACKPHOT       STR     STACKPHOT
+	CHIP_PPIMAGE	  STR	  CHIP
+	CHIP_PSPHOT	  STR	  CHIP
+	WARP_PSWARP	  STR	  WARP
+	STACK_PPSTACK	  STR	  STACK
+	STACK_PPSUB	  STR	  STACK
+	STACK_PSPHOT	  STR	  STACK
+	DIFF_PPSUB	  STR	  DIFF
+	DIFF_PSPHOT	  STR	  DIFF
+	JPEG_BIN1	  STR	  PPIMAGE_J1
+	JPEG_BIN2	  STR	  PPIMAGE_J2
+	FAKEPHOT	  STR	  FAKEPHOT
+	ADDSTAR		  STR	  ADDSTAR
+	PSASTRO		  STR	  DEFAULT_RECIPE
+	STACKPHOT_PSPHOT  STR     STACKPHOT
+	STACKPHOT_PPSUB   STR     STACKPHOT
+	STACKPHOT_PPSTACK STR     STACKPHOT
 	BACKGROUND_PPBACKGROUND	STR	BACKGROUND
 	BACKGROUND_PSWARP	STR	BACKGROUND
@@ -311,4 +313,11 @@
 	PSASTRO		STR	PS1_REFERENCE
 	STACKPHOT       STR     STACKPHOT
+END
+
+# stackphot (static sky) test reduction
+STACKPHOT_TEST	METADATA
+	STACKPHOT_PSPHOT  STR     STACKPHOT_TEST
+	STACKPHOT_PPSUB   STR     STACKPHOT
+	STACKPHOT_PPSTACK STR     STACKPHOT
 END