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

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/cmd.data (modified) (1 prop)
• src/opihi/cmd.data/write_vectors.c (modified) (5 diffs)

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

@@ -3 +3 @@
 int write_vectors (int argc, char **argv) {
   
-  int append;
   int i, j, Nvec, Ne, N;
   FILE *f;
   char **fmtlist, *fmttype;
-  char *p0, *p1, *p2, *format, *FITS;
+  char *p0, *p1, *p2, *format;
   Vector **vec;
 
@@ -34 +33 @@
 
   /* option generate a FITS output table */
-  FITS = NULL;
+  char *FITS = NULL;
   if ((N = get_argument (argc, argv, "-fits"))) {
     remove_argument (N, &argc, argv);
@@ -58 +57 @@
   }
 
-  append = FALSE;
+  int append = FALSE;
   if ((N = get_argument (argc, argv, "-append"))) {
     remove_argument (N, &argc, argv);
     append = TRUE;
+  }
+
+  char *compress = NULL;
+  if ((N = get_argument (argc, argv, "-compress-mode"))) {
+    remove_argument (N, &argc, argv);
+    compress = strcreate(argv[N]);
+    remove_argument (N, &argc, argv);
+  } else if ((N = get_argument (argc, argv, "-compress"))) {
+    remove_argument (N, &argc, argv);
+    compress = strcreate("GZIP_1");
+    if (!FITS) {
+      fprintf (stderr, "NOTE: write_vectors -compress has no effect on non-FITS\n");
+    }
   }
 
@@ -105 +117 @@
 
   if (FITS) {
-    int status = WriteVectorTableFITS (argv[1], FITS, vec, Nvec, append, format);
+    int status = WriteVectorTableFITS (argv[1], FITS, vec, Nvec, append, compress, format);
     free (vec);
     return status;
@@ -243 +255 @@
     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");
-    gprint (GP_ERR, "    ascii / csv : format consists of c-style format codes in form %NN.Md\n");
+    gprint (GP_ERR, "    ascii / csv : format consists of c-style format codes in form %%NN.Md\n");
     gprint (GP_ERR, ",     the following codes are allowed\n");
-    gprint (GP_ERR, "        %e -- double, %f -- float\n");
-    gprint (GP_ERR, "        %d -- int, %c -- char, %x -- hex int\n");
+    gprint (GP_ERR, "        %%e -- double, %%f -- float\n");
+    gprint (GP_ERR, "        %%d -- int, %%c -- char, %%x -- hex int\n");
     gprint (GP_ERR, "    FITS : format consists of the following FITS binary table format codes:\n");
     gprint (GP_ERR, "      B : 1 byte int\n");