Index: /trunk/ippconfig/cfh12k/psphot.config
===================================================================
--- /trunk/ippconfig/cfh12k/psphot.config	(revision 12722)
+++ /trunk/ippconfig/cfh12k/psphot.config	(revision 12723)
@@ -1,8 +1,9 @@
 
 # turn these on to see specific outputs
-#SAVE.BACKMDL	BOOL 	TRUE
+SAVE.OUTPUT	BOOL 	TRUE
+SAVE.BACKMDL	BOOL 	TRUE
 SAVE.BACKGND	BOOL 	TRUE
 #SAVE.BACKSUB	BOOL 	TRUE
-SAVE.RESID	BOOL 	TRUE
+#SAVE.RESID	BOOL 	TRUE
 #SAVE.PSF	BOOL 	TRUE
 #LOAD.PSF	BOOL 	FALSE
@@ -11,17 +12,17 @@
 BACKGROUND.YBIN	    S32   64            # size of background superpixels
 
+# image background parameters
 IMSTATS_NPIX        S32  5000    	 # number of pixels to use for sky estimate boxes:
+SKY_STAT            STR  FITTED_MEAN_V3  # statistic used to measure background
+SKY_CLIP_SIGMA    F32  2.0             # statistic used to measure background
+
+# SAMPLE_MEAN, SAMPLE_MEDIAN, CLIPPED_MEAN, ROBUST_MEAN, ROBUST_QUARTILE, FITTED_MEAN
+# FITTED_MEAN_V2, FITTED_MEAN_V3
 
 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
-# if you want to list multiple entries, uncomment 'MULTI' here
-# PSF_MODEL           MULTI
+# PSF model parameters : choose the PSF model desired
 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_SN_MIN      F32  20.0           # min S/N to measure moments
@@ -30,16 +31,4 @@
 AP_MIN_SN            F32  25.0
 
-# SKY_STAT            STR  ROBUST_MEDIAN  # statistic used to measure background
-SKY_STAT            STR  FITTED_MEAN_V3  # statistic used to measure background
-# SAMPLE_MEAN, SAMPLE_MEDIAN, CLIPPED_MEAN, ROBUST_MEAN, ROBUST_QUARTILE, FITTED_MEAN
-# FITTED_MEAN_V2, FITTED_MEAN_V3
-SKY_CLIP_SIGMA    F32  2.0             # statistic used to measure background
-
-# masking parameters (XXX EAM : rework this to use psRegion like ANALYSIS_REGION)
-XMIN                F32      8        	 # maximum valid x-coord
-XMAX                F32   2047        	 # maximum valid x-coord
-YMIN                F32     12        	 # maximum valid y-coord
-YMAX                F32   4095        	 # maximum valid y-coord
-
 # BREAK_POINT may be one of (PEAKS, MOMENTS, PSFMODEL, ENSEMBLE)
 BREAK_POINT         STR ENSEMBLE
@@ -47,2 +36,8 @@
 # OUTPUT.FORMAT       STR SMPDATA
 OUTPUT.FORMAT       STR PS1_DEV_0
+
+# masking parameters (XXX EAM : rework this to use psRegion like ANALYSIS_REGION)
+XMIN                F32   +10        	 # minimum valid x-coord
+XMAX                F32   -10        	 # maximum valid x-coord
+YMIN                F32   +10        	 # minimum valid y-coord
+YMAX                F32   -10        	 # maximum valid y-coord
Index: /trunk/ippconfig/megacam/psastro.config
===================================================================
--- /trunk/ippconfig/megacam/psastro.config	(revision 12722)
+++ /trunk/ippconfig/megacam/psastro.config	(revision 12723)
@@ -3,11 +3,14 @@
 
 # nominal plate scale (microns / pixel)
-PSASTRO.PIXEL.SCALE    F32  13.5
+PSASTRO.PIXEL.SCALE    F32  1.0
 
 # pmAstromGridAngle
 # max grid offset in FP units (microns)
 # use plate-scale to make this in pixels?
-PSASTRO.GRID.OFFSET    F32   10000.
-PSASTRO.GRID.SCALE     F32     500
+PSASTRO.GRID.OFFSET    F32    200.
+PSASTRO.GRID.SCALE     F32     15.
+
+# XXX Test for taurus
+PSASTRO.GRID.MIN.SIGMA F32  3.0
 
 # these tweak are in FP units (pixels, currently)
@@ -16,2 +19,8 @@
 PSASTRO.TWEAK.SMOOTH    F32      2
 PSASTRO.TWEAK.NSIGMA    F32      3
