Changeset 38406 for branches/eam_branches/ohana.20150429/src/opihi/cmd.data/read_vectors.c

Timestamp:

Jun 6, 2015, 10:03:56 AM (11 years ago)

Author:

eugene

Message:

add options to cast to force single-precision floats or long long int (stuffed into double); fits table I/O puts int64 into opihi double vector

File:

• branches/eam_branches/ohana.20150429/src/opihi/cmd.data/read_vectors.c (modified) (2 diffs)

branches/eam_branches/ohana.20150429/src/opihi/cmd.data/read_vectors.c

@@ -487 +487 @@
   }
   if (start < 0) ESCAPE ("invalid range: start < 0\n");
-  if (start >= header.Naxis[1]) ESCAPE ("invalid range: start >= Ny (%d)\n", header.Naxis[1]);
+  if (start >= header.Naxis[1]) ESCAPE ("invalid range: start >= Ny ("OFF_T_FMT")\n", header.Naxis[1]);
   if (Nrows < 0) ESCAPE ("invalid range: Nrows < 0\n");
 
   // just a warning:
   if (start + Nrows > header.Naxis[1]) {
-    if (VERBOSE) gprint (GP_ERR, "NOTE: reading last block will return only %d rows\n", header.Naxis[1] - start);
+    if (VERBOSE) gprint (GP_ERR, "NOTE: reading last block will return only "OFF_T_FMT" rows\n", header.Naxis[1] - start);
   }
 
@@ -555 +555 @@
     
     vecType = OPIHI_INT;
-    if (!strcmp (type, "double") || !strcmp (type, "float")) {
+    if (!strcmp (type, "double") || !strcmp (type, "float") || !strcmp (type, "int64_t")) {
       vecType = OPIHI_FLT;
     }