Changeset 20936 for trunk/Ohana/src/opihi/dvo/procks.c

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/dvo/procks.c (modified) (5 diffs)

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

@@ -95 +95 @@
 
   /* data has been loaded, get ready to plot it */
-  Yvec.Nelements = Xvec.Nelements = 3*Nrocks;
-  ALLOCATE (Xvec.elements, float, Xvec.Nelements);
-  ALLOCATE (Yvec.elements, float, Yvec.Nelements);
+  SetVector (&Xvec, OPIHI_FLT, 3*Nrocks);
+  SetVector (&Yvec, OPIHI_FLT, 3*Nrocks);
   
   /* project stars to screen display coords */
@@ -106 +105 @@
       while (rocks[i].ra[j] < Rmin) rocks[i].ra[j] += 360.0;
       while (rocks[i].ra[j] > Rmax) rocks[i].ra[j] -= 360.0;
-      fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], rocks[i].ra[j], rocks[i].dec[j], &graphmode.coords);
+      RD_to_XY (&Xvec.elements.Flt[N], &Yvec.elements.Flt[N], rocks[i].ra[j], rocks[i].dec[j], &graphmode.coords);
       N ++;
     }
@@ -114 +113 @@
   graphmode.style = 2; /* set style to points */
   graphmode.etype = 0; /* no errorbars */
-  PlotVectorPair (kapa, N, Xvec.elements, Yvec.elements, &graphmode);
+  PlotVectorPair (kapa, &Xvec, &Yvec, &graphmode);
 
   /* now plot vectors between two extrema */
   Yvec.Nelements = Xvec.Nelements = 2*Nrocks;
-  REALLOCATE (Xvec.elements, float, Xvec.Nelements);
-  REALLOCATE (Yvec.elements, float, Yvec.Nelements);
+  REALLOCATE (Xvec.elements.Flt, opihi_flt, Xvec.Nelements);
+  REALLOCATE (Yvec.elements.Flt, opihi_flt, Yvec.Nelements);
   
   /* project stars to screen display coords */
@@ -136 +135 @@
     while (rocks[i].ra[N1] < Rmin) rocks[i].ra[N1] += 360.0;
     while (rocks[i].ra[N1] > Rmax) rocks[i].ra[N1] -= 360.0;
-    fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], rocks[i].ra[N0], rocks[i].dec[N0], &graphmode.coords);
+    RD_to_XY (&Xvec.elements.Flt[N], &Yvec.elements.Flt[N], rocks[i].ra[N0], rocks[i].dec[N0], &graphmode.coords);
     N ++;
-    fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], rocks[i].ra[N1], rocks[i].dec[N1], &graphmode.coords);
+    RD_to_XY (&Xvec.elements.Flt[N], &Yvec.elements.Flt[N], rocks[i].ra[N1], rocks[i].dec[N1], &graphmode.coords);
     N ++;
   }
@@ -147 +146 @@
   graphmode.etype = 0; /* no errorbars */
 
-  PlotVectorPair (kapa, N, Xvec.elements, Yvec.elements, &graphmode);
+  PlotVectorPair (kapa, &Xvec, &Yvec, &graphmode);
 
-  free (Xvec.elements);
-  free (Yvec.elements);
+  free (Xvec.elements.Flt);
+  free (Yvec.elements.Flt);
   return (TRUE);