Changeset 37049 for trunk/Ohana/src/opihi/dvo/imdata.c

Timestamp:

Jul 17, 2014, 10:21:10 AM (12 years ago)

Author:

eugene

Message:

various changes due to mods to average.d and measure.d; new parsing concept for photocode-related fields

File:

• trunk/Ohana/src/opihi/dvo/imdata.c (modified) (4 diffs)

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

@@ -3 +3 @@
 int imdata (int argc, char **argv) {
   
-  off_t i, j, k, n, I;
+  off_t i, j, k, I;
   int N, NPTS, found, mode, TimeSelect, TimeFormat;
   off_t Nregions, NREGIONS;
@@ -152 +152 @@
         for (i = 0; i < catalog.Nmeasure; i++) {
           if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-          n = catalog.measure[i].averef;
-          vec[0].elements.Flt[N] = catalog.average[n].R - catalog.measure[i].dR / 3600.0;
+          vec[0].elements.Flt[N] = catalog.measure[i].R;
           N++;
           CHECK_REALLOCATE (vec[0].elements.Flt, opihi_flt, NPTS, N, 1000);
@@ -161 +160 @@
         for (i = 0; i < catalog.Nmeasure; i++) {
           if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-          n = catalog.measure[i].averef;
-          vec[0].elements.Flt[N] = catalog.average[n].D - catalog.measure[i].dD / 3600.0;
+          vec[0].elements.Flt[N] = catalog.measure[i].D;
           N++;
           CHECK_REALLOCATE (vec[0].elements.Flt, opihi_flt, NPTS, N, 1000);
@@ -194 +192 @@
         for (i = 0; i < catalog.Nmeasure; i++) {
           if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
-          n = catalog.measure[i].averef;
+          //n = catalog.measure[i].averef;
           // vec[0].elements.Flt[N] = catalog.average[n].M;
           N++;