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

Timestamp:

Mar 16, 2012, 2:14:22 PM (14 years ago)

Author:

eugene

Message:

rework dvo_client calls to pass the command via a file, not the cmd line (parens too complex)

File:

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

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

@@ -38 +38 @@
     remove_argument (N, &argc, argv);
     PARALLEL = TRUE;
-  }
-
-  // dump results directly to fits file (esp for parallel dvo)
-  char *ResultFile = NULL;
-  if ((N = get_argument (argc, argv, "-result"))) {
-    remove_argument (N, &argc, argv);
-    ResultFile = strcreate(argv[N]);
-    remove_argument (N, &argc, argv);
   }
 
@@ -63 +55 @@
   }
 
-  // this does all the work of re-packaging the command, calling it on the remote machines, then loading in the results
-  if (PARALLEL && !HOST_ID) {
-    // not all parallel ops need to set the region selection...
-    if (!SetSkyRegions (selection)) goto escape;
-
-    int status = HostTableParallelOps (argc, argv, ResultFile, 0);
-    return status;
-  }
-
   // init locally static variables (time refs)
   dbExtractMeasuresInit();
@@ -112 +95 @@
   /* load region corresponding to selection above */
   if ((skylist = SelectRegions (selection)) == NULL) goto escape;
+
+  // this does all the work of re-packaging the command, calling it on the remote machines, then loading in the results
+  if (PARALLEL && !HOST_ID) {
+    int status = HostTableParallelOps (argc, argv, RESULT_FILE, 0);
+
+    dbFreeFields (fields, Nfields);
+    dbFreeStack (stack, Nstack);
+    free (stack);
+    FreeSkyRegionSelection (selection);
+    dvo_catalog_free (&catalog);
+
+    return status;
+  }
 
   // load image data if needed (for fields listed below)
@@ -227 +223 @@
 
   // write vectors to a table (this is used by parallel dvo operations, but can be used elsewhere)
-  if (ResultFile) {
-    int status = WriteVectorTableFITS (ResultFile, "RESULT", vec, Nreturn, FALSE, NULL);
+  if (RESULT_FILE) {
+    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nreturn, FALSE, NULL);
     if (!status) goto escape;
   }
@@ -243 +239 @@
 
 escape:
-  if (ResultFile) free (ResultFile);
   if (vec) free (vec);
   free (values);