Changeset 20839 for branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/medacc.c

Timestamp:

Nov 25, 2008, 4:51:39 PM (18 years ago)

Author:

eugene

Message:

convert opihi vectors to double type, add option for int type as well

File:

• branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/medacc.c (modified) (4 diffs)

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

@@ -5 +5 @@
   int i, j, Nbins, Nvalues, N, N0, N1;
   double start, end, delta, k0, k1, fn;
-  float *V, *K, *V1, *K1, *O, *tmpvec, *tmpkey;
+  opihi_flt *V, *K, *V1, *K1, *O, *tmpvec, *tmpkey;
   Vector *val, *key, *out;
 
@@ -35 +35 @@
 
   out[0].Nelements = Nbins;
-  REALLOCATE (out[0].elements, float, out[0].Nelements);
-  bzero (out[0].elements, sizeof(float)*out[0].Nelements);
+  REALLOCATE (out[0].elements.Flt, opihi_flt, out[0].Nelements);
+  bzero (out[0].elements.Flt, sizeof(opihi_flt)*out[0].Nelements);
 
   /* copy vec and key to temp vectors */
-  ALLOCATE (tmpvec, float, val[0].Nelements);
-  ALLOCATE (tmpkey, float, val[0].Nelements);
+  ALLOCATE (tmpvec, opihi_flt, val[0].Nelements);
+  ALLOCATE (tmpkey, opihi_flt, val[0].Nelements);
 
-  V = val[0].elements;
-  K = key[0].elements;
+  V = val[0].elements.Flt;
+  K = key[0].elements.Flt;
   V1 = tmpvec;
   K1 = tmpkey;
@@ -53 +53 @@
 
   /* sort vec and key by key */
-  fsortpair (tmpkey, tmpvec, Nvalues);
+  dsortpair (tmpkey, tmpvec, Nvalues);
 
-  O = out[0].elements;
+  O = out[0].elements.Flt;
   /* find the start and end key for each range */
   N0 = 0;
@@ -67 +67 @@
     N1 = j;
     N = N1 - N0;
-    fsort (&tmpvec[N0], N);
+    dsort (&tmpvec[N0], N);
     fn = O[i] = 0;
     for (j = N0 + 0.25*N; j < N0 + 0.75*N; j++) {