Index: trunk/ippconfig/gpc1/psphot.config
===================================================================
--- trunk/ippconfig/gpc1/psphot.config	(revision 25475)
+++ trunk/ippconfig/gpc1/psphot.config	(revision 25756)
@@ -1,56 +1,31 @@
 
-# turn these on to see specific outputs
-SAVE.OUTPUT	BOOL 	TRUE
-SAVE.BACKMDL	BOOL 	TRUE
-SAVE.PSF	BOOL 	TRUE
-SAVE.PLOTS     	BOOL    TRUE
+BACKGROUND.XBIN	                    S32   256           # size of background superpixels
+BACKGROUND.YBIN	                    S32   256           # size of background superpixels
 
-# for testing:
-# BREAK_POINT STR BACKMDL
+SOFTEN.VARIANCE                     BOOL  TRUE          # XXX drop? soften the errors for bright pixels
+SOFTEN.VARIANCE.FRACTION            F32   0.005
 
-BACKGROUND.XBIN	    S32  256            # size of background superpixels
-BACKGROUND.YBIN	    S32  256            # size of background superpixels
+PEAKS_SMOOTH_SIGMA                  F32   2.5           # smoothing kernel sigma in pixels
 
-# image background parameters
-IMSTATS_NPIX        S32  10000    	 # number of pixels to use for sky estimate boxes:
-SKY_STAT            STR  FITTED_MEAN_V4  # statistic used to measure background
-SKY_CLIP_SIGMA      F32  2.0             # statistic used to measure background
+PSF_CLUMP_NX                        S32   3             # subdivide image in to NX x NY regions for 
+PSF_CLUMP_NY                        S32   3             # selecting PSF stars
+PSF_CLUMP_GRID_SCALE                F32   2.5		# XXX too large? size of Sx,Sy image pixel
 
-PEAKS_SMOOTH_SIGMA  F32   2.5            # smoothing kernel sigma in pixels
-PEAKS_NMAX          S32   5000           # on first pass, only keep NMAX peaks (0 == all)
-PEAKS_NSIGMA_LIMIT  F32   25.0           # peak significance threshold
-PEAKS_NSIGMA_LIMIT_2 F32   5.0           # peak significance threshold
-
-PSF_SN_LIM          F32  25              # minimum S/N for stars used for PSF model
-PSF_MAX_NSTARS      S32  300             # limit number of stars used for PSF model
-PSF_CLUMP_NX        S32   3               # subdivide image in to NX x NY regions for 
-PSF_CLUMP_NY        S32   3               # selecting PSF stars
-PSF_MOMENTS_RADIUS  F32  12               # calculate initial source moments with this radius
-PSF_CLUMP_GRID_SCALE F32 2.5		# size of Sx,Sy image pixel
-
-PSF.RESIDUALS       BOOL  TRUE            # generate the residuals?
+PSF.RESIDUALS.RADIUS   		    F32   9.0           # keep this pixel if residual is more significant than this
+PSF.RESIDUALS.SPATIAL_ORDER 	    S32   1             # fit spatial variations of the residuals at this order (0,1)
 
 # PSF model parameters : choose the PSF model desired
-PSF_MODEL           STR  PS_MODEL_PS1_V1
-PSPHOT.CR.NSIGMA.SOFTEN             F32   0.0025            # Softening parameter for weights
+PSF_MODEL              	 	    STR   PS_MODEL_PS1_V1
+PSPHOT.CR.NSIGMA.SOFTEN             F32   0.0025        # Softening parameter for weights in CR stat
 
-PSF.TREND.MODE                      STR   MAP # other options: POLY_CHEB, POLY_ORD
 PSF.TREND.NX                        S32   3
 PSF.TREND.NY                        S32   3
 
-EXT_MIN_SN           F32  50.0           # fit galaxies above this S/N limit
-FULL_FIT_SN_LIM      F32  25.0
-MOMENTS_SN_MIN      F32    5.0
-AP_MIN_SN            F32   5.0
+# rename NONLINEAR_FIT_SN_LIM?
+FULL_FIT_SN_LIM      		    F32   25.0
 
-OUTPUT.FORMAT        STR  PS1_V2
+APTREND.ORDER.MAX    		    S32   3
 
-PSF_SHAPE_NSIGMA     F32  3.0		 # max significance for shape variation
-PSF_MAX_CHI          F32  50.0		 # reject objects worse that this
-
-MEASURE.APTREND      BOOL TRUE           ### XXX for now, skip this (too many errors)
-APTREND.ORDER.MAX    S32  3
-
-DIAGNOSTIC.PLOTS                    METADATA
+DIAGNOSTIC.PLOTS METADATA
   IMAGE.BACKGROUND.CELL.HISTOGRAM   BOOL  FALSE
   IMAGE.BACKGROUND.CELL.HISTOGRAM.X S32   32
@@ -58,8 +33,6 @@
 END
 
-USE_FOOTPRINTS                      BOOL  TRUE       	  # use new pmFootprint peak packaging
-
-DIFF	METADATA
-	BACKGROUND.XBIN	    S32  32            # size of background superpixels
-	BACKGROUND.YBIN	    S32  32            # size of background superpixels
+DIFF METADATA
+  BACKGROUND.XBIN		    S32  32            # size of background superpixels
+  BACKGROUND.YBIN	    	    S32  32            # size of background superpixels
 END