Changeset 27835 for branches/tap_branches/ippconfig/gpc1/psastro.config

Timestamp:

May 3, 2010, 8:35:20 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches/ippconfig

Files:

• . (modified) (1 prop)
• gpc1/psastro.config (modified) (10 diffs)

branches/tap_branches/ippconfig/gpc1/psastro.config

@@ -17 +17 @@
 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 +25 @@
 # 
 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 +34 @@
 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 +42 @@
 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 +68 @@
 # 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)
+
+# 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)
@@ -80 +78 @@
 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?)
@@ -114 +115 @@
 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
 PHOTCODE.DATA METADATA
@@ -145 +152 @@
   GHOST_MAX_MAG                   F32 -25.0
 END
+PHOTCODE.DATA METADATA
+  FILTER   STR w
+  ZEROPT   F32 25.1
+  PHOTCODE STR r_SYNTH
+  GHOST_MAX_MAG                   F32 -20.0
+END
 
 REFSTAR_MASK                    BOOL TRUE
@@ -150 +163 @@
 REFSTAR_MASK_SATSTAR_MAG_MAX    F32 -17.40
 REFSTAR_MASK_SATSTAR_MAG_SLOPE  F32  13.45
-REFSTAR_MASK_SATSTAR_POS_ZERO   F32  -0.779
-
-# Length = SLOPE*(MAG_MAX - InstMag)
-
-REFSTAR_MASK_SATSPIKE_MAG_SLOPE F32  52.00
-REFSTAR_MASK_SATSPIKE_MAG_MAX   F32 -16.20
+REFSTAR_MASK_SATSTAR_POS_ZERO   F32  -0.798
+
+# Length = 10**(SLOPE*(MAG_MAX - InstMag)) - OFFSET
+
+REFSTAR_MASK_SATSPIKE_MAG_SLOPE F32  0.096
+REFSTAR_MASK_SATSPIKE_MAG_MAX   F32  7.35
+REFSTAR_MASK_SATSPIKE_OFFSET    F32 200.0
 
 # pair 1 (longer)
@@ -227 +241 @@
 END
 
+REFSTAR_MASK_CROSSTALK_MAG_SLOPE F32   3.44
+REFSTAR_MASK_CROSSTALK_MAG_MAX   F32 -14.47
+CROSSTALK_MAX_MAG                F32  20.0
+CROSSTALK_MASK                   BOOL TRUE