Index: trunk/Ohana/src/checkastro/src/bcatalog.c
===================================================================
--- trunk/Ohana/src/checkastro/src/bcatalog.c	(revision 37807)
+++ trunk/Ohana/src/checkastro/src/bcatalog.c	(revision 38441)
@@ -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: trunk/Ohana/src/checkastro/src/checkastro_images.c
===================================================================
--- trunk/Ohana/src/checkastro/src/checkastro_images.c	(revision 37807)
+++ trunk/Ohana/src/checkastro/src/checkastro_images.c	(revision 38441)
@@ -11,4 +11,5 @@
   /* register database handle with shutdown procedure */
   set_db (&db);
+  gfits_db_init (&db);
 
   /* lock and load the image db table */
Index: trunk/Ohana/src/checkastro/src/load_catalogs.c
===================================================================
--- trunk/Ohana/src/checkastro/src/load_catalogs.c	(revision 37807)
+++ trunk/Ohana/src/checkastro/src/load_catalogs.c	(revision 38441)
@@ -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: trunk/Ohana/src/checkastro/src/load_images.c
===================================================================
--- trunk/Ohana/src/checkastro/src/load_images.c	(revision 37807)
+++ trunk/Ohana/src/checkastro/src/load_images.c	(revision 38441)
@@ -10,5 +10,5 @@
 
   // convert database table to internal structure
-  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
+  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
   if (!image) {
       fprintf (stderr, "ERROR: failed to read images\n");