Changeset 38441 for trunk/Ohana/src/checkastro

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/checkastro/src/bcatalog.c (modified) (3 diffs)
• src/checkastro/src/checkastro_images.c (modified) (1 diff)
• src/checkastro/src/load_catalogs.c (modified) (2 diffs)
• src/checkastro/src/load_images.c (modified) (1 diff)

trunk/Ohana/src/checkastro/src/bcatalog.c

@@ -408 +408 @@
   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 +515 @@
   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 +609 @@
   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);

trunk/Ohana/src/checkastro/src/checkastro_images.c

@@ -11 +11 @@
   /* register database handle with shutdown procedure */
   set_db (&db);
+  gfits_db_init (&db);
 
   /* lock and load the image db table */

trunk/Ohana/src/checkastro/src/load_catalogs.c

@@ -35 +35 @@
     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 +43 @@
       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);

trunk/Ohana/src/checkastro/src/load_images.c

@@ -10 +10 @@
 
   // 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");