Index: trunk/ippconfig/hsc/psastro.config
===================================================================
--- trunk/ippconfig/hsc/psastro.config	(revision 39929)
+++ trunk/ippconfig/hsc/psastro.config	(revision 40370)
@@ -2,48 +2,62 @@
 PSASTRO.SAVE.REFMATCH         BOOL     T  # save refstars in a separate FITS table
 PSASTRO.SAVE.REFSTARS         BOOL     F  # save refstars in a separate FITS file (broken!)
-PSASTRO.CATDIR                STR      PS1.REF.20140713
+#PSASTRO.CATDIR                STR      PS1.REF.20140713
+PSASTRO.CATDIR 		       STR     PS1.REF.20170919
 DVO.GETSTAR                   STR      getstar
 DVO.GETSTAR.OUTFORMAT         STR      PS1_DEV_0
 DVO.GETSTAR.PHOTCODE          STR      i
-DVO.GETSTAR.MAX.RHO           F32      30000.0
-DVO.GETSTAR.MIN.MAG           F32      12.0
-DVO.GETSTAR.MIN.MAG.INST      F32     -15.0
+DVO.GETSTAR.MAX.RHO           F32      90000.0
+DVO.GETSTAR.MIN.MAG           F32      -3.0
+DVO.GETSTAR.MIN.MAG.INST      F32     -27.0
 
 PHOTCODE.DATA MULTI
 PHOTCODE.DATA METADATA
   FILTER   STR g
-  ZEROPT   F32 26.75
+#  ZEROPT   F32 26.75
+  ZEROPT   F32 26.70
   PHOTCODE STR g
-  GHOST_MAX_MAG                   F32 -16.5
+  GHOST_MAX_MAG                   F32 -22.0
 END
 PHOTCODE.DATA METADATA
   FILTER   STR r
-  ZEROPT   F32 27.1
+#  ZEROPT   F32 27.1
+  ZEROPT   F32 27.05
   PHOTCODE STR r
-  GHOST_MAX_MAG                   F32 -20.0
+  GHOST_MAX_MAG                   F32 -22.5
 END
 PHOTCODE.DATA METADATA
   FILTER   STR i
-  ZEROPT   F32 27.0
+#  ZEROPT   F32 27.0
+  ZEROPT   F32 26.8
   PHOTCODE STR i
-  GHOST_MAX_MAG                   F32 -25.0
+  GHOST_MAX_MAG                   F32 -23.0
 END
 PHOTCODE.DATA METADATA
   FILTER   STR z
-  ZEROPT   F32 26.2
+#  ZEROPT   F32 26.2
+  ZEROPT   F32 26.0
   PHOTCODE STR z
-  GHOST_MAX_MAG                   F32 -25.0
+  GHOST_MAX_MAG                   F32 -23.0
 END
 PHOTCODE.DATA METADATA
   FILTER   STR y
-  ZEROPT   F32 25.1
+#  ZEROPT   F32 25.1
+  ZEROPT   F32 25.55
   PHOTCODE STR y
-  GHOST_MAX_MAG                   F32 -25.0
+  GHOST_MAX_MAG                   F32 -23.0
+END
+PHOTCODE.DATA METADATA
+  FILTER   STR NB816
+#  ZEROPT   F32 26.0
+  ZEROPT   F32 23.75
+  PHOTCODE STR i
+  GHOST_MAX_MAG                   F32 -23.0
 END
 PHOTCODE.DATA METADATA
   FILTER   STR NB921
-  ZEROPT   F32 25.4
+#  ZEROPT   F32 25.4
+  ZEROPT   F32 23.95
   PHOTCODE STR z
-  GHOST_MAX_MAG                   F32 -25.0
+  GHOST_MAX_MAG                   F32 -23.0
 END
 
@@ -58,6 +72,6 @@
 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.NREF.MAX  S32   5000 # max stars accepted for fitting
+PSASTRO.GRID.NRAW.MAX  S32   5000 # max stars accepted for fitting
 
 PSASTRO.GRID.MIN.INST.MAG.RAW       F32      -14
@@ -116,16 +130,126 @@
 
 # Masking parameters
