Changeset 38553 for trunk/Ohana/src/opihi

Timestamp:

Jun 25, 2015, 10:41:05 PM (11 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/ipp-20150616

Location:

trunk/Ohana/src/opihi

Files:

• cmd.astro/radec.c (modified) (1 diff)
• cmd.astro/sexigesimal.c (modified) (1 diff)
• cmd.data/read_vectors.c (modified) (1 diff)
• dimm/telescope_cmds.c (modified) (1 diff)
• lib.shell/stack_math.c (modified) (6 diffs)

trunk/Ohana/src/opihi/cmd.astro/radec.c

@@ -45 +45 @@
 
   // convert to hms, dms
-  hms_format (ra_string, ra/15.0);
-  hms_format (dec_string, dec);
+  hms_format (ra_string, 32, ra/15.0);
+  hms_format (dec_string, 32, dec);
 
   set_str_variable ("RA", ra_string);

trunk/Ohana/src/opihi/cmd.astro/sexigesimal.c

@@ -35 +35 @@
   } else {
     value = atof (argv[1]);
-    hms_format (string, value);
+    hms_format (string, 80, value);
     if (argc == 3) {
       set_str_variable (argv[2], string);

trunk/Ohana/src/opihi/cmd.data/read_vectors.c

@@ -77 +77 @@
   if ((argc < 3) || !(argc % 2)) {
     gprint (GP_ERR, "USAGE: read name N name N ...\n");
+    gprint (GP_ERR, "  options:\n");
+    gprint (GP_ERR, "     -fits EXTNAME : read a fits file from the given extension (vector names are column names)\n");
+    gprint (GP_ERR, "     -v : verbose mode\n");
+    gprint (GP_ERR, "     -csv : comma-separated values (columns may be identified in excel-style: A, AC\n");
+    gprint (GP_ERR, "     -skip N : skip N lines before reading\n");
+    gprint (GP_ERR, "     column names may include a type: name:type\n");
+    gprint (GP_ERR, "       type is int, float, char, time\n");
+    gprint (GP_ERR, "       for char, values are placed into a list $name:0 - $name:n\n");
+    gprint (GP_ERR, "       for time, values are human-readable date/time strings YYYY/MM/DD,hh:mm:ss\n");
+    gprint (GP_ERR, "       the resulting vector is a float based on the TIMEFORMAT, TIMEREF values\n");
     return (FALSE);
   }

trunk/Ohana/src/opihi/dimm/telescope_cmds.c

@@ -87 +87 @@
     set_variable ("RA", ra);
     set_variable ("DEC", dec);
-    dms_format (line, (ra/15.0));
+    dms_format (line, 64, (ra/15.0));
     set_str_variable ("Rs", line);
-    dms_format (line, dec);
+    dms_format (line, 64, dec);
     set_str_variable ("Ds", line);
 

trunk/Ohana/src/opihi/lib.shell/stack_math.c

@@ -32 +32 @@
 
   switch (op[0]) {
-  case '?': SSS_FUNC(M1 ? M2: M3);
-  default:
-    snprintf (line, 512, "error: op %c not defined!", op[0]);
-    push_error (line);
-    return (FALSE);
-}
+    case '?': SSS_FUNC(M1 ? M2: M3);
+    default:
+      snprintf (line, 512, "error: op %c not defined!", op[0]);
+      push_error (line);
+      return (FALSE);
+  }
 # undef SSS_FUNC
 
@@ -447 +447 @@
 
   switch (op[0]) { 
-  case '+': SV_FUNC(ST_SCALAR_INT, M1 + *M2);
-  case '-': SV_FUNC(ST_SCALAR_INT, M1 - *M2);
-  case '*': SV_FUNC(ST_SCALAR_INT, M1 * *M2);
-  case '/': SV_FUNC(ST_SCALAR_FLT, M1 / (opihi_flt) *M2);
-  case '%': SV_FUNC(ST_SCALAR_INT, (long long) M1 % (long long) *M2);
-  case '^': SV_FUNC(ST_SCALAR_FLT, pow (M1, *M2));
-  case '@': SV_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, *M2));
-  case 'a': SV_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, *M2));
-  case 'D': SV_FUNC(ST_SCALAR_INT, MIN (M1, *M2));
-  case 'U': SV_FUNC(ST_SCALAR_INT, MAX (M1, *M2));
-  case '<': SV_FUNC(ST_SCALAR_INT, (M1 < *M2) ? 1 : 0);
-  case '>': SV_FUNC(ST_SCALAR_INT, (M1 > *M2) ? 1 : 0);
-  case '&': SV_FUNC(ST_SCALAR_INT, ((long long)M1 & (long long)*M2));
-  case '|': SV_FUNC(ST_SCALAR_INT, ((long long)M1 | (long long)*M2));
-  case 'E': SV_FUNC(ST_SCALAR_INT, (M1 == *M2) ? 1 : 0);
-  case 'N': SV_FUNC(ST_SCALAR_INT, (M1 != *M2) ? 1 : 0);
-  case 'L': SV_FUNC(ST_SCALAR_INT, (M1 <= *M2) ? 1 : 0);
-  case 'G': SV_FUNC(ST_SCALAR_INT, (M1 >= *M2) ? 1 : 0);
-  case 'A': SV_FUNC(ST_SCALAR_INT, (M1 && *M2) ? 1 : 0);
-  case 'O': SV_FUNC(ST_SCALAR_INT, (M1 || *M2) ? 1 : 0);
-  default:
-    snprintf (line, 512, "error: op %c not defined!", op[0]);
-    push_error (line);
-    return (FALSE);
-}
+    case '+': SV_FUNC(ST_SCALAR_INT, M1 + *M2);
+    case '-': SV_FUNC(ST_SCALAR_INT, M1 - *M2);
+    case '*': SV_FUNC(ST_SCALAR_INT, M1 * *M2);
+    case '/': SV_FUNC(ST_SCALAR_FLT, M1 / (opihi_flt) *M2);
+    case '%': SV_FUNC(ST_SCALAR_INT, (long long) M1 % (long long) *M2);
+    case '^': SV_FUNC(ST_SCALAR_FLT, pow (M1, *M2));
+    case '@': SV_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, *M2));
+    case 'a': SV_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, *M2));
+    case 'D': SV_FUNC(ST_SCALAR_INT, MIN (M1, *M2));
+    case 'U': SV_FUNC(ST_SCALAR_INT, MAX (M1, *M2));
+    case '<': SV_FUNC(ST_SCALAR_INT, (M1 < *M2) ? 1 : 0);
+    case '>': SV_FUNC(ST_SCALAR_INT, (M1 > *M2) ? 1 : 0);
+    case '&': SV_FUNC(ST_SCALAR_INT, ((long long)M1 & (long long)*M2));
+    case '|': SV_FUNC(ST_SCALAR_INT, ((long long)M1 | (long long)*M2));
+    case 'E': SV_FUNC(ST_SCALAR_INT, (M1 == *M2) ? 1 : 0);
+    case 'N': SV_FUNC(ST_SCALAR_INT, (M1 != *M2) ? 1 : 0);
+    case 'L': SV_FUNC(ST_SCALAR_INT, (M1 <= *M2) ? 1 : 0);
+    case 'G': SV_FUNC(ST_SCALAR_INT, (M1 >= *M2) ? 1 : 0);
+    case 'A': SV_FUNC(ST_SCALAR_INT, (M1 && *M2) ? 1 : 0);
+    case 'O': SV_FUNC(ST_SCALAR_INT, (M1 || *M2) ? 1 : 0);
+    default:
+      snprintf (line, 512, "error: op %c not defined!", op[0]);
+      push_error (line);
+      return (FALSE);
+  }
 # undef SV_FUNC
 
   /** free up any temporary buffers: **/
   if (V2[0].type == ST_VECTOR_TMP) {
-  free (V2[0].vector[0].elements.Ptr);
-  free (V2[0].vector);
-}
+    free (V2[0].vector[0].elements.Ptr);
+    free (V2[0].vector);
+  }
 
   clear_stack (V1);
