Index: /trunk/ippconfig/gpc1/Makefile.am
===================================================================
--- /trunk/ippconfig/gpc1/Makefile.am	(revision 15070)
+++ /trunk/ippconfig/gpc1/Makefile.am	(revision 15071)
@@ -7,5 +7,7 @@
 	camera.config \
 	format_raw.config \
-	ppImage.config
+	ppImage.config \
+	psphot.config \
+	psastro.config
 
 install_DATA = $(install_files)
Index: /trunk/ippconfig/gpc1/camera.config
===================================================================
--- /trunk/ippconfig/gpc1/camera.config	(revision 15070)
+++ /trunk/ippconfig/gpc1/camera.config	(revision 15071)
@@ -139,9 +139,18 @@
 END	   
 
+# internal to external filter names
+FILTER.ID       METADATA
+   g        STR   g.00000
+   r        STR   r.00000
+   i        STR   i.00000
+   z        STR   z.00000
+   y        STR   y.00000
+END
 
 # Recipe options
 RECIPES		METADATA
 	PPIMAGE		STR	gpc1/ppImage.config		# psphot details
-#	PSPHOT		STR	gpc1/psphot.config		# psphot details
+	PSASTRO		STR	gpc1/psastro.config		# psphot details
+	PSPHOT		STR	gpc1/psphot.config		# psphot details
 END
 
Index: /trunk/ippconfig/gpc1/format_raw.config
===================================================================
--- /trunk/ippconfig/gpc1/format_raw.config	(revision 15070)
+++ /trunk/ippconfig/gpc1/format_raw.config	(revision 15071)
@@ -171,4 +171,18 @@
 # How to translate PS concepts into FITS headers
 TRANSLATION	METADATA
+        FPA.FILTERID    STR     FILTERID
+        FPA.FILTER      STR     FILTERID
+        FPA.RA          STR     RA
+        FPA.DEC         STR     DEC
+        FPA.RADECSYS    STR     RADECSYS
+	FPA.OBSTYPE     STR     OBSTYPE
+	FPA.OBJECT	STR	OBJECT
+	FPA.FOCUS	STR	M2Z
+	FPA.TIME	STR	MJD-OBS
+	FPA.TIMESYS	STR	TIMESYS
+	FPA.ALT		STR	ALT
+	FPA.AZ		STR	AZ
+	FPA.TEMP	STR	DETTEM
+	FPA.EXPOSURE	STR	EXPTIME
 	CELL.XBIN	STR	CCDSUM
 	CELL.YBIN	STR	CCDSUM
@@ -186,5 +200,4 @@
 	FPA.DETECTOR	STR	GPC1
 	FPA.AIRMASS	F32	0.0
-	FPA.FILTER	STR	NONE
 	FPA.POSANGLE	F32	0.0
 	FPA.RA		STR	0:0:0
@@ -192,7 +205,4 @@
 	FPA.RADECSYS	STR	ICRS
 	FPA.NAME	S32	12345
-	FPA.TIME	STR	2005-11-23T12:34:56.78
-#	FPA.TIMESYS	STR	TIMESYS
-	FPA.OBSTYPE     STR     BIAS
 	CHIP.XPARITY	S32	1
 	CHIP.YPARITY	S32	1
@@ -455,6 +465,6 @@
 	CELL.READDIR	S32	1
 	CELL.BAD	S32	0
-	CELL.TIMESYS	STR	UTC
-	CELL.TIME	STR	2005-11-23T12:34:56.78
+	CELL.TIME	STR	MJD-OBS
+	CELL.TIMESYS	STR	TIMESYS
 #	CELL.SATURATION	STR	60000
 END
Index: /trunk/ippconfig/gpc1/psastro.config
===================================================================
--- /trunk/ippconfig/gpc1/psastro.config	(revision 15071)
+++ /trunk/ippconfig/gpc1/psastro.config	(revision 15071)
@@ -0,0 +1,35 @@
+
+# astrometry matching parameters
+
+# nominal plate scale (microns / pixel)
+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    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)
+PSASTRO.TWEAK.SCALE     F32      1
+PSASTRO.TWEAK.RANGE     F32     75
+PSASTRO.TWEAK.SMOOTH    F32      2
+PSASTRO.TWEAK.NSIGMA    F32      3
+
+DVO.CATDIR STR /data/alala.0/ipp/ippRefs/catdir.2mass
+
+# Mosaic Astrometry options
+PSASTRO.MOSAIC.MODE           BOOL     TRUE
+PSASTRO.MOSAIC.MAX.ERROR.N0 F32    0.50 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N1 F32    0.10 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.RADIUS.N1    F32    3
+PSASTRO.MOSAIC.RADIUS.N2    F32    1
+
+# DVO.GETSTAR STR /home/kiawe/eugene/psconfig/dev.lin64/bin/getstar
+
+# we need to allow a loose fit if we are fitting to 2mass (50mas internal error -> 100mas limit?)
+# if we are fitting against quality digital data, we can require tighter constraints
+
Index: /trunk/ippconfig/gpc1/psphot.config
===================================================================
--- /trunk/ippconfig/gpc1/psphot.config	(revision 15071)
+++ /trunk/ippconfig/gpc1/psphot.config	(revision 15071)
@@ -0,0 +1,37 @@
+
+# turn these on to see specific outputs
+SAVE.OUTPUT	BOOL 	TRUE
+SAVE.BACKMDL	BOOL 	TRUE
+SAVE.RESID	BOOL 	TRUE
+SAVE.BACKGND	BOOL 	TRUE
+#SAVE.BACKSUB	BOOL 	TRUE
+#SAVE.PSF	BOOL 	TRUE
+#LOAD.PSF	BOOL 	FALSE
+SAVE.PLOTS     	BOOL    TRUE
+
+BACKGROUND.XBIN	    S32  128            # size of background superpixels
+BACKGROUND.YBIN	    S32  128            # size of background superpixels
+
+# image background parameters
+IMSTATS_NPIX        S32  10000    	 # number of pixels to use for sky estimate boxes:
+SKY_STAT            STR  FITTED_MEAN_V4  # 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 desired
+PSF_MODEL           STR  PS_MODEL_QGAUSS
+
+MOMENTS_SN_MIN      F32   30.0
+EXT_MIN_SN           F32  50.0           # fit galaxies above this S/N limit
+FULL_FIT_SN_LIM      F32  50.0
+AP_MIN_SN            F32  50.0
+
+OUTPUT.FORMAT       STR PS1_DEV_1
+
+PSF_SHAPE_NSIGMA     F32  3.0		 # max significance for shape variation
+PSF_MAX_CHI          F32  50.0		 # reject objects worse that this
+APTREND.ORDER.MAX    S32  1
+
+BREAK_POINT STR ENSEMBLE