Index: /trunk/ippconfig/isp/camera.config
===================================================================
--- /trunk/ippconfig/isp/camera.config	(revision 11329)
+++ /trunk/ippconfig/isp/camera.config	(revision 11330)
@@ -68,24 +68,22 @@
 
    ### 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        
-   PPARITH.INPUT      INPUT    none.fits                      NONE          NONE         NONE         IMAGE     FPA
+   TYPE               INPUT    FILENAME.RULE                  FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA DATA.LEVEL FILE.TYPE 
+   PPIMAGE.INPUT      INPUT    none.fits                      NONE          NONE         NONE         FPA        IMAGE     
+   PPIMAGE.BIAS       INPUT    @DETDB                         NONE          {CAMERA}     NONE         CHIP       IMAGE     
+   PPIMAGE.DARK       INPUT    @DETDB                         NONE          {CAMERA}     NONE         CHIP       IMAGE     
+   PPIMAGE.FLAT       INPUT    @DETDB                         NONE          {CAMERA}     NONE         CHIP       IMAGE     
+     PPIMAGE.MASK     INPUT    mask.fits                      NONE          NONE         NONE         CHIP       IMAGE     
+   # PPIMAGE.BIAS     INPUT    bias.fits                      NONE          NONE         NONE         CHIP       IMAGE     
+   # PPIMAGE.DARK     INPUT    dark.fits                      NONE          NONE         NONE         CHIP       IMAGE     
+   # PPIMAGE.SHUTTER  INPUT    shutter.fits                   NONE          NONE         NONE         CHIP	 IMAGE     
+   # PPIMAGE.FLAT     INPUT    flat.fits                      NONE          NONE         NONE         CHIP       IMAGE     
 
-   # XXX should we have a fallback option for these?
-   PPIMAGE.BIAS       INPUT    @DETDB                         NONE          {CAMERA}     NONE         IMAGE     CHIP       
-   PPIMAGE.DARK       INPUT    @DETDB                         NONE          {CAMERA}     NONE         IMAGE     CHIP       
-   PPIMAGE.FLAT       INPUT    @DETDB                         NONE          {CAMERA}     NONE         IMAGE     CHIP       
+   PPARITH.INPUT      INPUT    none.fits                      NONE          NONE         NONE         FPA	 IMAGE     
 
-     PPIMAGE.MASK     INPUT    mask.fits                      NONE          NONE         NONE         IMAGE     CHIP       
-   # PPIMAGE.BIAS     INPUT    bias.fits                      NONE          NONE         NONE         IMAGE     CHIP       
-   # PPIMAGE.DARK     INPUT    dark.fits                      NONE          NONE         NONE         IMAGE     CHIP       
-   # PPIMAGE.SHUTTER  INPUT    shutter.fits                   NONE          NONE         NONE         IMAGE     CHIP
-   # PPIMAGE.FLAT     INPUT    flat.fits                      NONE          NONE         NONE         IMAGE     CHIP       
+   PSPHOT.INPUT       INPUT    none.fits                      NONE          NONE         NONE         CHIP       IMAGE     
+   PSPHOT.PSF.LOAD    INPUT    none.psf                       NONE          NONE         NONE         CHIP	 PSF       
 
-   PSPHOT.INPUT       INPUT    none.fits                      NONE          NONE         NONE         IMAGE     CHIP       
-   PSPHOT.PSF.LOAD    INPUT    none.psf                       NONE          NONE         NONE         PSF       CHIP
-
-   PSASTRO.INPUT.CMP  INPUT    none.fits                      NONE          NONE         PHU          CMP       FPA       
-   PSASTRO.INPUT.CMF  INPUT    none.fits                      NONE          SMPDATA      PHU          CMF       FPA       
+   PSASTRO.INPUT.CMP  INPUT    none.fits                      NONE          NONE         PHU          FPA        CMP       
+   PSASTRO.INPUT.CMF  INPUT    none.fits                      NONE          SMPDATA      PHU          FPA        CMF       
 
    ### output file definitions