@@ -554 +554 @@
 
   switch (op[0]) { 
-  case '+': VS_FUNC(ST_SCALAR_INT, *M1 + M2);
-  case '-': VS_FUNC(ST_SCALAR_INT, *M1 - M2);
-  case '*': VS_FUNC(ST_SCALAR_INT, *M1 * M2);
-  case '/': VS_FUNC(ST_SCALAR_FLT, *M1 / (opihi_flt) M2);
-  case '%': VS_FUNC(ST_SCALAR_INT, (long long) *M1 % (long long) M2);
-  case '^': VS_FUNC(ST_SCALAR_FLT, pow (*M1, M2));
-  case '@': VS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (*M1, M2));
-  case 'a': VS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (*M1, M2));
-  case 'D': VS_FUNC(ST_SCALAR_INT, MIN (*M1, M2));
-  case 'U': VS_FUNC(ST_SCALAR_INT, MAX (*M1, M2));
-  case '<': VS_FUNC(ST_SCALAR_INT, (*M1 < M2) ? 1 : 0);
-  case '>': VS_FUNC(ST_SCALAR_INT, (*M1 > M2) ? 1 : 0);
-  case '&': VS_FUNC(ST_SCALAR_INT, ((long long)*M1 & (long long)M2));
-  case '|': VS_FUNC(ST_SCALAR_INT, ((long long)*M1 | (long long)M2));
-  case 'E': VS_FUNC(ST_SCALAR_INT, (*M1 == M2) ? 1 : 0);
-  case 'N': VS_FUNC(ST_SCALAR_INT, (*M1 != M2) ? 1 : 0);
-  case 'L': VS_FUNC(ST_SCALAR_INT, (*M1 <= M2) ? 1 : 0);
-  case 'G': VS_FUNC(ST_SCALAR_INT, (*M1 >= M2) ? 1 : 0);
-  case 'A': VS_FUNC(ST_SCALAR_INT, (*M1 && M2) ? 1 : 0);
-  case 'O': VS_FUNC(ST_SCALAR_INT, (*M1 || M2) ? 1 : 0);
-  default:
-    snprintf (line, 512, "error: op %c not defined!", op[0]);
-    push_error (line);
-    return (FALSE);
-}
+    case '+': VS_FUNC(ST_SCALAR_INT, *M1 + M2);
+    case '-': VS_FUNC(ST_SCALAR_INT, *M1 - M2);
+    case '*': VS_FUNC(ST_SCALAR_INT, *M1 * M2);
+    case '/': VS_FUNC(ST_SCALAR_FLT, *M1 / (opihi_flt) M2);
+    case '%': VS_FUNC(ST_SCALAR_INT, (long long) *M1 % (long long) M2);
+    case '^': VS_FUNC(ST_SCALAR_FLT, pow (*M1, M2));
+    case '@': VS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (*M1, M2));
+    case 'a': VS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (*M1, M2));
+    case 'D': VS_FUNC(ST_SCALAR_INT, MIN (*M1, M2));
+    case 'U': VS_FUNC(ST_SCALAR_INT, MAX (*M1, M2));
+    case '<': VS_FUNC(ST_SCALAR_INT, (*M1 < M2) ? 1 : 0);
+    case '>': VS_FUNC(ST_SCALAR_INT, (*M1 > M2) ? 1 : 0);
+    case '&': VS_FUNC(ST_SCALAR_INT, ((long long)*M1 & (long long)M2));
+    case '|': VS_FUNC(ST_SCALAR_INT, ((long long)*M1 | (long long)M2));
+    case 'E': VS_FUNC(ST_SCALAR_INT, (*M1 == M2) ? 1 : 0);
+    case 'N': VS_FUNC(ST_SCALAR_INT, (*M1 != M2) ? 1 : 0);
+    case 'L': VS_FUNC(ST_SCALAR_INT, (*M1 <= M2) ? 1 : 0);
+    case 'G': VS_FUNC(ST_SCALAR_INT, (*M1 >= M2) ? 1 : 0);
+    case 'A': VS_FUNC(ST_SCALAR_INT, (*M1 && M2) ? 1 : 0);
+    case 'O': VS_FUNC(ST_SCALAR_INT, (*M1 || M2) ? 1 : 0);
+    default:
+      snprintf (line, 512, "error: op %c not defined!", op[0]);
+      push_error (line);
+      return (FALSE);
+  }
 # undef VS_FUNC
 
