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

trunk/Ohana/src/opihi/dvo/compare.c

@@ -10 +10 @@
   Nmatch = 0;
   NMATCH = D_NMATCH;
-  REALLOCATE (rvec[0].elements, float, NMATCH);
-  REALLOCATE (dvec[0].elements, float, NMATCH);
-  REALLOCATE (mvec[0].elements, float, NMATCH);
-  REALLOCATE (drvec[0].elements, float, NMATCH);
-  REALLOCATE (ddvec[0].elements, float, NMATCH);
-  REALLOCATE (dmvec[0].elements, float, NMATCH);
+  ResetVector ( rvec, OPIHI_FLT, NMATCH);
+  ResetVector ( dvec, OPIHI_FLT, NMATCH);
+  ResetVector ( mvec, OPIHI_FLT, NMATCH);
+  ResetVector (drvec, OPIHI_FLT, NMATCH);
+  ResetVector (ddvec, OPIHI_FLT, NMATCH);
+  ResetVector (dmvec, OPIHI_FLT, NMATCH);
 
   for (i = j = 0; (i < catlog1[0].Naverage) && (j < catlog2[0].Naverage);) {
@@ -36 +36 @@
         dR = hypot (dX, dY);
         if (dR < radius) {
-          rvec[0].elements[Nmatch] = catlog1[0].average[i].R;
-          dvec[0].elements[Nmatch] = catlog1[0].average[i].D;
-          // mvec[0].elements[Nmatch] = catlog1[0].average[i].M;
-          drvec[0].elements[Nmatch] = dX;
-          ddvec[0].elements[Nmatch] = dY;
-          // dmvec[0].elements[Nmatch] = catlog1[0].average[i].M - catlog2[0].average[j].M;
+          rvec[0].elements.Flt[Nmatch] = catlog1[0].average[i].R;
+          dvec[0].elements.Flt[Nmatch] = catlog1[0].average[i].D;
+          // mvec[0].elements.Flt[Nmatch] = catlog1[0].average[i].M;
+          drvec[0].elements.Flt[Nmatch] = dX;
+          ddvec[0].elements.Flt[Nmatch] = dY;
+          // dmvec[0].elements.Flt[Nmatch] = catlog1[0].average[i].M - catlog2[0].average[j].M;
           Nmatch ++;
           if (Nmatch == NMATCH - 1) {
             NMATCH += D_NMATCH;
-            REALLOCATE ( rvec[0].elements, float, NMATCH);
-            REALLOCATE ( dvec[0].elements, float, NMATCH);
-            REALLOCATE ( mvec[0].elements, float, NMATCH);
-            REALLOCATE (drvec[0].elements, float, NMATCH);
-            REALLOCATE (ddvec[0].elements, float, NMATCH);
-            REALLOCATE (dmvec[0].elements, float, NMATCH);
+            REALLOCATE ( rvec[0].elements.Flt, opihi_flt, NMATCH);
+            REALLOCATE ( dvec[0].elements.Flt, opihi_flt, NMATCH);
+            REALLOCATE ( mvec[0].elements.Flt, opihi_flt, NMATCH);
+            REALLOCATE (drvec[0].elements.Flt, opihi_flt, NMATCH);
+            REALLOCATE (ddvec[0].elements.Flt, opihi_flt, NMATCH);
+            REALLOCATE (dmvec[0].elements.Flt, opihi_flt, NMATCH);
           }
         }
@@ -59 +59 @@
   }
 
-  REALLOCATE ( rvec[0].elements, float, Nmatch);
-  REALLOCATE ( dvec[0].elements, float, Nmatch);
-  REALLOCATE ( mvec[0].elements, float, Nmatch);
-  REALLOCATE (drvec[0].elements, float, Nmatch);
-  REALLOCATE (ddvec[0].elements, float, Nmatch);
-  REALLOCATE (dmvec[0].elements, float, Nmatch);
-  
-  rvec[0].Nelements = Nmatch;
-  dvec[0].Nelements = Nmatch;
-  mvec[0].Nelements = Nmatch;
-  drvec[0].Nelements = Nmatch;
-  ddvec[0].Nelements = Nmatch;
-  dmvec[0].Nelements = Nmatch;
-
+  ResetVector ( rvec, OPIHI_FLT, Nmatch);
+  ResetVector ( dvec, OPIHI_FLT, Nmatch);
+  ResetVector ( mvec, OPIHI_FLT, Nmatch);
+  ResetVector (drvec, OPIHI_FLT, Nmatch);
+  ResetVector (ddvec, OPIHI_FLT, Nmatch);
+  ResetVector (dmvec, OPIHI_FLT, Nmatch);
 }