Changeset 8641

Timestamp:

Aug 27, 2006, 1:28:06 PM (20 years ago)

Author:

eugene

Message:

added counter to total matches

File:

• trunk/Ohana/src/addstar/src/addstar.c (modified) (6 diffs)

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

@@ -3 +3 @@
 int main (int argc, char **argv) {
 
-  int Nm, Na, Ns, status;
+  int Nmatch, status;
   int i, Nstars, Nimage, Noverlap, Nsubset;
   unsigned long long Naverage, Nmeasure;
@@ -88 +88 @@
   /* XXX clean this up a bit : for only_image, I don't need to do this loop
      unless we are getting the calibration. */
-  Naverage = Nmeasure = 0;
+  Nmatch = Naverage = Nmeasure = 0;
   for (i = 0; i < skylist[0].Nregions; i++) {
 
@@ -112 +112 @@
     }
 
-    Nm = catalog.Nmeasure + catalog.Nmeas_off;
-    Na = catalog.Naverage;
-    Ns = Nstars;
-
     Naverage += catalog.Naverage;
     Nmeasure += catalog.Nmeasure;
@@ -123 +119 @@
         Nsubset = Nstars;
         if (options.closest) {
-          find_matches_closest (skylist[0].regions[i], stars, Nstars, &catalog, &image, overlap, Noverlap, MOSAIC, options);
+          Nmatch += find_matches_closest (skylist[0].regions[i], stars, Nstars, &catalog, &image, overlap, Noverlap, MOSAIC, options);
         } else {
-          find_matches (skylist[0].regions[i], stars, Nstars, &catalog, &image, overlap, Noverlap, MOSAIC, options);
+          Nmatch += find_matches (skylist[0].regions[i], stars, Nstars, &catalog, &image, overlap, Noverlap, MOSAIC, options);
         }
         break;
@@ -132 +128 @@
       case M_REFLIST:
         subset = find_subset (skylist[0].regions[i], stars, Nstars, &Nsubset);
-        find_matches_refstars (skylist[0].regions[i], subset, Nsubset, &catalog, options);
+        Nmatch += find_matches_refstars (skylist[0].regions[i], subset, Nsubset, &catalog, options);
         if (Nsubset) free (subset);
         break;
@@ -176 +172 @@
   gettimeofday (&stop, NULL);
   dtime = DTIME (stop, start);
-  fprintf (stderr, "SUCCESS: elapsed time %9.4f sec for %5d stars, %6lld average, %7lld measure\n", dtime, Nstars, Naverage, Nmeasure);
+  fprintf (stderr, "SUCCESS: elapsed time %9.4f sec for %5d stars (%5d matches), %6lld average, %7lld measure\n", dtime, Nstars, Nmatch, Naverage, Nmeasure);
   exit (0);
 }