-# REFSTAR_MASK			BOOL TRUE
-# REFSTAR_MASK_MAX_MAG		F32  -15.0
-# REFSTAR_MASK_SATSTAR_MAG_MAX    F32  -15.0
-# REFSTAR_MASK_SATSTAR_MAG_SLOPE  F32  10.15
-# REFSTAR_MASK_SATSTAR_POS_ZERO   F32   0.0
-
-# REFSTAR_MASK_SATSPIKE_MAG_SLOPE F32 0.5188
-# REFSTAR_MASK_SATSPIKE_MAG_MAX   F32 -14.644
-# REFSTAR_MASK_SATSPIKE_OFFSET    F32 0.0
-# REFSTAR_MASK_SATSPIKE_WIDTH     F32 6.0
-# REFSTAR_MASK_SATSPIKE_L0        F32 0
-# REFSTAR_MASK_SATSPIKE_WIDTH_SLOPE  F32 0.0106
+REFSTAR_MASK			BOOL TRUE
+REFSTAR_MASK_MAX_MAG		F32  -15.0
+REFSTAR_MASK_SATSTAR_MAG_MAX    F32  -15.0
+REFSTAR_MASK_SATSTAR_MAG_SLOPE  F32   4.45 # Was 10.15
+REFSTAR_MASK_SATSTAR_POS_ZERO   F32   -15.0
+
+REFSTAR_MASK_SATSPIKE_MAG_SLOPE F32 0.35
+REFSTAR_MASK_SATSPIKE_MAG_MAX   F32 -14.5
+REFSTAR_MASK_SATSPIKE_OFFSET    F32 0.0
+REFSTAR_MASK_SATSPIKE_WIDTH     F32 6.0
+REFSTAR_MASK_SATSPIKE_L0        F32 0
+REFSTAR_MASK_SATSPIKE_WIDTH_SLOPE  F32 0.0106
+
+REFSTAR_MASK_BLEED		BOOL TRUE
+
+REFSTAR_MASK_BLEED_MAG_MAX      F32 -14.5
+REFSTAR_MASK_BLEED_MAG_SLOPE    F32   2.0
+
+REFSTAR_MASK_BLEED_ORIENTATION_X BOOL FALSE
+REFSTAR_MASK_BLEED_MAG_MAX_X    F32 -15.0
+REFSTAR_MASK_BLEED_MAG_SLOPE_X  F32   5.0
+
+REFSTAR_MASK_BLEED_ORIENTATION_Y BOOL TRUE
+REFSTAR_MASK_BLEED_MAG_MAX_Y    F32 -14.5
+REFSTAR_MASK_BLEED_MAG_SLOPE_Y  F32   0.425
+
+REFSTAR_COUNT_GHOSTS            BOOL TRUE
+#REFSTAR_MASK_GHOST              BOOL TRUE
+REFSTAR_MASK_GHOST		 BOOL FALSE
+GHOST_MODEL                     STR  hsc/ghost.model.mdc
+
+
+#REFSTAR_MASK_GLINTS		BOOL TRUE
+REFSTAR_MASK_GLINTS		BOOL FALSE
+GLINT_MAX_MAG			F32  -19
+GLINT_LENGTH_MAG_SLOPE		F32  0.0
+GLINT_LENGTH_MAG_ZERO		F32  0.0
+GLINT_WIDTH			F32  80.0
+
+
+# The slopes and radii and region below are all in FPA units, 1/13.5 of a regular pixel.
+GLINT.REGION			MULTI
+GLINT.REGION			METADATA
+  GLINT.TYPE                    STR  HSC
+  GLINT.PIXEL.SCALE		F32  3.49794238e-06
+  REGION			STR  [-350000:350000,-350000:350000]
+  GLINT.RADIUS.INNER            F32  252435  # 0.883 degrees
+  GLINT.RADIUS.OUTER		F32  283025  # 0.990 degrees
+  
+  GLINT.FILTER.TERM		MULTI
+  GLINT.FILTER.TERM		METADATA
+    FILTER			STR	g
+    @C_TERMS			F32	-4467.9759580157  10022.1277915657  -5156.3556611527 # a comment
+    @R_TERMS			F32	-4375.9715493905  9717.6993803237   -5203.2424778605 # a comment
+    FACTOR			F32	1.002
+    LIMIT			F32	14.0
+  END
+  GLINT.FILTER.TERM		METADATA
+    FILTER			STR      r
+    @C_TERMS			F32	 -4354.2575893763  9762.9766653532  -5011.1243975288 # a comment
+    @R_TERMS			F32	 -4263.2230039887  9457.4516871365  -5057.2762518308 # a comment
+    FACTOR			F32	 1.0015
+    LIMIT			F32	 13.5
+  END
+  GLINT.FILTER.TERM		METADATA
+    FILTER			STR      i
+    @C_TERMS			F32	 -4243.1837126908  9517.3512135240  -4876.3237965836 # a comment
+    @R_TERMS			F32	 -4154.5095389959  9215.4140278639  -4924.2923196315 # a comment
+    FACTOR			F32	1.001
+    LIMIT			F32	13.5
+  END
+  GLINT.FILTER.TERM		METADATA
+    FILTER			STR      z
+    @C_TERMS			F32	 -3966.2315539829  8920.7199277389  -4555.9567436784 # a comment
+    @R_TERMS			F32	 -3878.4529585585  8619.7241050446  -4604.3603386145 # a comment
+    FACTOR			F32	0.9995
+    LIMIT			F32	13.0
+  END
+  GLINT.FILTER.TERM		METADATA
+    FILTER			STR      y
+    @C_TERMS			F32	 -3723.5919271089  8403.7641770854  -4281.0159171765 # a comment
+    @R_TERMS			F32	 -3637.0352789862  8104.8245491120  -4330.4583627761 # a comment
+    FACTOR			F32	1.000
+    LIMIT			F32	13.0
+  END
+  GLINT.FILTER.TERM		METADATA
+    FILTER			STR      NB816
+    @C_TERMS			F32	 -4243.1837126908  9517.3512135240  -4876.3237965836 # a comment
+    @R_TERMS			F32	 -4154.5095389959  9215.4140278639  -4924.2923196315 # a comment
+    FACTOR			F32	1.001
+    LIMIT			F32	13.5
+  END
+  GLINT.FILTER.TERM		METADATA
+    FILTER			STR      NB921
+    @C_TERMS			F32	 -3966.2315539829  8920.7199277389  -4555.9567436784 # a comment
+    @R_TERMS			F32	 -3878.4529585585  8619.7241050446  -4604.3603386145 # a comment
+    FACTOR			F32	1.0005
+    LIMIT			F32	12.0
+  END
+
+END
+
+#  GLINT.RADIUS.INNER		F32  245000
+#  GLINT.RADIUS.OUTER		F32  260000
+
+#  GLINT.ANGLE.INNER_SLOPE       F32  -0.0059259
+#  GLINT.ANGLE.INNER_ZERO	F32  72
+
+#  GLINT.ANGLE.OUTER_SLOPE	F32 0.0088889 
+#  GLINT.ANGLE.OUTER_ZERO	F32 -41
+
+#   GLINT.ANGLE.INNER_SLOPE      F32  0.0
+#   GLINT.ANGLE.INNER_ZERO       F32  7.0
+#   GLINT.ANGLE.INNER_ZERO       F32  1.5
+#   GLINT.ANGLE.OUTER_SLOPE      F32  0.0
+#   GLINT.ANGLE.OUTER_ZERO       F32 22.0
+#   GLINT.ANGLE.OUTER_ZERO       F32  6.0
+
+
+
+
+
 
 # REFSTAR_MASK_GLINTS             BOOL  TRUE
