Changeset 15743 for trunk/Ohana/src/relastro

Timestamp:

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

Author:

eugene

Message:

importing updates from eam_branch_20071130

Location:

trunk/Ohana/src/relastro/src

Files:

• bcatalog.c (modified) (2 diffs)
• load_catalogs.c (modified) (2 diffs)
• reload_catalogs.c (modified) (1 diff)

trunk/Ohana/src/relastro/src/bcatalog.c

@@ -6 +6 @@
   int NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm;
   float mag;
+
+  // XXX PhotNsec as a global is a bad idea; either get it from catalog
+  // or get it from:
+  // Nsecfilt = GetPhotcodeNsecfilt ();
+  // assert (catalog[0].Nsecfilt == Nsecfilt);
 
   /* we are moving only the subset of measurements from catalog[0] to subcatalog[0] */
@@ -104 +109 @@
   subcatalog[0].Nmeasure = Nmeasure;
   subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
+  subcatalog[0].Nsecf_mem = Naverage * PhotNsec;
+  assert (PhotNsec == catalog[0].Nsecfilt);
 
   if (VERBOSE) {

trunk/Ohana/src/relastro/src/load_catalogs.c

@@ -13 +13 @@
   for (i = 0; i < skylist[0].Nregions; i++) {
 
+    // we only allow output if we do not use a subset.  in this case,
+    // the output parameters are correctly set for catalog[i] via pcatalog
     pcatalog = subselect ? &tcatalog : &catalog[i];
 
@@ -26 +28 @@
       exit (1);
     }
-    if (VERBOSE && !pcatalog[0].Nave_disk) fprintf (stderr, "no data in %s, skipping\n", pcatalog[0].filename);
+    if (VERBOSE && !pcatalog[0].Naves_disk) fprintf (stderr, "no data in %s, skipping\n", pcatalog[0].filename);
 
     // select only the brighter stars

trunk/Ohana/src/relastro/src/reload_catalogs.c

@@ -29 +29 @@
       exit (1);
     }
-    if (VERBOSE && (catalog.Nave_disk == 0)) {
+    if (VERBOSE && (catalog.Naves_disk == 0)) {
         fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
         dvo_catalog_unlock (&catalog);