Changeset 38441 for trunk/Ohana/src/dvomerge/src/dvosecfilt_catalogs.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/dvomerge/src/dvosecfilt_catalogs.c (modified) (4 diffs)

trunk/Ohana/src/dvomerge/src/dvosecfilt_catalogs.c

@@ -39 +39 @@
     // always load all of the data (if any exists)
     catalog.Nsecfilt  = 0;
-    catalog.catflags  = LOAD_SECF;  // XXX this will fail for MEF version
+    catalog.catflags  = DVO_LOAD_SECFILT;  // XXX this will fail for MEF version
     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
@@ -48 +48 @@
     }
 
-    if (catalog.Naves_disk == 0) {
+    if (catalog.Naverage_disk == 0) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
@@ -64 +64 @@
 
     insec = catalog.secfilt;
-    ALLOCATE (outsec, SecFilt, catalog.Naves_disk * Nsecfilt);
+    ALLOCATE (outsec, SecFilt, catalog.Naverage_disk * Nsecfilt);
 
-    for (k = 0; k < catalog.Naves_disk; k++) {
+    for (k = 0; k < catalog.Naverage_disk; k++) {
       for (j = 0; (j < catalog.Nsecfilt) && (j < Nsecfilt); j++) {
         outsec[k*Nsecfilt + j] = insec[k*NsecInput + j];
@@ -77 +77 @@
     catalog.secfilt = outsec;
     catalog.Nsecfilt = Nsecfilt;
-    catalog.Nsecf_mem = Nsecfilt * catalog.Naves_disk;
-    catalog.Nsecf_disk = Nsecfilt * catalog.Naves_disk;
+    catalog.Nsecfilt_mem = Nsecfilt * catalog.Naverage_disk;
+    catalog.Nsecfilt_disk = Nsecfilt * catalog.Naverage_disk;
 
     dvo_catalog_save (&catalog, VERBOSE);