Changeset 7973

Timestamp:

Jul 25, 2006, 8:13:36 AM (20 years ago)

Author:

eugene

Message:

fixes for tycho / ptolemy related searches

Location:

trunk/Ohana/src

Files:

• addstar/src/find_matches_refstars.c (modified) (1 diff)
• addstar/src/gettycho.c (modified) (2 diffs)
• gastro2/include/gastro2.h (modified) (1 diff)
• gastro2/src/gargs.c (modified) (1 diff)
• gastro2/src/getptolemy.c (modified) (1 diff)
• gastro2/src/gptolemy2.c (modified) (2 diffs)

trunk/Ohana/src/addstar/src/find_matches_refstars.c

@@ -41 +41 @@
   Nmiss = catalog[0].Nmissing;
   NMISS = Nmiss + 1000;
+  if ((NMISS < 1) || (NMISS > 1e10)) {
+      fprintf (stderr, "weird value for NMISS: %d\n", NMISS);
+  }
   ALLOCATE (next_miss, int, NMISS);
   REALLOCATE (catalog[0].missing, Missing, NMISS);

trunk/Ohana/src/addstar/src/gettycho.c

@@ -63 +63 @@
       nitems = fread (buffer, NBYTE, NITEM, f);
       if (nitems == 0) break;
-      if (nitems != NITEM) {
-        fprintf (stderr, "ERROR: failure reading data from file %s\n", filename);
-        exit (1);
-      }
 
-      for (j = 0; j < NITEM; j++) {
+      for (j = 0; j < nitems; j++) {
         line = &buffer[j*NBYTE];
         stars[Ntycho].R = atof (&line[15]);
@@ -115 +111 @@
         CHECK_REALLOCATE (stars, Stars, NTYCHO, Ntycho, 5000);
       }
+
+      if (nitems != NITEM) break;
     }
   next_section:

trunk/Ohana/src/gastro2/include/gastro2.h

@@ -125 +125 @@
 int GASTRO_MAX_NSTARS;
 int TEXTMODE;
+int PTOLEMY_FILL_FACTOR;
 
 int    FORCE;

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

@@ -35 +35 @@
   if ((N = get_argument (*argc, argv, "-textmode"))) {
     TEXTMODE = TRUE;
+    remove_argument (N, argc, argv);
+  }
+
+  /* force read of image database with mismatched NSTARS & size */ 
+  PTOLEMY_FILL_FACTOR = FALSE;
+  if ((N = get_argument (*argc, argv, "-ptolemy-fill-factor"))) {
+    PTOLEMY_FILL_FACTOR = TRUE;
     remove_argument (N, argc, argv);
   }

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

@@ -18 +18 @@
     if (Nptolemy == 0) continue;
 
-    FracArea = ptolemy_area (ptolemy, Nptolemy, &regions[i]);
+    // XXX this measurement adjusts a DVO database for 
+    // partial coverage; the correction is bogus if the
+    // sky density of the catalog is too low (<< 100 stars
+    // per field
+    FracArea = 1.0;
+    if (PTOLEMY_FILL_FACTOR) {
+        FracArea = ptolemy_area (ptolemy, Nptolemy, &regions[i]);
+    } 
 
     Ns = Ref[0].N;

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

@@ -19 +19 @@
   switch (lock_catalog (&catalog, LCK_SOFT)) {
     case 0:
+      fprintf (stderr, "can't lock catalog %s\n", filename);
+      return ((GSCdata *)NULL);
     case 2:
-      fprintf (stderr, "can't lock catalog data %s\n", filename);
+      fprintf (stderr, "catalog %s is empty\n", filename);
       return ((GSCdata *)NULL);
     case 1:
@@ -40 +42 @@
   ALLOCATE (stars, GSCdata, *Nstars);
 
-  /* select all entries, ignore magnitudes */
+  /* select all entries, use first magnitude */
   for (i = 0; i < catalog.Naverage; i++, nstar++) {
     stars[nstar].R = catalog.average[i].R;