Changeset 37049 for trunk/Ohana/src/opihi/dvo/pmeasure.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/pmeasure.c (modified) (1 diff)

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

@@ -203 +203 @@
         if (TimeSelect && (catalog.measure[m+k].t > tzero + trange)) continue;
         if ((PhotcodeClip != -1) && (catalog.measure[m+k].photcode != PhotcodeClip)) continue;
-        mag = PhotCat (&catalog.measure[m+k]);
+        mag = PhotCat (&catalog.measure[m+k], MAG_CLASS_PSF);
         Zvec[Npts] = MIN (1.0, MAX (0.01, (mag - Mz) / Mr));
         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);
         }