Changeset 36905 for branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/pmeasure.c

Timestamp:

Jun 18, 2014, 11:20:22 AM (12 years ago)

Author:

eugene

Message:

various changes to deal with new dvo structure names

File:

• branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/pmeasure.c (modified) (1 diff)

branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/pmeasure.c

@@ -207 +207 @@
         if (LimExclude && (Zvec[Npts] > 0.99)) continue;
         if (Zvec[Npts] < 0.011) continue;
-        R = catalog.average[i].R - catalog.measure[m+k].dR/3600.0;
-        D = catalog.average[i].D - catalog.measure[m+k].dD/3600.0;
+        R = catalog.measure[m+k].R;
+        D = catalog.measure[m+k].D;
         // XXX drop this check
         if ((R < Rmin) || (R > Rmax) || (D < -90.0) || (D > 90.0)) {
           char *date;
           date = ohana_sec_to_date (catalog.measure[m+k].t);
-          gprint (GP_LOG, "out: %f, %f : %s : (%f, %f) + (%f, %f)\n", R, D, date, catalog.average[i].R, catalog.average[i].D, catalog.measure[m+k].dR/3600.0, catalog.measure[m+k].dD/3600.0);
+          gprint (GP_LOG, "out: %f, %f : %s : (%f, %f) + (%f, %f)\n", R, D, date, catalog.average[i].R, catalog.average[i].D, catalog.measure[m+k].R, catalog.measure[m+k].D);
           free (date);
         }