Changeset 36590

Timestamp:

Mar 17, 2014, 1:33:17 PM (12 years ago)

Author:

eugene

Message:

fix left-behind photcode APIs; add sync for relphot remote clients to avoid loading overloading

Location:

branches/eam_branches/ipp-20140206/Ohana/src

Files:

• opihi/dvo/photometry.c (modified) (2 diffs)
• relphot/src/launch_region_hosts.c (modified) (2 diffs)
• relphot/src/relphot_parallel_images.c (modified) (1 diff)
• relphot/src/setMrelCatalog.c (modified) (2 diffs)

branches/eam_branches/ipp-20140206/Ohana/src/opihi/dvo/photometry.c

@@ -662 +662 @@
       break;
     case AVE_dMAG:
-      value = PhotdM (code, average, secfilt);
+      value = PhotAveErr (code, average, secfilt);
       break;
     case AVE_Xm:
@@ -865 +865 @@
   /* for ErrSelect, check average errors */
   if (ErrSelect) {
-    dM = PhotdM (code, average, secfilt);
+    dM = PhotAveErr (code, average, secfilt);
     if (dM > ErrValue) return (FALSE);
   }

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/launch_region_hosts.c

@@ -78 +78 @@
     if (PARALLEL_REGIONS_MANUAL) continue;
 
+    // launch the job, then wait for it to be done loading catalogs.  force the remote
+    // client to generate the file
+    char *syncfile = make_filename (CATDIR, host->hostname, host->hostID, "loadcat.sync");
+    clear_sync_file (syncfile);
+
     // launch the job on the remote machine (no handshake)
     int errorInfo = 0;
@@ -86 +91 @@
     }
     host->pid = pid; // save for future reference
+
+    // remove client is done, go ahead with next client
+    check_sync_file (syncfile, 1);
+    clear_sync_file (syncfile);
+    free (syncfile);
   }
 

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/relphot_parallel_images.c

@@ -52 +52 @@
   catalog = load_catalogs (skylist, &Ncatalog, 0, NULL);
   MARKTIME("-- load catalog data: %f sec\n", dtime);
+
+  // NOTE: if I let all hosts load blindly, I saturate the data clients with too many
+  // relphot_client requests.  I need to have the master mediate this.  the master
+  // will not launch the next remote job until this one says it is done
+  char *syncfile = make_filename (CATDIR, regionHosts->hosts[myHost].hostname, REGION_HOST_ID, "loadcat.sync");
+  update_sync_file (syncfile, 1);
   
   // generate tables go from catID,objID -> catSeq,objSeq

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/setMrelCatalog.c

@@ -255 +255 @@
 
         // Map (Maplist) and Mkron (Mkronlist,dkronlist) are used to calculate mean mags per filter
-        float Map = PhotAper (&measure[k]);
+        float Map = PhotAperCat (&measure[k]);
         if (!isnan(Map)) {
             Maplist[Nap] = Map - Mcal - Mmos - Mgrid;
@@ -263 +263 @@
         }
 
-        float Mkron = PhotKron (&measure[k]);
+        float Mkron = PhotKronCat (&measure[k]);
         if (!isnan(Mkron)) {
           Mkronlist[Nkron] = Mkron - Mcal - Mmos - Mgrid;