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

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

@@ -53 +53 @@
   Rmid = 0.5*(Rmin + Rmax);
 
+  Npts = 0;
   NPTS = 200;
-  ALLOCATE (Xvec.elements, float, NPTS);
-  ALLOCATE (Yvec.elements, float, NPTS);
-  Npts = 0;
+  SetVector (&Xvec, OPIHI_FLT, NPTS);
+  SetVector (&Yvec, OPIHI_FLT, NPTS);
    
   regions = skylist[0].regions;
@@ -76 +76 @@
       RD_to_XYpic (&X[3], &Y[3], regions[i][0].Rmax, regions[i][0].Dmin, &graphmode.coords, Rmin, Rmax, Rmid, &leftside);
 
-      Xvec.elements[Npts] = X[0];
-      Yvec.elements[Npts] = Y[0];
+      Xvec.elements.Flt[Npts] = X[0];
+      Yvec.elements.Flt[Npts] = Y[0];
       for (j = 1; j < 4; j++) {
-        Xvec.elements[Npts + j*2 - 0] = X[j];
-        Yvec.elements[Npts + j*2 - 0] = Y[j];
-        Xvec.elements[Npts + j*2 - 1] = X[j];
-        Yvec.elements[Npts + j*2 - 1] = Y[j];
+        Xvec.elements.Flt[Npts + j*2 - 0] = X[j];
+        Yvec.elements.Flt[Npts + j*2 - 0] = Y[j];
+        Xvec.elements.Flt[Npts + j*2 - 1] = X[j];
+        Yvec.elements.Flt[Npts + j*2 - 1] = Y[j];
       }
-      Xvec.elements[Npts+7] = Xvec.elements[Npts];
-      Yvec.elements[Npts+7] = Yvec.elements[Npts];
+      Xvec.elements.Flt[Npts+7] = Xvec.elements.Flt[Npts];
+      Yvec.elements.Flt[Npts+7] = Yvec.elements.Flt[Npts];
       Npts += 8;
       if (Npts > NPTS - 1) {  /* this is OK because NPTS is made always a multiple of 8 */
         NPTS += 200;
-        REALLOCATE (Xvec.elements, float, NPTS);
-        REALLOCATE (Yvec.elements, float, NPTS);
+        REALLOCATE (Xvec.elements.Flt, opihi_flt, NPTS);
+        REALLOCATE (Yvec.elements.Flt, opihi_flt, NPTS);
       }
     }
@@ -96 +96 @@
 
   gprint (GP_ERR, "plotting %d catalogs\n", Npts/8);
-  Xvec.Nelements = Xvec.Nelements = Npts;
+  Xvec.Nelements = Yvec.Nelements = Npts;
   if (Npts > 0) {
     graphmode.style = 2; /* points */
     graphmode.ptype = 100; /* connect pairs of points */
     graphmode.etype = 0;
-    PlotVectorPair (kapa, Npts, Xvec.elements, Yvec.elements, &graphmode);
+    PlotVectorPair (kapa, &Xvec, &Yvec, &graphmode);
   }
 
-  free (Xvec.elements);
-  free (Yvec.elements);
+  free (Xvec.elements.Ptr);
+  free (Yvec.elements.Ptr);
   free (regions);