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

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

@@ -42 +42 @@
   Nout = Nin / scale;
 
-  REALLOCATE (out[0].elements.Flt, opihi_flt, Nout);
-  out[0].Nelements = Nout;
+  // re-binning creates a float vector
+  ResetVector (out, OPIHI_FLT, in[0].Nelements);
 
-  Vin  = in[0].elements.Flt;
   Vout = out[0].elements.Flt;
-  for (n = j = 0; j < Nout; j++, Vout++) {
-    *Vout = 0;
-    for (N = i = 0; (i < scale) && (n < Nin); n++, i++, Vin++) {
-      if (!finite (*Vin)) continue;
-      if (Ignore && (*Vin == IgnoreValue)) continue;
-      *Vout += *Vin;
-      N ++;
-    } 
-    if (Normalize) {
-      if (N > 0) { 
-        *Vout /= (opihi_flt) N; 
-      } else {
-        *Vout = 0;
+
+  if (in[0].type == OPIHI_FLT) {
+    opihi_flt *Vin  = in[0].elements.Flt;
+    for (n = j = 0; j < Nout; j++, Vout++) {
+      *Vout = 0;
+      for (N = i = 0; (i < scale) && (n < Nin); n++, i++, Vin++) {
+        if (!finite (*Vin)) continue;
+        if (Ignore && (*Vin == IgnoreValue)) continue;
+        *Vout += *Vin;
+        N ++;
+      } 
+      if (Normalize) {
+        if (N > 0) { 
+          *Vout /= (opihi_flt) N; 
+        } else {
+          *Vout = 0;
+        }
+      }
+    }
+  } else {
+    opihi_int *Vin  = in[0].elements.Int;
+    for (n = j = 0; j < Nout; j++, Vout++) {
+      *Vout = 0;
+      for (N = i = 0; (i < scale) && (n < Nin); n++, i++, Vin++) {
+        if (!finite (*Vin)) continue;
+        if (Ignore && (*Vin == IgnoreValue)) continue;
+        *Vout += *Vin;
+        N ++;
+      } 
+      if (Normalize) {
+        if (N > 0) { 
+          *Vout /= (opihi_flt) N; 
+        } else {
+          *Vout = 0;
+        }
       }
     }