+
+DVO.CATDIR STR /data/alala.0/ipp/ippRefs/catdir.2mass
+PSASTRO.MOSAIC.MAX.ERROR.N0 F32    0.50 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N1 F32    0.05 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.RADIUS.N1    F32    3
+PSASTRO.MOSAIC.RADIUS.N2    F32    1
Index: /trunk/ippconfig/megacam/psphot.config
===================================================================
--- /trunk/ippconfig/megacam/psphot.config	(revision 12722)
+++ /trunk/ippconfig/megacam/psphot.config	(revision 12723)
@@ -1,30 +1,25 @@
 
+# turn these on to see specific outputs
+# SAVE.OUTPUT	BOOL 	FALSE
 SAVE.BACKMDL	BOOL 	TRUE
-SAVE.BACKGND	BOOL 	TRUE
-SAVE.BACKSUB	BOOL 	TRUE
-#SAVE.RESID	BOOL 	TRUE
+#SAVE.BACKGND	BOOL 	TRUE
+#SAVE.BACKSUB	BOOL 	TRUE
+SAVE.RESID	BOOL 	TRUE
 #SAVE.PSF	BOOL 	TRUE
 #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
+BACKGROUND.XBIN	    S32  128            # size of background superpixels
+BACKGROUND.YBIN	    S32  128            # size of background superpixels
 
-# image statistics parameters
-IMSTATS_NPIX        S32  3000    	 # number of pixels to use for sky estimate boxes:
+# image background parameters
+IMSTATS_NPIX        S32  10000    	 # number of pixels to use for sky estimate boxes:
+SKY_STAT            STR  FITTED_MEAN_V3  # statistic used to measure background
+SKY_CLIP_SIGMA      F32  2.0             # statistic used to measure background
 
 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
-# if you want to list multiple entries, uncomment 'MULTI' here
-# PSF_MODEL           MULTI
+# PSF model parameters : choose the PSF model desired
 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_SN_MIN      F32   30.0
@@ -33,3 +28,8 @@
 AP_MIN_SN            F32  50.0
 
-SKY_STAT            STR  SAMPLE_MEDIAN  # statistic used to measure background
+# OUTPUT.FORMAT       STR SMPDATA
+OUTPUT.FORMAT       STR PS1_DEV_0
+
+PSF_SHAPE_NSIGMA     F32  3.0		 # max significance for shape variation
+PSF_MAX_CHI          F32  50.0		 # reject objects worse that this
+
Index: /trunk/ippconfig/recipes/psastro.config
===================================================================
--- /trunk/ippconfig/recipes/psastro.config	(revision 12722)
+++ /trunk/ippconfig/recipes/psastro.config	(revision 12723)
@@ -55,5 +55,6 @@
 PSASTRO.MOSAIC.CHIP.NSIGMA    F32      3  # fit clipping sigmas
 
-PSASTRO.MOSAIC.MAX.ERROR      F32      1.5 # max allow error for valid solution (UNITS?)
+PSASTRO.MOSAIC.MAX.ERROR.N0   F32      1.5 # max allow error for valid solution (UNITS?)
+PSASTRO.MOSAIC.MAX.ERROR.N1   F32      1.5 # max allow error for valid solution (UNITS?)
 PSASTRO.MOSAIC.MIN.NSTAR      S32      6   # min fitted stars in solution
 
Index: /trunk/ippconfig/recipes/psphot.config
===================================================================
--- /trunk/ippconfig/recipes/psphot.config	(revision 12722)
+++ /trunk/ippconfig/recipes/psphot.config	(revision 12723)
@@ -105,5 +105,5 @@
 # BREAK_POINT may be one of (PEAKS, MOMENTS, PSFMODEL, ENSEMBLE)
 BREAK_POINT           STR  NONE
-# PEAKS_OUTPUT_FILE   STR  peaks.dat
+PEAKS_OUTPUT_FILE   STR  peaks.dat
 # MOMENTS_OUTPUT_FILE STR  moments.dat
 # ANALYSIS_REGION     STR  [1000:1600,2800:3400]
@@ -120,2 +120,4 @@
 
 OUTPUT.FORMAT       STR SMPDATA
+NOISE.FACTOR        F32 5.0
+NOISE.SIZE          F32 2.0
Index: /trunk/ippconfig/recipes/pswarp.config
===================================================================
--- /trunk/ippconfig/recipes/pswarp.config	(revision 12723)
+++ /trunk/ippconfig/recipes/pswarp.config	(revision 12723)
@@ -0,0 +1,4 @@
+
+GRID.NX S32 128
+GRID.NY S32 128
+INTERPOLATION.MODE STR BILINEAR