Changeset 40291 for trunk/Ohana/src/opihi/cmd.data/print_vectors.c

Timestamp:

Dec 13, 2017, 10:53:48 AM (9 years ago)

Author:

eugene

Message:

merge EAM development branch changes for DR2 into trunk (add PS1_V6 dvo format; change Mcal to McalPSF, McalAPER; change opihi int vectors to 64bit)

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/cmd.data/print_vectors.c (modified) (3 diffs)

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

@@ -4 +4 @@
 
   Vector **vec;
-  int i, j;
+  int i, j, N;
+
+  int START_VALUE = 0;
+  if ((N = get_argument (argc, argv, "-s"))) {
+    remove_argument (N, &argc, argv);
+    START_VALUE = atoi (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  int END_VALUE = -1;
+  if ((N = get_argument (argc, argv, "-e"))) {
+    remove_argument (N, &argc, argv);
+    END_VALUE = atoi (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
 
   if (argc < 2) {
@@ -27 +41 @@
   }
 
-  for (j = 0; j < MaxLen; j++) {
+  // start and end may be 0 - N (truncated to N) or may be negative, in which case it refers to 
+  // distance from the end (just like vector[-5])
+  START_VALUE = (START_VALUE < 0) ? MaxLen + START_VALUE + 1 : MIN (START_VALUE, MaxLen);
+  START_VALUE = MAX (0, START_VALUE);
+
+  END_VALUE = (END_VALUE < 0) ? MaxLen + END_VALUE + 1 : MIN (END_VALUE, MaxLen);
+  END_VALUE = MAX (0, END_VALUE);
+
+  for (j = START_VALUE; j < END_VALUE; j++) {
     for (i = 0; i < Nvec; i++) {
       if (j >= vec[i][0].Nelements) {
@@ -35 +57 @@
           gprint (GP_LOG, "%f ", vec[i][0].elements.Flt[j]);
         } else {
-          gprint (GP_LOG, "%d ", vec[i][0].elements.Int[j]);
+          gprint (GP_LOG, OPIHI_INT_FMT" ", vec[i][0].elements.Int[j]);
         }
       }