Changeset 15743 for trunk/Ohana/src/getstar

Timestamp:

Dec 5, 2007, 3:29:29 PM (19 years ago)

Author:

eugene

Message:

importing updates from eam_branch_20071130

Location:

trunk/Ohana/src/getstar/src

Files:

• getstar.c (modified) (3 diffs)
• select_by_region.c (modified) (1 diff)

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

@@ -21 +21 @@
   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.Nsecfilt  = GetPhotcodeNsecfilt ();
 
@@ -47 +48 @@
           exit (2);
         }
-        if (!catalog.Nave_disk) {
+        if (!catalog.Naves_disk) {
           dvo_catalog_unlock (&catalog);
           dvo_catalog_free (&catalog);
@@ -78 +79 @@
         }
         /* skip empty catalogs */
-        if (!catalog.Nave_disk) continue;
+        if (!catalog.Naves_disk) continue;
         stars = select_by_image (&catalog, &image, 0, 0, stars, &Nstars);
       }

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

@@ -91 +91 @@
   output[0].Naverage = Nave;
   output[0].Nmeasure = Nmeas;
+  output[0].Nsecf_mem = Nave*Nsecfilt;
+
   fprintf (stderr, "output catalog has %d stars (%d measures, %d secfilt)\n",
            output[0].Naverage, output[0].Nmeasure, output[0].Nsecfilt);