Changeset 20857 for branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/zplot.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/zplot.c (modified) (3 diffs)

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

@@ -3 +3 @@
 int zplot (int argc, char **argv) {
   
-  int i, kapa, Npts;
-  opihi_flt *in, *out;
+  int i, kapa;
+  opihi_flt *out;
   double min, range;
   Graphdata graphmode;
@@ -33 +33 @@
   Zvec.Nelements = zvec[0].Nelements;
   ALLOCATE (Zvec.elements.Flt, opihi_flt, Zvec.Nelements);
+  out = Zvec.elements.Flt;
  
-  in = zvec[0].elements.Flt;
-  out = Zvec.elements.Flt;
-  for (i = 0; i < Zvec.Nelements; i++, in++, out++) {
-    *out = MIN (1.0, MAX (0.01, (*in - min) / range));
+  if (zvec[0].type == OPIHI_FLT) {
+    opihi_flt *in = zvec[0].elements.Flt;
+    for (i = 0; i < Zvec.Nelements; i++, in++, out++) {
+      *out = MIN (1.0, MAX (0.01, (*in - min) / range));
+    }
+  } else {
+    opihi_int *in = zvec[0].elements.Flt;
+    for (i = 0; i < Zvec.Nelements; i++, in++, out++) {
+      *out = MIN (1.0, MAX (0.01, (*in - min) / range));
+    }
   }
 
@@ -44 +51 @@
   graphmode.size = -1; /* point size determined by Zvec */
   graphmode.etype = 0; /* no errorbars */
-  Npts = xvec[0].Nelements;
-  PlotVectorTriplet (kapa, Npts, xvec[0].elements.Flt, yvec[0].elements.Flt, Zvec.elements.Flt, &graphmode);
+  PlotVectorTriplet (kapa, xvec, yvec, Zvec, &graphmode);
 
   free (Zvec.elements.Flt);