Changeset 38352 for branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_uniphot.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/uniphot/src/update_dvo_uniphot.c (modified) (2 diffs)

branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_uniphot.c

@@ -61 +61 @@
   for (i = 0; i < pglob.gl_pathc; i++) {
     catalog.filename = pglob.gl_pathv[i];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -69 +69 @@
       exit (2);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);