Index: trunk/ippconfig/gpc1/dvo.config
===================================================================
--- trunk/ippconfig/gpc1/dvo.config	(revision 26173)
+++ trunk/ippconfig/gpc1/dvo.config	(revision 26265)
@@ -1,5 +1,4 @@
 
 # location of DVO database tables
-CATDIR			/data/alala.0/eugene/isp/catdir
 MOSAICNAME              GPC1
 
Index: trunk/ippconfig/gpc1/psastro.config
===================================================================
--- trunk/ippconfig/gpc1/psastro.config	(revision 26173)
+++ trunk/ippconfig/gpc1/psastro.config	(revision 26265)
@@ -17,5 +17,5 @@
 PSASTRO.GRID.NSTAR.MAX S32     800 # max stars accepted for fitting
 
-PSASTRO.MAX.NRAW      S32       200   # max stars accepted for fitting (0 for all)
+PSASTRO.MAX.NRAW      S32      1000   # max stars accepted for fitting (0 for all)
 PSASTRO.MAX.NREF      S32      5000   # max stars accepted for fitting (0 for all)
 
@@ -25,11 +25,7 @@
 # 
 PSASTRO.MIN.INST.MAG.RAW       F32     -17.0   # min instrumental magnitude for stars accepted for fitting
-PSASTRO.MAX.INST.MAG.RAW       F32     -10.0   # max instrumental magnitude for stars accepted for fitting
-
-#
-# PSASTRO.GRID.MIN.ANGLE F32 0.0 # start angle (degrees)
-# PSASTRO.GRID.MAX.ANGLE F32 360.0
-# PSASTRO.GRID.DEL.ANGLE F32  1.0
-PSASTRO.GRID.MIN.ANGLE F32 -0.5 # start angle (degrees)
+PSASTRO.MAX.INST.MAG.RAW       F32      -8.0   # max instrumental magnitude for stars accepted for fitting
+
+PSASTRO.GRID.MIN.ANGLE F32 -1.0 # start angle (degrees)
 PSASTRO.GRID.MAX.ANGLE F32 +0.5
 PSASTRO.GRID.DEL.ANGLE F32  0.5
@@ -38,6 +34,4 @@
 PSASTRO.GRID.MIN.SCALE F32  1.00
 PSASTRO.GRID.MAX.SCALE F32  1.00
-# PSASTRO.GRID.MIN.SCALE F32  0.98
-# PSASTRO.GRID.MAX.SCALE F32  1.021
 PSASTRO.GRID.DEL.SCALE F32  0.01
 
@@ -48,8 +42,11 @@
 PSASTRO.MATCH.RADIUS.N3 F32    20
 PSASTRO.MATCH.RADIUS.N4 F32    20
-PSASTRO.MATCH.RADIUS.N5 F32    20
+PSASTRO.MATCH.RADIUS.N5 F32    10
 PSASTRO.MATCH.RADIUS.N6 F32    10
-PSASTRO.MATCH.RADIUS.N7 F32    10
+PSASTRO.MATCH.RADIUS.N7 F32     5
 PSASTRO.MATCH.FIT.NITER S32     8
+
+# for iterations >= N, require a single match per reference
+PSASTRO.MATCH.UNIQ.ITER S32     4 
 
 # XXX Test for taurus
@@ -71,8 +68,8 @@
 # Mosaic Astrometry options
 PSASTRO.MOSAIC.MODE         BOOL   TRUE
-# PSASTRO.MOSAIC.MAX.ERROR.N0 F32    1.80 # max allow error for valid solution (arcsec)
-# PSASTRO.MOSAIC.MAX.ERROR.N1 F32    1.20 # max allow error for valid solution (arcsec)
-# PSASTRO.MOSAIC.MAX.ERROR.N2 F32    0.80 # max allow error for valid solution (arcsec)
-# PSASTRO.MOSAIC.MAX.ERROR.N3 F32    0.50 # max allow error for valid solution (arcsec)
+
+PSASTRO.MOSAIC.CHIP.NITER     S32      5  # fit clipping iterations (NOTE: last iteration is NITER, not NITER - 1)
+PSASTRO.MOSAIC.CHIP.NSIGMA    F32      3  # fit clipping sigmas
+PSASTRO.MOSAIC.UNIQ.ITER      S32      3  # for iterations >= N, require a single match per reference
 
 PSASTRO.MOSAIC.MAX.ERROR.N0 F32    0.00 # max allow error for valid solution (arcsec)
@@ -80,19 +77,22 @@
 PSASTRO.MOSAIC.MAX.ERROR.N2 F32    0.00 # max allow error for valid solution (arcsec)
 PSASTRO.MOSAIC.MAX.ERROR.N3 F32    0.00 # max allow error for valid solution (arcsec)
-PSASTRO.MOSAIC.MAX.ERROR.N4 F32    5.00 # max allow error for valid solution (arcsec)
-
-# mosaic radius match in pixels
+PSASTRO.MOSAIC.MAX.ERROR.N4 F32    0.00 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N5 F32    5.00 # max allow error for valid solution (arcsec)
+
+# mosaic radius match in pixels (do these make sense?)
 PSASTRO.MOSAIC.RADIUS.N0    F32    5
-PSASTRO.MOSAIC.RADIUS.N1    F32    0
-PSASTRO.MOSAIC.RADIUS.N2    F32    0
-PSASTRO.MOSAIC.RADIUS.N3    F32    0
-PSASTRO.MOSAIC.RADIUS.N4    F32    20
+PSASTRO.MOSAIC.RADIUS.N1    F32    10
+PSASTRO.MOSAIC.RADIUS.N2    F32    10
+PSASTRO.MOSAIC.RADIUS.N3    F32    5
+PSASTRO.MOSAIC.RADIUS.N4    F32    3
+PSASTRO.MOSAIC.RADIUS.N5    F32    3
 
 PSASTRO.MOSAIC.CHIP.ORDER     S32      1  # limit chip-fit order to 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      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)
-PSASTRO.MOSAIC.CHIP.ORDER.N4  S32      3 # fit order (-1 means use default)
+PSASTRO.MOSAIC.CHIP.ORDER.N4  S32      1 # fit order (-1 means use default)
+PSASTRO.MOSAIC.CHIP.ORDER.N5  S32      3 # fit order (-1 means use default)
 
 # we need to allow a loose fit if we are fitting to 2mass (50mas internal error -> 100mas limit?)
@@ -113,4 +113,10 @@
 DVO.GETSTAR.MIN.MAG         F32      12.0
 DVO.GETSTAR.MIN.MAG.INST    F32     -15.0
+
+# rather than mean, use specified EDGE:
+ZERO.POINT.USE.MEAN	      	BOOL     FALSE
+ZERO.POINT.EDGE.FRACTION      	F32      0.9
+ZERO.POINT.EDGE.SAMPLE        	S32      25
+ZERO.POINT.EDGE.SAMPLE.FRACTION F32      0.1
 
 PHOTCODE.DATA MULTI