Changeset 3390

Timestamp:

Mar 7, 2005, 6:18:38 PM (21 years ago)

Author:

eugene

Message:

minor mods, no impact on elixir

Location:

trunk/Ohana/src/gastro2/src

Files:

• ConfigInit.c (modified) (2 diffs)
• gastro2.c (modified) (1 diff)
• gproject2.c (modified) (1 diff)
• gstars2.c (modified) (1 diff)

trunk/Ohana/src/gastro2/src/ConfigInit.c

@@ -19 +19 @@
   ScanConfig (config, "DEFAULT_RADIUS",    "%lf", 0, &DEFAULT_RADIUS);
   ScanConfig (config, "MINIMUM_RADIUS",    "%lf", 0, &MINIMUM_RADIUS);
-  ScanConfig (config, "MAX_ERROR",         "%lf", 0, &MAX_ERROR);
   ScanConfig (config, "MAX_NONLINEAR",     "%lf", 0, &MAX_NONLINEAR);
   ScanConfig (config, "MAX_PRECISE",       "%lf", 0, &MIN_PRECISE);
@@ -47 +46 @@
   ScanConfig (config, "PHOTCODE_FILE",     "%s",  0, PhotCodeFile);
   ScanConfig (config, "GASTRO_MAX_NSTARS", "%d",  0, &GASTRO_MAX_NSTARS);
+  ScanConfig (config, "GASTRO_MAX_MAG_ERROR", "%lf", 0, &MAX_ERROR);
 
   if (strcasecmp (ROUGH_ASTROMETRY, "header") && 

trunk/Ohana/src/gastro2/src/gastro2.c

@@ -31 +31 @@
 
   for (i = 0; i < 3; i++) {
-    gfit (&Target, &Ref, 1);
+    gfit (&Target, &Ref, MIN (MAX (1, NPOLYTERMS), 3));
     fprintf (stderr, "precision: %f\n", Target.answer.dR / sqrt(Target.answer.N));
   }

trunk/Ohana/src/gastro2/src/gproject2.c

@@ -61 +61 @@
     
   Subset[0].N = N;
+  sort_stars_mag (Subset[0].stars, N);
+  if (GASTRO_MAX_NSTARS && (GASTRO_MAX_NSTARS < Subset[0].N)) {
+    Subset[0].N = GASTRO_MAX_NSTARS;
+    REALLOCATE (Subset[0].stars, StarData, Subset[0].N);
+  }
+  if (VERBOSE) fprintf (stderr, "using %d stars from ref catalog\n", Subset[0].N);
+
   REALLOCATE (Subset[0].stars, StarData, MAX (1, Subset[0].N));
 

trunk/Ohana/src/gastro2/src/gstars2.c

@@ -153 +153 @@
       /* hardwired dophot exclusions should eventually be encapsulated elsewhere */
       if ((type == 4) || (type == 6) || (type == 5) || (type == 9)) continue;
-      if (dmag > 100) continue;
+      if (dmag > 1000*MAX_ERROR) continue;
       stars[N].dM   = 0.001 * dmag;
       stars[N].type = type;