Index: /branches/eam_branches/ipp-20130904/ippconfig/recipes/psphot.config
===================================================================
--- /branches/eam_branches/ipp-20130904/ippconfig/recipes/psphot.config	(revision 36345)
+++ /branches/eam_branches/ipp-20130904/ippconfig/recipes/psphot.config	(revision 36346)
@@ -189,12 +189,10 @@
 
 # extended source aperture-like measurements
-EXTENDED_SOURCE_ANALYSIS            BOOL  FALSE  # perform any of the aperture-like measurements?
+EXTENDED_SOURCE_PETROSIAN           BOOL  FALSE
+EXTENDED_SOURCE_RAW_RADIUS          BOOL  FALSE  # use circular (T) or elliptical (F) contours for petrosians?
 EXTENDED_SOURCE_SN_LIM              F32   20.0
-EXTENDED_SOURCE_RAW_RADIUS          BOOL  FALSE
-EXTENDED_SOURCE_PETROSIAN           BOOL  FALSE
-EXTENDED_SOURCE_ISOPHOTAL           BOOL  FALSE
-EXTENDED_SOURCE_ANNULI              BOOL  FALSE
-EXTENDED_SOURCE_KRON                BOOL  FALSE
-PETROSIAN_FOR_STARS                 BOOL  FALSE
+EXT.NSIGMA.LIMIT.USE                BOOL  TRUE
+EXT.FIT.MIN.GAL.LIMIT               F32   10.0
+EXT.FIT.MIN.GAL.LIMIT.USE           BOOL  FALSE
 
 KRON_ITERATIONS                     S32   2
@@ -411,4 +409,15 @@
 END
 
+EXT.ANALYSIS.MAG.LIMITS METADATA
+    TYPE  DATA FILTER.ID MAG.LIMIT
+    gband DATA g         20.0            
+    rband DATA r         20.0       	 
+    iband DATA i         20.0		 
+    zband DATA z         20.0		 
+    yband DATA y         20.0		 
+    wband DATA w         20.0		 
+    other DATA any       20.0		 
+END
+
 # if true keep all matched sources, even if we get a non-finite aperture flux measurement
 PSPHOT.STACK.KEEP.BAD.MATCHES  BOOL     F
@@ -640,10 +649,18 @@
   # Extended source fit parameters
   # these models are used for high-quality shape analysis after all sources have been removed
+  SAVE.RESID BOOL T
+
   EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform the detailed extended sourc fits?
   EXT_MODEL                           STR   PS_MODEL_QGAUSS
+  PSF_MODEL                           STR   PS_MODEL_PS1_V1
 
   LMM_FIT_CHISQ_CONVERGENCE           BOOL  FALSE           # use the (old) chisq convergence or the new parameter one 
   LMM_FIT_GAIN_FACTOR_MODE            S32   2               # there are 3 options to determine the gain factor (0,1,2)
   EXT_FIT_MIN_TOL                     F32   0.1             # Fit tolerance for EXT
+
+  # XXX these are only needed if we want to get perfect fits of the synthetic data
+  PSF_FIT_RADIUS_SCALE         F32   3.75
+  EXT_FIT_NSIGMA_CONV          F32   11
+  PSF.RESIDUALS BOOL F
 
   # if this is defined, it gives a list of the model names to fit below (ALL or NONE are also valid)