Index: trunk/ippconfig/cfh12k/psastro.config
===================================================================
--- trunk/ippconfig/cfh12k/psastro.config	(revision 12374)
+++ trunk/ippconfig/cfh12k/psastro.config	(revision 12516)
@@ -2,20 +2,19 @@
 # astrometry matching parameters
 
-# nominal plate scale (microns / pixel)
-# PSASTRO.PLATE.SCALE    F32  13.5
-PSASTRO.PLATE.SCALE    F32  1.0
+# nominal plate scale (mm / pixel)
+PSASTRO.PIXEL.SCALE    F32  0.0135
 
 # pmAstromGridMatch:
-PSASTRO.GRID.MIN.ANGLE F32 -0.0851
-PSASTRO.GRID.MAX.ANGLE F32 +0.0851
-PSASTRO.GRID.DEL.ANGLE F32  0.0170
+PSASTRO.GRID.SEARCH    BOOL TRUE
+PSASTRO.GRID.MIN.ANGLE F32 -2.0
+PSASTRO.GRID.MAX.ANGLE F32 +2.0
+PSASTRO.GRID.DEL.ANGLE F32  0.5
+PSASTRO.GRID.MIN.SIGMA F32  5.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   1000.
-PSASTRO.GRID.SCALE     F32     50
+PSASTRO.GRID.OFFSET    F32   10000
+PSASTRO.GRID.SCALE     F32     500
 
 # these tweak are in FP units (pixels, currently)
@@ -30,7 +29,11 @@
 
 # pmAstromMatchFit
-PSASTRO.CHIP.NX        S32      1  # fit order
-PSASTRO.CHIP.NY        S32      1  # fit order
+PSASTRO.CHIP.ORDER     S32      1  # fit order
 PSASTRO.CHIP.NITER     S32      3  # fit clipping iterations
 PSASTRO.CHIP.NSIGMA    F32      3  # fit clipping sigmas
 
+PSASTRO.MAX.ERROR      F32      10.0 # max error in pixels
+PSASTRO.MIN.NSTAR      S32      10   # min fitted stars in solution
+
+MAG_MAX F32 20
+DVO.CATDIR STR /data/alala.0/ipp/ippRefs/catdir.2mass