Changeset 33944 for branches/eam_branches/ipp-20120405/Ohana/src/opihi/dvo/avextract.c

Timestamp:

May 29, 2012, 4:18:58 PM (14 years ago)

Author:

eugene

Message:

split out time from csystem inits in dbExtractAverageInit to dbExtractAverageInitAve; allow option to skip result output for parallel ops; fix remote -reload; flush, fsync, fsetlockfile on remote command to ensure all machines see it (and report errors caught); handle equal value bins in threshold function; set global variable to hold the scrip name

File:

• branches/eam_branches/ipp-20120405/Ohana/src/opihi/dvo/avextract.c (modified) (4 diffs)

branches/eam_branches/ipp-20120405/Ohana/src/opihi/dvo/avextract.c

@@ -74 +74 @@
   }
 
+  // this is used to NOT save the results in the results file
+  // use this option when mextract is used in a script which does its
+  // own job of packaging the results
+  int SKIP_RESULTS = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-results"))) {
+    remove_argument (N, &argc, argv);
+    SKIP_RESULTS = TRUE;
+  }
+
   dvo_catalog_init (&catalog, TRUE);
 
@@ -87 +96 @@
     goto escape; 
   }
+
+  // init locally static variables (time refs)
+  dbExtractAveragesInit (); 
 
   // command-line is of the form: avextract field,field, field [where (field op value)...]
@@ -198 +210 @@
       m = catalog.average[j].measureOffset;
 
-      // reset counters for saved fields, extract fields
-      dbExtractAveragesInit (); 
+      dbExtractAveragesInitAve ();  // reset counters for saved fields (costs very little)
+
       for (n = 0; n < Nfields; n++) {
         values[n] = dbExtractAverages (&catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], &fields[n]);
@@ -234 +246 @@
 
   // write vectors to a table (this is used by parallel dvo operations, but can be used elsewhere)
-  if (RESULT_FILE) {
+  if (RESULT_FILE && !SKIP_RESULTS) {
     int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nreturn, FALSE, NULL);
-    if (!status) goto escape;
+    if (!status) {
+      goto escape;
+    }
   }