Changeset 33309 for branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/mextract.c

Timestamp:

Feb 20, 2012, 6:55:53 AM (14 years ago)

Author:

eugene

Message:

dvo_client with mextract connected to vector IO table now builds

File:

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

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

@@ -5 +5 @@
 # define PARALLEL_SERIAL 0
 # define MAX_PATH_LENGTH 1024
+
+int HostTableLaunchJobs (HostTable *table, char *basecmd);
+Vector **MergeVectors (Vector **vec, int *Nvec, Vector **invec, int Ninvec);
 
 int mextract (int argc, char **argv) {
@@ -93 +96 @@
 
     // load fields from file
-    // ReadVectorTables
+    int    Nvec = 0;
+    Vector **vec = NULL;
+    for (i = 0; i < table->Nhosts; i++) {
+      char resultFile[MAX_PATH_LENGTH];
+      snprintf (resultFile, MAX_PATH_LENGTH, "%s/dvo.results.fits", table->hosts[i].pathname);
+        
+      int    Ninvec = 0;
+      Vector **invec = ReadVectorTableFITS (resultFile, "MEXTRACT", &Ninvec);
+
+      vec = MergeVectors (vec, &Nvec, invec, Ninvec);
+      if (vec != invec) {
+        FreeVectorArray (invec, Ninvec);
+      }
+    }
+
+    for (i = 0; i < Nvec; i++) {
+      AssignVector (vec[i], vec[i]->name, ANYVECTOR, TRUE);
+    }
+    free (vec);
+
     return TRUE;
   }
@@ -449 +471 @@
 }
 
+// take two arrays of vectors and merge equal named vectors.
+// for ease, require that the order of the names match & number of vectors match
+Vector **MergeVectors (Vector **vec, int *Nvec, Vector **invec, int Ninvec) {
+
+  int i, j;
+
+  if (vec == NULL) {
+    *Nvec = Ninvec;
+    return invec;
+  }
+
+  myAssert (*Nvec == Ninvec, "programming error (1)");
+
+  for (i = 0; i < Ninvec; i++) {
+    myAssert (!strcmp(vec[i]->name, invec[i]->name), "programming error (2)");
+    myAssert (vec[i]->type == invec[i]->type, "programming error (2)");
+
+    if (vec[i]->type == OPIHI_FLT) {
+      REALLOCATE (vec[i]->elements.Flt, opihi_flt, vec[i]->Nelements + invec[i]->Nelements);
+      for (j = 0; j < invec[i]->Nelements; j++) {
+        vec[i]->elements.Flt[i+j] = vec[i]->elements.Flt[j];
+      }
+    } else {
+      REALLOCATE (vec[i]->elements.Int, opihi_int, vec[i]->Nelements + invec[i]->Nelements);
+      for (j = 0; j < invec[i]->Nelements; j++) {
+        vec[i]->elements.Int[i+j] = vec[i]->elements.Int[j];
+      }
+    }
+    vec[i]->Nelements += invec[i]->Nelements;
+  }
+  return vec;
+}