Changeset 20936 for trunk/Ohana/src/opihi/dvo/simage.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/simage.c (modified) (6 diffs)

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

@@ -92 +92 @@
 
   /* set up storage buffers */
-  Xvec.Nelements = Nstars;
-  Yvec.Nelements = Nstars;
-  Zvec.Nelements = Nstars;
-  ALLOCATE (Xvec.elements, float, Xvec.Nelements);
-  ALLOCATE (Yvec.elements, float, Yvec.Nelements);
-  ALLOCATE (Zvec.elements, float, Zvec.Nelements);
+  SetVector (&Xvec, OPIHI_FLT, Nstars);
+  SetVector (&Yvec, OPIHI_FLT, Nstars);
+  SetVector (&Zvec, OPIHI_FLT, Nstars);
   ALLOCATE (buffer, char, (BLOCK*BYTES_STAR));
 
@@ -107 +104 @@
     if (nbytes != BLOCK*BYTES_STAR) {
       gprint (GP_ERR, "failed to read in stars (1)\n");
-      free (Xvec.elements);
-      free (Yvec.elements);
-      free (Zvec.elements);
+      free (Xvec.elements.Flt);
+      free (Yvec.elements.Flt);
+      free (Zvec.elements.Flt);
       free (buffer);
       return (FALSE);
@@ -118 +115 @@
       dparse (&M,  3, &buffer[j*BYTES_STAR]);
       XY_to_RD (&R, &D, X, Y, &coords);
-      fRD_to_XY (&Xvec.elements[nstars], &Yvec.elements[nstars], R, D, &graphmode.coords);
-      Zvec.elements[nstars] = MIN (1.0, MAX (0.01, (M - zero) / range));
+      RD_to_XY (&Xvec.elements.Flt[nstars], &Yvec.elements.Flt[nstars], R, D, &graphmode.coords);
+      Zvec.elements.Flt[nstars] = MIN (1.0, MAX (0.01, (M - zero) / range));
     }
   }
@@ -126 +123 @@
   if (nbytes != (Nbytes % (BLOCK*BYTES_STAR))) {
     gprint (GP_ERR, "ERROR: failed to read in stars (2)\n");
-    free (Xvec.elements);
-    free (Yvec.elements);
-    free (Zvec.elements);
+    free (Xvec.elements.Flt);
+    free (Yvec.elements.Flt);
+    free (Zvec.elements.Flt);
     free (buffer);
     return (FALSE);
@@ -137 +134 @@
     dparse (&M,  3, &buffer[j*BYTES_STAR]);
     XY_to_RD (&R, &D, X, Y, &coords);
-    fRD_to_XY (&Xvec.elements[nstars], &Yvec.elements[nstars], R, D, &graphmode.coords);
-    Zvec.elements[nstars] = MIN (1.0, MAX (0.01, (M - zero) / range));
+    RD_to_XY (&Xvec.elements.Flt[nstars], &Yvec.elements.Flt[nstars], R, D, &graphmode.coords);
+    Zvec.elements.Flt[nstars] = MIN (1.0, MAX (0.01, (M - zero) / range));
   }
   
   if (nstars != Nstars) {
     gprint (GP_ERR, "ERROR: failed to read in all stars (%d of %d)\n", nstars, Nstars);
-    free (Xvec.elements);
-    free (Yvec.elements);
-    free (Zvec.elements);
+    free (Xvec.elements.Flt);
+    free (Yvec.elements.Flt);
+    free (Zvec.elements.Flt);
     free (buffer);
     return (FALSE);
@@ -155 +152 @@
   Npts = Xvec.Nelements;
 
-  PlotVectorTriplet (kapa, Npts, Xvec.elements, Yvec.elements, Zvec.elements, &graphmode);
+  PlotVectorTriplet (kapa, &Xvec, &Yvec, &Zvec, &graphmode);
 
-  free (Xvec.elements);
-  free (Yvec.elements);
-  free (Zvec.elements);
+  free (Xvec.elements.Flt);
+  free (Yvec.elements.Flt);
+  free (Zvec.elements.Flt);
   free (buffer);