Index: trunk/ippconfig/gpc1/psastro.config
===================================================================
--- trunk/ippconfig/gpc1/psastro.config	(revision 40875)
+++ trunk/ippconfig/gpc1/psastro.config	(revision 41367)
@@ -129,6 +129,6 @@
 DVO.GETSTAR.PHOTCODE        STR      i
 DVO.GETSTAR.MAX.RHO         F32      10000.0
-DVO.GETSTAR.MIN.MAG         F32      12.0
-DVO.GETSTAR.MIN.MAG.INST    F32     -25.0
+DVO.GETSTAR.MIN.MAG         F32      2.0
+DVO.GETSTAR.MIN.MAG.INST    F32     -35.0
 
 # rather than mean, use specified EDGE:
@@ -144,4 +144,5 @@
   PHOTCODE STR g
   GHOST_MAX_MAG                   F32 -16.5
+  GLINT_MAX_MAG                   F32 -23.0
 END
 PHOTCODE.DATA METADATA
@@ -150,4 +151,5 @@
   PHOTCODE STR r
   GHOST_MAX_MAG                   F32 -20.0
+  GLINT_MAX_MAG                   F32 -23.0
 END
 PHOTCODE.DATA METADATA
@@ -155,5 +157,6 @@
   ZEROPT   F32 24.611
   PHOTCODE STR i
-  GHOST_MAX_MAG                   F32 -25.0
+  GHOST_MAX_MAG                   F32 -22.0
+  GLINT_MAX_MAG                   F32 -23.4
 END
 PHOTCODE.DATA METADATA
@@ -161,5 +164,6 @@
   ZEROPT   F32 24.250
   PHOTCODE STR z
-  GHOST_MAX_MAG                   F32 -25.0
+  GHOST_MAX_MAG                   F32 -22.0
+  GLINT_MAX_MAG                   F32 -23.4
 END
 PHOTCODE.DATA METADATA
@@ -167,5 +171,6 @@
   ZEROPT   F32 23.320
   PHOTCODE STR y
-  GHOST_MAX_MAG                   F32 -25.0
+  GHOST_MAX_MAG                   F32 -21.5
+  GLINT_MAX_MAG                   F32 -23.0
 END
 PHOTCODE.DATA METADATA
@@ -173,5 +178,6 @@
   ZEROPT   F32 26.3
   PHOTCODE STR r
-  GHOST_MAX_MAG                   F32 -20.0
+  GHOST_MAX_MAG                   F32 -20.4
+  GLINT_MAX_MAG                   F32 -24.4
 END
 
@@ -180,11 +186,14 @@
 REFSTAR_MASK_SATSTAR_MAG_MAX    F32 -15.0
 REFSTAR_MASK_SATSTAR_MAG_SLOPE  F32  10.15
-# CZW: Original 2010-02-08 position angle offset
-REFSTAR_MASK_SATSTAR_POS_ZERO   F32  -0.798
-# CZW: Updated 2011-02-18 position angle offset. As above, offset 0.5 degree.
-# REFSTAR_MASK_SATSTAR_POS_ZERO   F32  -0.78927
-#REFSTAR_MASK_SATSTAR_POS_ZERO   F32  -0.80237
-#REFSTAR_MASK_SATSTAR_POS_ZERO   F32  -0.81109
-# Length = 10**(SLOPE*(MAG_MAX - InstMag)) - OFFSET
+
+# TdB20200430: Updated satspike position angle offset
+REFSTAR_MASK_SATSTAR_POS_ZERO   F32  -0.79451
+PSASTRO.MODEL.ROT.PARITY      S32     1
+
+#TdB20200229: The size of saturated star circles should be an exponential for gpc2
+#rad(mag) = REFSTAR_MASK_SATSTAR_RAD_OFFSET + REFSTAR_MASK_SATSTAR_EXP**(REFSTAR_MASK_SATSTAR_MAG_MAX-mag)
+REFSTAR_MASK_SATSTAR_MAG_MAX    F32 -11.363
+REFSTAR_MASK_SATSTAR_RAD_OFFSET F32  17.631
+REFSTAR_MASK_SATSTAR_EXP        F32   1.493
 
 REFSTAR_MASK_SATSPIKE_MAG_SLOPE F32  0.096