Index: /trunk/ippconfig/megacam/camera.config
===================================================================
--- /trunk/ippconfig/megacam/camera.config	(revision 11329)
+++ /trunk/ippconfig/megacam/camera.config	(revision 11330)
@@ -48,5 +48,4 @@
 END
 
-
 # move this elsewhere?  we need a lookup table to go from filter ID to abstract name
 FILTER.ID       METADATA
@@ -81,4 +80,15 @@
 END
 
+# convert supplied FPA.OBSTYPE values to abstract exptype names
+OBSTYPE.TABLE METADATA
+  bias 	   STR BIAS
+  zero 	   STR BIAS
+  dark 	   STR DARK
+  flat 	   STR SKYFLAT
+  skyflat  STR SKYFLAT
+  domeflat STR DOMEFLAT
+  object   STR OBJECT
+  science  STR OBJECT
+END
 
 # Recipe options
Index: /trunk/ippconfig/megacam_detrended/camera.config
===================================================================
--- /trunk/ippconfig/megacam_detrended/camera.config	(revision 11329)
+++ /trunk/ippconfig/megacam_detrended/camera.config	(revision 11330)
@@ -48,4 +48,36 @@
 END
 
+# move this elsewhere?  we need a lookup table to go from filter ID to abstract name
+FILTER.ID       METADATA
+   u.MP9301     STR u
+   g.MP9401     STR g
+   r.MP9601     STR r
+   i.MP9701     STR i
+   z.MP9801     STR z
+   Zp           STR z
+   Zprime       STR z
+   Ha.MP7605    STR Ha
+   Halpha       STR Ha
+   Haalpha.on   STR Ha
+   HaOFF.MP7604 STR HaOff
+
+   CN.MP780     STR CN
+   cn.MP7803    STR CN
+   CN.MP7803    STR CN
+
+   TiO.MP77     STR TiO
+   tio.MP7701   STR TiO
+   TiO.MP7701   STR TiO
+   NB920        STR NB920
+
+   B2F          STR B2F 
+   Bj           STR Bj  
+   Vj           STR Vj  
+   Rj           STR Rj  
+   Ij           STR Ij  
+   Hb           STR Hb  
+   HbOff        STR HbOff
+END
+
 # Recipe options
 RECIPES		METADATA
@@ -56,41 +88,50 @@
 FILERULES METADATA
    # filerule aliases: select the version you prefer for the given type
-   PSPHOT.OUTPUT      STR PSPHOT.OUTPUT.CMP
-   PSASTRO.INPUT      STR PSASTRO.INPUT.CMP
-   PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.MEF.CMF
+   PSPHOT.OUTPUT      STR PSPHOT.SPL.CMF
+   # PSPHOT.OUTPUT      STR PSPHOT.CMP
+
+   PSASTRO.INPUT      STR PSASTRO.SPL.CMF
+   PSASTRO.OUTPUT     STR PSASTRO.MEF.CMF
 
    ### input file definitions
    TYPE               INPUT FILENAME.RULE  FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA DATA.LEVEL FILE.TYPE
