Index: /trunk/ippconfig/recipes/psphot.config
===================================================================
--- /trunk/ippconfig/recipes/psphot.config	(revision 17396)
+++ /trunk/ippconfig/recipes/psphot.config	(revision 17397)
@@ -107,5 +107,5 @@
 PSF.RESIDUALS.PIX.SN                F32   0.0             # keep this pixel if residual is more significant than this
  
-# EXTended source model parameters
+# 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
@@ -114,8 +114,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,13 +123,37 @@
 
 # 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  PS_MODEL_GAUSS    20.0    FALSE
+ #PGAUSS_RAW  EXTENDED_SOURCE_MODEL  PS_MODEL_PGAUSS   20.0    FALSE
+ #QGAUSS_RAW  EXTENDED_SOURCE_MODEL   PS_MODEL_QGAUSS   20.0    FALSE
+ #SERSIC_RAW  EXTENDED_SOURCE_MODEL   PS_MODEL_SERSIC   20.0    FALSE
+ #GAUSS_PSF   EXTENDED_SOURCE_MODEL  PS_MODEL_GAUSS    20.0    TRUE
+ #PGAUSS_PSF  EXTENDED_SOURCE_MODEL  PS_MODEL_PGAUSS   20.0    TRUE
+ #QGAUSS_PSF  EXTENDED_SOURCE_MODEL  PS_MODEL_QGAUSS   20.0    TRUE
+ SERSIC_PSF  EXTENDED_SOURCE_MODEL  PS_MODEL_SERSIC   20.0    TRUE
+END
+
+# define the annuli (in pixels) for surface brightness measurements
+@RADIAL.ANNULAR.BINS.LOWER           F32     0.0   5.0  10.0  20.0  40.0  80.0
+@RADIAL.ANNULAR.BINS.UPPER           F32     5.0  10.0  20.0  40.0  80.0 160.0
+
+# Extended source fit parameters
 EXTENDED_TEST                       METADATA
-  EXTENDED_SOURCE_FITS                BOOL  TRUE
+  EXTENDED_SOURCE_ANALYSIS            BOOL  TRUE  # perform any of the aperture-like measurements?
   EXTENDED_SOURCE_SN_LIM              F32   20.0
-  EXTENDED_SOURCE_PSF_CONVOLVED       BOOL  FALSE
   EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
   EXTENDED_SOURCE_ISOPHOTAL           BOOL  TRUE
   EXTENDED_SOURCE_ANNULI              BOOL  TRUE
-  EXTENDED_SOURCE_KRON                BOOL  TRUE
-END
+  EXTENDED_SOURCE_KRON                BOOL  FALSE
+END
+
+ISOPHOTAL_FLUX                      F32   20.0
+PETROSIAN_R0                        F32    5.0 # reference radius in pixels
+PETROSIAN_FLUX_RATIO                F32    0.1 # we measure out to where flux = R0 * FLUX_RATIO
 
 FITMODE                             STR   BLEND  
@@ -164,5 +187,5 @@
 POISSON.ERRORS.PARAMS               BOOL  TRUE
 
-PCM_BOX_SIZE                        S32   2
+PCM_BOX_SIZE                        S32   8
 
 OUTPUT.FORMAT                       STR   SMPDATA     
@@ -221,3 +244,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   4.0  # sources with extNsigma greater that this get tagged as likely extended sources