Index: /branches/eam_branches/ohana.20150429/src/addstar/src/SEDfit.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/SEDfit.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/SEDfit.c	(revision 38352)
@@ -198,5 +198,5 @@
   outcat[0].Naverage  = Nave;
   outcat[0].Nmeasure  = Nmeas;
-  outcat[0].Nsecf_mem = Nave*Nsec;
+  outcat[0].Nsecfilt_mem = Nave*Nsec;
   
   free (sourceValue.mags);
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Image.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Image.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Image.c	(revision 38352)
@@ -12,6 +12,6 @@
   }
 
-  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
-  if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
+  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
+  if (options[0].update) catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
   
   // XXX this is probably not needed anymore
@@ -47,6 +47,6 @@
     catalog.filename  = skylist[0].filename[i];
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
-    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
+    if (options[0].update) catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     // an error exit status here is a significant error
@@ -56,7 +56,7 @@
     }
 
-    // Naves_disk == 0 implies an empty catalog file
+    // Naverage_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs 
-    if ((catalog.Naves_disk == 0) && options[0].only_match) {
+    if ((catalog.Naverage_disk == 0) && options[0].only_match) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
@@ -73,5 +73,5 @@
       SetProtect (TRUE);
       if (options[0].update) {
-	catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+	catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 	dvo_catalog_update (&catalog, VERBOSE);
       } else {
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Refcat.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Refcat.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Refcat.c	(revision 38352)
@@ -36,6 +36,6 @@
     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;
-    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
+    if (options[0].update) catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
   
     // an error exit status here is a significant error
@@ -45,7 +45,7 @@
     }
 
-    // Naves_disk == 0 implies an empty catalog file
+    // Naverage_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs
-    if ((catalog.Naves_disk == 0) && options[0].only_match) {
+    if ((catalog.Naverage_disk == 0) && options[0].only_match) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
@@ -63,5 +63,5 @@
       SetProtect (TRUE);
       if (options[0].update) {
-	catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+	catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 	dvo_catalog_update (&catalog, VERBOSE);
       } else {
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Reflist.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Reflist.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Reflist.c	(revision 38352)
@@ -36,6 +36,6 @@
     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;
-    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
+    if (options[0].update) catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     // an error exit status here is a significant error
@@ -46,5 +46,5 @@
 
     /* for only_match, skip empty catalogs XXX EAM : this leaves behind empty files */
-    if ((catalog.Naves_disk == 0) && options[0].only_match) {
+    if ((catalog.Naverage_disk == 0) && options[0].only_match) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
@@ -59,5 +59,5 @@
       SetProtect (TRUE);
       if (options[0].update) {
-	catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+	catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 	dvo_catalog_update (&catalog, VERBOSE);
       } else {
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/addstar.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/addstar.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/addstar.c	(revision 38352)
@@ -108,5 +108,5 @@
     catalog.catformat   = dvo_catalog_catformat (CATFORMAT);     // set the default catformat from config data
     catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
-    catalog.catflags    = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF | LOAD_LENSING;
+    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING;
     catalog.Nsecfilt    = GetPhotcodeNsecfilt ();
 
@@ -118,5 +118,5 @@
     if (catalog.catmode != DVO_MODE_SPLIT) options.update = FALSE;
 
-    if (options.update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
+    if (options.update) catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     // open as read or write, depending on desire
@@ -135,7 +135,7 @@
     if (VERBOSE) MARKTIME ("load cpt: %f sec\n", dtime); RESETTIME; 
 
-    // Naves_disk == 0 implies an empty catalog file
+    // Naverage_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs
-    if ((catalog.Naves_disk == 0) && options.only_match) {
+    if ((catalog.Naverage_disk == 0) && options.only_match) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
@@ -175,5 +175,5 @@
       SetProtect (TRUE);
       if (options.update) {
-	catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF | LOAD_LENSING;
+	catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING;
 	dvo_catalog_update (&catalog, VERBOSE);
       } else {
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches.c	(revision 38352)
@@ -91,5 +91,5 @@
 
   /* set up pointers for linked list of measure */
-  if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeas_disk)) {
+  if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeasure_disk)) {
     next_meas = init_measure_links (catalog[0].average, Nave, catalog[0].measure, Nmeas);
   } else {
@@ -320,5 +320,5 @@
   catalog[0].Naverage = Nave;
   catalog[0].Nmeasure = Nmeas;
-  catalog[0].Nsecf_mem = Nave*Nsecfilt;
+  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nmatch);
 
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_ICRF.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_ICRF.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_ICRF.c	(revision 38352)
@@ -164,5 +164,5 @@
   catalog[0].Naverage  = Nave;
   catalog[0].Nmeasure  = Nmeas;
-  catalog[0].Nsecf_mem = Nave*Nsecfilt;
+  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %d "OFF_T_FMT" "OFF_T_FMT" ("OFF_T_FMT" matches)\n",  Nstars, Nave, Nmeas, Nmatch);
 
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_closest.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_closest.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_closest.c	(revision 38352)
@@ -91,5 +91,5 @@
 
   /* set up pointers for linked list of measure */
-  if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeas_disk)) {
+  if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeasure_disk)) {
     // this version is only valid if we have done a full catalog load, and if the catalog
     // is sorted while processed
@@ -381,5 +381,5 @@
   catalog[0].Nmeasure = Nmeas;
   catalog[0].Nlensing = Nlens;
-  catalog[0].Nsecf_mem = Nave*Nsecfilt;
+  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas, Nlens: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nlens, Nmatch);
 
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_closest_refstars.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_closest_refstars.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_closest_refstars.c	(revision 38352)
@@ -85,5 +85,5 @@
 
   /* set up pointers for linked list of measure */
-  if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeas_disk)) {
+  if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeasure_disk)) {
     // this version is only valid if we have done a full catalog load, and if the catalog
     // is sorted while processed
@@ -322,5 +322,5 @@
   catalog[0].Naverage = Nave;
   catalog[0].Nmeasure = Nmeas;
-  catalog[0].Nsecf_mem = Nave*Nsecfilt;
+  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nmatch);
 
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_refstars.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_refstars.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_refstars.c	(revision 38352)
@@ -70,5 +70,5 @@
 
   /* set up pointers for linked list of measurements */
-  if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeas_disk)) {
+  if (catalog[0].sorted && (catalog[0].Nmeasure == catalog[0].Nmeasure_disk)) {
     // this version is only valid if we have done a full catalog load, and if the catalog
     // is sorted while processed
@@ -298,5 +298,5 @@
   catalog[0].Naverage = Nave;
   catalog[0].Nmeasure = Nmeas;
-  catalog[0].Nsecf_mem = Nave*Nsecfilt;
+  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %d "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nmatch);
 
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_starpar.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_starpar.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/find_matches_starpar.c	(revision 38352)
@@ -205,5 +205,5 @@
   catalog[0].Naverage  = Nave;
   catalog[0].Nstarpar  = Nstarpar;
-  catalog[0].Nsecf_mem = Nave*Nsecfilt;
+  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nstarpar: %d "OFF_T_FMT" "OFF_T_FMT" ("OFF_T_FMT" matches)\n",  Nstars, Nave, Nstarpar, Nmatch);
 
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/load2mass_as_rawdata.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/load2mass_as_rawdata.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/load2mass_as_rawdata.c	(revision 38352)
@@ -181,5 +181,5 @@
 	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 ();
 
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/load2mass_catalog.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/load2mass_catalog.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/load2mass_catalog.c	(revision 38352)
@@ -56,5 +56,5 @@
   catalog[0].Naverage = Nave;
   catalog[0].Nmeasure = Nmeas;
-  catalog[0].Nsecf_mem = Nave*Nsec;
+  catalog[0].Nsecfilt_mem = Nave*Nsec;
   return (TRUE);
 }
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/loadICRF_catalog.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/loadICRF_catalog.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/loadICRF_catalog.c	(revision 38352)
@@ -10,5 +10,5 @@
   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_SECF | LOAD_MEAS;
+  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE;
   catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/loadstarpar_catalog.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/loadstarpar_catalog.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/loadstarpar_catalog.c	(revision 38352)
@@ -10,5 +10,5 @@
   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_SECF | LOAD_STARPAR;
+  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_STARPAR;
   catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/loadsupercos_rawdata.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/loadsupercos_rawdata.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/loadsupercos_rawdata.c	(revision 38352)
@@ -168,5 +168,5 @@
 	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 ();
 
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/loadwise_prelim_rawdata.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/loadwise_prelim_rawdata.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/loadwise_prelim_rawdata.c	(revision 38352)
@@ -186,5 +186,5 @@
 	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 ();
 
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/loadwise_rawdata.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/loadwise_rawdata.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/loadwise_rawdata.c	(revision 38352)
@@ -198,5 +198,5 @@
 	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 ();
 
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/resort_threaded.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/resort_threaded.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/resort_threaded.c	(revision 38352)
@@ -45,5 +45,5 @@
     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_LENSING;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_LENSING;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
   
@@ -57,6 +57,6 @@
     }
 
