Changeset 20839 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/imdata.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/dvo/imdata.c (modified) (10 diffs)

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

@@ -125 +125 @@
   /* create output vector */
   NPTS = 1000;
-  REALLOCATE (vec[0].elements, float, NPTS);
+  REALLOCATE (vec[0].elements.Flt, opihi_flt, NPTS);
   vec[0].Nelements = N = 0;
 
@@ -153 +153 @@
           if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
           n = catalog.measure[i].averef;
-          vec[0].elements[N] = catalog.average[n].R - catalog.measure[i].dR / 3600.0;
-          N++;
-          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+          vec[0].elements.Flt[N] = catalog.average[n].R - catalog.measure[i].dR / 3600.0;
+          N++;
+          CHECK_REALLOCATE (vec[0].elements.Flt, opihi_flt, NPTS, N, 1000);
         }
         break;
@@ -162 +162 @@
           if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
           n = catalog.measure[i].averef;
-          vec[0].elements[N] = catalog.average[n].D - catalog.measure[i].dD / 3600.0;
-          N++;
-          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+          vec[0].elements.Flt[N] = catalog.average[n].D - catalog.measure[i].dD / 3600.0;
+          N++;
+          CHECK_REALLOCATE (vec[0].elements.Flt, opihi_flt, NPTS, N, 1000);
         }
         break;
@@ -170 +170 @@
         for (i = 0; i < catalog.Nmeasure; i++) {
           if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-          vec[0].elements[N] = catalog.measure[i].M;
-          N++;
-          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+          vec[0].elements.Flt[N] = catalog.measure[i].M;
+          N++;
+          CHECK_REALLOCATE (vec[0].elements.Flt, opihi_flt, NPTS, N, 1000);
         }
         break;
@@ -178 +178 @@
         for (i = 0; i < catalog.Nmeasure; i++) {
           if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-          vec[0].elements[N] = catalog.measure[i].dM;
-          N++;
-          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+          vec[0].elements.Flt[N] = catalog.measure[i].dM;
+          N++;
+          CHECK_REALLOCATE (vec[0].elements.Flt, opihi_flt, NPTS, N, 1000);
         }
         break;
@@ -186 +186 @@
         for (i = 0; i < catalog.Nmeasure; i++) {
           if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-          vec[0].elements[N] = catalog.measure[i].Mcal;
-          N++;
-          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+          vec[0].elements.Flt[N] = catalog.measure[i].Mcal;
+          N++;
+          CHECK_REALLOCATE (vec[0].elements.Flt, opihi_flt, NPTS, N, 1000);
         }
         break;
@@ -195 +195 @@
           if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
           n = catalog.measure[i].averef;
-          // vec[0].elements[N] = catalog.average[n].M;
+          // vec[0].elements.Flt[N] = catalog.average[n].M;
           N++;
         }
@@ -202 +202 @@
         for (i = 0; i < catalog.Nmeasure; i++) {
           if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-          vec[0].elements[N] = catalog.measure[i].photcode;
-          N++;
-          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+          vec[0].elements.Flt[N] = catalog.measure[i].photcode;
+          N++;
+          CHECK_REALLOCATE (vec[0].elements.Flt, opihi_flt, NPTS, N, 1000);
         }
         break;
@@ -210 +210 @@
         for (i = 0; i < catalog.Nmeasure; i++) {
           if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-          vec[0].elements[N] = TimeValue (catalog.measure[i].t, TimeReference, TimeFormat);
-          N++;
-          CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
+          vec[0].elements.Flt[N] = TimeValue (catalog.measure[i].t, TimeReference, TimeFormat);
+          N++;
+          CHECK_REALLOCATE (vec[0].elements.Flt, opihi_flt, NPTS, N, 1000);
         }
         break;
@@ -220 +220 @@
   
   vec[0].Nelements = N;
-  REALLOCATE (vec[0].elements, float, MAX(1,N));
+  REALLOCATE (vec[0].elements.Flt, opihi_flt, MAX(1,N));
   return (TRUE);
 }