Changeset 29845

Timestamp:

Nov 26, 2010, 10:37:36 AM (15 years ago)

Author:

eugene

Message:

merge updates from trunk

Location:

branches/eam_branches/ipp-20101103/Ohana/src

Files:

• opihi/dvo/find_matches.c (modified) (1 diff)
• relphot/src/SetSignals.c (modified) (1 diff)
• relphot/src/load_catalogs.c (modified) (1 diff)

branches/eam_branches/ipp-20101103/Ohana/src/opihi/dvo/find_matches.c

@@ -80 +80 @@
   /* build spatial index (RA sort) referencing input array sequence */
   for (i = 0; i < Npoints; i++) {
-    X1[i] = Y1[i] = NAN;
+    // we need to have a finite number for the sort below; index == -1 entries are skipped
+    // in the matching process
+    X1[i] = Y1[i] = 0.0; 
     N1[i] = i;
     if (index[i] == -1) continue;

branches/eam_branches/ipp-20101103/Ohana/src/relphot/src/SetSignals.c

@@ -15 +15 @@
       return;
     }
-    Shutdown ("halted by signal (trapped)");
+    Shutdown ("%s","halted by signal (trapped)");
 }    
 
 void SetProtect (int mode) {
   Protect = mode;
-  if (Trapped && !Protect) Shutdown ("halted by signal (protect)");
+  if (Trapped && !Protect) Shutdown ("%s","halted by signal (protect)");
 }
 

branches/eam_branches/ipp-20101103/Ohana/src/relphot/src/load_catalogs.c

@@ -47 +47 @@
 
   fprintf (stderr, "using %d of %d stars (%d of %d measurements)\n", Nstar, Nstar_total, Nmeas, Nmeas_total);
-  if (Nstar < 1) {
-      Shutdown ("ERROR: no stars match the minimum requirements; exiting\n");
-  }
+  if (Nstar < 1) Shutdown ("%s", "ERROR: no stars match the minimum requirements; exiting \n");
+   
 
   // XXX consider only returning the populated catalogs