@@ -137,2 +261,24 @@
 #   GLINT.TYPE                    STR HSC
 # END
+
+STATICSKY_CAL   METADATA
+    REFSTAR_MASK                BOOL FALSE
+    PSASTRO.SAVE.REFMATCH       BOOL FALSE
+    PSASTRO.FIX.CHIPS           BOOL FALSE
+    PSASTRO.USE.MODEL           BOOL FALSE
+    PSASTRO.MOSAIC.MODE         BOOL FALSE
+    DVO.GETSTAR.FIXED.ZEROPT    F32   30.0
+        DVO.GETSTAR.MIN.MAG.INST    F32   -22.0
+    PSASTRO.CATDIR               STR  PS1.REF.20140713
+    ZERO.POINT.USE.MEAN                  BOOL    TRUE
+    PSASTRO.MATCH.RADIUS.N0 F32    30
+    PSASTRO.MATCH.RADIUS.N1 F32    20
+    PSASTRO.MATCH.RADIUS.N2 F32    10
+    PSASTRO.MATCH.RADIUS.N3 F32    2
+    PSASTRO.MATCH.RADIUS.N4 F32    1
+    PSASTRO.MATCH.FIT.NITER S32    5
+
+    PSASTRO.MAX.ERROR      F32      0.2  # in arcsec units, if larger than 0.2" on skycell then a problem..
+
+    TRANSFORM.GALAXY.SHAPE.ERRORS  BOOL T
+END
