Changeset 20857 for branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/peak.c

Timestamp:

Nov 30, 2008, 7:45:21 AM (18 years ago)

Author:

eugene

Message:

modify functions to use both int and flt vectors

File:

• branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/peak.c (modified) (1 diff)

branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/peak.c

@@ -26 +26 @@
     end   = atof (argv[4]);
   } else {
-    start = vecx[0].elements.Flt[0];
-    end   = vecx[0].elements.Flt[vecx[0].Nelements - 1];
+    start = (vecx[0].type == OPIHI_FLT) ? vecx[0].elements.Flt[0] : vecx[0].elements.Int[0];
+    end   = (vecx[0].type == OPIHI_FLT) ? vecx[0].elements.Flt[vecx[0].Nelements - 1] : vecx[0].elements.Int[vecx[0].Nelements - 1];
   }
 
-  X = vecx[0].elements.Flt;
-  Y = vecy[0].elements.Flt;
+  imax = -1;
 
-  imax = -1;
-  xmax = *X;
-  ymax = *Y;
-  for (i = 1; i < vecx[0].Nelements-1; i++, X++, Y++) {
-    if ((*X >= start) && (*X <= end)) {
-      if ((imax == -1) || (*Y > ymax)) {
-        xmax = *X;
-        ymax = *Y;
-        imax = i;
+  if (vecx[0].type == OPIHI_FLT) {
+    opihi_flt *X = vecx[0].elements.Flt;
+    xmax = X[start];
+    ymax = (vecy[0].type == OPIHI_FLT) ? vecy[0].elements.Flt[start] : vecy[0].elements.Int[start];
+    for (i = 1; i < vecx[0].Nelements-1; i++, X++, Y++) {
+      if ((*X >= start) && (*X <= end)) {
+        if ((imax == -1) || (*Y > ymax)) {
+          xmax = *X;
+          ymax = (vecy[0].type == OPIHI_FLT) ? vecy[0].elements.Flt[i] : vecy[0].elements.Int[i];
+          imax = i;
+        }
       }
-    }
-  }      
+    }      
+  } else {
+    opihi_int *X = vecx[0].elements.Int;
+    xmax = X[start];
+    ymax = (vecy[0].type == OPIHI_FLT) ? vecy[0].elements.Flt[start] : vecy[0].elements.Int[start];
+    for (i = 1; i < vecx[0].Nelements-1; i++, X++, Y++) {
+      if ((*X >= start) && (*X <= end)) {
+        if ((imax == -1) || (*Y > ymax)) {
+          xmax = *X;
+          ymax = (vecy[0].type == OPIHI_FLT) ? vecy[0].elements.Flt[i] : vecy[0].elements.Int[i];
+          imax = i;
+        }
+      }
+    }      
+  }
 
   set_variable ("peakval", ymax);