-   PPIMAGE.INPUT      INPUT @FILES         {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE    
-   PSPHOT.INPUT       INPUT @FILES         {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE    
-   PSASTRO.INPUT.CMP  INPUT @FILES         NONE          NONE         PHU          CHIP       CMP      
+   PPIMAGE.INPUT      INPUT none.fits      {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE    
+   PSPHOT.INPUT       INPUT none.fits      {CHIP.NAME}   {CELL.NAME}  NONE         CHIP       IMAGE    
+   PSPHOT.MASK        INPUT none.fits      NONE          NONE         NONE         FPA        MASK
+   PSPHOT.WEIGHT      INPUT none.fits      NONE          NONE         NONE         FPA        WEIGHT
+   PSPHOT.PSF         INPUT none.fits      NONE          NONE         NONE         FPA        PSF
+   PSPHOT.SRC         INPUT none.fits      NONE          NONE         NONE         CHIP       CMF
+   PSASTRO.INPUT.CMP  INPUT none.fits      NONE          NONE         NONE         CHIP       CMP      
+
    PSASTRO.INPUT.CMF  INPUT @FILES         NONE          SMPDATA      PHU          CHIP       CMF      
 
    ### output file definitions
-   TYPE                OUTPUT FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE EXTNAME.XTRA FILE.LEVEL DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT
-   PPIMAGE.OUTPUT      OUTPUT {OUTPUT}.{CHIP.NAME}.fit      NONE          NONE         NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fit   NONE   	  NONE         NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit    	    NONE   	  NONE         NONE         FPA        FPA        IMAGE     TRUE      SPLIT
-   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit    	    NONE   	  NONE         NONE         FPA        FPA        IMAGE     TRUE      SPLIT
+   TYPE                OUTPUT FILENAME.RULE                 FILENAME.XTRA EXTNAME.RULE 	 EXTNAME.XTRA 	 FILE.LEVEL DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT
+   PPIMAGE.OUTPUT      OUTPUT {OUTPUT}.{CHIP.NAME}.fit      NONE          NONE         	 NONE         	 CHIP       CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fit   NONE   	  NONE         	 NONE         	 CHIP       CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fit    	    NONE   	  NONE         	 NONE         	 FPA        FPA        IMAGE     TRUE      SPLIT
+   PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fit    	    NONE   	  NONE         	 NONE         	 FPA        FPA        IMAGE     TRUE      SPLIT
 
-   PPIMAGE.BIN1       OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit    NONE          NONE         NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.BIN2       OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit    NONE   	  NONE         NONE         CHIP       CHIP       IMAGE     TRUE      SPLIT
-   PPIMAGE.JPEG1      OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg    NONE   	  NONE         NONE         FPA        CHIP       JPEG      TRUE      SPLIT
-   PPIMAGE.JPEG2      OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg    NONE   	  NONE         NONE         FPA        CHIP       JPEG      TRUE      SPLIT
+   PPIMAGE.BIN1       OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fit    NONE          NONE         	 NONE         	 CHIP       CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.BIN2       OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fit    NONE   	  NONE         	 NONE         	 CHIP       CHIP       IMAGE     TRUE      SPLIT
+   PPIMAGE.JPEG1      OUTPUT {OUTPUT}.{CHIP.NAME}.b1.jpg    NONE   	  NONE         	 NONE         	 FPA        CHIP       JPEG      TRUE      SPLIT
+   PPIMAGE.JPEG2      OUTPUT {OUTPUT}.{CHIP.NAME}.b2.jpg    NONE   	  NONE         	 NONE         	 FPA        CHIP       JPEG      TRUE      SPLIT
 
-   PSPHOT.RESID       OUTPUT {OUTPUT}.res.fits             {CHIP.NAME}   {CELL.NAME}  {CELL.NAME}   CHIP       CHIP       IMAGE     TRUE      SPLICED
-   PSPHOT.BACKGND     OUTPUT {OUTPUT}.bck.fits             {CHIP.NAME}   {CELL.NAME}  {CELL.NAME}   CHIP       CHIP       IMAGE     TRUE      SPLICED
-   PSPHOT.BACKSUB     OUTPUT {OUTPUT}.sub.fits             {CHIP.NAME}   {CELL.NAME}  {CELL.NAME}   CHIP       CHIP       IMAGE     TRUE      SPLICED
-   PSPHOT.BACKMDL     OUTPUT {OUTPUT}.mdl.fits             {CHIP.NAME}   {CELL.NAME}  {CELL.NAME}   CHIP       CHIP       IMAGE     TRUE      SPLICED
+   PSPHOT.RESID       OUTPUT {OUTPUT}.res.fits             {CHIP.NAME}   {CELL.NAME}  	 {CELL.NAME}   	 CHIP       CHIP       IMAGE     TRUE      SPLICED
+   PSPHOT.BACKGND     OUTPUT {OUTPUT}.bck.fits             {CHIP.NAME}   {CELL.NAME}  	 {CELL.NAME}   	 CHIP       CHIP       IMAGE     TRUE      SPLICED
+   PSPHOT.BACKSUB     OUTPUT {OUTPUT}.sub.fits             {CHIP.NAME}   {CELL.NAME}  	 {CELL.NAME}   	 CHIP       CHIP       IMAGE     TRUE      SPLICED
+   PSPHOT.BACKMDL     OUTPUT {OUTPUT}.mdl.fits             {CHIP.NAME}   {CELL.NAME}  	 {CELL.NAME}   	 CHIP       CHIP       IMAGE     TRUE      SPLICED
 
-   PSPHOT.OUTPUT.RAW  OUTPUT {OUTPUT}.{CHIP.NAME}          NONE          NONE         PHU           CHIP       CHIP       RAW       TRUE      NONE
-   PSPHOT.OUTPUT.SX   OUTPUT {OUTPUT}.sx                   NONE          NONE         PHU           CHIP       CHIP       SX        TRUE      NONE
-   PSPHOT.OUTPUT.OBJ  OUTPUT {OUTPUT}.obj                  NONE          NONE         PHU           CHIP       CHIP       OBJ       TRUE      NONE
-   PSPHOT.OUTPUT.CMF  OUTPUT {OUTPUT}.cmf                  NONE          SMPDATA      PHU           CHIP       CHIP       CMF       TRUE      NONE
-   PSPHOT.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.{CELL.NAME}.cmp NONE   NONE         PHU           CELL       CELL       CMP       TRUE      NONE
+   # various options for saving the psphot output in different formats
+   PSPHOT.RAW  	      OUTPUT {OUTPUT}.{CHIP.NAME}          NONE          NONE         	 PHU           	 CHIP       CHIP       RAW       TRUE      NONE
+   PSPHOT.SX   	      OUTPUT {OUTPUT}.sx                   NONE          NONE         	 PHU           	 CHIP       CHIP       SX        TRUE      NONE
+   PSPHOT.OBJ  	      OUTPUT {OUTPUT}.obj                  NONE          NONE         	 PHU           	 CHIP       CHIP       OBJ       TRUE      NONE
+   PSPHOT.CMP         OUTPUT {OUTPUT}{CHIP.N}.cmp          NONE          NONE         	 PHU           	 CHIP       CHIP       CMP       TRUE      NONE
+   PSPHOT.SPL.CMF     OUTPUT {OUTPUT}{CHIP.N}.cmf          NONE          SMPDATA      	 {CHIP.NAME}   	 CHIP       CHIP       CMF       TRUE      NONE
+   PSPHOT.MEF.CMF     OUTPUT {OUTPUT}.cmf                  NONE          {CHIP.NAME}.cmf {CHIP.NAME}     FPA        CHIP       CMF       TRUE      NONE
 
-   PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.xmp      NONE          NONE         PHU           FPA        CHIP       CMP       TRUE      NONE
-   PSASTRO.OUTPUT.SPL.CMF OUTPUT {OUTPUT}.{CHIP.NAME}.xmp  NONE          SMPDATA      PHU           CHIP       CHIP       CMF       TRUE      NONE
-   PSASTRO.OUTPUT.MEF.CMF OUTPUT {OUTPUT}.xmp              NONE          {CHIP.NAME}.cmf {CHIP.NAME}.hdr FPA    CHIP       CMF       TRUE      NONE
+   PSASTRO.CMP        OUTPUT {OUTPUT}{CHIP.N}.xmp      	   NONE          NONE         	 PHU           	 CHIP       CHIP       CMP       TRUE      NONE
+   PSASTRO.SPL.CMF    OUTPUT {OUTPUT}{CHIP.N}.xmf      	   NONE          SMPDATA      	 PHU           	 CHIP       CHIP       CMF       TRUE      SPLIT
+   PSASTRO.MEF.CMF    OUTPUT {OUTPUT}.xmf             	   NONE          {CHIP.NAME}.cmf {CHIP.NAME}     FPA        CHIP       CMF       TRUE      SPLICED
 END
 
@@ -103,6 +144,2 @@
 
 # filename.xtra: used to carry arglist name (internal)
-
-# filename.xtra: used to define the JPEG colormap
-# extname.rule: used to define the JPEG scaling method
-# extname.xtra: used to carry arguments of JPEG scaling method
Index: /trunk/ippconfig/megacam_detrended/psphot.config
===================================================================
--- /trunk/ippconfig/megacam_detrended/psphot.config	(revision 11329)
+++ /trunk/ippconfig/megacam_detrended/psphot.config	(revision 11330)
@@ -3,5 +3,5 @@
 #SAVE.BACKGND	BOOL 	TRUE
 #SAVE.BACKSUB	BOOL 	TRUE
-SAVE.RESID	BOOL 	TRUE
+#SAVE.RESID	BOOL 	TRUE
 #SAVE.PSF	BOOL 	TRUE
 #LOAD.PSF	BOOL 	FALSE
@@ -20,5 +20,5 @@
 
 # image statistics parameters
-IMSTATS_NPIX        S32  10000    	 # number of pixels to use for sky estimate boxes:
+IMSTATS_NPIX        S32  1000    	 # number of pixels to use for sky estimate boxes:
 SKY_HISTOGRAM_BINS  F32  1
 SKY_STAT            STR  FITTED_MEAN_V2  # statistic used to measure background
Index: /trunk/ippconfig/recipes/psastro.config
===================================================================
--- /trunk/ippconfig/recipes/psastro.config	(revision 11329)
+++ /trunk/ippconfig/recipes/psastro.config	(revision 11330)
@@ -36,5 +36,5 @@
 PSASTRO.MIN.NSTAR      S32      3  # min fitted stars in solution
 
-MAG_MAX F32 18.0  ## XXX change name to PSASTRO.something?
+MAG_MAX F32 23.0  ## XXX change name to PSASTRO.something?
 
 # option may be MAX, MIN, or VALUE. for VALUE, look up 
Index: /trunk/ippconfig/recipes/psphot.config
===================================================================
--- /trunk/ippconfig/recipes/psphot.config	(revision 11329)
+++ /trunk/ippconfig/recipes/psphot.config	(revision 11330)
@@ -21,5 +21,5 @@
 SKY_FIT_ORDER       S32  0
 SKY_FIT_LINEAR      BOOL FALSE
-SKY_STAT            STR  FITTED_MEAN     # statistic used to measure background
+SKY_STAT            STR  FITTED_MEAN_V3  # statistic used to measure background
 # allowed values for SKY_STAT: 
 # SAMPLE_MEAN, SAMPLE_MEDIAN, CLIPPED_MEAN, ROBUST_MEAN, ROBUST_QUARTILE, FITTED_MEAN
@@ -30,14 +30,14 @@
 YMIN                F32   0        	 # minimum valid y-coord
 YMAX                F32   0        	 # maximum valid y-coord
-SATURATION          F32   64000     	 # saturation level on this chip
 
 # peak finding 
 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  10.0 	   	 # peak significance threshold
+PEAKS_NSIGMA_LIMIT  F32  25.0 	   	 # peak significance threshold
+PEAKS_NSIGMA_LIMIT_2 F32  5.0 	   	 # peak significance threshold
 
 # parameters to control the selection of the peak in the Sx,Sy plane
 MOMENTS_SCALE       F32   0.1
-MOMENTS_SN_MIN      F32   10.0
+MOMENTS_SN_MIN      F32   100.0           # min S/N to measure moments
 MOMENTS_SX_MAX      F32   3.0
 MOMENTS_SY_MAX      F32   3.0
@@ -82,5 +82,5 @@
 PSF_MIN_SN           F32  2.0		 # reject objects below this significance
 PSF_MAX_CHI          F32  50.0		 # reject objects worse that this
-FULL_FIT_SN_LIM      F32  10.0
+FULL_FIT_SN_LIM      F32  50.0
 
 # EXTended source model parameters
Index: /trunk/ippconfig/simple/camera.config
===================================================================
--- /trunk/ippconfig/simple/camera.config	(revision 11329)
+++ /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 11329)
+++ /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 11329)
+++ /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
