Index: trunk/ippconfig/simple/camera.config
===================================================================
--- trunk/ippconfig/simple/camera.config	(revision 11123)
+++ trunk/ippconfig/simple/camera.config	(revision 11330)
@@ -57,24 +57,23 @@
    PSASTRO.INPUT      STR PSASTRO.INPUT.CMP
    PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.CMP
-   PSPHOT.OUTPUT      STR PSPHOT.OUTPUT.RAW
+   PSPHOT.OUTPUT      STR PSPHOT.OUTPUT.CMF
 
    ### input file definitions
-   TYPE               INPUT    FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.TYPE DATA.LEVEL 
-   PPIMAGE.INPUT      INPUT    none.fits                     NONE          NONE         NONE         IMAGE     FPA        
-   PSWARP.INPUT       INPUT    none.fits                     NONE          NONE         NONE         IMAGE     FPA        
-   PSWARP.SKYCELL     INPUT    none.fits                     NONE          NONE         NONE         IMAGE     FPA        
-
-   PPIMAGE.BIAS       INPUT    @DETDB                        NONE         fpa           NONE         IMAGE     CHIP       
-   PPIMAGE.DARK       INPUT    @DETDB                        NONE         fpa           NONE         IMAGE     CHIP       
-   PPIMAGE.FLAT       INPUT    @DETDB                        NONE         fpa           NONE         IMAGE     CHIP       
-   PPIMAGE.MASK       INPUT    @DETDB                        NONE         fpa           NONE         IMAGE     CHIP       
-
-   PSPHOT.INPUT       INPUT    none.fits                     NONE          NONE         NONE         IMAGE     CHIP       
-   PSWARP.INPUT       INPUT    none.fits                     NONE          NONE         NONE         IMAGE     FPA        
-   PSWARP.SKYCELL     INPUT    none.fits                     NONE          NONE         NONE         IMAGE     FPA        
-
-   PSASTRO.INPUT.CMP  INPUT    none.fits                     NONE          NONE         PHU          CMP       CHIP       
-   PSASTRO.INPUT.CMF  INPUT    none.fits                     NONE          SMPDATA      PHU          CMF       CHIP       
-   PSPHOT.PSF.LOAD    INPUT   {OUTPUT}.psf                   NONE          NONE         NONE         PSF       CHIP
+   TYPE               INPUT    FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA DATA.LEVEL FILE.TYPE 
+   PPIMAGE.INPUT      INPUT    none.fits                     NONE          NONE         NONE         FPA        IMAGE     
+   INPUT.MASK         INPUT    none.fits                     NONE          NONE         NONE         FPA        MASK      
+   INPUT.WEIGHT       INPUT    none.fits                     NONE          NONE         NONE         FPA        WEIGHT    
+   INPUT.PSF          INPUT    none.fits                     NONE          NONE         NONE         READOUT	PSF       
+   INPUT.SRC          INPUT    none.fits                     NONE          SMPDATA      PHU          READOUT	CMF       
+   PPIMAGE.BIAS       INPUT    @DETDB                        NONE         fpa           NONE         CHIP       IMAGE     
+   PPIMAGE.DARK       INPUT    @DETDB                        NONE         fpa           NONE         CHIP       IMAGE     
+   PPIMAGE.FLAT       INPUT    @DETDB                        NONE         fpa           NONE         CHIP       IMAGE     
+   PPIMAGE.MASK       INPUT    @DETDB                        NONE         fpa           NONE         CHIP       IMAGE     
+   PSPHOT.INPUT       INPUT    none.fits                     NONE          NONE         NONE         CHIP       IMAGE     
+   PSWARP.INPUT       INPUT    none.fits                     NONE          NONE         NONE         FPA        IMAGE     
+   PSWARP.SKYCELL     INPUT    none.fits                     NONE          NONE         NONE         FPA        IMAGE     
+   PSASTRO.INPUT.CMP  INPUT    none.fits                     NONE          NONE         PHU          CHIP       CMP       
+   PSASTRO.INPUT.CMF  INPUT    none.fits                     NONE          SMPDATA      PHU          CHIP       CMF       
+   PSPHOT.PSF.LOAD    INPUT   {OUTPUT}.psf                   NONE          NONE         NONE         CHIP	PSF       
 
    ### output file definitions
@@ -109,6 +108,4 @@
 
    PSASTRO.OUTPUT.CMP  OUTPUT   {OUTPUT}.smp       NONE          NONE         NONE         CMP       FPA       	FPA        TRUE      NONE
-
-   PSWARP.OUTPUT       OUTPUT   {OUTPUT}.fits      NONE   	 NONE         NONE         IMAGE     FPA        FPA        TRUE      NONE
 END
 
Index: trunk/ippconfig/simple/format.config
===================================================================
--- trunk/ippconfig/simple/format.config	(revision 11123)
+++ trunk/ippconfig/simple/format.config	(revision 11330)
@@ -41,8 +41,7 @@
 	FPA.DEC		STR	DEC
 	FPA.OBJECT	STR	OBJECT
-	FPA.TIME	STR	DATE-OBS TIME-OBS	# Date and time
+#	FPA.TIME	STR	DATE-OBS TIME-OBS	# Date and time
 	CELL.EXPOSURE	STR	EXPTIME
 	CELL.DARKTIME	STR	DARKTIME
-	CELL.TIME	STR	DATE-OBS TIME-OBS	# Date and time
 #	CELL.TIME	STR	DATE-OBS TIME-OBS	# Date and time
 	CELL.XBIN	STR	CCDSUM
@@ -56,6 +55,8 @@
 	CELL.GAIN	F32	1.0
 	CELL.READNOISE	F32	2.0
-	CELL.SATURATION	F32	65535
-	CELL.BAD	F32	-65535
+	CELL.SATURATION	F32	46000
+	CELL.BAD	F32	0
+#	CELL.SATURATION	F32	65535
+#	CELL.BAD	F32	-65535
 	CELL.READDIR	S32	1
 	CELL.TIMESYS	STR	UTC
Index: trunk/ippconfig/simple/psphot.config
===================================================================
--- trunk/ippconfig/simple/psphot.config	(revision 11123)
+++ trunk/ippconfig/simple/psphot.config	(revision 11330)
@@ -5,12 +5,8 @@
 SAVE.PLOTS      BOOL    TRUE
 SAVE.RESID	BOOL 	TRUE
-SAVE.PSF	BOOL 	FALSE
+SAVE.PSF	BOOL 	TRUE
 LOAD.PSF	BOOL 	FALSE
 
-# masking parameters
-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
+IMSTATS_NPIX        S32  3000    	 # number of pixels to use for sky estimate boxes:
 
 PSPHOT_TEST METADATA
@@ -18,2 +14,11 @@
  SAVE.RESID	BOOL 	TRUE
 END
+
+PEAKS_OUTPUT_FILE   STR  peaks.dat
+MOMENTS_OUTPUT_FILE STR  moments.dat
+
+MOMENTS_SN_MIN      F32  20.0           # min S/N to measure moments
+FULL_FIT_SN_LIM     F32  100.0
+EXT_MIN_SN          F32  100.0           # fit galaxies above this S/N limit
+
+PEAKS_NSIGMA_LIMIT  F32  10.0 	   	 # peak significance threshold