Changeset 41341 for trunk/Ohana/src/opihi/cmd.data/write_vectors.c

Timestamp:

Apr 16, 2020, 2:04:27 PM (6 years ago)

Author:

tdeboer

Message:

quick undo

File:

• trunk/Ohana/src/opihi/cmd.data/write_vectors.c (modified) (8 diffs)

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

@@ -32 +32 @@
   }
 
-  /* option generate a FITS output table */
+  // option generate a FITS output table (FITS holds the filename) 
+  // in FITS output context, -header is interpretted as a buffer containing
+  // header keywords to supplement the FITS table header
   char *FITS = NULL;
+  Header *fitsheader = NULL;
+  Buffer *headbuffer = NULL;
   if ((N = get_argument (argc, argv, "-fits"))) {
     remove_argument (N, &argc, argv);
     FITS = strcreate (argv[N]);
     remove_argument (N, &argc, argv);
-  }
-
+
+    if ((N = get_argument (argc, argv, "-header"))) {
+      remove_argument (N, &argc, argv);
+      if ((headbuffer = SelectBuffer (argv[N], OLDBUFFER, TRUE)) == NULL) return (FALSE);
+      fitsheader = &headbuffer->header;
+      remove_argument (N, &argc, argv);
+    }
+  }
+  
   /* option generate a FITS output table */
   int CSV = FALSE;
@@ -124 +135 @@
 
   if (FITS) {
-    int status = WriteVectorTableFITS (argv[1], FITS, vec, Nvec, append, compress, format, Ntile);
+    int status = WriteVectorTableFITS (argv[1], FITS, fitsheader, vec, Nvec, append, compress, format, Ntile);
     free (vec);
     return status;
@@ -143 +154 @@
   if (ADD_HEADER) {
     for (j = 0; j < Nvec; j++) {
+      if (j == 0) fprintf (f, "# ");
       if (CSV) {
         fprintf (f, "%s,", vec[j][0].name);
       } else {
-        if (j == 0) fprintf (f, "# ");
         fprintf (f, "%s ", vec[j][0].name);
       }
@@ -155 +166 @@
   /* default output format */
   if (format == (char *) NULL) {
+    char padChar = CSV ? ',' : ' ';
     for (i = 0; i < vec[0][0].Nelements; i++) {
       for (j = 0; j < Nvec; j++) {
-        if (vec[j][0].type == OPIHI_FLT) {
-          if (CSV) {
-            fprintf (f, "%.12g,", vec[j][0].elements.Flt[i]);
-          } else {
-            fprintf (f, "%.12g ", vec[j][0].elements.Flt[i]);
-          }
-        } else {
-          if (CSV) {
-            fprintf (f, OPIHI_INT_FMT",", vec[j][0].elements.Int[i]);
-          } else {
-            fprintf (f, OPIHI_INT_FMT" ", vec[j][0].elements.Int[i]);
-          }
+        switch (vec[j][0].type) {
+          case OPIHI_FLT:
+            fprintf (f, "%.12g%c", vec[j][0].elements.Flt[i], padChar);
+            break;
+          case OPIHI_INT:
+            fprintf (f, OPIHI_INT_FMT"%c", vec[j][0].elements.Int[i], padChar);
+            break;
+          case OPIHI_STR:
+            fprintf (f, "%s%c", vec[j][0].elements.Str[i], padChar);
+            break;
         }
       }
@@ -215 +225 @@
         fmttype[j] = 'd';
         break;
+      case 's':
+        fmttype[j] = 's';
+        break;
       default:
-        gprint (GP_ERR, "syntax error in format (only e,f,d,c,x allowed)\n");
+        gprint (GP_ERR, "syntax error in format (only e,f,d,c,x,s allowed)\n");
         return (FALSE);
     }
@@ -223 +236 @@
   strcat (fmtlist[Nvec-1], p0);
   
+  // check format types against vector types:
+  for (j = 0; j < Nvec; j++) {
+    switch (vec[j][0].type) {
+      case OPIHI_FLT:
+      case OPIHI_INT:
+        if (fmttype[j] == 's') {
+          gprint (GP_ERR, "mismatch between string format and numerical vector for %s\n", vec[j][0].name);
+          return FALSE;
+        }
+        break;
+      case OPIHI_STR:
+        if (fmttype[j] != 's') {
+          gprint (GP_ERR, "mismatch between numerical format and string vector for %s\n", vec[j][0].name);
+          return FALSE;
+        }
+        break;
+    }
+  }
+
   for (i = 0; i < vec[0][0].Nelements; i++) {
     for (j = 0; j < Nvec; j++) {
@@ -239 +271 @@
         }
       } 
+      if (fmttype[j] == 's') {
+        fprintf (f, fmtlist[j], vec[j][0].elements.Str[i]);
+      } 
     }
     fprintf (f, "\n");
@@ -260 +295 @@
     gprint (GP_ERR, "  -append : write to the end of the existing file\n");
     gprint (GP_ERR, "  -fits NAME : write a fits table (extention name is NAME, column names match vector names)\n");
+    gprint (GP_ERR, "     in FITS output context, -header takes an additional argument which is interpretted\n");
+    gprint (GP_ERR, "     as a buffer containing header keywords to supplement the FITS table header\n");
     gprint (GP_ERR, "  -csv : write a comma-separated values file (eg, to read in excel)\n");
     gprint (GP_ERR, "  -f \"format\" : provide formatting codes for output:\n");