Index: /branches/eam_branches/ipp-20110505/ippconfig/gpc1/camera.config
===================================================================
--- /branches/eam_branches/ipp-20110505/ippconfig/gpc1/camera.config	(revision 31621)
+++ /branches/eam_branches/ipp-20110505/ippconfig/gpc1/camera.config	(revision 31622)
@@ -165,4 +165,7 @@
 NPIX_INTERCHIP          S32     103794483
 
+# This sets the maximum size for the fwhm_major.  This is roughly 3", and 98.67% of all exposures in the database are less than this.
+MAX_ALLOWED_FWHM          F32         12
+
 # The set of maskbits that should not be set to NAN in "released" images
 # This value is equal to CONV.POOR | STARCORE | SPIKE | SUSPECT  = 0x5280
Index: /branches/eam_branches/ipp-20110505/ippconfig/gpc1/ppStack.config
===================================================================
--- /branches/eam_branches/ipp-20110505/ippconfig/gpc1/ppStack.config	(revision 31621)
+++ /branches/eam_branches/ipp-20110505/ippconfig/gpc1/ppStack.config	(revision 31622)
@@ -38,4 +38,5 @@
 
 STACK_THREEPI  METADATA
+    PSF.INPUT.MAX   F32     12.0
     OUTPUT.NOCOMP   BOOL    FALSE
     OUTPUT.LOGFLUX  BOOL    TRUE
Index: /branches/eam_branches/ipp-20110505/ippconfig/gpc1/psphot.config
===================================================================
--- /branches/eam_branches/ipp-20110505/ippconfig/gpc1/psphot.config	(revision 31621)
+++ /branches/eam_branches/ipp-20110505/ippconfig/gpc1/psphot.config	(revision 31622)
@@ -20,4 +20,8 @@
 PSF_MODEL              	 	    STR   PS_MODEL_PS1_V1
 PSPHOT.CR.NSIGMA.SOFTEN             F32   0.0025        # Softening parameter for weights in CR stat
+
+PSPHOT.CR.MAX.SIZE                  F32   0.8             # guess for limit on M_minor in pix^2
+PSPHOT.CR.MAX.MAG                   F32  -8.0             # guess for limit on Kron Mag
+PSPHOT.CR.AUTOSCALE                 BOOL  FALSE
 
 PSF.TREND.NX                        S32   3
Index: /branches/eam_branches/ipp-20110505/ippconfig/isp/psastro.config
===================================================================
--- /branches/eam_branches/ipp-20110505/ippconfig/isp/psastro.config	(revision 31621)
+++ /branches/eam_branches/ipp-20110505/ippconfig/isp/psastro.config	(revision 31622)
@@ -3,10 +3,10 @@
 
 # nominal plate scale (microns / pixel)
-PSASTRO.PIXEL.SCALE    F32  10.0
+PSASTRO.PIXEL.SCALE    F32  1.0
 
 # pmAstromGridMatch:
 PSASTRO.GRID.MIN.ANGLE F32 -2.0
 PSASTRO.GRID.MAX.ANGLE F32 +2.0
-PSASTRO.GRID.DEL.ANGLE F32  0.25
+PSASTRO.GRID.DEL.ANGLE F32  0.5
 PSASTRO.GRID.MIN.SIGMA F32  5.0
 
@@ -14,7 +14,32 @@
 # 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   500.
+PSASTRO.GRID.SCALE     F32      10
 
+PSASTRO.GRID.NREF.MAX S32 2500
+PSASTRO.GRID.NRAW.MAX S32 1500
+
+PSASTRO.PLOT.INST.MAG.MAX F32 -4.0
+PSASTRO.PLOT.INST.MAG.MIN F32 -12.0
+PSASTRO.PLOT.REF.MAG.MIN  F32 +10.0
+PSASTRO.PLOT.REF.MAG.MAX  F32 +20.0
+
+PSASTRO.MIN.INST.MAG.RAW      F32  -12
+PSASTRO.GRID.MIN.INST.MAG.RAW F32  -12
+PSASTRO.MAX.INST.MAG.RAW      F32  -4
+PSASTRO.GRID.MAX.INST.MAG.RAW F32  -4 
+
+ #PSASTRO.MATCH.RADIUS   F32    3
+
+PSASTRO.MATCH.RADIUS.N0 F32    15
+PSASTRO.MATCH.RADIUS.N1 F32    10
+PSASTRO.MATCH.RADIUS.N2 F32    9
+PSASTRO.MATCH.RADIUS.N3 F32    8
+PSASTRO.MATCH.RADIUS.N4 F32    7
+PSASTRO.MATCH.RADIUS.N5 F32    5
+PSASTRO.MATCH.RADIUS.N6 F32    5
+PSASTRO.MATCH.RADIUS.N7 F32    3
+
+PSASTRO.MATCH.FIT.NITER S32    8 
 # these tweak are in FP units (pixels, currently)
 PSASTRO.TWEAK.SCALE     F32      1
