Index: trunk/ippconfig/hsc/psastro.config
===================================================================
--- trunk/ippconfig/hsc/psastro.config	(revision 39504)
+++ trunk/ippconfig/hsc/psastro.config	(revision 39926)
@@ -6,5 +6,5 @@
 DVO.GETSTAR.OUTFORMAT         STR      PS1_DEV_0
 DVO.GETSTAR.PHOTCODE          STR      i
-DVO.GETSTAR.MAX.RHO           F32      10000.0
+DVO.GETSTAR.MAX.RHO           F32      30000.0
 DVO.GETSTAR.MIN.MAG           F32      12.0
 DVO.GETSTAR.MIN.MAG.INST      F32     -15.0
@@ -13,5 +13,5 @@
 PHOTCODE.DATA METADATA
   FILTER   STR g
-  ZEROPT   F32 28.0
+  ZEROPT   F32 26.75
   PHOTCODE STR g
   GHOST_MAX_MAG                   F32 -16.5
@@ -19,5 +19,5 @@
 PHOTCODE.DATA METADATA
   FILTER   STR r
-  ZEROPT   F32 28.0
+  ZEROPT   F32 27.1
   PHOTCODE STR r
   GHOST_MAX_MAG                   F32 -20.0
@@ -25,5 +25,5 @@
 PHOTCODE.DATA METADATA
   FILTER   STR i
-  ZEROPT   F32 26.9
+  ZEROPT   F32 27.0
   PHOTCODE STR i
   GHOST_MAX_MAG                   F32 -25.0
@@ -31,23 +31,85 @@
 PHOTCODE.DATA METADATA
   FILTER   STR z
-  ZEROPT   F32 28.0
+  ZEROPT   F32 26.2
+  PHOTCODE STR z
+  GHOST_MAX_MAG                   F32 -25.0
+END
+PHOTCODE.DATA METADATA
+  FILTER   STR y
+  ZEROPT   F32 25.1
+  PHOTCODE STR y
+  GHOST_MAX_MAG                   F32 -25.0
+END
+PHOTCODE.DATA METADATA
+  FILTER   STR NB921
+  ZEROPT   F32 25.4
   PHOTCODE STR z
   GHOST_MAX_MAG                   F32 -25.0
 END
 
+
+PSASTRO.USE.MODEL            BOOL TRUE
+
+# extra field for ref stars:
+PSASTRO.PHOTOM.WINDOW.SIGMA  F32 0.0
+
+PSASTRO.GRID.MIN.ANGLE F32 -2.0 # start angle (degrees)
+PSASTRO.GRID.MAX.ANGLE F32 +2.0
+PSASTRO.GRID.DEL.ANGLE F32  1.0
+
+PSASTRO.GRID.NREF.MAX  S32   1000 # max stars accepted for fitting
+PSASTRO.GRID.NRAW.MAX  S32   1000 # max stars accepted for fitting
+
+PSASTRO.GRID.MIN.INST.MAG.RAW       F32      -14
+PSASTRO.GRID.MAX.INST.MAG.RAW       F32       -9
+
 # pmAstromMatchFit
-PSASTRO.CHIP.ORDER     S32      3  # 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
 
 # single-chip radius match in pixels
-PSASTRO.MATCH.RADIUS.N0 F32    90
-PSASTRO.MATCH.RADIUS.N1 F32    60
-PSASTRO.MATCH.RADIUS.N2 F32    30
-PSASTRO.MATCH.RADIUS.N3 F32    20
-PSASTRO.MATCH.RADIUS.N4 F32    20
-PSASTRO.MATCH.RADIUS.N5 F32    10
-PSASTRO.MATCH.RADIUS.N6 F32    10
-PSASTRO.MATCH.RADIUS.N7 F32    5
-PSASTRO.MATCH.FIT.NITER S32    8
+PSASTRO.MATCH.RADIUS.N0 F32    30
+PSASTRO.MATCH.RADIUS.N1 F32    20
+PSASTRO.MATCH.RADIUS.N2 F32    20
+PSASTRO.MATCH.RADIUS.N3 F32    10
+PSASTRO.MATCH.RADIUS.N4 F32    10
+PSASTRO.MATCH.RADIUS.N5 F32     8 # was 5
+PSASTRO.MATCH.RADIUS.N6 F32     2
+PSASTRO.MATCH.RADIUS.N7 F32     0
+PSASTRO.MATCH.FIT.NITER S32     6 # was 7
 
+# Mosaic Astrometry options
+PSASTRO.MOSAIC.MODE         BOOL   TRUE
+
+# for iterations >= N, require a single match per reference
+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)
+PSASTRO.MOSAIC.MAX.ERROR.N1 F32    0.00 # max allow error for valid solution (arcsec)
+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    0.00 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N5 F32    0.30 # max allow error for valid solution (arcsec)
+
+# mosaic radius match in pixels (do these make sense?)
+PSASTRO.MOSAIC.RADIUS.N0    F32    15
+PSASTRO.MOSAIC.RADIUS.N1    F32    10
+PSASTRO.MOSAIC.RADIUS.N2    F32    10
+PSASTRO.MOSAIC.RADIUS.N3    F32    5
+PSASTRO.MOSAIC.RADIUS.N4    F32    5
+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      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.N5  S32      3 # fit order (-1 means use default)
+
+PSASTRO.MODEL.REF.CHIP        STR      x050
+PSASTRO.MODEL.REF.CHIP.ANGLE  F32      90.0
+PSASTRO.MODEL.ROT.PARITY      S32      -1