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

Timestamp:

Mar 8, 2007, 12:21:18 PM (19 years ago)

Author:

eugene

Message:

complete merge from branch dvo-mods-2007-02

File:

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

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

@@ -39 +39 @@
     }      
   }
+
+  gprint (GP_ERR, "function is poorly defined; disabled and may be removed\n");
+  return (FALSE);
 
   if (argc != 4) {
@@ -137 +140 @@
           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 +149 @@
           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 +157 @@
         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 +165 @@
         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 +173 @@
         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);
@@ -179 +182 @@
           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;
+          // vec[0].elements[N] = catalog.average[n].M;
           N++;
         }
@@ -186 +189 @@
         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);