Changeset 31434 for branches/czw_branch/20110406/ippconfig/gpc1/psastro.config

Timestamp:

May 4, 2011, 3:20:38 PM (15 years ago)

Author:

watersc1

Message:

Merging trunk into this branch

Location:

branches/czw_branch/20110406

Files:

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

branches/czw_branch/20110406/ippconfig/gpc1/psastro.config

@@ -16 +16 @@
 PSASTRO.GRID.SCALE     F32      50
 PSASTRO.GRID.NSTAR.MAX S32     800 # deprecated 
-PSASTRO.GRID.NREF.MAX  S32     800 # max stars accepted for fitting from ref catalog
-PSASTRO.GRID.NRAW.MAX  S32    1200 # max stars accepted for fitting from raw image
+PSASTRO.GRID.NREF.MAX  S32     800 # max stars accepted for grid search from ref catalog
+PSASTRO.GRID.NRAW.MAX  S32    1200 # max stars accepted for grid search from raw image
 
 PSASTRO.MAX.NRAW      S32      1000   # max stars accepted for fitting (0 for all)
@@ -28 +28 @@
 PSASTRO.MIN.INST.MAG.RAW       F32     -15.0   # min instrumental magnitude for stars accepted for fitting
 PSASTRO.MAX.INST.MAG.RAW       F32      -8.0   # max instrumental magnitude for stars accepted for fitting
+PSASTRO.GRID.MIN.INST.MAG.RAW  F32     -15.0   # min instrumental magnitude for stars accepted for grid search
+PSASTRO.GRID.MAX.INST.MAG.RAW  F32      -8.0   # max instrumental magnitude for stars accepted for grid search
 
 PSASTRO.GRID.MIN.ANGLE F32 -1.0 # start angle (degrees)
@@ -314 +316 @@
   # allow more stars per chip and boost the density to which we query
   # from the reference database.
-  PSASTRO.MAX.NRAW      S32      2000   # 
-  PSASTRO.MAX.NREF      S32      8000   # max stars accepted for fitting (0 for all)
-  DVO.GETSTAR.MAX.RHO   F32      60000.0
+  PSASTRO.MAX.NRAW               S32      2000   # 
+  PSASTRO.MAX.NREF               S32      8000   # max stars accepted for fitting (0 for all)
+  # use wider range of magnitudes for grid search
+  PSASTRO.GRID.MIN.INST.MAG.RAW  F32     -15.0   # min instrumental magnitude for stars accepted for fitting
+  PSASTRO.GRID.MAX.INST.MAG.RAW  F32     -11.0   # max instrumental magnitude for stars accepted for fitting
+
+  # reduce the magnitude range to avoid the bright stars have bad astrometry problem
+  PSASTRO.MIN.INST.MAG.RAW       F32     -12.0   # min instrumental magnitude for stars accepted for fitting
+  PSASTRO.MAX.INST.MAG.RAW       F32     -11.0   # min instrumental magnitude for stars accepted for fitting
+
+  DVO.GETSTAR.MIN.MAG.INST   F32     -15.0
+  DVO.GETSTAR.MAX.RHO        F32      60000.0
   
   # the crowding is high, so unless we restrict somewhat tightly early
@@ -324 +335 @@
 
   # single-chip radius match in pixels
-  PSASTRO.MATCH.RADIUS.N0 F32    10
+  PSASTRO.MATCH.RADIUS.N0 F32   10
   PSASTRO.MATCH.RADIUS.N1 F32    5
   PSASTRO.MATCH.RADIUS.N2 F32    5