Changeset 15509 for trunk/Ohana/src/opihi/dvo/gstar.c

Timestamp:

Nov 7, 2007, 6:28:03 PM (19 years ago)

Author:

eugene

Message:

converted internal NO_MAG and NO_ERR to NAN, NAN_S_SHORT, etc as appropriate

File:

• trunk/Ohana/src/opihi/dvo/gstar.c (modified) (4 diffs)

trunk/Ohana/src/opihi/dvo/gstar.c

@@ -274 +274 @@
 }
 
-void print_value (double value, short int ival) {
-  if (ival == NO_MAG) 
+void print_double (double value) {
+  if (isnan(value)) 
+    gprint (GP_LOG, "NaN    ");
+  else 
+    gprint (GP_LOG, "%6.3f ", value);
+}
+
+void print_short (double value, short int ival) {
+  if (ival == NAN_S_SHORT) 
     gprint (GP_LOG, "NaN    ");
   else 
@@ -320 +327 @@
     case 0: /* average mags */
       if (seq == -1) {
-        print_value (NO_MAG, NO_MAG);
+        print_double (NAN);
       } else {
-        print_value (secfilt[seq].M, secfilt[seq].M);
+        print_double (secfilt[seq].M);
       }
       break;
@@ -328 +335 @@
     case 1: /* average mags errors */
       if (seq == -1) {
-        print_value (NO_MAG, NO_MAG);
+        print_double (NAN);
       } else {
-        print_value (secfilt[seq].dM, secfilt[seq].dM);
+        print_double (secfilt[seq].dM);
       }
       break;
@@ -336 +343 @@
     case 2: /* average mag chisq */
       if (seq == -1) {
-        print_value (NO_MAG, NO_MAG);
+        print_short (NAN_S_SHORT, NAN_S_SHORT);
       } else {
-        print_value (pow (10.0, 0.01*secfilt[seq].Xm), secfilt[seq].Xm);
+        print_short (pow (10.0, 0.01*secfilt[seq].Xm), secfilt[seq].Xm);
       }
       break;