Changeset 38352 for branches/eam_branches/ohana.20150429/src/opihi/dvo/avextract.c

Timestamp:

Jun 2, 2015, 12:37:17 PM (11 years ago)

Author:

eugene

Message:

rename some dvo-internal structures and enums to enable macro-ization and to avoid namespace collisions

File:

• branches/eam_branches/ohana.20150429/src/opihi/dvo/avextract.c (modified) (1 diff)

branches/eam_branches/ohana.20150429/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;