Changeset 12008 for branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/imdata.c

Timestamp:

Feb 22, 2007, 4:05:39 PM (19 years ago)

Author:

eugene

Message:

adding fields needed by DVO for PS1 support; pre-calculating Xccd, Yccd

File:

• branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/imdata.c (modified) (6 diffs)

branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/imdata.c

@@ -137 +137 @@
           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_PS / 3600.0;
+          vec[0].elements[N] = catalog.average[n].R - catalog.measure[i].dR / 3600.0;
           N++;
           CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
@@ -146 +146 @@
           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_PS / 3600.0;
+          vec[0].elements[N] = catalog.average[n].D - catalog.measure[i].dD / 3600.0;
           N++;
           CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
@@ -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_PS;
+          vec[0].elements[N] = catalog.measure[i].M;
           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_PS;
+          vec[0].elements[N] = catalog.measure[i].dM;
           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_PS;
+          vec[0].elements[N] = catalog.measure[i].Mcal;
           N++;
           CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
@@ -186 +186 @@
         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].source;
+          vec[0].elements[N] = catalog.measure[i].photcode;
           N++;
           CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);