Index: trunk/ippconfig/recipes/psphot.config
===================================================================
--- trunk/ippconfig/recipes/psphot.config	(revision 28422)
+++ trunk/ippconfig/recipes/psphot.config	(revision 29005)
@@ -90,5 +90,15 @@
 
 PSF_FIT_ITER                        S32   50              # Maximum number of fitting iterations for PSF
-PSF_FIT_TOL                         F32   0.01            # Fit tolerance for PSF
+PSF_FIT_MIN_TOL                     F32   0.01            # Fit tolerance for PSF
+PSF_FIT_MAX_TOL                     F32   2.00            # Fit tolerance for PSF
+
+PSF_FIT_MIN_VALID_FLUX              F32  -100000000.0     # minimum allow flux for fitted source
+PSF_FIT_MAX_VALID_FLUX              F32  +100000000.0     # maximum allow flux for fitted source
+
+# the following is used to require a minimum quality of fit before
+# stopping based on the tolerance.  be careful of using this in
+# conjunction with non-poisson errors (POISSON.ERRORS.LMM) or with
+# pooly determined errors
+PSF_FIT_MAX_CHISQ                   F32  20.00            # require chisq / DOF to reach this level before giving up
 
 # PSF model parameters : choose the PSF model
@@ -113,4 +123,5 @@
 PSF.FAKE.ALLOW                      BOOL  FALSE           # Allow use of fake PSFs when having trouble?
 
+PSF_FIT_RADIUS                      F32   15.0            # XXX this is now autoscaled
 PSF_REF_RADIUS                      F32   25.0            # aperture magnitudes are scaled via 
                                                           # curve-of-growth to this radius
@@ -138,5 +149,5 @@
  
 # this model is used for approximate subtraction in the main object analysis step
-EXT_MODEL                           STR   PS_MODEL_QGAUSS
+EXT_MODEL                           STR   PS_MODEL_SERSIC
 EXT_FIT_NSIGMA                      F32   1               # significance for pixel included in fit
 EXT_FIT_PADDING                     F32   5               # extra annulus to use for fit 
@@ -145,5 +156,12 @@
 
 EXT_FIT_ITER                        S32   20              # Maximum number of fitting iterations for EXT
-EXT_FIT_TOL                         F32   0.01            # Fit tolerance for EXT
+EXT_FIT_MIN_TOL                     F32   0.01            # Fit tolerance for EXT
+EXT_FIT_MAX_TOL                     F32   2.00            # Fit tolerance for EXT
+
+# the following is used to require a minimum quality of fit before
+# stopping based on the tolerance.  be careful of using this in
+# conjunction with non-poisson errors (POISSON.ERRORS.LMM) or with
+# pooly determined errors
+EXT_FIT_MAX_CHISQ                   F32  20.00            # require chisq / DOF to reach this level before giving up
 
 # extended source aperture-like measurements
@@ -224,5 +242,5 @@
 PCM_BOX_SIZE                        S32   8
 
-NOISE.FACTOR                        F32   5.0
+NOISE.FACTOR                        F32  10.0
 NOISE.SIZE                          F32   2.0
 
@@ -343,5 +361,4 @@
   DIFF_STATS			    BOOL TRUE	       # Calculate diff-specific stats
   OUTPUT.FORMAT		            STR  PS1_DV1       # Format of output file
-
 END