Index: /trunk/ippconfig/isp/camera.config
===================================================================
--- /trunk/ippconfig/isp/camera.config	(revision 9658)
+++ /trunk/ippconfig/isp/camera.config	(revision 9659)
@@ -28,4 +28,5 @@
         PPIMAGE_OBDSF   STR     isp/ppImage_obdsf.config    # Overscan, bias, dark, shutter, flat only
         PPIMAGE_OBDSFP  STR     isp/ppImage_obdsfp.config   # Overscan, bias, dark, shutter, flat, psphot
+        PPIMAGE_PA      STR     isp/ppImage_pa.config       # psphot, psastro
         PPIMAGE_B       STR     isp/ppImage_b.config        # Bias only
         PPIMAGE_D       STR     isp/ppImage_d.config        # Dark only
Index: /trunk/ippconfig/isp/ppImage_pa.config
===================================================================
--- /trunk/ippconfig/isp/ppImage_pa.config	(revision 9659)
+++ /trunk/ippconfig/isp/ppImage_pa.config	(revision 9659)
@@ -0,0 +1,48 @@
+### Phase 2 recipe configuration file
+
+# List of tasks to perform
+MASK		BOOL	FALSE		# Mask bad pixels
+MASK.VALUE      U8      0xff            # only mask pixels matching this bitmask
+NONLIN		BOOL	FALSE		# Non-linearity correction
+OVERSCAN	BOOL	TRUE		# Overscan subtraction
+BIAS		BOOL	FALSE		# Bias subtraction
+DARK		BOOL	FALSE		# Dark subtraction
+SHUTTER		BOOL	FALSE		# Shutter correction
+FLAT		BOOL	FALSE		# Flat-field normalisation
+FRINGE		BOOL	FALSE		# Fringe subtraction
+PHOTOM		BOOL	TRUE		# Source identification and photometry
+ASTROM.CHIP	BOOL	TRUE
+ASTROM.MOSAIC	BOOL	FALSE		# Astrometry
+
+BASE.FITS       BOOL    TRUE            # Save base detrended image?
+CHIP.FITS       BOOL   	FALSE           # Save chip-mosaic-ed image? 
+FPA1.FITS       BOOL   	FALSE           # Save 1st binned fpa image? 
+FPA2.FITS       BOOL   	FALSE           # Save 2nd binned fpa image? 
+BIN1.FITS	BOOL	FALSE		# Save 1st binned chip image?
+BIN2.FITS	BOOL	FALSE		# Save 2nd binned chip image?
+BIN1.JPEG	BOOL	TRUE		# Save 1st binned jpeg?
+BIN2.JPEG	BOOL	TRUE		# Save 2nd binned jpeg?
+
+# Non-linearity correction
+NONLIN.SOURCE		STR	CHIP.NAME	# How to determine the source
+#@NONLIN.DATA		F32	0.0 1.001 0.001	# A polynomial
+NONLIN.DATA		STR	nonlin.dat	# Filename for lookup table
+#NONLIN.DATA		METADATA		# Source of non-linearity data
+#	ccd00		STR	nonlin00.dat	# A lookup table 
+#	@ccd01		F32	0.0 1.001 0.001	# A polynomial
+#END
+
+# Overscan subtraction
+OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
+#OVERSCAN.FIT		STR	SPLINE		# NONE | POLYNOMIAL | SPLINE
+OVERSCAN.FIT		STR	POLYNOMIAL	# NONE | POLYNOMIAL | SPLINE
+OVERSCAN.ORDER		S32	5		# Order of polynomial fit
+OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
+
+# binned output image options
+BIN1.XBIN		S32	8
+BIN1.YBIN		S32	8
+BIN2.XBIN		S32	64
+BIN2.YBIN		S32	64
+
+PHOTCODE.RULE		STR	{CAMERA}.{FILTER.ID}.{CHIP.N}
Index: /trunk/ippconfig/isp/psastro.config
===================================================================
--- /trunk/ippconfig/isp/psastro.config	(revision 9658)
+++ /trunk/ippconfig/isp/psastro.config	(revision 9659)
@@ -7,7 +7,10 @@
 
 # pmAstromGridMatch:
-PSASTRO.GRID.MIN.ANGLE F32 -0.0851
-PSASTRO.GRID.MAX.ANGLE F32 +0.0851
-PSASTRO.GRID.DEL.ANGLE F32  0.0170
+PSASTRO.GRID.MIN.ANGLE F32 -2.0
+PSASTRO.GRID.MAX.ANGLE F32 +2.0
+#PSASTRO.GRID.MIN.ANGLE F32 102.0
+#PSASTRO.GRID.MAX.ANGLE F32 104.0
+PSASTRO.GRID.DEL.ANGLE F32  0.25
+PSASTRO.GRID.MIN.SIGMA F32  5.0
 
 # pmAstromGridAngle
@@ -27,5 +30,5 @@
 # pmAstromRadiusMatch
 # use plate-scale to make this in pixels?
-PSASTRO.MATCH.RADIUS   F32    32
+PSASTRO.MATCH.RADIUS   F32    8
 
 # pmAstromMatchFit
@@ -35,3 +38,6 @@
 PSASTRO.CHIP.NSIGMA    F32      3  # fit clipping sigmas
 
-MAG_MAX F32 10.0
+PSASTRO.MAX.ERROR      F32      2.0 # max error in pixels
+PSASTRO.MIN.NSTAR      S32      10  # min fitted stars in solution
+
+MAG_MAX F32 10
Index: /trunk/ippconfig/isp/psphot.config
===================================================================
--- /trunk/ippconfig/isp/psphot.config	(revision 9658)
+++ /trunk/ippconfig/isp/psphot.config	(revision 9659)
@@ -2,8 +2,8 @@
 #SAVE.OUTPUT	BOOL 	TRUE
 #SAVE.BACKMDL	BOOL 	TRUE
-SAVE.BACKGND	BOOL 	TRUE
-SAVE.BACKSUB	BOOL 	TRUE
-SAVE.RESID	BOOL 	TRUE
-SAVE.PSF	BOOL 	TRUE
+#SAVE.BACKGND	BOOL 	TRUE
+#SAVE.BACKSUB	BOOL 	TRUE
+#SAVE.RESID	BOOL 	TRUE
+#SAVE.PSF	BOOL 	TRUE
 
 #LOAD.PSF	BOOL 	FALSE
@@ -43,9 +43,9 @@
 # PSF model parameters : choose the PSF model
 # list as many PSF_MODEL options as desired
-# PSF_MODEL           MULTI
-# PSF_MODEL             STR  PS_MODEL_QGAUSS
-# PSF_MODEL           STR  PS_MODEL_GAUSS
+# PSF_MODEL         MULTI
+# 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
+# PSF_MODEL         STR  PS_MODEL_TGAUSS  ## not well tested, not very successful
 
 MOMENTS_SCALE       F32   0.1
@@ -94,6 +94,6 @@
 # BREAK_POINT         STR  ENSEMBLE
 
-PEAKS_OUTPUT_FILE   STR  peaks.dat
-MOMENTS_OUTPUT_FILE STR  moments.dat
+# PEAKS_OUTPUT_FILE   STR  peaks.dat
+# MOMENTS_OUTPUT_FILE STR  moments.dat
 # ANALYSIS_REGION     STR  [1000:1600,2800:3400]
 # POISSON_ERRORS      BOOL TRUE