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

trunk/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;
 
@@ -21 +21 @@
   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]);
@@ -34 +37 @@
   Nbins = 1 + (int)((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);
 
   /* 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 +55 @@
 
   /* 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 +69 @@
     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++) {