Changeset 20857 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/paverage.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/paverage.c (modified) (5 diffs)

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

@@ -10 +10 @@
   double Radius, Rmin, Rmax, R, D;
   unsigned IDclip, IDchoice, LimExclude;
-  opihi_flt *Xvec, *Yvec, *Zvec;
+  float *Xvec, *Yvec, *Zvec;
   void *Signal;
 
@@ -38 +38 @@
     photcode = GetPhotcodebyName (argv[Narg]);
     if (!photcode) {
-        fprintf (stderr, "unknown photcode %s\n", argv[Narg]);
-        return (FALSE);
+      fprintf (stderr, "unknown photcode %s\n", argv[Narg]);
+      return (FALSE);
     }
     remove_argument (Narg, &argc, argv);
     Nsec = GetPhotcodeNsec (photcode[0].code);
     if (Nsec == -1) {
-        fprintf (stderr, "photcode %s is not an AVERAGE photcode\n", argv[Narg]);
-        return (FALSE);
+      fprintf (stderr, "photcode %s is not an AVERAGE photcode\n", argv[Narg]);
+      return (FALSE);
     }
   }
@@ -96 +96 @@
   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
@@ -133 +133 @@
       R = average[i].R;
       D = average[i].D;
-      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;
       }
     }
@@ -152 +155 @@
     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);