Changeset 20839 for branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/ungridify.c

Timestamp:

Nov 25, 2008, 4:51:39 PM (18 years ago)

Author:

eugene

Message:

convert opihi vectors to double type, add option for int type as well

File:

• branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/ungridify.c (modified) (2 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/ungridify.c

@@ -6 +6 @@
   int Nx, Ny, NX, NY;
   int Xmin, Xmax, Ymin, Ymax;
-  float *v, *x, *y, *z;
   Buffer *bf;
+  float *v;
   Vector *vx, *vy, *vz;
+  opihi_flt *x, *y, *z;
 
   if (argc != 9) {
@@ -29 +30 @@
   if ((vy = SelectVector (argv[7], ANYVECTOR, TRUE)) == NULL) return (FALSE);
   if ((vz = SelectVector (argv[8], ANYVECTOR, TRUE)) == NULL) return (FALSE);
-  REALLOCATE (vx[0].elements, float, Nx*Ny);
-  REALLOCATE (vy[0].elements, float, Nx*Ny);
-  REALLOCATE (vz[0].elements, float, Nx*Ny);
+  REALLOCATE (vx[0].elements.Flt, opihi_flt, Nx*Ny);
+  REALLOCATE (vy[0].elements.Flt, opihi_flt, Nx*Ny);
+  REALLOCATE (vz[0].elements.Flt, opihi_flt, Nx*Ny);
 
-  x = vx[0].elements;
-  y = vy[0].elements;
-  z = vz[0].elements;
+  x = vx[0].elements.Flt;
+  y = vy[0].elements.Flt;
+  z = vz[0].elements.Flt;
   n = 0;
   v = (float *)bf[0].matrix.buffer;
   for (j = Ymin; j < Ymax; j++) {
     for (i = Xmin; i < Xmax; i++, x++, y++, z++, n++) {
-      vx[0].elements[n] = i;
-      vy[0].elements[n] = j;
+      vx[0].elements.Flt[n] = i;
+      vy[0].elements.Flt[n] = j;
       if (i < 0) continue;
       if (i >= NX) continue;
       if (j < 0) continue;
       if (j >= NY) continue;
-      vz[0].elements[n] = v[i+j*NX];
+      vz[0].elements.Flt[n] = v[i+j*NX];
     }
   }