Index: /branches/eam_branch_20080324/ippconfig/recipes/psphot.config
===================================================================
--- /branches/eam_branch_20080324/ippconfig/recipes/psphot.config	(revision 17278)
+++ /branches/eam_branch_20080324/ippconfig/recipes/psphot.config	(revision 17279)
@@ -108,5 +108,6 @@
  
 # EXTended source model parameters
-EXT_MODEL                           STR   PS_MODEL_SERSIC
+# this model is used for approximate subtraction in the main object analysis step
+EXT_MODEL                           STR   PS_MODEL_QGAUSS
 EXT_MIN_SN                          F32   50.0            # fit galaxies above this S/N limit
 EXT_FIT_NSIGMA                      F32   1               # significance for pixel included in fit
@@ -114,8 +115,7 @@
 EXT_MOMENTS_RADIUS                  F32   9
 
-# Extended source fit parameters
-EXTENDED_SOURCE_FITS                BOOL  FALSE
+# extended source aperture-like measurements
+EXTENDED_SOURCE_ANALYSIS            BOOL  FALSE  # perform any of the aperture-like measurements?
 EXTENDED_SOURCE_SN_LIM              F32   20.0
-EXTENDED_SOURCE_PSF_CONVOLVED       BOOL  FALSE
 EXTENDED_SOURCE_PETROSIAN           BOOL  FALSE
 EXTENDED_SOURCE_ISOPHOTAL           BOOL  FALSE
@@ -124,8 +124,25 @@
 
 # Extended source fit parameters
+# these models are used for high-quality shape analysis after all sources have been removed
+EXTENDED_SOURCE_FITS                BOOL  FALSE  # perform the detailed extended sourc fits?
+
+# extended source models applied to sources
+EXTENDED_SOURCE_MODELS METADATA 
+ TYPE  	    EXTENDED_SOURCE_MODEL  MODEL            SNLIM   PSF_CONVOLVED
+ GAUSS_RAW   EXTENDED_SOURCE_MODEL  PM_MODEL_GAUSS   20.0    FALSE
+ PGAUSS_RAW  EXTENDED_SOURCE_MODEL  PM_MODEL_GAUSS   20.0    FALSE
+ QGAUSS_RAW  EXTENDED_SOURCE_MODEL  PM_MODEL_GAUSS   20.0    FALSE
+ SERSIC_RAW  EXTENDED_SOURCE_MODEL  PM_MODEL_GAUSS   20.0    FALSE
+ GAUSS_PSF   EXTENDED_SOURCE_MODEL  PM_MODEL_GAUSS   20.0    TRUE
+ PGAUSS_PSF  EXTENDED_SOURCE_MODEL  PM_MODEL_GAUSS   20.0    TRUE
+ QGAUSS_PSF  EXTENDED_SOURCE_MODEL  PM_MODEL_GAUSS   20.0    TRUE
+ SERSIC_PSF  EXTENDED_SOURCE_MODEL  PM_MODEL_GAUSS   20.0    TRUE
+END
+
+# Extended source fit parameters
 EXTENDED_TEST                       METADATA
-  EXTENDED_SOURCE_FITS                BOOL  TRUE
   EXTENDED_SOURCE_SN_LIM              F32   20.0
   EXTENDED_SOURCE_PSF_CONVOLVED       BOOL  FALSE
+  EXTENDED_SOURCE_FITS                BOOL  TRUE
   EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
   EXTENDED_SOURCE_ISOPHOTAL           BOOL  TRUE
@@ -221,3 +238,4 @@
 PSF.FLUXSCALE.NY                    S32   5 		  # number cells to measure flux scale variations
 
-PSPHOT.CRNSIGMA.LIMIT               F32   3.0  # sources with crNsigma greater that this get tagged as likely cosmic rays
+PSPHOT.CR.NSIGMA.LIMIT              F32   3.0  # sources with crNsigma greater that this get tagged as likely cosmic rays
+PSPHOT.EXT.NSIGMA.LIMIT             F32   3.0  # sources with extNsigma greater that this get tagged as likely extended sources