Changeset 27509

Timestamp:

Mar 29, 2010, 1:46:26 PM (16 years ago)

Author:

eugene

Message:

adding timing marks

Location:

branches/eam_branches/20100225/Ohana/src

Files:

• relastro/src/relastro.c (modified) (3 diffs)
• relphot/src/relphot.c (modified) (7 diffs)

branches/eam_branches/20100225/Ohana/src/relastro/src/relastro.c

@@ -1 +1 @@
 # include "relastro.h"
+
+# define MARKTIME(MSG,...) { \
+  float dtime; \
+  gettimeofday (&stop, (void *) NULL); \
+  dtime = DTIME (stop, start); \
+  fprintf (stderr, MSG, __VA_ARGS__); }
 
 int main (int argc, char **argv) {
@@ -6 +12 @@
   Catalog *catalog;
   FITS_DB db;
+  struct timeval start, stop;
 
   SkyList *skylist = NULL;
+
+  gettimeofday (&start, (void *) NULL);
 
   /* get configuration info, args */
@@ -26 +35 @@
   if (db.dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db.filename);
   if (!dvo_image_load (&db, VERBOSE, FALSE)) Shutdown ("can't read image catalog %s", db.filename);
+  MARKTIME("load image data: %f sec\n", dtime);
 
   /* load regions and images based on specified sky patch (default depth) */
   skylist = load_images (&db, &UserPatch);
+  MARKTIME("load images: %f sec\n", dtime);
 
   /* load catalog data from region files : subselect high-quality measurements */
   catalog = load_catalogs (skylist, &Ncatalog, TRUE);
+  MARKTIME("load catalog data: %f sec\n", dtime);
 
   /* match measurements with images */
   initImageBins (catalog, Ncatalog);
+  MARKTIME("make image bins: %f sec\n", dtime);
+
   findImages (catalog, Ncatalog);
+  MARKTIME("set up image indexes: %f sec\n", dtime);
 
   if (PLOTSTUFF) {

branches/eam_branches/20100225/Ohana/src/relphot/src/relphot.c

@@ -1 +1 @@
 # include "relphot.h"
 # define USE_DIRECT 0
+
+# define MARKTIME(MSG,...) { \
+  float dtime; \
+  gettimeofday (&stop, (void *) NULL); \
+  dtime = DTIME (stop, start); \
+  fprintf (stderr, MSG, __VA_ARGS__); }
 
 int main (int argc, char **argv) {
@@ -7 +13 @@
   Catalog *catalog;
   FITS_DB db;
+  struct timeval start, stop;
+  SkyList *skylist = NULL;
 
-  SkyList *skylist = NULL;
+  gettimeofday (&start, (void *) NULL);
 
   /* get configuration info, args */
@@ -39 +47 @@
     if (!dvo_image_load (&db, VERBOSE, FALSE)) Shutdown ("can't read image catalog %s", db.filename);
   }
+  MARKTIME("load image data: %f sec\n", dtime);
 
   /* load regions and images based on specified sky patch */
@@ -45 +54 @@
   // XXX this is fairly lame: argv[1] is photcode if UserPatchSelect is true
   skylist = load_images (&db, argv[1], &UserPatch, UserPatchSelect);
+  MARKTIME("load images: %f sec\n", dtime);
 
   /* unlock, if we can (else, unlocked below) */
@@ -51 +61 @@
   /* load catalog data from region files */
   catalog = load_catalogs (skylist, &Ncatalog);
+  MARKTIME("load catalog data: %f sec\n", dtime);
   
   /* add in a loop over the catalogs calling dvo_catalog_chipcoords */
@@ -56 +67 @@
   /* match measurements with images, mosaics */
   initImageBins  (catalog, Ncatalog);
+  MARKTIME("make image bins: %f sec\n", dtime);
+
   initMosaicBins (catalog, Ncatalog);
   initGridBins   (catalog, Ncatalog);
@@ -61 +74 @@
 
   findImages (catalog, Ncatalog);
+  MARKTIME("set up image indexes: %f sec\n", dtime);
+
   findMosaics (catalog, Ncatalog);  /* also sets Grid values */
+  MARKTIME("set up mosaic indexes: %f sec\n", dtime);
+
   SAVEPLOT = FALSE;