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

branches/eam_branches/ohana.20150429/src/relphot/src/relphot_objects.c

@@ -42 +42 @@
     catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
     catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
-    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 ();
 
@@ -49 +49 @@
       exit (1);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
       dvo_catalog_unlock (&catalog);