Changeset 20857 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/pmeasure.c

Timestamp:

Nov 30, 2008, 7:45:21 AM (18 years ago)

Author:

eugene

Message:

modify functions to use both int and flt vectors

File:

• branches/eam_branch_20081124/Ohana/src/opihi/dvo/pmeasure.c (modified) (4 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/dvo/pmeasure.c

@@ -14 +14 @@
   unsigned photFlagChoice, photFlagClip;
   int PhotcodeClip;
-  opihi_flt *Xvec, *Yvec, *Zvec;
+  float *Xvec, *Yvec, *Zvec;
   time_t tzero, tend;
   void *Signal;
@@ -169 +169 @@
   Npts = 0;
   NPTS = 1000;
-  ALLOCATE (Xvec, opihi_flt, NPTS);
-  ALLOCATE (Yvec, opihi_flt, NPTS);
-  ALLOCATE (Zvec, opihi_flt, NPTS);
+  ALLOCATE (Xvec, float, NPTS);
+  ALLOCATE (Yvec, float, NPTS);
+  ALLOCATE (Zvec, float, NPTS);
 
   // prepare to handle interrupt signals
@@ -218 +218 @@
           free (date);
         }
-        status = RD_to_XY (&Xvec[Npts], &Yvec[Npts], R, D, &graphmode.coords);
+        status = fRD_to_XY (&Xvec[Npts], &Yvec[Npts], R, D, &graphmode.coords);
         if (!status) continue;
         Npts ++;
 
         if (Npts == NPTS - 1) {
-            NPTS += 1000;
-            REALLOCATE (Xvec, opihi_flt, NPTS);
-            REALLOCATE (Yvec, opihi_flt, NPTS);
-            REALLOCATE (Zvec, opihi_flt, NPTS);
+          NPTS += 1000;
+          REALLOCATE (Xvec, float, NPTS);
+          REALLOCATE (Yvec, float, NPTS);
+          REALLOCATE (Zvec, float, NPTS);
         }
         if ((Npts > NCHUNK) || (Nloaded >= 25)) {
-            PlotVectorTriplet (kapa, Npts, Xvec, Yvec, Zvec, &graphmode);
-            Npts = 0;
-            Nloaded = 0;
+          KapaPrepPlot (kapa, Npts, graphmode);
+          KapaPlotVector (kapa, Npts, Xvec, "x");
+          KapaPlotVector (kapa, Npts, Yvec, "y");
+          KapaPlotVector (kapa, Npts, Zvec, "z");
+          Npts = 0;
+          Nloaded = 0;
         }
       }
@@ -238 +241 @@
     dvo_catalog_free (&catalog);
   }
-  if (Npts > 0) PlotVectorTriplet (kapa, Npts, Xvec, Yvec, Zvec, &graphmode);
-
+  if (Npts > 0) {
+    KapaPrepPlot (kapa, Npts, graphmode);
+    KapaPlotVector (kapa, Npts, Xvec, "x");
+    KapaPlotVector (kapa, Npts, Yvec, "y");
+    KapaPlotVector (kapa, Npts, Zvec, "z");
+  }
   free (Xvec);
   free (Yvec);