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

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

@@ -49 +49 @@
 
   gprint (GP_ERR, "function is poorly defined; disabled and may be removed\n");
+  gprint (GP_ERR, "this function extracts measure data corresponding to a given image?\n");
   return (FALSE);
 
@@ -124 +125 @@
   
   /* create output vector */
+  N = 0;
   NPTS = 1000;
-  REALLOCATE (vec[0].elements, float, NPTS);
-  vec[0].Nelements = N = 0;
+  ResetVector (vec, OPIHI_FLT, NPTS);
 
   // prepare to handle interrupt signals
@@ -153 +154 @@
           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 +163 @@
           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 +171 @@
         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 +179 @@
         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 +187 @@
         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 +196 @@
           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 +203 @@
         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 +211 @@
         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 +221 @@
   
   vec[0].Nelements = N;
-  REALLOCATE (vec[0].elements, float, MAX(1,N));
+  REALLOCATE (vec[0].elements.Flt, opihi_flt, MAX(1,N));
   return (TRUE);
 }