@@ -203,6 +212,4 @@
 
 
-
-
 REFSTAR_MASK_BLEED              BOOL FALSE
 REFSTAR_MASK_BLEED_MAG_MAX      F32 -15.0
@@ -218,24 +225,27 @@
 # GHOST_MAX_MAG                   F32 -20.0
 
-GLINT_LENGTH_MAG_SLOPE          F32 2500.0
-GLINT_LENGTH_MAG_ZERO           F32 -20.0
-GLINT_WIDTH                     F32  150.0
 REFSTAR_COUNT_GHOSTS            BOOL TRUE
 REFSTAR_MASK_GHOST              BOOL TRUE
-
-# GHOST_CENTER_X_0         	F32   66.2
-# GHOST_CENTER_X_SLOPE         	F32   -0.02454
-# GHOST_CENTER_Y_0         	F32   16.6
-# GHOST_CENTER_Y_SLOPE         	F32   +0.01565
-# 
-# GHOST_INNER_MAJOR_0         	F32   32.9
-# GHOST_INNER_MAJOR_SLOPE         F32   +0.00612
-# GHOST_INNER_MINOR_0         	F32   58.7
-# GHOST_INNER_MINOR_SLOPE         F32   -0.00258
-# 
-# GHOST_OUTER_MAJOR_0         	F32   90.6
-# GHOST_OUTER_MAJOR_SLOPE         F32   +0.01548
-# GHOST_OUTER_MINOR_0         	F32  133.9
-# GHOST_OUTER_MINOR_SLOPE         F32   -0.00288
+PSASTRO.SAVE.GHOSTS             BOOL TRUE  # save ghost positions as table in output smf file
+
+#TdB20200305: The length of glints as function of mag is recomputed for gpc2
+#glint_length(mag) = GLINT_LENGTH_MAG_SLOPE*(GLINT_LENGTH_MAG_ZERO-mag)
+GLINT_LENGTH_MAG_SLOPE          F32 1901.0
+GLINT_LENGTH_MAG_ZERO           F32 -16.8
+#TdB20200308: The length of glints also depends on position off the focal plane (perpendicular to pixel FPA), out to GLINT_LENGTH_POS_CUT
+#glint_length(pos) = GLINT_LENGTH_POS_SLOPE*(GLINT_LENGTH_POS_REF-pos)
+GLINT_LENGTH_POS_SLOPE          F32 0.00019
+GLINT_LENGTH_POS_REF            F32 33821.
+GLINT_LENGTH_POS_CUT            F32 30700.
+GLINT_LENGTH_MIN_FPA            F32 1500.0
+#TdB20200312: The angle that glints have depends on position along the focal plane (parallel to pixel FPA)
+#glint_angle(pos) = GLINT_ANGLE_SLOPE*(GLINT_ANGLE_POS_REF-(pos/1000))
+GLINT_ANGLE_POS_SLOPE           F32  0.07903  
+GLINT_ANGLE_POS_REF             F32 -575.5
+GLINT_WIDTH                     F32  80.0
+
+# save glint positions?
+PSASTRO.SAVE.GLINTS             BOOL TRUE  # save glint positions as table in output smf file
+
 
 PR_RECIPE METADATA
@@ -244,14 +254,15 @@
 
 REFSTAR_MASK_GLINTS		BOOL  TRUE
-GLINT_MAX_MAG                   F32 -21.0
+GLINT_MAX_MAG                   F32 -21.
 GLINT.REGION			MULTI
 
+#TdB20200514: GPC1 does not show any glints coming from the left or right, at all, after searching thousands of images. So, shrinking the bounding boxes to zero.
 GLINT.REGION			METADATA
-  REGION			STR  [-38000:-24000,-20000:+20000]
+  REGION			STR  [-38000:-38000,-20000:+20000]
   GLINT.TYPE                    STR  LEFT
 END
 
 GLINT.REGION			METADATA
-  REGION			STR  [+24000:+38000,-20000:+20000]
+  REGION			STR  [+38000:+38000,-20000:+20000]
   GLINT.TYPE                    STR  RIGHT
 END