Changeset 38441 for trunk/Ohana/src/getstar/src/getstar.c

Timestamp:

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

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/getstar/src/getstar.c (modified) (5 diffs)

trunk/Ohana/src/getstar/src/getstar.c

@@ -28 +28 @@
   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 +63 @@
         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 +71 @@
           exit (2);
         }
-        if (!catalog.Naves_disk) {
+        if (!catalog.Naverage_disk) {
           dvo_catalog_unlock (&catalog);
           dvo_catalog_free (&catalog);
@@ -95 +95 @@
         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 +104 @@
         }
         /* skip empty catalogs */
-        if (!catalog.Naves_disk) continue;
+        if (!catalog.Naverage_disk) continue;
         stars = select_by_image (&catalog, &image, 0, 0, stars, &Nstars);
       }