Changeset 38441 for trunk/Ohana/src/opihi/dvo/gstar.c

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/dvo/gstar.c (modified) (1 diff)

trunk/Ohana/src/opihi/dvo/gstar.c

@@ -235 +235 @@
 
   /* lock, load, unlock catalog */
-  catalog.catflags = LOAD_AVES | LOAD_SECF;
-  catalog.catflags |= GetMeasures ? LOAD_MEAS : SKIP_MEAS;
+  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
+  catalog.catflags |= GetMeasures ? DVO_LOAD_MEASURE : DVO_SKIP_MEASURE;
   catalog.Nsecfilt = 0;