Changeset 37701

Timestamp:

Nov 30, 2014, 1:33:28 PM (12 years ago)

Author:

eugene

Message:

add some info to the loops

File:

• branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/relastro_parallel_images.c (modified) (4 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/relastro_parallel_images.c

@@ -60 +60 @@
   char *syncfile = make_filename (CATDIR, regionHosts->hosts[myHost].hostname, REGION_HOST_ID, "loadcat.sync");
   catalog = load_catalogs (skylist, &Ncatalog, TRUE, 0, NULL, syncfile);
-  MARKTIME("-- load catalog data: %f sec\n", dtime);
+  MARKTIME("-- load catalog data, host %d: %f sec\n", REGION_HOST_ID, dtime);
   free (syncfile);
   
@@ -76 +76 @@
   /* match measurements with images, mosaics */
   initImageBins  (catalog, Ncatalog, TRUE);
-  MARKTIME("-- make image bins: %f sec\n", dtime);
+  MARKTIME("-- make image bins, host %d: %f sec\n", REGION_HOST_ID, dtime);
 
   findImages (catalog, Ncatalog, TRUE);
-  MARKTIME("-- set up image indexes: %f sec\n", dtime);
+  MARKTIME("-- set up image indexes, host %d: %f sec\n", REGION_HOST_ID, dtime);
 
   // set test points based on the starmap
@@ -103 +103 @@
     case TARGET_CHIPS:
       for (i = 0; i < NLOOP; i++) {
-        if (RESET_IMAGES) UpdateMeasures (catalog, Ncatalog);
+        if (RESET_IMAGES) {
+          UpdateMeasures (catalog, Ncatalog);
+          MARKTIME("reset measures loop %d, host %d: %f sec\n", i, REGION_HOST_ID, dtime);
+        }
         UpdateObjects (catalog, Ncatalog, (i > 0));
+        MARKTIME("update objects loop %d, host %d: %f sec\n", i, REGION_HOST_ID, dtime);
         if ((i > 1) || !USE_GALAXY_MODEL) {
           // if GALAXY_MODEL is selected, we want to delay the frame correction until we have 
           // applied the galaxy model a couple of times.
           FrameCorrectionParallelSlave (catalog, Ncatalog, regionHosts, i); 
+          MARKTIME("frame correction loop %d, host %d: %f sec\n", i, REGION_HOST_ID, dtime);
         }
         share_mean_pos (catalog, Ncatalog, regionHosts, i);
@@ -114 +119 @@
 
         UpdateChips (catalog, Ncatalog);
+        MARKTIME("update chips loop %d, host %d: %f sec\n", i, REGION_HOST_ID, dtime);
         share_image_pos (regionHosts, i);
         slurp_image_pos (catalog, Ncatalog, regionHosts, i);
         share_meas_pos (catalog, Ncatalog, regionHosts, i);
         slurp_meas_pos (catalog, Ncatalog, regionHosts, i);
-        MARKTIME("update chips: %f sec\n", dtime);
+        MARKTIME("done exchange loop %d, host %d: %f sec\n", i, REGION_HOST_ID, dtime);
       }
       // create summary plots of the process