Changeset 33563 for branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/avmatch.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/avmatch.c (modified) (4 diffs)

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

@@ -48 +48 @@
     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);
   }
 
@@ -98 +90 @@
 
     // I need to pass the RA & DEC vectors to the remote clients...
-    int status = HostTableParallelOps (argc, argv, ResultFile, RAvec->Nelements);
-    if (ResultFile) free (ResultFile);
+    int status = HostTableParallelOps (argc, argv, RESULT_FILE, RAvec->Nelements);
     if (vec) free (vec);
     
@@ -225 +216 @@
   // write vectors to a table (this is used by parallel dvo operations, but can be used elsewhere)
   // only write the fields which were in a valid catalog
-  if (ResultFile) {
+  if (RESULT_FILE) {
     // extend the array by one to hold index array
     REALLOCATE (vec, Vector *, Nfields + 1);
@@ -271 +262 @@
       vec[i][0].Nelements = Nfound;
     }
-    int status = WriteVectorTableFITS (ResultFile, "RESULT", vec, Nfields + 1, FALSE, NULL);
+    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nfields + 1, FALSE, NULL);
     free (vec[Nfields]->elements.Int);
     free (vec[Nfields]);