Index: /branches/eam_branches/20090715/ippconfig/recipes/psphot.config
===================================================================
--- /branches/eam_branches/20090715/ippconfig/recipes/psphot.config	(revision 25656)
+++ /branches/eam_branches/20090715/ippconfig/recipes/psphot.config	(revision 25657)
@@ -15,5 +15,5 @@
 
 # the zero point is used to set a basic scale for DVO
-ZERO_PT                             F32   25.000          # zero point used by DVO
+ZERO_PT                             F32   25.000          # zero point used by DVO XXX deprecate this
 
 # these parameter govern how the background is measured
@@ -45,8 +45,23 @@
 PEAKS_SMOOTH_SIGMA                  F32   1.0             # smoothing kernel sigma in pixels
 PEAKS_SMOOTH_NSIGMA                 F32   2.0             # smoothing kernel width in sigmas
-PEAKS_NSIGMA_LIMIT                  F32   25.0            # peak significance threshold
+PEAKS_NSIGMA_LIMIT                  F32   20.0            # peak significance threshold
 PEAKS_NSIGMA_LIMIT_2                F32   5.0             # peak significance threshold
-PEAKS_NMAX                          S32   0               # on first pass, only keep NMAX peaks (0 == all)
-PEAKS_MIN_GAUSS                     F32   0.5             # Minimum valid fraction of kernel
+PEAKS_NMAX                          S32   5000            # on first pass, only keep NMAX peaks (0 == all)
+PEAKS_MIN_GAUSS                     F32   0.5             # On quick convolution, mask pixels for which the 
+				    	  		  # input pixels contribute less than this fraction of the flux
+# parameters which adjust the footprint analysis
+USE_FOOTPRINTS                      BOOL  TRUE       	  # use new pmFootprint peak packaging
+FOOTPRINT_NPIXMIN                   S32   5       	  # Minimum size of a pmFootprint
+FOOTPRINT_NSIGMA_LIMIT              F32   20      	  # threshold for bright pmFootprint detection
+FOOTPRINT_NSIGMA_LIMIT_2            F32   4       	  # threshold for faint pmFootprint detection
+FOOTPRINT_GROW_RADIUS               S32   3       	  # How much to grow bright footprints
+FOOTPRINT_GROW_RADIUS_2             S32   5       	  # How much to grow faint footprints
+FOOTPRINT_CULL_NSIGMA_DELTA         F32   4       	  # Cull peaks that aren't nsigma above coll to neighbour
+FOOTPRINT_CULL_NSIGMA_MIN           F32   1       	  # Minimum height of colls in units of skyStdev
+FOOTPRINT_CULL_NSIGMA_PAD           F32   0.01       	  # Fractional Padding for stdev
+
+# parameter for the simple deblending
+DEBLEND_PEAK_FRACTION               F32   0.1
+DEBLEND_SKY_NSIGMA                  F32   10.0
 
 # parameters to control the selection of the peak in the Sx,Sy plane
@@ -176,8 +191,4 @@
 PETROSIAN_FLUX_RATIO                F32    0.1 # we measure out to where flux = R0 * FLUX_RATIO
 
-FITMODE                             STR   BLEND  
-DEBLEND_PEAK_FRACTION               F32   0.1
-DEBLEND_SKY_NSIGMA                  F32   10.0
-
 # APTREND                           STR   NONE, CONSTANT, SKYBIAS, SKYSAT, XY_LIN, SKY_XY_LIN, SKYSAT_XY_LIN, ALL
 MEASURE.APTREND	                    BOOL  TRUE
@@ -211,14 +222,4 @@
 NOISE.FACTOR                        F32   5.0
 NOISE.SIZE                          F32   2.0
-
-USE_FOOTPRINTS                      BOOL  TRUE       	  # use new pmFootprint peak packaging
-FOOTPRINT_NPIXMIN                   S32   5       	  # Minimum size of a pmFootprint
-FOOTPRINT_NSIGMA_LIMIT              F32   20      	  # threshold for bright pmFootprint detection
-FOOTPRINT_NSIGMA_LIMIT_2            F32   4       	  # threshold for faint pmFootprint detection
-FOOTPRINT_GROW_RADIUS               S32   3       	  # How much to grow bright footprints
-FOOTPRINT_GROW_RADIUS_2             S32   5       	  # How much to grow faint footprints
-FOOTPRINT_CULL_NSIGMA_DELTA         F32   4       	  # Cull peaks that aren't nsigma above coll to neighbour
-FOOTPRINT_CULL_NSIGMA_MIN           F32   1       	  # Minimum height of colls in units of skyStdev
-FOOTPRINT_CULL_NSIGMA_PAD           F32   0.01       	  # Fractional Padding for stdev
 
 # alternate PSPHOT-type recipes