Changeset 20859 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/compare.c

Timestamp:

Nov 30, 2008, 11:13:15 AM (18 years ago)

Author:

eugene

Message:

allow functions to use FLT or INT vectors as appropriate; document valid types

File:

• branches/eam_branch_20081124/Ohana/src/opihi/dvo/compare.c (modified) (2 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/dvo/compare.c

@@ -10 +10 @@
   Nmatch = 0;
   NMATCH = D_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);
+  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);) {
@@ -59 +59 @@
   }
 
-  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);
-  
-  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);
 }