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

Timestamp:

Aug 24, 2005, 8:51:56 AM (21 years ago)

Author:

eugene

Message:

adding internal vs external formats for average, measure, secfilt

File:

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

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

@@ -154 +154 @@
       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 / 1000.0;
+        vec[0].elements[N] = catalog.measure[i].M_PS;
         N++;
         CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
@@ -162 +162 @@
       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 / 1000.0;
+        vec[0].elements[N] = catalog.measure[i].dM_PS;
         N++;
         CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
@@ -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].Mcal / 1000.0;
+        vec[0].elements[N] = catalog.measure[i].Mcal_PS;
         N++;
         CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
@@ -179 +179 @@
         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 / 1000.0;
+        vec[0].elements[N] = catalog.average[n].M_PS;
         N++;
       }