@@ -24,5 +49,5 @@
 
 # match radius in pixels for CHIP astrometry
-PSASTRO.MATCH.RADIUS   F32    8
+PSASTRO.MATCH.RADIUS   F32    5
 
 # pmAstromMatchFit
@@ -38,4 +63,7 @@
 PSASTRO.CATDIR         STR      SYNTH.BRIGHT
 PSASTRO.MATCH.LUMFUNC  BOOL     TRUE
+PSASTRO.IGNORE	       STR	SATURATED, DEFECT, SATSTAR, BLEND,FAIL
+
+
 
 
Index: /branches/eam_branches/ipp-20110505/ippconfig/isp/psphot.config
===================================================================
--- /branches/eam_branches/ipp-20110505/ippconfig/isp/psphot.config	(revision 31621)
+++ /branches/eam_branches/ipp-20110505/ippconfig/isp/psphot.config	(revision 31622)
@@ -1,2 +1,8 @@
+# cosmic ray recipe options - these were tested with o5472i0009o01.201734.ch.191131.cmf
+
+PSPHOT.CR.MAX.SIZE                  F32   0.20           # guess for limit on M_minor in pix^2
+PSPHOT.CR.MAX.MAG                   F32   -7.0             # guess for limit on Kron Mag
+PSPHOT.CR.AUTOSCALE                 BOOL  FALSE
+
 
 # turn these on to see specific outputs
Index: /branches/eam_branches/ipp-20110505/ippconfig/megacam/format_mef.config
===================================================================
--- /branches/eam_branches/ipp-20110505/ippconfig/megacam/format_mef.config	(revision 31621)
+++ /branches/eam_branches/ipp-20110505/ippconfig/megacam/format_mef.config	(revision 31622)
@@ -107,4 +107,5 @@
 	FPA.TEMP	STR	DETTEM
 	FPA.EXPOSURE	STR	EXPTIME
+	FPA.ZP		STR	ZPT_OBS
 	CHIP.TEMP	STR	DETTEM
         CELL.EXPOSURE   STR     EXPTIME
Index: /branches/eam_branches/ipp-20110505/ippconfig/recipes/nightly_science.config
===================================================================
--- /branches/eam_branches/ipp-20110505/ippconfig/recipes/nightly_science.config	(revision 31621)
+++ /branches/eam_branches/ipp-20110505/ippconfig/recipes/nightly_science.config	(revision 31622)
@@ -203,10 +203,7 @@
   NAME      STR STS
   DISTRIBUTION STR STS
-  # XXX: STS observations are temporarily being taken outside the STS tessellation
-  # switch tess_id from STS.V3 to RINGS
-  TESS      STR RINGS.V3
-  # TESS      STR STS.V3
+  TESS      STR STS.V4
   OBSMODE   STR STS%
-  OBJECT    STR STS%
+#  OBJECT    STR STS%
   STACKABLE BOOL FALSE
   DIFFABLE  BOOL FALSE
Index: /branches/eam_branches/ipp-20110505/ippconfig/recipes/ppImage.config
===================================================================
--- /branches/eam_branches/ipp-20110505/ippconfig/recipes/ppImage.config	(revision 31621)
+++ /branches/eam_branches/ipp-20110505/ippconfig/recipes/ppImage.config	(revision 31622)
@@ -559,5 +559,5 @@
   BIN2.FITS        BOOL    TRUE            # Save 2nd binned chip image?
   BACKGROUND       BOOL    TRUE            # Subtract background?
