Changeset 20936 for trunk/Ohana/src/opihi/cmd.data/vbin.c

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/cmd.data/vbin.c (modified) (2 diffs)

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

@@ -5 +5 @@
   int i, j, n, N, Nin, Nout;
   int Normalize, Ignore;
-  float *Vout, *Vin, IgnoreValue;
+  opihi_flt *Vout, IgnoreValue;
   double scale;
   Vector *in, *out;
@@ -42 +42 @@
   Nout = Nin / scale;
 
-  REALLOCATE (out[0].elements, float, Nout);
-  out[0].Nelements = Nout;
+  // re-binning creates a float vector
+  ResetVector (out, OPIHI_FLT, in[0].Nelements);
 
-  Vin  = in[0].elements;
-  Vout = out[0].elements;
-  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 /= (float) N; 
-      } else {
-        *Vout = 0;
+  Vout = out[0].elements.Flt;
+
+  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;
+        }
       }
     }