Changeset 38441 for trunk/Ohana/src/dvolens

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/dvolens/src/update_objects.c (modified) (2 diffs)

trunk/Ohana/src/dvolens/src/update_objects.c

@@ -61 +61 @@
     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 | LOAD_LENSING | LOAD_LENSOBJ;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog
 
@@ -68 +68 @@
       exit (1);
     }
-    if (VERBOSE && (catalog.Naves_disk == 0)) {
+    if (VERBOSE && (catalog.Naverage_disk == 0)) {
         fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
         dvo_catalog_unlock (&catalog);