Index: /trunk/ippconfig/cfh12k/psastro.config
===================================================================
--- /trunk/ippconfig/cfh12k/psastro.config	(revision 15631)
+++ /trunk/ippconfig/cfh12k/psastro.config	(revision 15632)
@@ -17,18 +17,9 @@
 PSASTRO.TWEAK.NSIGMA    F32      3
 
-# pmAstromRadiusMatch
-# use plate-scale to make this in pixels?
-PSASTRO.MATCH.RADIUS   F32    8
-
-# pmAstromMatchFit
-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.NRAW       S32      500   # max stars accepted for fitting (0 for all)
+PSASTRO.MAX.NREF       S32      500   # max stars accepted for fitting (0 for all)
 
 PSASTRO.MAX.ERROR      F32      10.0 # max error in pixels
 PSASTRO.MIN.NSTAR      S32      10   # min fitted stars in solution
-
-PSASTRO.MAX.NRAW       S32      500   # max stars accepted for fitting (0 for all)
-PSASTRO.MAX.NREF       S32      500   # max stars accepted for fitting (0 for all)
 
 PSASTRO.MOSAIC.MAX.ERROR.N0 F32    0.90 # max allow error for valid solution (arcsec)
@@ -38,7 +29,5 @@
 
 PSASTRO.MOSAIC.RADIUS.N0    F32    8.0
-# this one is *worse* because of the residual, unfitted distortion
-# PSASTRO.MOSAIC.RADIUS.N1    F32    16 
-PSASTRO.MOSAIC.RADIUS.N1    F32    0.0 #ski re-matching at this stage: poor distortion term
+PSASTRO.MOSAIC.RADIUS.N1    F32    0.0 # do not refine the match
 PSASTRO.MOSAIC.RADIUS.N2    F32    0.0
 
@@ -51,3 +40,18 @@
 PSASTRO.MOSAIC.GRADIENT.NY    S32     4   # number of y-dir cells per chip
 
-DVO.CATDIR STR /data/alala.0/ipp/ippRefs/catdir.2mass
+# use this recipe to set a tight constraint
+PSASTRO.FINE METADATA
+  PSASTRO.MOSAIC.MAX.ERROR.N0 F32    0.50 # max allow error for valid solution (arcsec)
+  PSASTRO.MOSAIC.MAX.ERROR.N1 F32    0.40 # max allow error for valid solution (arcsec)
+  PSASTRO.MOSAIC.MAX.ERROR.N2 F32    0.20 # max allow error for valid solution (arcsec)
+  PSASTRO.MOSAIC.MAX.ERROR.N3 F32    0.10 # max allow error for valid solution (arcsec)
+
+  PSASTRO.MOSAIC.RADIUS.N0    F32    3
+  PSASTRO.MOSAIC.RADIUS.N1    F32    2
+  PSASTRO.MOSAIC.RADIUS.N2    F32    1
+
+  PSASTRO.MOSAIC.CHIP.ORDER.N0  S32      0 # fit order (-1 means use default)
+  PSASTRO.MOSAIC.CHIP.ORDER.N1  S32      0 # fit order (-1 means use default)
+  PSASTRO.MOSAIC.CHIP.ORDER.N2  S32      1 # fit order (-1 means use default)
+  PSASTRO.MOSAIC.CHIP.ORDER.N3  S32      1 # fit order (-1 means use default)
+END
Index: /trunk/ippconfig/megacam/psastro.config
===================================================================
--- /trunk/ippconfig/megacam/psastro.config	(revision 15631)
+++ /trunk/ippconfig/megacam/psastro.config	(revision 15632)
@@ -11,10 +11,4 @@
 PSASTRO.GRID.SCALE     F32     15.
 
-# XXX Test for taurus
-PSASTRO.GRID.MIN.SIGMA F32  3.0
-
-PSASTRO.MAX.NRAW       S32      500   # max stars accepted for fitting (0 for all)
-PSASTRO.MAX.NREF       S32      500   # max stars accepted for fitting (0 for all)
-
 # these tweak are in FP units (pixels, currently)
 PSASTRO.TWEAK.SCALE     F32      1
@@ -23,8 +17,9 @@
 PSASTRO.TWEAK.NSIGMA    F32      3
 
-DVO.CATDIR STR /data/alala.0/ipp/ippRefs/catdir.2mass
+PSASTRO.MAX.NRAW       S32      500   # max stars accepted for fitting (0 for all)
+PSASTRO.MAX.NREF       S32      500   # max stars accepted for fitting (0 for all)
 
-# Mosaic Astrometry options
-PSASTRO.MOSAIC.MODE         BOOL   TRUE
+PSASTRO.MAX.ERROR      F32      10.0 # max error in pixels
+PSASTRO.MIN.NSTAR      S32      10   # min fitted stars in solution
 
 PSASTRO.MOSAIC.MAX.ERROR.N0 F32    0.90 # max allow error for valid solution (arcsec)
@@ -34,6 +29,6 @@
 
 PSASTRO.MOSAIC.RADIUS.N0    F32    8.0
-PSASTRO.MOSAIC.RADIUS.N1    F32    0.0
-PSASTRO.MOSAIC.RADIUS.N2    F32    0.0
+PSASTRO.MOSAIC.RADIUS.N1    F32    0.0 # do not refine the match
+PSASTRO.MOSAIC.RADIUS.N2    F32    0.0 # do not refine the match
 
 PSASTRO.MOSAIC.CHIP.ORDER.N0  S32      0 # fit order (-1 means use default)
@@ -41,4 +36,7 @@
 PSASTRO.MOSAIC.CHIP.ORDER.N2  S32      1 # fit order (-1 means use default)
 PSASTRO.MOSAIC.CHIP.ORDER.N3  S32      1 # fit order (-1 means use default)
+
+PSASTRO.MOSAIC.GRADIENT.NX    S32      2   # number of x-dir cells per chip
+PSASTRO.MOSAIC.GRADIENT.NY    S32      4   # number of y-dir cells per chip
 
 # use this recipe to set a tight constraint
@@ -49,7 +47,7 @@
   PSASTRO.MOSAIC.MAX.ERROR.N3 F32    0.10 # max allow error for valid solution (arcsec)
 
-  PSASTRO.MOSAIC.RADIUS.N0    F32    3
-  PSASTRO.MOSAIC.RADIUS.N1    F32    2
-  PSASTRO.MOSAIC.RADIUS.N2    F32    1
+  PSASTRO.MOSAIC.RADIUS.N0    F32    8.0
+  PSASTRO.MOSAIC.RADIUS.N1    F32    0.0
+  PSASTRO.MOSAIC.RADIUS.N2    F32    0.0
 
   PSASTRO.MOSAIC.CHIP.ORDER.N0  S32      0 # fit order (-1 means use default)
@@ -59,7 +57,4 @@
 END
 
-# 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
-
+# XXX Test for taurus
+# PSASTRO.GRID.MIN.SIGMA F32  3.0