Changeset 20936 for trunk/Ohana/src/opihi/mana/rawstars.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/mana/rawstars.c (modified) (2 diffs)

trunk/Ohana/src/opihi/mana/rawstars.c

@@ -55 +55 @@
   Np = xp[0].Nelements;
 
-  REALLOCATE (xc[0].elements, float, Np);
-  REALLOCATE (yc[0].elements, float, Np);
-  REALLOCATE (sx[0].elements, float, Np);
-  REALLOCATE (sy[0].elements, float, Np);
-  REALLOCATE (sxy[0].elements, float, Np);
-  REALLOCATE (zs[0].elements, float, Np);
-  REALLOCATE (zc[0].elements, float, Np);
-  REALLOCATE (sk[0].elements, float, Np);
-  xc[0].Nelements = yc[0].Nelements = sx[0].Nelements = Np;
-  sy[0].Nelements = zs[0].Nelements = zc[0].Nelements = Np;
-  sxy[0].Nelements = sk[0].Nelements = Np;
+  ResetVector (xc, OPIHI_FLT, Np);
+  ResetVector (yc, OPIHI_FLT, Np);
+  ResetVector (sx, OPIHI_FLT, Np);
+  ResetVector (sy, OPIHI_FLT, Np);
+  ResetVector (sxy, OPIHI_FLT, Np);
+  ResetVector (zs, OPIHI_FLT, Np);
+  ResetVector (zc, OPIHI_FLT, Np);
+  ResetVector (sk, OPIHI_FLT, Np);
 
   v = (float *) buff[0].matrix.buffer;
   for (i = 0; i < Np; i++) {
-    x = xp[0].elements[i];
-    y = yp[0].elements[i];
+    x = (xp[0].type == OPIHI_FLT) ? xp[0].elements.Flt[i] : xp[0].elements.Int[i];
+    y = (yp[0].type == OPIHI_FLT) ? yp[0].elements.Flt[i] : yp[0].elements.Int[i];
     if (x < 0) continue;
     if (x >= Nx) continue;
@@ -77 +74 @@
 
     get_rough_star (v, Nx, Ny, x, y, 
-                    &xc[0].elements[i], 
-                    &yc[0].elements[i], 
-                    &sx[0].elements[i], 
-                    &sy[0].elements[i], 
-                    &sxy[0].elements[i], 
-                    &zs[0].elements[i], 
-                    &zc[0].elements[i],
-                    &sk[0].elements[i]);
+                    &xc[0].elements.Flt[i], 
+                    &yc[0].elements.Flt[i], 
+                    &sx[0].elements.Flt[i], 
+                    &sy[0].elements.Flt[i], 
+                    &sxy[0].elements.Flt[i], 
+                    &zs[0].elements.Flt[i], 
+                    &zc[0].elements.Flt[i],
+                    &sk[0].elements.Flt[i]);
   }