Index: trunk/ippconfig/simple/psphot.config
===================================================================
--- trunk/ippconfig/simple/psphot.config	(revision 9324)
+++ trunk/ippconfig/simple/psphot.config	(revision 10461)
@@ -1,90 +1,18 @@
 
-#SAVE.BACKMDL	BOOL 	TRUE
-#SAVE.BACKGND	BOOL 	TRUE
-#SAVE.BACKSUB	BOOL 	TRUE
-#SAVE.RESID	BOOL 	TRUE
-#SAVE.PSF	BOOL 	TRUE
-#LOAD.PSF	BOOL 	FALSE
-
-# image noise parameters
-RDNOISE             STR  HD:RDNOISE      # read-noise in electrons
-GAIN                STR  HD:GAIN         # electrons / DN
-ZERO_POINT          F32  25.000          # zero point used by DVO
-
-# background model : 
-BACKGROUND.XBIN	    S32   128
-BACKGROUND.YBIN	    S32   128
+SAVE.BACKMDL	BOOL 	TRUE
+SAVE.BACKGND	BOOL 	TRUE
+SAVE.BACKSUB	BOOL 	TRUE
+SAVE.RESID	BOOL 	FALSE
+SAVE.PSF	BOOL 	FALSE
+LOAD.PSF	BOOL 	FALSE
 
 # masking parameters
-XMIN                F32   2        	 # minimum valid x-coord
-XMAX                F32   -2        	 # maximum valid x-coord
-YMIN                F32   2        	 # minimum valid y-coord
-YMAX                F32   -2        	 # maximum valid y-coord
-SATURATION          F32  50000     	 # saturation level on this chip
-MIN_VALID_PIXEL     F32      1     	 # saturation level on this chip
+XMIN                F32   0        	 # minimum valid x-coord
+XMAX                F32   0        	 # maximum valid x-coord
+YMIN                F32   0        	 # minimum valid y-coord
+YMAX                F32   0        	 # maximum valid y-coord
 
-# image statistics parameters
-IMSTATS_NPIX        S32  1000    	 # number of pixels to use for sky estimate boxes:
-
-# peak finding 
-PEAKS_SMOOTH_SIGMA  F32  1.0       	 # smoothing kernel sigma in pixels
-PEAKS_SMOOTH_NSIGMA F32  3.0   	   	 # smoothing kernel width in sigmas
-PEAKS_NSIGMA_LIMIT  F32  25.0 	   	 # peak significance threshold
-
-# basic object statistics
-SKY_INNER_RADIUS    F32  15		 # square annulus for local sky measurement
-SKY_OUTER_RADIUS    F32  25		 # square annulus for local sky measurement
-PSF_MOMENTS_RADIUS  F32  3               # calculate initial source moments with this radius
-PSF_SN_LIM          F32  100             # minimum S/N for stars used for PSF model
-PSF_MAX_NSTARS      S32  300             # limit number of stars used for PSF model
-
-# PSF model parameters : choose the PSF model
-# list as many PSF_MODEL options as desired
-# PSF_MODEL           MULTI
-PSF_MODEL           STR  PS_MODEL_QGAUSS
-# PSF_MODEL           STR  PS_MODEL_GAUSS
-# PSF_MODEL           STR  PS_MODEL_PGAUSS
-# PSF_MODEL           STR  PS_MODEL_TGAUSS  ## not well tested, not very successful
-
-MOMENTS_SCALE       F32   0.1
-MOMENTS_SN_MIN      F32   30.0
-MOMENTS_SX_MAX      F32   3.0
-MOMENTS_SY_MAX      F32   3.0
-MOMENTS_AR_MAX      F32   1.5		 # maximum axial ratio: 1 / AR < (sx / sy) < AR
-
-PSF_FIT_RADIUS      F32  15.0	         # fitting radius for test PSF model
-PSF_REF_RADIUS      F32  35.0            # aperture magnitudes are scaled via 
-					 # curve-of-growth to this radius
-# PSF-like source model parameters
-PSF_FIT_NSIGMA       F32  1.0		 # significance for pixel included in fit
-PSF_FIT_PADDING      F32  5.0            # extra annulus to use for fit 
-PSF_SHAPE_NSIGMA     F32  3.0		 # max significance for shape variation
-PSF_MIN_SN           F32  2.0		 # reject objects below this significance
-PSF_MAX_CHI          F32  50.0		 # reject objects worse that this
-
-# EXTended source model parameters
-EXT_MODEL            STR  PS_MODEL_PGAUSS
-EXT_MIN_SN           F32  50.0           # fit galaxies above this S/N limit
-EXT_FIT_NSIGMA       F32  1		 # significance for pixel included in fit
-EXT_FIT_PADDING      F32  10             # extra annulus to use for fit 
-EXT_MOMENTS_RADIUS   F32  9
-
-FITMODE              STR  BLEND
-DEBLEND_PEAK_FRACTION   F32 0.1
-DEBLEND_SKY_NSIGMA      F32 10.0
-
-# APTREND 	     STR CONSTANT
-APTREND 	     STR  ALL
-# APTREND 	     STR  SKYSAT_XY_LIN
-# APTREND 	     STR  SKYSAT
-# APTREND 	     STR  SKYBIAS
-FULL_FIT_SN_LIM      F32  50.0
-AP_MIN_SN            F32  50.0
-
-# test options
-# BREAK_POINT         STR  PEAKS
-# PEAKS_OUTPUT_FILE   STR  peaks.dat
-# MOMENTS_OUTPUT_FILE STR  moments.dat
-# ANALYSIS_REGION     STR  [1000:1600,2800:3400]
-# POISSON_ERRORS      BOOL TRUE
-# SKY_BIAS            F32  0.0
+PSPHOT_TEST METADATA
+ SAVE.BACKSUB	BOOL 	FALSE
+ SAVE.RESID	BOOL 	TRUE
+END