-    // Naves_disk == 0 implies an empty catalog file, skip empty catalogs
-    if (catalog.Naves_disk == 0) {
+    // Naverage_disk == 0 implies an empty catalog file, skip empty catalogs
+    if (catalog.Naverage_disk == 0) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/resort_unthreaded.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/resort_unthreaded.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/resort_unthreaded.c	(revision 38352)
@@ -23,5 +23,5 @@
     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_LENSING;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_LENSING;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -32,6 +32,6 @@
     }
 
-    // Naves_disk == 0 implies an empty catalog file, skip empty catalogs
-    if (catalog.Naves_disk == 0) {
+    // Naverage_disk == 0 implies an empty catalog file, skip empty catalogs
+    if (catalog.Naverage_disk == 0) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/addstar/src/sedstar.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/addstar/src/sedstar.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/addstar/src/sedstar.c	(revision 38352)
@@ -26,5 +26,5 @@
   for (i = 0; i < skylist[0].Nregions; i++) {
     incatalog.filename = skylist[0].filename[i];
-    incatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    incatalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
 
     // an error exit status here is a significant error
@@ -34,6 +34,6 @@
     }
 
-    // Naves_disk == 0 implies an empty catalog file
-    if ((incatalog.Naves_disk == 0) && options.only_match) {
+    // Naverage_disk == 0 implies an empty catalog file
+    if ((incatalog.Naverage_disk == 0) && options.only_match) {
       if (VERBOSE) fprintf (stderr, "skipping empty region\n");
       dvo_catalog_unlock (&incatalog);
@@ -54,5 +54,5 @@
     outcatalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
     outcatalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-    outcatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    outcatalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     // an error exit status here is a significant error
Index: /branches/eam_branches/ohana.20150429/src/checkastro/src/bcatalog.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/checkastro/src/bcatalog.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/checkastro/src/bcatalog.c	(revision 38352)
@@ -408,5 +408,5 @@
   subcatalog[0].Nmeasure = Nmeasure;
   subcatalog[0].Nsecfilt = oldcatalog[0].Nsecfilt;
-  subcatalog[0].Nsecf_mem = Naverage * oldcatalog[0].Nsecfilt;
+  subcatalog[0].Nsecfilt_mem = Naverage * oldcatalog[0].Nsecfilt;
 
   return (TRUE);
@@ -515,5 +515,5 @@
   subcatalog[0].Nmeasure = Nmeasure;
   subcatalog[0].Nsecfilt = oldcatalog[0].Nsecfilt;
-  subcatalog[0].Nsecf_mem = Naverage * oldcatalog[0].Nsecfilt;
+  subcatalog[0].Nsecfilt_mem = Naverage * oldcatalog[0].Nsecfilt;
 
   return (TRUE);
@@ -609,5 +609,5 @@
   subcatalog[0].Nmeasure = Nmeasure;
   subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
-  subcatalog[0].Nsecf_mem = Naverage * catalog[0].Nsecfilt;
+  subcatalog[0].Nsecfilt_mem = Naverage * catalog[0].Nsecfilt;
 
   return (TRUE);
Index: /branches/eam_branches/ohana.20150429/src/checkastro/src/load_catalogs.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/checkastro/src/load_catalogs.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/checkastro/src/load_catalogs.c	(revision 38352)
@@ -35,5 +35,5 @@
     pcatalog->catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
     pcatalog->catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
-    pcatalog->catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF; // don't need to load all data at this point
+    pcatalog->catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT; // don't need to load all data at this point
     pcatalog->Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -43,5 +43,5 @@
       exit (1);
     }
-    if (!pcatalog[0].Naves_disk) {
+    if (!pcatalog[0].Naverage_disk) {
       if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", pcatalog[0].filename);
       dvo_catalog_unlock (pcatalog);
Index: /branches/eam_branches/ohana.20150429/src/delstar/src/delete_duplicate_images.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/delstar/src/delete_duplicate_images.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/delstar/src/delete_duplicate_images.c	(revision 38352)
@@ -110,5 +110,5 @@
     catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
@@ -119,5 +119,5 @@
       exit (2);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
       dvo_catalog_unlock (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/delstar/src/delete_duplicate_measures.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/delstar/src/delete_duplicate_measures.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/delstar/src/delete_duplicate_measures.c	(revision 38352)
@@ -45,5 +45,5 @@
     catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
@@ -54,5 +54,5 @@
       exit (2);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
       dvo_catalog_unlock (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/delstar/src/delete_fix_LAP.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/delstar/src/delete_fix_LAP.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/delstar/src/delete_fix_LAP.c	(revision 38352)
@@ -43,5 +43,5 @@
     catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
@@ -52,5 +52,5 @@
       exit (2);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
       dvo_catalog_unlock (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/delstar/src/delete_fix_LAP_edges.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/delstar/src/delete_fix_LAP_edges.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/delstar/src/delete_fix_LAP_edges.c	(revision 38352)
@@ -51,5 +51,5 @@
     catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
@@ -60,5 +60,5 @@
       exit (2);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
       dvo_catalog_unlock (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/delstar/src/delete_fix_LAP_edges_delete.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/delstar/src/delete_fix_LAP_edges_delete.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/delstar/src/delete_fix_LAP_edges_delete.c	(revision 38352)
@@ -91,5 +91,5 @@
     catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
@@ -100,5 +100,5 @@
       exit (2);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
       dvo_catalog_unlock (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/delstar/src/delete_imagefile.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/delstar/src/delete_imagefile.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/delstar/src/delete_imagefile.c	(revision 38352)
@@ -26,5 +26,5 @@
     catalog.filename = sky[0].filename[i];  /* don't free region before catalog! */
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     // an error exit status here is a significant error
@@ -33,5 +33,5 @@
       exit (2);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/delstar/src/delete_imagename.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/delstar/src/delete_imagename.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/delstar/src/delete_imagename.c	(revision 38352)
@@ -41,5 +41,5 @@
       catalog.filename = skylist[0].filename[i];  /* don't free region before catalog! */
       catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-      catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+      catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
       // an error exit status here is a significant error
@@ -48,5 +48,5 @@
 	exit (2);
       }
-      if (!catalog.Naves_disk) {
+      if (!catalog.Naverage_disk) {
 	dvo_catalog_unlock (&catalog);
 	dvo_catalog_free (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/delstar/src/delete_orphans.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/delstar/src/delete_orphans.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/delstar/src/delete_orphans.c	(revision 38352)
@@ -252,5 +252,5 @@
   catalog.Nmeasure = Nmeas;
   catalog.Nmissing = Nmiss;
-  catalog.Nsecf_mem = Nave*Nsecfilt;
+  catalog.Nsecfilt_mem = Nave*Nsecfilt;
 
   if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: %d %d %d\n", Nave, Nmeas, Nmiss);
Index: /branches/eam_branches/ohana.20150429/src/delstar/src/delete_photcodes.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/delstar/src/delete_photcodes.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/delstar/src/delete_photcodes.c	(revision 38352)
@@ -41,5 +41,5 @@
     catalog.filename  = HOST_ID ? hostfile : skylist[0].filename[i];
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
@@ -50,5 +50,5 @@
       exit (2);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
       dvo_catalog_unlock (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/delstar/src/delete_photcodes_single.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/delstar/src/delete_photcodes_single.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/delstar/src/delete_photcodes_single.c	(revision 38352)
@@ -10,5 +10,5 @@
   catalog.filename  = cptname;
   catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
   if (VERBOSE) fprintf (stderr, "deleting from %s\n", catalog.filename);
@@ -19,5 +19,5 @@
     return FALSE;
   }
-  if (!catalog.Naves_disk) {
+  if (!catalog.Naverage_disk) {
     if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
     dvo_catalog_unlock (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/delstar/src/delete_times.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/delstar/src/delete_times.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/delstar/src/delete_times.c	(revision 38352)
@@ -62,5 +62,5 @@
     catalog.filename = skylist[0].filename[i];  /* don't free region before catalog! */
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     // an error exit status here is a significant error
@@ -69,5 +69,5 @@
       exit (2);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/delstar/src/find_matches.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/delstar/src/find_matches.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/delstar/src/find_matches.c	(revision 38352)
@@ -245,5 +245,5 @@
   catalog[0].Nmeasure = Nmeas;
   catalog[0].Nmissing = Nmiss;
-  catalog[0].Nsecf_mem = Nave*Nsecfilt;
+  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
 
   if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT"\n",  Nave,  Nmeas,  Nmiss);
Index: /branches/eam_branches/ohana.20150429/src/dvolens/src/update_objects.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvolens/src/update_objects.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvolens/src/update_objects.c	(revision 38352)
@@ -61,5 +61,5 @@
     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,5 +68,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/LoadCatalog.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/LoadCatalog.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/LoadCatalog.c	(revision 38352)
@@ -8,5 +8,5 @@
 
     // always load all of the data (if any exists)
-    catalog[0].catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF | LOAD_LENSING | LOAD_LENSOBJ | LOAD_STARPAR;
+    catalog[0].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ | DVO_LOAD_STARPAR;
 
     catalog[0].catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoconvert.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoconvert.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoconvert.c	(revision 38352)
@@ -82,5 +82,5 @@
 
       // skip empty input catalogs
-      if (!incatalog.Naves_disk) {
+      if (!incatalog.Naverage_disk) {
 	dvo_catalog_unlock (&incatalog);
 	dvo_catalog_free (&incatalog);
@@ -93,5 +93,5 @@
     SkyListFree (inlist);
 
-    outcatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    outcatalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
     dvo_catalog_save (&outcatalog, VERBOSE);
     dvo_catalog_unlock (&outcatalog);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeContinue.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeContinue.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeContinue.c	(revision 38352)
@@ -109,5 +109,5 @@
     LoadCatalog (&incatalog, &inlist[0].regions[i][0], inlist[0].filename[i], "r", NsecfiltInput);
     // skip empty input catalogs
-    if (!incatalog.Naves_disk) {
+    if (!incatalog.Naverage_disk) {
 	dvo_catalog_unlock (&incatalog);
 	dvo_catalog_free (&incatalog);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeContinue_threaded.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeContinue_threaded.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeContinue_threaded.c	(revision 38352)
@@ -47,5 +47,5 @@
     LoadCatalog (&incatalog, threadData->region, threadData->filename, "r", threadData->NsecfiltInput);
     // skip empty input catalogs
-    if (!incatalog.Naves_disk) {
+    if (!incatalog.Naverage_disk) {
       dvo_catalog_unlock (&incatalog);
       dvo_catalog_free (&incatalog);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeCreate.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeCreate.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeCreate.c	(revision 38352)
@@ -145,5 +145,5 @@
 
       // skip empty input catalogs
-      if (!incatalog.Naves_disk) {
+      if (!incatalog.Naverage_disk) {
 	dvo_catalog_unlock (&incatalog);
 	dvo_catalog_free (&incatalog);
@@ -166,5 +166,5 @@
 
       // skip empty input catalogs
-      if (!incatalog.Naves_disk) {
+      if (!incatalog.Naverage_disk) {
 	dvo_catalog_unlock (&incatalog);
 	dvo_catalog_free (&incatalog);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeFromList.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeFromList.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeFromList.c	(revision 38352)
@@ -113,5 +113,5 @@
 
     // skip empty input catalogs
-    if (!incatalog.Naves_disk) {
+    if (!incatalog.Naverage_disk) {
 	dvo_catalog_unlock (&incatalog);
 	dvo_catalog_free (&incatalog);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeUpdate_catalogs.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeUpdate_catalogs.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeUpdate_catalogs.c	(revision 38352)
@@ -142,5 +142,5 @@
 
     // skip empty input catalogs
-    if (!incatalog.Naves_disk) {
+    if (!incatalog.Naverage_disk) {
 	dvo_catalog_unlock (&incatalog);
 	dvo_catalog_free (&incatalog);
@@ -176,5 +176,5 @@
 
       // if no catalog already exists, use the input catalog to define the format or the specified format
-      if (outcatalog.Naves_disk == 0) {
+      if (outcatalog.Naverage_disk == 0) {
 	if (UPDATE_CATFORMAT) {
 	  outcatalog.catformat = dvo_catalog_catformat (UPDATE_CATFORMAT);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeUpdate_threaded.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeUpdate_threaded.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvomergeUpdate_threaded.c	(revision 38352)
@@ -44,5 +44,5 @@
     LoadCatalog (&incatalog, threadData->region, threadData->filename, "r", threadData->NsecfiltInput);
     // skip empty input catalogs
-    if (!incatalog.Naves_disk) {
+    if (!incatalog.Naverage_disk) {
       dvo_catalog_unlock (&incatalog);
       dvo_catalog_free (&incatalog);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairCPT.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairCPT.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairCPT.c	(revision 38352)
@@ -76,5 +76,5 @@
   }
 
-  measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
+  measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
   myAssert(measure, "failed to convert ftable to measure data");
 
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairDeleteImageList.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairDeleteImageList.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairDeleteImageList.c	(revision 38352)
@@ -246,5 +246,5 @@
 	gfits_scan(&cpmHeaderTBL, "NAXIS1", "%d", 1, &NbytesPerRow);
 
-	measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
+	measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
 	myAssert(measure, "failed to convert ftable to measure data");
     
@@ -284,5 +284,5 @@
 
 	// convert internal to external format 
-	if (!MeasureToFtable (&cpmFtable, NULL, measureNew, NmeasureNew, catformat)) {
+	if (!MeasureToFtable (&cpmFtable, NULL, measureNew, NmeasureNew, catformat, TRUE)) {
 	  myAbort("trouble converting format");
 	}
@@ -531,5 +531,5 @@
 
     /* convert internal to external format */
-    if (!SecFiltToFtable (&cpsFtable, secfilt, Nrows, catformat)) {
+    if (!SecFiltToFtable (&cpsFtable, secfilt, Nrows, catformat, TRUE)) {
       myAbort("trouble converting format");
     }
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairDeleteImagesByExternID.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairDeleteImagesByExternID.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairDeleteImagesByExternID.c	(revision 38352)
@@ -284,5 +284,5 @@
 	// NOTE: FtableToMeasure (and equivalent) free the data associated with cpmFtable.
 	// We are left with the data in measure.
-	measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
+	measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
 	myAssert(measure, "failed to convert ftable to measure data");
     
@@ -333,5 +333,5 @@
 
 	// convert internal to external format 
-	if (!MeasureToFtable (&cpmFtable, NULL, measureNew, NmeasureNew, catformat)) {
+	if (!MeasureToFtable (&cpmFtable, NULL, measureNew, NmeasureNew, catformat, TRUE)) {
 	  myAbort("trouble converting format");
 	}
@@ -732,5 +732,5 @@
 
     /* convert internal to external format */
-    if (!SecFiltToFtable (&cpsFtable, secfilt, Nrows, catformat)) {
+    if (!SecFiltToFtable (&cpsFtable, secfilt, Nrows, catformat, TRUE)) {
       myAbort("trouble converting format");
     }
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairFixCPT.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairFixCPT.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairFixCPT.c	(revision 38352)
@@ -121,5 +121,5 @@
 
   myAbort ("fix cpts");
-  measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
+  measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
   myAssert(measure, "failed to convert ftable to measure data");
 
@@ -128,5 +128,5 @@
 
   // convert internal to external format 
-  if (!MeasureToFtable (&cpmFtable, NULL, measure, Nmeasure, catformat)) {
+  if (!MeasureToFtable (&cpmFtable, NULL, measure, Nmeasure, catformat, TRUE)) {
     myAbort("trouble converting format");
   }
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairFixTables.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairFixTables.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairFixTables.c	(revision 38352)
@@ -103,5 +103,5 @@
 
       // convert internal to external format 
-      if (!MeasureToFtable (&cpmFtable, NULL, measureNew, NmeasureNew, catformat)) {
+      if (!MeasureToFtable (&cpmFtable, NULL, measureNew, NmeasureNew, catformat, TRUE)) {
 	myAbort("trouble converting format");
       }
@@ -183,5 +183,5 @@
   gfits_scan(&cpmHeaderTBL, "NAXIS2", "%d", 1, &Nrows);
 
-  measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
+  measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
   myAssert(measure, "failed to convert ftable to measure data");
     
@@ -390,5 +390,5 @@
 
     /* convert internal to external format */
-    if (!SecFiltToFtable (&cpsFtable, secfilt, Nrows, catformat)) {
+    if (!SecFiltToFtable (&cpsFtable, secfilt, Nrows, catformat, TRUE)) {
       myAbort("trouble converting format");
     }
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairImageVsMeasure.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairImageVsMeasure.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairImageVsMeasure.c	(revision 38352)
@@ -128,5 +128,5 @@
       gfits_scan(&cpmHeaderTBL, "NAXIS1", "%d", 1, &NbytesPerRow);
 
-      measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
+      measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
       myAssert(measure, "failed to convert ftable to measure data");
     
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairImagesVsMeasures.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairImagesVsMeasures.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairImagesVsMeasures.c	(revision 38352)
@@ -134,5 +134,5 @@
       gfits_scan(&cpmHeaderTBL, "NAXIS1", "%d", 1, &NbytesPerRow);
 
-      measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat);
+      measure = FtableToMeasure (&cpmFtable, NULL, &Nmeasure, &catformat, FALSE);
       myAssert(measure, "failed to convert ftable to measure data");
     
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvosecfilt_catalogs.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvosecfilt_catalogs.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvosecfilt_catalogs.c	(revision 38352)
@@ -39,5 +39,5 @@
     // 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,5 +48,5 @@
     }
 
-    if (catalog.Naves_disk == 0) {
+    if (catalog.Naverage_disk == 0) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
@@ -64,7 +64,7 @@
 
     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,6 +77,6 @@
     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);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoverify_utils.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoverify_utils.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/dvoverify_utils.c	(revision 38352)
@@ -178,5 +178,5 @@
   catalog.catformat = DVO_FORMAT_UNDEF; // read-only,do not set the catformat
   catalog.catmode   = DVO_MODE_UNDEF; // read-only, do not set the catmode
-  catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_LENSING | LOAD_LENSOBJ;
+  catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ;
   catalog.Nsecfilt  = 0;
   
@@ -187,6 +187,6 @@
   }
 
-  // Naves_disk == 0 implies an empty catalog file, skip empty catalogs
-  if (catalog.Naves_disk == 0) {
+  // Naverage_disk == 0 implies an empty catalog file, skip empty catalogs
+  if (catalog.Naverage_disk == 0) {
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/merge_catalogs.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/merge_catalogs.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/merge_catalogs.c	(revision 38352)
@@ -57,5 +57,5 @@
   output[0].Naverage = Naverage;
   output[0].Nmeasure = Nmeasure;
-  output[0].Nsecf_mem = Naverage * Nsecfilt;
+  output[0].Nsecfilt_mem = Naverage * Nsecfilt;
   
   if (VERBOSE) {
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/merge_catalogs_new.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/merge_catalogs_new.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/merge_catalogs_new.c	(revision 38352)
@@ -115,5 +115,5 @@
   output[0].Nlensing = Nlensing;
   output[0].Nstarpar = Nstarpar;
-  output[0].Nsecf_mem = Naverage * NsecfiltOut;
+  output[0].Nsecfilt_mem = Naverage * NsecfiltOut;
 
   // If we are using dvomergeCreate to split an existing catalog, then the max objID in
Index: /branches/eam_branches/ohana.20150429/src/dvomerge/src/merge_catalogs_old.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvomerge/src/merge_catalogs_old.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvomerge/src/merge_catalogs_old.c	(revision 38352)
@@ -112,5 +112,5 @@
 
   /* set up pointers for linked list of measure */
-  if (output[0].sorted && (output[0].Nmeasure >= output[0].Nmeas_disk)) {
+  if (output[0].sorted && (output[0].Nmeasure >= output[0].Nmeasure_disk)) {
     // this version is only valid if we have done a full catalog load, and if the catalog
     // is sorted while processed
@@ -504,5 +504,5 @@
   output[0].Nlensing = Nlens;
   output[0].Nstarpar = Nstar;
-  output[0].Nsecf_mem = Nave*NsecfiltOut;
+  output[0].Nsecfilt_mem = Nave*NsecfiltOut;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas, Nlens: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nlens, Nmatch);
 
Index: /branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_FWobjects_dvopsps.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_FWobjects_dvopsps.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_FWobjects_dvopsps.c	(revision 38352)
@@ -53,5 +53,5 @@
     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
     catalog.catmode   = DVO_MODE_UNDEF;	  // not needed since we skip empty catalogs
-    catalog.catflags  = LOAD_AVES | LOAD_SECF | LOAD_LENSOBJ;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_LENSOBJ;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -60,5 +60,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_detections_dvopsps.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_detections_dvopsps.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_detections_dvopsps.c	(revision 38352)
@@ -65,5 +65,5 @@
     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
     catalog.catmode   = DVO_MODE_UNDEF;	  // not needed since we skip empty catalogs
-    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -72,5 +72,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_diffobj_dvopsps.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_diffobj_dvopsps.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_diffobj_dvopsps.c	(revision 38352)
@@ -53,5 +53,5 @@
     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
     catalog.catmode   = DVO_MODE_UNDEF;	  // not needed since we skip empty catalogs
-    catalog.catflags  = LOAD_AVES | LOAD_SECF;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -60,5 +60,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_objects_dvopsps.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_objects_dvopsps.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvopsps/src/insert_objects_dvopsps.c	(revision 38352)
@@ -53,5 +53,5 @@
     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
     catalog.catmode   = DVO_MODE_UNDEF;	  // not needed since we skip empty catalogs
-    catalog.catflags  = LOAD_AVES | LOAD_SECF;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -60,5 +60,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/dvosplit/src/dvosplit.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvosplit/src/dvosplit.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvosplit/src/dvosplit.c	(revision 38352)
@@ -80,5 +80,5 @@
     incatalog.filename = skylist[0].filename[i];
     incatalog.Nsecfilt = GetPhotcodeNsecfilt ();
-    incatalog.catflags = LOAD_NONE;
+    incatalog.catflags = DVO_LOAD_NONE;
 
     // an error exit status here is a significant error
@@ -89,5 +89,5 @@
 
     // skip empty input catalogs
-    if (!incatalog.Naves_disk) {
+    if (!incatalog.Naverage_disk) {
       dvo_catalog_unlock (&incatalog);
       dvo_catalog_free (&incatalog);
Index: /branches/eam_branches/ohana.20150429/src/dvosplit/src/open_output_catalogs.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvosplit/src/open_output_catalogs.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvosplit/src/open_output_catalogs.c	(revision 38352)
@@ -14,5 +14,5 @@
     outcatalogs[i].filename  = outlist[0].filename[i];
     outcatalogs[i].Nsecfilt  = GetPhotcodeNsecfilt ();
-    outcatalogs[i].catflags  = LOAD_NONE;
+    outcatalogs[i].catflags  = DVO_LOAD_NONE;
     outcatalogs[i].catformat = CATFORMAT ? dvo_catalog_catformat (CATFORMAT) : catformat;  // set the default catformat from config data
     outcatalogs[i].catmode   = CATMODE   ? dvo_catalog_catmode (CATMODE)     : catmode;    // set the default catmode from config data
Index: /branches/eam_branches/ohana.20150429/src/dvosplit/src/split_averages.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvosplit/src/split_averages.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvosplit/src/split_averages.c	(revision 38352)
@@ -10,6 +10,6 @@
   AveLinks *avelinks;
 
-  ALLOCATE (outref, int, incatalog[0].Naves_disk);
-  ALLOCATE (outcat, int, incatalog[0].Naves_disk);
+  ALLOCATE (outref, int, incatalog[0].Naverage_disk);
+  ALLOCATE (outcat, int, incatalog[0].Naverage_disk);
   ALLOCATE (outmem, int, outlist[0].Nregions);
 
@@ -25,9 +25,9 @@
 
   // split out the average & secfilt entries:
-  incatalog[0].catflags = LOAD_AVES | LOAD_SECF;
+  incatalog[0].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
 
   if ((incatalog[0].catmode == DVO_MODE_SPLIT) && !FULL_TABLE) {
-    Nblocks = incatalog[0].Naves_disk / NROWS;
-    if (incatalog[0].Naves_disk % NROWS) Nblocks ++;
+    Nblocks = incatalog[0].Naverage_disk / NROWS;
+    if (incatalog[0].Naverage_disk % NROWS) Nblocks ++;
   } else {
     Nblocks = 1;
@@ -40,5 +40,5 @@
       dvo_catalog_load_segment (incatalog, VERBOSE, block*NROWS, NROWS);
       fprintf (stderr, "splitting %s (averages) .. %d of %d\n", incatalog[0].filename, block, Nblocks);
-      assert (block*NROWS == incatalog[0].Naves_off);
+      assert (block*NROWS == incatalog[0].Naverage_off);
     } else {
       dvo_catalog_load (incatalog, VERBOSE);
@@ -48,5 +48,5 @@
     // distribute data to the output catalogs
     for (ave = 0; ave < incatalog[0].Naverage; ave++) {
-      averef = ave + incatalog[0].Naves_off;
+      averef = ave + incatalog[0].Naverage_off;
 	
       inR = incatalog[0].average[ave].R;
@@ -75,5 +75,5 @@
 
       Nout = outcatalogs[Ncat].Naverage;
-      outref[averef] = Nout + outcatalogs[Ncat].Naves_off;
+      outref[averef] = Nout + outcatalogs[Ncat].Naverage_off;
       outcat[averef] = Ncat;
 
@@ -85,5 +85,5 @@
       for (n = 0; n < Nsecfilt; n++) {
 	outcatalogs[Ncat].secfilt[Nout*Nsecfilt + n] = incatalog[0].secfilt[ave*Nsecfilt + n];
-	outcatalogs[Ncat].Nsecf_mem++;
+	outcatalogs[Ncat].Nsecfilt_mem++;
       }
 
@@ -96,5 +96,5 @@
     dvo_catalog_free_data (incatalog);
 
-    // double check the values of Naverage, Nsecf_mem?
+    // double check the values of Naverage, Nsecfilt_mem?
 
     // XXX for output.catformat == MEF, we probably need to skip this stuff and the free below
@@ -103,19 +103,19 @@
     if (!FULL_TABLE) {
       for (cat = 0; cat < outlist[0].Nregions; cat++) {
-	outcatalogs[cat].catflags = LOAD_AVES | LOAD_SECF;
+	outcatalogs[cat].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
 
 	dvo_catalog_save (&outcatalogs[cat], VERBOSE);
-	// fprintf (stderr, "secfilt: %d %d %d %d\n", outcatalogs[cat].Nsecf_mem, outcatalogs[cat].Nsecf_disk, outcatalogs[cat].Nsecf_off, outcatalogs[cat].Naverage, outcatalogs[cat].Nsecfilt);
+	// fprintf (stderr, "secfilt: %d %d %d %d\n", outcatalogs[cat].Nsecfilt_mem, outcatalogs[cat].Nsecfilt_disk, outcatalogs[cat].Nsecfilt_off, outcatalogs[cat].Naverage, outcatalogs[cat].Nsecfilt);
 
 	// advance the pointers and free the current data
 	// XXX these should be done within save segment:
-	outcatalogs[cat].Naves_disk += outcatalogs[cat].Naverage;
-	outcatalogs[cat].Naves_off  += outcatalogs[cat].Naverage;
-	outcatalogs[cat].Nsecf_disk += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
-	outcatalogs[cat].Nsecf_off  += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
+	outcatalogs[cat].Naverage_disk += outcatalogs[cat].Naverage;
+	outcatalogs[cat].Naverage_off  += outcatalogs[cat].Naverage;
+	outcatalogs[cat].Nsecfilt_disk += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
+	outcatalogs[cat].Nsecfilt_off  += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
 	outcatalogs[cat].Nsecfilt    = Nsecfilt;
 
 	outcatalogs[cat].Naverage    = 0;
-	outcatalogs[cat].Nsecf_mem   = 0;
+	outcatalogs[cat].Nsecfilt_mem   = 0;
       }
     }
Index: /branches/eam_branches/ohana.20150429/src/dvosplit/src/split_measures.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvosplit/src/split_measures.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvosplit/src/split_measures.c	(revision 38352)
@@ -19,15 +19,15 @@
 
   // split out the measure entries:
-  incatalog[0].catflags = LOAD_MEAS | LOAD_AVES | LOAD_SECF;
+  incatalog[0].catflags = DVO_LOAD_MEASURE | DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
 
   // if ((incatalog[0].catformat == DVO_FORMAT_ELIXIR) || (incatalog[0].catformat == DVO_FORMAT_LONEOS)) {
   //   // for these two formats, we need the average and secfilt values around until we do the measures...
   //   // XXX I am loading these 2x -- perhaps I can make the API smarter about reloading?
-  //   incatalog[0].catflags |= LOAD_AVES | LOAD_SECF; 
+  //   incatalog[0].catflags |= DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT; 
   // }
 
   if ((incatalog[0].catmode == DVO_MODE_SPLIT) && !FULL_TABLE) {
-    Nblocks = incatalog[0].Nmeas_disk / NROWS;
-    if (incatalog[0].Nmeas_disk % NROWS) Nblocks ++;
+    Nblocks = incatalog[0].Nmeasure_disk / NROWS;
+    if (incatalog[0].Nmeasure_disk % NROWS) Nblocks ++;
   } else {
     Nblocks = 1;
@@ -40,5 +40,5 @@
       dvo_catalog_load_segment (incatalog, VERBOSE, block*NROWS, NROWS);
       fprintf (stderr, "splitting %s (measures) .. %d of %d\n", incatalog[0].filename, block, Nblocks);
-      assert (block*NROWS == incatalog[0].Nmeas_off);
+      assert (block*NROWS == incatalog[0].Nmeasure_off);
     } else {
       dvo_catalog_load (incatalog, VERBOSE);
@@ -72,9 +72,9 @@
     if (!FULL_TABLE) {
       for (cat = 0; cat < outlist[0].Nregions; cat++) {
-	outcatalogs[cat].catflags = LOAD_MEAS;
+	outcatalogs[cat].catflags = DVO_LOAD_MEASURE;
 	dvo_catalog_save (&outcatalogs[cat], VERBOSE);
 
-	outcatalogs[cat].Nmeas_disk += outcatalogs[cat].Nmeasure;
-	outcatalogs[cat].Nmeas_off  += outcatalogs[cat].Nmeasure;
+	outcatalogs[cat].Nmeasure_disk += outcatalogs[cat].Nmeasure;
+	outcatalogs[cat].Nmeasure_off  += outcatalogs[cat].Nmeasure;
 	outcatalogs[cat].Nmeasure    = 0;
       }
@@ -84,5 +84,5 @@
   if (FULL_TABLE) {
     for (cat = 0; cat < outlist[0].Nregions; cat++) {
-      outcatalogs[cat].catflags = LOAD_AVES | LOAD_SECF | LOAD_MEAS;
+      outcatalogs[cat].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE;
       dvo_catalog_save (&outcatalogs[cat], VERBOSE);
     }
Index: /branches/eam_branches/ohana.20150429/src/dvosplit/src/split_missings.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/dvosplit/src/split_missings.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/dvosplit/src/split_missings.c	(revision 38352)
@@ -15,7 +15,7 @@
 
   // split out the missing entries:
-  incatalog[0].catflags = LOAD_MISS;
-  Nblocks = incatalog[0].Nmiss_disk / NROWS;
-  if (incatalog[0].Nmiss_disk % NROWS) Nblocks ++;
+  incatalog[0].catflags = DVO_LOAD_MISSING;
+  Nblocks = incatalog[0].Nmissing_disk / NROWS;
+  if (incatalog[0].Nmissing_disk % NROWS) Nblocks ++;
   for (block = 0; block < Nblocks; block++) {
 
@@ -35,9 +35,9 @@
 
     for (cat = 0; cat < outlist[0].Nregions; cat++) {
-      outcatalogs[cat].catflags = LOAD_MISS;
+      outcatalogs[cat].catflags = DVO_LOAD_MISSING;
       dvo_catalog_save_segment (&outcatalog[cat], VERBOSE);
 
-      outcatalog[cat].Nmiss_disk += outcatalog[cat].Nmissing;
-      outcatalog[cat].Nmiss_off  += outcatalog[cat].Nmissing;
+      outcatalog[cat].Nmissing_disk += outcatalog[cat].Nmissing;
+      outcatalog[cat].Nmissing_off  += outcatalog[cat].Nmissing;
       outcatalog[cat].Nmissing    = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/fakeastro/src/fakeastro_2mass.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/fakeastro/src/fakeastro_2mass.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/fakeastro/src/fakeastro_2mass.c	(revision 38352)
@@ -21,5 +21,5 @@
     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_SECF | LOAD_MEAS | LOAD_STARPAR;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE | DVO_LOAD_STARPAR;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
@@ -27,5 +27,5 @@
       exit (1);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
 	if (VERBOSE2) { fprintf (stderr, "no data in %s, skipping\n", catalog.filename); }
 	dvo_catalog_unlock (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/fakeastro/src/fakestar_catalog.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/fakeastro/src/fakestar_catalog.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/fakeastro/src/fakestar_catalog.c	(revision 38352)
@@ -9,5 +9,5 @@
   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_SECF | LOAD_STARPAR;
+  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_STARPAR;
   catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     
Index: /branches/eam_branches/ohana.20150429/src/fakeastro/src/insert_fakestar.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/fakeastro/src/insert_fakestar.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/fakeastro/src/insert_fakestar.c	(revision 38352)
@@ -118,5 +118,5 @@
   catalog[0].Naverage  = Nave;
   catalog[0].Nstarpar  = Nstarpar;
-  catalog[0].Nsecf_mem = Nave*Nsecfilt;
+  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nstarpar: %d "OFF_T_FMT" "OFF_T_FMT" ("OFF_T_FMT" matches)\n",  Nstars, Nave, Nstarpar, Nmatch);
 
Index: /branches/eam_branches/ohana.20150429/src/fakeastro/src/load_fake_stars.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/fakeastro/src/load_fake_stars.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/fakeastro/src/load_fake_stars.c	(revision 38352)
@@ -15,5 +15,5 @@
     catalog[i].catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
     catalog[i].catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
-    catalog[i].catflags  = LOAD_AVES | LOAD_SECF | LOAD_STARPAR;
+    catalog[i].catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_STARPAR;
     catalog[i].Nsecfilt  = GetPhotcodeNsecfilt ();
     if (!dvo_catalog_open (&catalog[i], skylist[0].regions[i], VERBOSE, "r")) {
@@ -23,5 +23,5 @@
     dvo_catalog_unlock (&catalog[i]);
 
-    if (!catalog[i].Naves_disk) {
+    if (!catalog[i].Naverage_disk) {
 	if (VERBOSE2) { fprintf (stderr, "no data in %s, skipping\n", catalog[i].filename); }
 	dvo_catalog_free (&catalog[i]);
Index: /branches/eam_branches/ohana.20150429/src/fakeastro/src/match_fake_stars.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/fakeastro/src/match_fake_stars.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/fakeastro/src/match_fake_stars.c	(revision 38352)
@@ -282,5 +282,5 @@
   catalog[0].Nmeasure = Nmeas;
   catalog[0].Nstarpar = Nstarpar;
-  catalog[0].Nsecf_mem = Nave*Nsecfilt;
+  catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nmatch);
 
Index: /branches/eam_branches/ohana.20150429/src/fakeastro/src/save_fake_stars.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/fakeastro/src/save_fake_stars.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/fakeastro/src/save_fake_stars.c	(revision 38352)
@@ -23,6 +23,6 @@
     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_SECF | LOAD_MEAS | LOAD_STARPAR; // use this for non-update mode
-    catalog.catflags  = LOAD_AVES | LOAD_SECF | LOAD_STARPAR;
+    // catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE | DVO_LOAD_STARPAR; // use this for non-update mode
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_STARPAR;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
 
Index: /branches/eam_branches/ohana.20150429/src/gastro/src/getptolemy.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/gastro/src/getptolemy.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/gastro/src/getptolemy.c	(revision 38352)
@@ -26,5 +26,5 @@
     // set the parameters which guide catalog open/load/create
     catalog.filename  = skylist[0].filename[i];
-    catalog.catflags  = LOAD_AVES | LOAD_MEAS;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;
     catalog.Nsecfilt  = 0;
 
@@ -36,7 +36,7 @@
     dvo_catalog_unlock (&catalog);
 
-    // Naves_disk == 0 implies an empty catalog file
+    // Naverage_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       dvo_catalog_free (&catalog);
       continue;
Index: /branches/eam_branches/ohana.20150429/src/gastro2/src/getptolemy.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/gastro2/src/getptolemy.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/gastro2/src/getptolemy.c	(revision 38352)
@@ -28,5 +28,5 @@
     // set the parameters which guide catalog open/load/create
     catalog.filename  = skylist[0].filename[i];
-    catalog.catflags  = LOAD_AVES | LOAD_MEAS;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;
     catalog.Nsecfilt  = 0;
 
@@ -38,7 +38,7 @@
     dvo_catalog_unlock (&catalog);
 
-    // Naves_disk == 0 implies an empty catalog file
+    // Naverage_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       dvo_catalog_free (&catalog);
       continue;
Index: /branches/eam_branches/ohana.20150429/src/getstar/src/getstar.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/getstar/src/getstar.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/getstar/src/getstar.c	(revision 38352)
@@ -28,5 +28,5 @@
   output.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
   output.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
-  output.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+  output.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
   output.Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -63,6 +63,6 @@
 	catalog.filename = skylist[0].filename[i];
 	catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-	catalog.catflags = LOAD_AVES | LOAD_SECF;
-	catalog.catflags |= needMeas ? LOAD_MEAS : SKIP_MEAS;
+	catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
+	catalog.catflags |= needMeas ? DVO_LOAD_MEASURE : DVO_SKIP_MEASURE;
 
 	// an error exit status here is a significant error
@@ -71,5 +71,5 @@
 	  exit (2);
 	}
-	if (!catalog.Naves_disk) {
+	if (!catalog.Naverage_disk) {
 	  dvo_catalog_unlock (&catalog);
 	  dvo_catalog_free (&catalog);
@@ -95,6 +95,6 @@
 	catalog.filename = skylist[0].filename[i];
 	catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-	catalog.catflags = LOAD_AVES | LOAD_SECF;
-	catalog.catflags |= needMeas ? LOAD_MEAS : SKIP_MEAS;
+	catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
+	catalog.catflags |= needMeas ? DVO_LOAD_MEASURE : DVO_SKIP_MEASURE;
 
 	// an error exit status here is a significant error
@@ -104,5 +104,5 @@
 	}
 	/* skip empty catalogs */
-	if (!catalog.Naves_disk) continue;
+	if (!catalog.Naverage_disk) continue;
 	stars = select_by_image (&catalog, &image, 0, 0, stars, &Nstars);
       }
Index: /branches/eam_branches/ohana.20150429/src/getstar/src/select_by_region.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/getstar/src/select_by_region.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/getstar/src/select_by_region.c	(revision 38352)
@@ -162,5 +162,5 @@
   output[0].Naverage = Nave;
   output[0].Nmeasure = Nmeas;
-  output[0].Nsecf_mem = Nave*Nsecfilt;
+  output[0].Nsecfilt_mem = Nave*Nsecfilt;
 
   fprintf (stderr, "output catalog has "OFF_T_FMT" stars ("OFF_T_FMT" measures, %d secfilt)\n",
Index: /branches/eam_branches/ohana.20150429/src/markrock/src/markrock.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/markrock/src/markrock.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/markrock/src/markrock.c	(revision 38352)
@@ -38,5 +38,5 @@
   catalog.filename = argv[1];
   catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
   // an error exit status here is a significant error
@@ -45,5 +45,5 @@
     exit (2);
   }
-  if (catalog.Naves_disk) {
+  if (catalog.Naverage_disk) {
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/markstar/src/markstar.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/markstar/src/markstar.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/markstar/src/markstar.c	(revision 38352)
@@ -42,5 +42,5 @@
   catalog.filename = argv[1];
   catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
   // an error exit status here is a significant error
@@ -49,5 +49,5 @@
     exit (2);
   }
-  if (!catalog.Naves_disk) {
+  if (!catalog.Naverage_disk) {
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/mosastro/src/getptolemy.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/mosastro/src/getptolemy.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/mosastro/src/getptolemy.c	(revision 38352)
@@ -26,5 +26,5 @@
     // set the parameters which guide catalog open/load/create
     catalog.filename  = skylist[0].filename[i];
-    catalog.catflags  = LOAD_AVES | LOAD_MEAS;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;
     catalog.Nsecfilt  = 0;
 
@@ -36,7 +36,7 @@
     dvo_catalog_unlock (&catalog);
 
-    // Naves_disk == 0 implies an empty catalog file
+    // Naverage_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       dvo_catalog_free (&catalog);
       continue;
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/avextract.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/avextract.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/avextract.c	(revision 38352)
@@ -185,8 +185,8 @@
     snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     catalog.filename = (HOST_ID || PARALLEL_LOCAL) ? hostfile : skylist[0].filename[i];
-    catalog.catflags = LOAD_AVES | LOAD_SECF;
-    catalog.catflags |= needMeasure ? LOAD_MEAS : SKIP_MEAS;
-    catalog.catflags |= needLensobj ? LOAD_LENSOBJ : SKIP_LENSOBJ;
-    catalog.catflags |= needStarpar ? LOAD_STARPAR : SKIP_STARPAR;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
+    catalog.catflags |= needMeasure ? DVO_LOAD_MEASURE : DVO_SKIP_MEASURE;
+    catalog.catflags |= needLensobj ? DVO_LOAD_LENSOBJ : DVO_SKIP_LENSOBJ;
+    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/avmatch.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/avmatch.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/avmatch.c	(revision 38352)
@@ -190,8 +190,8 @@
     snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
-    catalog.catflags = LOAD_AVES | LOAD_SECF;
-    catalog.catflags |= needMeasure ? LOAD_MEAS    : SKIP_MEAS;
-    catalog.catflags |= needLensobj ? LOAD_LENSOBJ : SKIP_LENSOBJ;
-    catalog.catflags |= needStarpar ? LOAD_STARPAR : SKIP_STARPAR;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
+    catalog.catflags |= needMeasure ? DVO_LOAD_MEASURE    : DVO_SKIP_MEASURE;
+    catalog.catflags |= needLensobj ? DVO_LOAD_LENSOBJ : DVO_SKIP_LENSOBJ;
+    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/calextract.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/calextract.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/calextract.c	(revision 38352)
@@ -61,5 +61,5 @@
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[Nr];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/calmextract.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/calmextract.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/calmextract.c	(revision 38352)
@@ -74,5 +74,5 @@
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[Nr];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/catalog.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/catalog.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/catalog.c	(revision 38352)
@@ -315,5 +315,5 @@
       /* lock, load, unlock catalog */
       catalog.filename = filename;
-      catalog.catflags = LOAD_AVES;
+      catalog.catflags = DVO_LOAD_AVERAGE;
 
       // an error exit status here is a significant error
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/ccd.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/ccd.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/ccd.c	(revision 38352)
@@ -69,5 +69,5 @@
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[k];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/cmatch.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/cmatch.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/cmatch.c	(revision 38352)
@@ -29,5 +29,5 @@
   /* load data from the photometry database file */
   catalog1.filename = filename;
-  catalog1.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+  catalog1.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
 
   // an error exit status here is a significant error
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/cmd.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/cmd.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/cmd.c	(revision 38352)
@@ -68,5 +68,5 @@
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[j];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/ddmags.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/ddmags.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/ddmags.c	(revision 38352)
@@ -66,5 +66,5 @@
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[k];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/dmagaves.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/dmagaves.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/dmagaves.c	(revision 38352)
@@ -58,5 +58,5 @@
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[j];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/dmagmeas.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/dmagmeas.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/dmagmeas.c	(revision 38352)
@@ -66,5 +66,5 @@
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[j];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/dmags.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/dmags.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/dmags.c	(revision 38352)
@@ -64,5 +64,5 @@
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[j];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/dmt.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/dmt.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/dmt.c	(revision 38352)
@@ -77,5 +77,5 @@
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[k];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/extract.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/extract.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/extract.c	(revision 38352)
@@ -252,7 +252,7 @@
       catalog.measure = (Measure *) NULL;
       catalog.secfilt = (SecFilt *) NULL;
-      loadmode = LOAD_AVES | LOAD_SECF;
+      loadmode = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
       if ((mode == REF) || (mode == TYPE) || (mode == NPHOT) || (mode == NCODE)) 
-	loadmode = loadmode | LOAD_MEAS;
+	loadmode = loadmode | DVO_LOAD_MEASURE;
 
       /* lock, load, unlock catalog */
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/fitcolors.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/fitcolors.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/fitcolors.c	(revision 38352)
@@ -162,5 +162,5 @@
     /* lock, load, unlock catalog */
     catalog[k].filename = skylist[0].filename[k];
-    catalog[k].catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog[k].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog[k].Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/fitsed.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/fitsed.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/fitsed.c	(revision 38352)
@@ -188,5 +188,5 @@
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[k];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/gstar.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/gstar.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/gstar.c	(revision 38352)
@@ -235,6 +235,6 @@
 
   /* 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;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/imdata.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/imdata.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/imdata.c	(revision 38352)
@@ -136,5 +136,5 @@
     /* get file name and open */
     catalog.filename = skylist[0].filename[j];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/lcurve.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/lcurve.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/lcurve.c	(revision 38352)
@@ -76,5 +76,5 @@
   /* set filename, read in header */
   catalog.filename = skylist[0].filename[0];
-  catalog.catflags = LOAD_AVES | LOAD_MEAS;
+  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;
   catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/lightcurve.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/lightcurve.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/lightcurve.c	(revision 38352)
@@ -59,5 +59,5 @@
   /* set filename, read in header */
   catalog.filename = skylist[0].filename[0];
-  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
   catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/mextract.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/mextract.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/mextract.c	(revision 38352)
@@ -229,7 +229,7 @@
     snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
-    // catalog.catflags |= needLensing ? LOAD_LENSING : SKIP_LENSING;
-    catalog.catflags |= needStarpar ? LOAD_STARPAR : SKIP_STARPAR;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
+    // catalog.catflags |= needLensing ? DVO_LOAD_LENSING : DVO_SKIP_LENSING;
+    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
     catalog.Nsecfilt = Nsecfilt;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/mmatch.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/mmatch.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/mmatch.c	(revision 38352)
@@ -248,6 +248,6 @@
     snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
-    catalog.catflags = LOAD_AVES | LOAD_SECF | LOAD_MEAS;
-    catalog.catflags |= needStarpar ? LOAD_STARPAR : SKIP_STARPAR;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE;
+    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
     catalog.Nsecfilt = Nsecfilt;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/mmextract.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/mmextract.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/mmextract.c	(revision 38352)
@@ -183,5 +183,5 @@
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[i];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = Nsecfilt;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/objectcoverage.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/objectcoverage.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/objectcoverage.c	(revision 38352)
@@ -184,5 +184,5 @@
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[k];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/paverage.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/paverage.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/paverage.c	(revision 38352)
@@ -105,5 +105,5 @@
   for (j = 0; (j < skylist[0].Nregions) && !interrupt; j++) {
     catalog.filename = skylist[0].filename[j];
-    catalog.catflags = LOAD_AVES | LOAD_SECF;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt = Nsecfilt;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/pmeasure.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/pmeasure.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/pmeasure.c	(revision 38352)
@@ -178,5 +178,5 @@
   for (j = 0; (j < skylist[0].Nregions) && !interrupt; j++) {
     catalog.filename = skylist[0].filename[j];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS;
+    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;
     catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/opihi/dvo/subpix.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/opihi/dvo/subpix.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/opihi/dvo/subpix.c	(revision 38352)
@@ -40,5 +40,5 @@
   /* lock, load, unlock catalog */
   catalog.filename = skylist[0].filename[0];
-  catalog.catflags = LOAD_AVES | LOAD_MEAS;
+  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE;
   catalog.Nsecfilt = 0;
 
Index: /branches/eam_branches/ohana.20150429/src/photdbc/src/join_stars.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/photdbc/src/join_stars.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/photdbc/src/join_stars.c	(revision 38352)
@@ -224,5 +224,5 @@
   catalog[0].Naverage = Naves;
   catalog[0].Nmeasure = Nmeas;
-  catalog[0].Nsecf_mem = Naves*catalog[0].Nsecfilt;
+  catalog[0].Nsecfilt_mem = Naves*catalog[0].Nsecfilt;
   
   return;
Index: /branches/eam_branches/ohana.20150429/src/photdbc/src/make_subcatalog.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/photdbc/src/make_subcatalog.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/photdbc/src/make_subcatalog.c	(revision 38352)
@@ -190,5 +190,5 @@
   subcatalog[0].Nmeasure = Nmeasure;
   subcatalog[0].Nsecfilt = Nsecfilt;
-  subcatalog[0].Nsecf_mem = Naverage * Nsecfilt;
+  subcatalog[0].Nsecfilt_mem = Naverage * Nsecfilt;
 
   // XXX for now, don't copy the missing entries (these should be re-computed)
Index: /branches/eam_branches/ohana.20150429/src/photdbc/src/photdbc_catalogs.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/photdbc/src/photdbc_catalogs.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/photdbc/src/photdbc_catalogs.c	(revision 38352)
@@ -24,5 +24,5 @@
     incatalog.filename  = hostID ? hostfile : skylist[0].filename[i];
     incatalog.Nsecfilt = GetPhotcodeNsecfilt ();
-    incatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    incatalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
 
     // an error exit status here is a significant error
@@ -32,5 +32,5 @@
     }
     // skip empty input catalogs
-    if (!incatalog.Naves_disk) {
+    if (!incatalog.Naverage_disk) {
       dvo_catalog_unlock (&incatalog);
       dvo_catalog_free (&incatalog);
@@ -54,5 +54,5 @@
     outcatalog.catmode   = CATMODE   ? dvo_catalog_catmode (CATMODE)     : incatalog.catmode;
     outcatalog.Nsecfilt  = incatalog.Nsecfilt;                 // inherit from the incatalog
-    outcatalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    outcatalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     // output catalogs always represent the same skyregions as the input catalogs
Index: /branches/eam_branches/ohana.20150429/src/relastro/src/UpdateObjectOffsets.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relastro/src/UpdateObjectOffsets.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relastro/src/UpdateObjectOffsets.c	(revision 38352)
@@ -34,5 +34,5 @@
     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 ();
 
@@ -41,5 +41,5 @@
       exit (1);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
       dvo_catalog_unlock (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/relastro/src/bcatalog.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relastro/src/bcatalog.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relastro/src/bcatalog.c	(revision 38352)
@@ -521,5 +521,5 @@
   subcatalog[0].Nmeasure = Nmeasure;
   subcatalog[0].Nsecfilt = oldcatalog[0].Nsecfilt;
-  subcatalog[0].Nsecf_mem = Naverage * oldcatalog[0].Nsecfilt;
+  subcatalog[0].Nsecfilt_mem = Naverage * oldcatalog[0].Nsecfilt;
 
   return (TRUE);
@@ -628,5 +628,5 @@
   subcatalog[0].Nmeasure = Nmeasure;
   subcatalog[0].Nsecfilt = oldcatalog[0].Nsecfilt;
-  subcatalog[0].Nsecf_mem = Naverage * oldcatalog[0].Nsecfilt;
+  subcatalog[0].Nsecfilt_mem = Naverage * oldcatalog[0].Nsecfilt;
 
   return (TRUE);
@@ -722,5 +722,5 @@
   subcatalog[0].Nmeasure = Nmeasure;
   subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
-  subcatalog[0].Nsecf_mem = Naverage * catalog[0].Nsecfilt;
+  subcatalog[0].Nsecfilt_mem = Naverage * catalog[0].Nsecfilt;
 
   return (TRUE);
Index: /branches/eam_branches/ohana.20150429/src/relastro/src/high_speed_catalogs.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relastro/src/high_speed_catalogs.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relastro/src/high_speed_catalogs.c	(revision 38352)
@@ -31,5 +31,5 @@
     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 ();
 
@@ -38,5 +38,5 @@
       exit (1);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
       dvo_catalog_unlock (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/relastro/src/high_speed_objects.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relastro/src/high_speed_objects.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relastro/src/high_speed_objects.c	(revision 38352)
@@ -32,5 +32,5 @@
   catalogOut.filename = filename; // based on the input name, need to keep everything below the catdir portion
   catalogOut.Nsecfilt = Nsecfilt;
-  catalogOut.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF; // load all data
+  catalogOut.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT; // load all data
   
   catalogOut.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
@@ -263,5 +263,5 @@
   catalogOut.Nmeasure=Nmatchmeas;
   catalogOut.Nsecfilt=Nsecfilt;
-  catalogOut.Nsecf_mem=Nmatch*Nsecfilt;
+  catalogOut.Nsecfilt_mem=Nmatch*Nsecfilt;
 
   populate_tiny_values (&catalogOut, DVO_TV_MEASURE);
Index: /branches/eam_branches/ohana.20150429/src/relastro/src/hpm_catalogs.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relastro/src/hpm_catalogs.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relastro/src/hpm_catalogs.c	(revision 38352)
@@ -29,5 +29,5 @@
     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 ();
 
@@ -36,5 +36,5 @@
       exit (1);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
       dvo_catalog_unlock (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/relastro/src/hpm_objects.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relastro/src/hpm_objects.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relastro/src/hpm_objects.c	(revision 38352)
@@ -33,5 +33,5 @@
   catalogOut.filename = filename;
   catalogOut.Nsecfilt = Nsecfilt;
-  catalogOut.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF; // load all data
+  catalogOut.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT; // load all data
   
   catalogOut.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
@@ -279,5 +279,5 @@
   }
   catalogOut.Nsecfilt = Nsecfilt;
-  catalogOut.Nsecf_mem = Nsecfilt * catalogOut.Naverage;
+  catalogOut.Nsecfilt_mem = Nsecfilt * catalogOut.Naverage;
 
   populate_tiny_values (&catalogOut, DVO_TV_MEASURE);
Index: /branches/eam_branches/ohana.20150429/src/relastro/src/load_catalogs.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relastro/src/load_catalogs.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relastro/src/load_catalogs.c	(revision 38352)
@@ -40,5 +40,5 @@
     pcatalog->catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
     pcatalog->catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
-    pcatalog->catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF; // don't need to load all data at this point
+    pcatalog->catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT; // don't need to load all data at this point
     pcatalog->Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -48,5 +48,5 @@
       exit (1);
     }
-    if (!pcatalog[0].Naves_disk) {
+    if (!pcatalog[0].Naverage_disk) {
       if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", pcatalog[0].filename);
       dvo_catalog_unlock (pcatalog);
Index: /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_merge_source.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_merge_source.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_merge_source.c	(revision 38352)
@@ -45,5 +45,5 @@
   catalog_src.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
   catalog_src.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
-  catalog_src.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+  catalog_src.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
   catalog_src.Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -52,5 +52,5 @@
     exit (1);
   }
-  if (!catalog_src.Naves_disk) {
+  if (!catalog_src.Naverage_disk) {
     fprintf (stderr, "no data in %s, error in cat ID?\n", catalog_src.filename);
     exit (1);
Index: /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_objects.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_objects.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relastro/src/relastro_objects.c	(revision 38352)
@@ -44,5 +44,5 @@
     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 ();
 
@@ -52,5 +52,5 @@
       exit (1);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       if (VERBOSE2) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
       dvo_catalog_unlock (&catalog);
Index: /branches/eam_branches/ohana.20150429/src/relphot/src/bcatalog.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relphot/src/bcatalog.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relphot/src/bcatalog.c	(revision 38352)
@@ -245,5 +245,5 @@
   subcatalog[0].Nmeasure = Nmeasure;
   subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
-  subcatalog[0].Nsecf_mem = Naverage * catalog[0].Nsecfilt;
+  subcatalog[0].Nsecfilt_mem = Naverage * catalog[0].Nsecfilt;
 
   if (VERBOSE) {
@@ -368,5 +368,5 @@
   subcatalog[0].Nmeasure = Nmeasure;
   subcatalog[0].Nsecfilt = oldcatalog[0].Nsecfilt;
-  subcatalog[0].Nsecf_mem = Naverage * oldcatalog[0].Nsecfilt;
+  subcatalog[0].Nsecfilt_mem = Naverage * oldcatalog[0].Nsecfilt;
 
   return (TRUE);
@@ -461,5 +461,5 @@
   subcatalog[0].Nmeasure = Nmeasure;
   subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
-  subcatalog[0].Nsecf_mem = Naverage * catalog[0].Nsecfilt;
+  subcatalog[0].Nsecfilt_mem = Naverage * catalog[0].Nsecfilt;
 
   return (TRUE);
Index: /branches/eam_branches/ohana.20150429/src/relphot/src/load_catalogs.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relphot/src/load_catalogs.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relphot/src/load_catalogs.c	(revision 38352)
@@ -45,5 +45,5 @@
     tcatalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
     tcatalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
-    tcatalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF;    // don't need to load all data at this point
+    tcatalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;    // don't need to load all data at this point
     tcatalog.Nsecfilt  = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog
 
@@ -52,5 +52,5 @@
       exit (1);
     }
-    if (!tcatalog.Naves_disk) {
+    if (!tcatalog.Naverage_disk) {
 	if (VERBOSE2) { fprintf (stderr, "no data in %s, skipping\n", tcatalog.filename); }
 	dvo_catalog_unlock (&tcatalog);
Index: /branches/eam_branches/ohana.20150429/src/relphot/src/reload_catalogs.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relphot/src/reload_catalogs.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relphot/src/reload_catalogs.c	(revision 38352)
@@ -58,5 +58,5 @@
     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 ();               // set the desired number in case we need to create the catalog
 
@@ -65,5 +65,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/relphot/src/relphot_objects.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relphot/src/relphot_objects.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relphot/src/relphot_objects.c	(revision 38352)
@@ -42,5 +42,5 @@
     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,5 +49,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/relphot/src/relphot_synthphot.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/relphot/src/relphot_synthphot.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/relphot/src/relphot_synthphot.c	(revision 38352)
@@ -43,5 +43,5 @@
     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_SECF;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -50,5 +50,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_ckids.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_ckids.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_ckids.c	(revision 38352)
@@ -46,5 +46,5 @@
     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
     catalog.catmode   = DVO_MODE_UNDEF;	  // not needed since we skip empty catalogs
-    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 ();
 
@@ -53,5 +53,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_fiximids.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_fiximids.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_fiximids.c	(revision 38352)
@@ -41,5 +41,5 @@
     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
     catalog.catmode   = DVO_MODE_UNDEF;	  // not needed since we skip empty catalogs
-    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 ();
 
@@ -48,5 +48,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_fixstkids.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_fixstkids.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_fixstkids.c	(revision 38352)
@@ -41,5 +41,5 @@
     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
     catalog.catmode   = DVO_MODE_UNDEF;	  // not needed since we skip empty catalogs
-    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 ();
 
@@ -48,5 +48,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setastrom.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setastrom.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setastrom.c	(revision 38352)
@@ -42,5 +42,5 @@
     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
     catalog.catmode   = DVO_MODE_UNDEF;	  // not needed since we skip empty catalogs
-    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,5 +49,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setgalmodel.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setgalmodel.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setgalmodel.c	(revision 38352)
@@ -38,5 +38,5 @@
     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
     catalog.catmode   = DVO_MODE_UNDEF;	  // not needed since we skip empty catalogs
-    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF | LOAD_STARPAR;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_STARPAR;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -45,5 +45,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setphot.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setphot.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setphot.c	(revision 38352)
@@ -54,5 +54,5 @@
     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
     catalog.catmode   = DVO_MODE_UNDEF;	  // not needed since we skip empty catalogs
-    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 ();
 
@@ -61,5 +61,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setposangle.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setposangle.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_setposangle.c	(revision 38352)
@@ -55,5 +55,5 @@
     catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs
     catalog.catmode   = DVO_MODE_UNDEF;	  // not needed since we skip empty catalogs
-    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 ();
 
@@ -62,5 +62,5 @@
       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);
Index: /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_uniphot.c
===================================================================
--- /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_uniphot.c	(revision 38351)
+++ /branches/eam_branches/ohana.20150429/src/uniphot/src/update_dvo_uniphot.c	(revision 38352)
@@ -61,5 +61,5 @@
   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,5 +69,5 @@
       exit (2);
     }
-    if (!catalog.Naves_disk) {
+    if (!catalog.Naverage_disk) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);