-  MASK.STATS       BOOL    TRUE            # Calculate Mask statistics.
+  # MASK.STATS       BOOL    TRUE            # Calculate Mask statistics.
 END
 
Index: /branches/eam_branches/ipp-20110505/ippconfig/recipes/ppStack.config
===================================================================
--- /branches/eam_branches/ipp-20110505/ippconfig/recipes/ppStack.config	(revision 31621)
+++ /branches/eam_branches/ipp-20110505/ippconfig/recipes/ppStack.config	(revision 31622)
@@ -59,4 +59,5 @@
 ZP.MATCH	F32	0.1		# Fraction of images to match for good star
 ZP.AIRMASS	METADATA		# Airmass terms by filter
+	u.MP9301 F32	0.0
 	g	F32	0.0
 	r	F32	0.0
@@ -67,4 +68,5 @@
 END
 ZP.TARGET	METADATA		# Target zero point by filter
+	u.MP9301 F32	25.0
 	g	F32	25.0
 	r	F32	25.0
@@ -143,2 +145,20 @@
 STACK_THREEPI  METADATA
 END
+
+TEST1 METADATA
+  PSF.AUTOSIZE	  BOOL	FALSE		# Determine output PSF size from input PSFs?
+  PSF.OUTPUT.FWHM F32	6.5		# Target size for output PSF (if not auto-sized)
+  PSF.MODEL	  STR	PS_MODEL_PS1_V1	# Model for PSF generation
+END
+
+TEST2 METADATA
+  PSF.AUTOSIZE	  BOOL	FALSE		# Determine output PSF size from input PSFs?
+  PSF.OUTPUT.FWHM F32	7.0		# Target size for output PSF (if not auto-sized)
+  PSF.MODEL	  STR	PS_MODEL_PS1_V1	# Model for PSF generation
+END
+
+TEST3 METADATA
+  PSF.AUTOSIZE	  BOOL	FALSE		# Determine output PSF size from input PSFs?
+  PSF.OUTPUT.FWHM F32	8.0		# Target size for output PSF (if not auto-sized)
+  PSF.MODEL	  STR	PS_MODEL_PS1_V1	# Model for PSF generation
+END
Index: /branches/eam_branches/ipp-20110505/ippconfig/recipes/psphot.config
===================================================================
--- /branches/eam_branches/ipp-20110505/ippconfig/recipes/psphot.config	(revision 31621)
+++ /branches/eam_branches/ipp-20110505/ippconfig/recipes/psphot.config	(revision 31622)
@@ -320,6 +320,6 @@
 PSPHOT.CRMASK.YTEST		    S32   0
 PSPHOT.CRMASK.APPLY		    BOOL  FALSE		  # TEST THIS before enabling.
-PSPHOT.CR.MAX.SIZE		    F32   0.8		  # guess for limit on M_minor in pix^2
-PSPHOT.CR.MAX.MAG		    F32  -8.0		  # guess for limit on Kron Mag
+PSPHOT.CR.MAX.SIZE		    F32   0		  # guess for limit on M_minor in pix^2
+PSPHOT.CR.MAX.MAG		    F32   0		  # guess for limit on Kron Mag
 PSPHOT.CR.AUTOSCALE		    BOOL  FALSE
 
Index: /branches/eam_branches/ipp-20110505/ippconfig/recipes/reductionClasses.mdc
===================================================================
--- /branches/eam_branches/ipp-20110505/ippconfig/recipes/reductionClasses.mdc	(revision 31621)
+++ /branches/eam_branches/ipp-20110505/ippconfig/recipes/reductionClasses.mdc	(revision 31622)
@@ -739,2 +739,21 @@
 END
 
+# random user tests (may not be stable or consistent)
+TEST1 METADATA
+   STACK_PPSTACK   STR TEST1
+   STACK_PPSUB     STR STACK
+   STACK_PSPHOT    STR STACK
+END
+    
+TEST2 METADATA
+   STACK_PPSTACK   STR TEST2
+   STACK_PPSUB     STR STACK
+   STACK_PSPHOT    STR STACK
+END
+    
+TEST3 METADATA
+   STACK_PPSTACK   STR TEST3
+   STACK_PPSUB     STR STACK
+   STACK_PSPHOT    STR STACK
+END
+