Changeset 38443 for branches/eam_branches/ipp-20150419/Ohana/src/opihi/dvo/avextract.c

Timestamp:

Jun 12, 2015, 9:26:15 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150419/Ohana/src/opihi

Files:

• . (modified) (1 prop)
• dvo/avextract.c (modified) (2 diffs)

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

@@ -185 +185 @@
     snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     catalog.filename = (HOST_ID || PARALLEL_LOCAL) ? hostfile : skylist[0].filename[i];
-    catalog.catflags = LOAD_AVES | LOAD_SECF;
-    catalog.catflags |= needMeasure ? LOAD_MEAS : SKIP_MEAS;
-    catalog.catflags |= needLensobj ? LOAD_LENSOBJ : SKIP_LENSOBJ;
-    catalog.catflags |= needStarpar ? LOAD_STARPAR : SKIP_STARPAR;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
+    catalog.catflags |= needMeasure ? DVO_LOAD_MEASURE : DVO_SKIP_MEASURE;
+    catalog.catflags |= needLensobj ? DVO_LOAD_LENSOBJ : DVO_SKIP_LENSOBJ;
+    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
     catalog.Nsecfilt = 0;
 
@@ -256 +256 @@
   // write vectors to a table (this is used by parallel dvo operations, but can be used elsewhere)
   if (RESULT_FILE && !SKIP_RESULTS) {
-    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nreturn, FALSE, NULL);
+    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nreturn, FALSE, FALSE, NULL);
     if (!status) {
       goto escape;