Changeset 33882 for branches/eam_branches/ipp-20120405/Ohana/src/opihi/cmd.data

Timestamp:

May 16, 2012, 4:27:16 PM (14 years ago)

Author:

eugene

Message:

add -incl option to for loops (include end point if appropriate; eg 0 1 2 3 [4], but not 0 2 4 [5]); add -frac option to dot command; add -csv output option to write; add -header option to text and csv output modes

Location:

branches/eam_branches/ipp-20120405/Ohana/src/opihi/cmd.data

Files:

• dot.c (modified) (2 diffs)
• write_vectors.c (modified) (3 diffs)

branches/eam_branches/ipp-20120405/Ohana/src/opihi/cmd.data/dot.c

@@ -3 +3 @@
 int dot (int argc, char **argv) {
   
-  int kapa;
+  int kapa, N;
   Graphdata graphmode;
   float x, y;
 
   if (!style_args (&graphmode, &argc, argv, &kapa)) return FALSE;
+
+  /* FracPositions uses coordinates of 0-1 relative to axis range */
+  int FracPositions = FALSE;
+  if ((N = get_argument (argc, argv, "-frac"))) {
+    remove_argument (N, &argc, argv);
+    FracPositions = TRUE;
+  } 
 
   if (argc != 3) {
@@ -15 +22 @@
   x = atof(argv[1]);
   y = atof(argv[2]);
+
+  if (FracPositions) {
+    x =  x * (graphmode.xmax - graphmode.xmin) + graphmode.xmin;
+    y =  y * (graphmode.ymax - graphmode.ymin) + graphmode.ymin;
+  }    
 
   /* set point style and errorbar mode (these are NOT sticky) */

branches/eam_branches/ipp-20120405/Ohana/src/opihi/cmd.data/write_vectors.c

@@ -21 +21 @@
   FITS = NULL;
   if ((N = get_argument (argc, argv, "-fits"))) {
+    if (format) {
+      gprint (GP_ERR, "ERROR: do not mix -fits and -format\n");
+      free (format);
+      return (FALSE);
+    }
     remove_argument (N, &argc, argv);
     FITS = strcreate (argv[N]);
     remove_argument (N, &argc, argv);
+  }
+
+  /* option generate a FITS output table */
+  int CSV = FALSE;
+  if ((N = get_argument (argc, argv, "-csv"))) {
+    if (format) {
+      gprint (GP_ERR, "ERROR: do not mix -csv and -format\n");
+      free (format);
+      return (FALSE);
+    }
+    if (FITS) {
+      gprint (GP_ERR, "ERROR: do not mix -csv and -fits\n");
+      free (FITS);
+      return (FALSE);
+    }
+    remove_argument (N, &argc, argv);
+    CSV = TRUE;
   }
 
@@ -30 +52 @@
     remove_argument (N, &argc, argv);
     append = TRUE;
+  }
+
+  int ADD_HEADER = FALSE;
+  if ((N = get_argument (argc, argv, "-header"))) {
+    remove_argument (N, &argc, argv);
+    ADD_HEADER = TRUE;
   }
 
@@ -83 +111 @@
 
   /* default output format */
+  if (ADD_HEADER) {
+    for (j = 0; j < Nvec; j++) {
+      if (CSV) {
+        fprintf (f, "%s,", vec[j][0].name);
+      } else {
+        if (j == 0) fprintf (f, "# ");
+        fprintf (f, "%s ", vec[j][0].name);
+      }
+    }
+    fprintf (f, "\n");
+  }
+
+  /* default output format */
   if (format == (char *) NULL) {
     for (i = 0; i < vec[0][0].Nelements; i++) {
       for (j = 0; j < Nvec; j++) {
         if (vec[j][0].type == OPIHI_FLT) {
-          fprintf (f, "%.12g ", vec[j][0].elements.Flt[i]);
+          if (CSV) {
+            fprintf (f, "%.12g,", vec[j][0].elements.Flt[i]);
+          } else {
+            fprintf (f, "%.12g ", vec[j][0].elements.Flt[i]);
+          }
         } else {
-          fprintf (f, "%d ", vec[j][0].elements.Int[i]);
+          if (CSV) {
+            fprintf (f, "%d,", vec[j][0].elements.Int[i]);
+          } else {
+            fprintf (f, "%d ", vec[j][0].elements.Int[i]);
+          }
         }
       }