Index: /trunk/ippconfig/megacam_detrended/camera.config
===================================================================
--- /trunk/ippconfig/megacam_detrended/camera.config	(revision 7085)
+++ /trunk/ippconfig/megacam_detrended/camera.config	(revision 7086)
@@ -52,4 +52,5 @@
 	PHASE2		STR	megacam_detrended/phase2.config		# Phase 2 recipe details
 	PSPHOT		STR	megacam_detrended/psphot.config		# psphot details
+	PSASTRO		STR	megacam_detrended/psastro.config	# psastro details
 END
 
@@ -246,5 +247,5 @@
 
    PSPHOT.OUTPUT.RAW  METADATA
-         FILENAME.RULE   STR {OUTPUT}
+         FILENAME.RULE   STR {OUTPUT}.{CHIP.NAME}
          FILENAME.XTRA   STR NONE
          EXTNAME.RULE    STR NONE
@@ -295,3 +296,38 @@
 	 FILE.MODE       STR WRITE
    END
+
+   PSASTRO.INPUT	 STR PSASTRO.INPUT.CMP
+   PSASTRO.OUTPUT	 STR PSASTRO.OUTPUT.CMP
+
+   PSASTRO.INPUT.CMP  METADATA
+         FILENAME.RULE   STR @FILES
+         FILENAME.XTRA   STR NONE
+         EXTNAME.RULE    STR NONE
+         EXTNAME.XTRA    STR PHU
+         FILE.DEPTH 	 STR CHIP
+	 DATA.DEPTH 	 STR CHIP
+	 FILE.TYPE       STR CMP
+	 FILE.MODE       STR READ
+   END
+   PSASTRO.INPUT.CMF  METADATA
+         FILENAME.RULE   STR @FILES
+         FILENAME.XTRA   STR NONE
+         EXTNAME.RULE    STR SMPDATA
+         EXTNAME.XTRA    STR PHU
+         FILE.DEPTH 	 STR CHIP
+	 DATA.DEPTH 	 STR CHIP
+	 FILE.TYPE       STR CMF
+	 FILE.MODE       STR READ
+   END
+
+   PSASTRO.OUTPUT.CMP  METADATA
+         FILENAME.RULE   STR {OUTPUT}.smp
+         FILENAME.XTRA   STR NONE
+         EXTNAME.RULE    STR NONE
+         EXTNAME.XTRA    STR PHU
+         FILE.DEPTH 	 STR CHIP
+	 DATA.DEPTH 	 STR CHIP
+	 FILE.TYPE       STR CMP
+	 FILE.MODE       STR WRITE
+   END
 END
Index: /trunk/ippconfig/megacam_detrended/format_split.config
===================================================================
--- /trunk/ippconfig/megacam_detrended/format_split.config	(revision 7085)
+++ /trunk/ippconfig/megacam_detrended/format_split.config	(revision 7086)
@@ -82,5 +82,5 @@
         CELL.GAIN       STR     GAIN
         CELL.READNOISE  STR     RDNOISE
-        CELL.SATURATION STR     SATURATE
+#        CELL.SATURATION STR     SATURATE
 	CELL.TIME	STR	MJD-OBS
         CELL.XBIN       STR     CCDBIN1
@@ -91,5 +91,5 @@
 DEFAULTS        METADATA
 	CELL.READDIR		S32	1		# Cell is read in x direction
-        CELL.BAD                S32     0
+        CELL.BAD                S32     1
 	CELL.TIMESYS		STR	UTC
 	CELL.XPARITY		S32	1
@@ -97,4 +97,5 @@
 	CELL.X0			S32	0
 	CELL.Y0			S32	0
+        CELL.SATURATION 	S32     50000
 END
 
@@ -120,4 +121,5 @@
  
 # How to get the supplementary stuff: mask and weight
+#### XXX these are probably not needed now
 SUPPLEMENTARY	METADATA
 	MASK.SOURCE	STR	FILE		# Source type for mask: EXT | FILE
Index: /trunk/ippconfig/megacam_detrended/psastro.config
===================================================================
--- /trunk/ippconfig/megacam_detrended/psastro.config	(revision 7086)
+++ /trunk/ippconfig/megacam_detrended/psastro.config	(revision 7086)
@@ -0,0 +1,36 @@
+
+# astrometry matching parameters
+
+# nominal plate scale (microns / pixel)
+# PSASTRO.PLATE.SCALE    F32  13.5
+PSASTRO.PLATE.SCALE    F32  1.0
+
+# pmAstromGridMatch:
+PSASTRO.GRID.MIN.ANGLE F32 -0.0851
+PSASTRO.GRID.MAX.ANGLE F32 +0.0851
+PSASTRO.GRID.DEL.ANGLE F32  0.0170
+
+# 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   1000.
+PSASTRO.GRID.SCALE     F32     50
+
+# these tweak are in FP units (pixels, currently)
+PSASTRO.TWEAK.SCALE     F32      1
+PSASTRO.TWEAK.RANGE     F32     75
+PSASTRO.TWEAK.SMOOTH    F32      2
+PSASTRO.TWEAK.NSIGMA    F32      3
+
+# pmAstromRadiusMatch
+# use plate-scale to make this in pixels?
+PSASTRO.MATCH.RADIUS   F32    10.
+
+# pmAstromMatchFit
+PSASTRO.CHIP.NX        S32      1  # fit order
+PSASTRO.CHIP.NY        S32      1  # fit order
+PSASTRO.CHIP.NITER     S32      3  # fit clipping iterations
+PSASTRO.CHIP.NSIGMA    F32      3  # fit clipping sigmas
+
Index: /trunk/ippconfig/megacam_detrended/psphot.config
===================================================================
--- /trunk/ippconfig/megacam_detrended/psphot.config	(revision 7085)
+++ /trunk/ippconfig/megacam_detrended/psphot.config	(revision 7086)
@@ -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
@@ -47,9 +47,15 @@
 # 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  25.0            # aperture magnitudes are scaled via 
+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  0.2		 # significance for pixel included in fit
+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
@@ -72,9 +78,10 @@
 # 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
+# BREAK_POINT         STR  CLASS
 # PEAKS_OUTPUT_FILE   STR  peaks.dat
 # MOMENTS_OUTPUT_FILE STR  moments.dat