Changeset 3645

Timestamp:

Apr 1, 2005, 3:58:43 PM (21 years ago)

Author:

eugene

Message:

added timing info

Location:

trunk/Ohana/src/addstar/src

Files:

• addstar.c (modified) (3 diffs)
• gimages.c (modified) (3 diffs)

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

@@ -3 +3 @@
 int main (int argc, char **argv) {
 
-  int i, Nstars, Noverlap, Nregions, Nsubset;
+  int i, Nstars, Noverlap, Nregions, Nsubset, Naverage, Nmeasure;
   Stars *stars, **subset;
   Image image, *overlap;
   GSCRegion *regions;
   Catalog catalog;
+
+  double dtime;
+  struct timeval start, stop;
+
+  gettimeofday (&start, NULL);
 
   SetSignals ();
@@ -40 +45 @@
   }
 
+  Naverage = Nmeasure = 0;
   for (i = 0; i < Nregions; i++) {
     if (!load_pt_catalog (&catalog, &regions[i])) continue;
+
+    Naverage += catalog.Naverage;
+    Nmeasure += catalog.Nmeasure;
 
     switch (MODE) {
@@ -65 +74 @@
   if (CALIBRATE) { FindCalibration (&image); }
   unlock_image_db (&image); 
+
+  gettimeofday (&stop, NULL);
+  dtime = DTIME (stop, start);
+  fprintf (stderr, "SUCCESS: elapsed time %8.3f sec for %5d stars, %6d average, %7d measure\n", dtime, Nstars, Naverage, Nmeasure);
   exit (0);
 }

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

@@ -98 +98 @@
   ALLOCATE (pimage, Image, NPIMAGE);
 
-  fprintf (stderr, "find overlapping images\n");
   /* run through image table, reading images in blocks */
   for (Ntimage = 0; Ntimage < Nimage; Ntimage += ntimage) {
@@ -108 +107 @@
 
       /* if any of these images are WRP images, need to find matching DIS */
-      if (!FindMosaicForImage (timage, ntimage, i)) {
-        fprintf (stderr, "!");
-        continue;
-      }
+      if (!FindMosaicForImage (timage, ntimage, i)) continue;
 
       addtolist = FALSE;
@@ -142 +138 @@
     }
   }
-  fprintf (stderr, "done\n");
 
   BuildChipMatch (pimage, npimage);