Changeset 33543 for branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/gstar.c

Timestamp:

Mar 16, 2012, 7:51:21 AM (14 years ago)

Author:

eugene

Message:

parallelize gstar, update avmatch to work with merged vectors by index; remove elements from dvoshell.h which have moved to libdvo

File:

• branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/gstar.c (modified) (2 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/gstar.c

@@ -68 +68 @@
   }
 
+  int PARALLEL = FALSE;
+  if ((N = get_argument (argc, argv, "-parallel"))) {
+    remove_argument (N, &argc, argv);
+    PARALLEL = TRUE;
+  }
+
   if (argc != 4) {
     gprint (GP_ERR, "USAGE: gstar RA DEC Radius [-m]\n");
@@ -89 +95 @@
   }
 
+  HostTable *table = NULL;  
+  if (PARALLEL) {
+    char *CATDIR = GetCATDIR();
+    table = HostTableLoad (CATDIR, sky->hosts);
+    if (!table) {
+      gprint (GP_ERR, "ERROR: failure reading Host Table %s for database %s\n", sky->hosts, CATDIR);
+      return FALSE;
+    }    
+
+    SkyRegion *region = skylist[0].regions[0];
+    int hostID = (region->hostFlags & DATA_USE_BCK) ? region->backupID : region->hostID;
+    int index = table->index[hostID];
+    
+    char hostfile[1024];
+    snprintf (hostfile, 1024, "%s/%s.cpt", table->hosts[index].pathname, region->name);
+    catalog.filename = hostfile;
+  } else {
+    catalog.filename = skylist[0].filename[0];
+  }
+
   /* lock, load, unlock catalog */
-  catalog.filename = skylist[0].filename[0];
   catalog.catflags = GetMeasures ? LOAD_AVES | LOAD_MEAS | LOAD_SECF : LOAD_AVES | LOAD_SECF;
   catalog.Nsecfilt = 0;