Changeset 20936 for trunk/Ohana/src/opihi/cmd.data/accum.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/accum.c (modified) (3 diffs)

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

@@ -5 +5 @@
   int i, Nbins, bin, N, Normalize;
   float start, end, delta;
-  float *V, *K, *O, *NV;
+  int *NV;
+  opihi_flt *V, *K, *O;
   Vector *val, *key, *out;
 
@@ -29 +30 @@
   if ((out = SelectVector (argv[2], ANYVECTOR, TRUE)) == NULL) return (FALSE);
 
+  REQUIRE_VECTOR_FLT (val, FALSE); 
+  REQUIRE_VECTOR_FLT (key, FALSE); 
+
   start = atof (argv[4]);
   end   = atof (argv[5]);
@@ -45 +49 @@
   Nbins = (end - start) / delta;
 
-  out[0].Nelements = Nbins;
-  REALLOCATE (out[0].elements, float, out[0].Nelements);
-  bzero (out[0].elements, sizeof(float)*out[0].Nelements);
+  ResetVector (out, OPIHI_FLT, Nbins);
+  bzero (out[0].elements.Flt, sizeof(opihi_flt)*out[0].Nelements);
   if (Normalize) {
-    ALLOCATE (NV, float, Nbins);
-    bzero (NV, sizeof(float)*Nbins);
+    ALLOCATE (NV, int, Nbins);
+    bzero (NV, sizeof(int)*Nbins);
   }
 
-  V = val[0].elements;
-  K = key[0].elements;
-  O = out[0].elements;
+  V = val[0].elements.Flt;
+  K = key[0].elements.Flt;
+  O = out[0].elements.Flt;
 
   for (i = 0; i < val[0].Nelements; i++, V++, K++) {