@@ -584 +584 @@
 
   if (V1[0].type == ST_VECTOR_TMP) {
-  free (V1[0].vector[0].elements.Ptr);
-  free (V1[0].vector);
-}
+    free (V1[0].vector[0].elements.Ptr);
+    free (V1[0].vector);
+  }
 
   clear_stack (V1);
@@ -1061 +1061 @@
 
   switch (op[0]) { 
-  case '+': SS_FUNC(ST_SCALAR_INT, M1 + M2);
-  case '-': SS_FUNC(ST_SCALAR_INT, M1 - M2);
-  case '*': SS_FUNC(ST_SCALAR_INT, M1 * M2);
-  case '/': SS_FUNC(ST_SCALAR_FLT, M1 / (opihi_flt) M2);
-  case '%': SS_FUNC(ST_SCALAR_INT, (long long) M1 % (long long) M2);
-  case '^': SS_FUNC(ST_SCALAR_FLT, pow (M1, M2));
-  case '@': SS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, M2));
-  case 'a': SS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, M2));
-  case 'D': SS_FUNC(ST_SCALAR_INT, MIN (M1, M2));
-  case 'U': SS_FUNC(ST_SCALAR_INT, MAX (M1, M2));
-  case '<': SS_FUNC(ST_SCALAR_INT, (M1 < M2) ? 1 : 0);
-  case '>': SS_FUNC(ST_SCALAR_INT, (M1 > M2) ? 1 : 0);
-  case '&': SS_FUNC(ST_SCALAR_INT, ((long long)M1 & (long long)M2));
-  case '|': SS_FUNC(ST_SCALAR_INT, ((long long)M1 | (long long)M2));
-  case 'E': SS_FUNC(ST_SCALAR_INT, (M1 == M2) ? 1 : 0);
-  case 'N': SS_FUNC(ST_SCALAR_INT, (M1 != M2) ? 1 : 0);
-  case 'L': SS_FUNC(ST_SCALAR_INT, (M1 <= M2) ? 1 : 0);
-  case 'G': SS_FUNC(ST_SCALAR_INT, (M1 >= M2) ? 1 : 0);
-  case 'A': SS_FUNC(ST_SCALAR_INT, (M1 && M2) ? 1 : 0);
-  case 'O': SS_FUNC(ST_SCALAR_INT, (M1 || M2) ? 1 : 0);
-  default:
-    snprintf (line, 512, "error: op %c not defined!", op[0]);
-    push_error (line);
-    return (FALSE);
-}
+    case '+': SS_FUNC(ST_SCALAR_INT, M1 + M2);
+    case '-': SS_FUNC(ST_SCALAR_INT, M1 - M2);
+    case '*': SS_FUNC(ST_SCALAR_INT, M1 * M2);
+    case '/': SS_FUNC(ST_SCALAR_FLT, M1 / (opihi_flt) M2);
+    case '%': SS_FUNC(ST_SCALAR_INT, (long long) M1 % (long long) M2);
+    case '^': SS_FUNC(ST_SCALAR_FLT, pow (M1, M2));
+    case '@': SS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, M2));
+    case 'a': SS_FUNC(ST_SCALAR_FLT, DEG_RAD*atan2 (M1, M2));
+    case 'D': SS_FUNC(ST_SCALAR_INT, MIN (M1, M2));
+    case 'U': SS_FUNC(ST_SCALAR_INT, MAX (M1, M2));
+    case '<': SS_FUNC(ST_SCALAR_INT, (M1 < M2) ? 1 : 0);
+    case '>': SS_FUNC(ST_SCALAR_INT, (M1 > M2) ? 1 : 0);
+    case '&': SS_FUNC(ST_SCALAR_INT, ((long long)M1 & (long long)M2));
+    case '|': SS_FUNC(ST_SCALAR_INT, ((long long)M1 | (long long)M2));
+    case 'E': SS_FUNC(ST_SCALAR_INT, (M1 == M2) ? 1 : 0);
+    case 'N': SS_FUNC(ST_SCALAR_INT, (M1 != M2) ? 1 : 0);
+    case 'L': SS_FUNC(ST_SCALAR_INT, (M1 <= M2) ? 1 : 0);
+    case 'G': SS_FUNC(ST_SCALAR_INT, (M1 >= M2) ? 1 : 0);
+    case 'A': SS_FUNC(ST_SCALAR_INT, (M1 && M2) ? 1 : 0);
+    case 'O': SS_FUNC(ST_SCALAR_INT, (M1 || M2) ? 1 : 0);
+    default:
+      snprintf (line, 512, "error: op %c not defined!", op[0]);
+      push_error (line);
+      return (FALSE);
+  }
 # undef SS_FUNC
 
@@ -1133 +1133 @@
     case 'E': 
       value = strcmp (V1[0].name, V2[0].name) ? 0 : 1;
-    break; 
+      break; 
     case 'N': 
       value = strcmp (V1[0].name, V2[0].name) ? 1 : 0;
-    break; 
+      break; 
     default:
       snprintf (line, 512, "error: op %c not defined for string operations!", op[0]);