Changeset 38444 for branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/addstar.c

Timestamp:

Jun 12, 2015, 9:30:51 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/addstar.c (modified) (5 diffs)

branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/addstar.c

@@ -104 +104 @@
 
     // set the parameters which guide catalog open/load/create
-    catalog.filename  = skylist[0].filename[i];
-    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;
-    catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
+    catalog.filename    = skylist[0].filename[i];
+    catalog.catmode     = dvo_catalog_catmode (CATMODE);         // set the default catmode from config data
+    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    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING;
+    catalog.Nsecfilt    = GetPhotcodeNsecfilt ();
 
     // XXX need to do something to enforce consistency.  we can change options.update
@@ -117 +118 @@
     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
@@ -134 +135 @@
     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);
@@ -174 +175 @@
       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 {
@@ -193 +194 @@
   /*** update the image table ***/
   /* setup image table format and lock */
+  gfits_db_init (&db);
   db.mode   = dvo_catalog_catmode (CATMODE);
   db.format = dvo_catalog_catformat (CATFORMAT);