Changeset 20936 for trunk/Ohana/src/opihi/cmd.data/vgrid.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/cmd.data/vgrid.c (modified) (4 diffs)

trunk/Ohana/src/opihi/cmd.data/vgrid.c

@@ -5 +5 @@
   int i, Nx, Ny, Xb, Yb;
   float Xmin, Xmax, dX, Ymin, Ymax, dY;
-  float *buf, *val, *x, *y, *z;
+  float *buf;
+  opihi_flt *val, *x, *y, *z;
   int *Nval;
   Buffer *bf;
@@ -12 +13 @@
   if (argc != 11) {
     gprint (GP_ERR, "USAGE: vgrid x y z buffer Xmin Xmax dX Ymin Ymax dY\n");
+    gprint (GP_ERR, "  re-grid values from a triplet of vectors (x,y,z) into an image\n");
+    gprint (GP_ERR, "  the vectors must be floating-point type\n");
     return (FALSE);
   }
@@ -22 +25 @@
   if (vx[0].Nelements != vy[0].Nelements) return (FALSE);
   if (vx[0].Nelements != vz[0].Nelements) return (FALSE);
+
+  REQUIRE_VECTOR_FLT (vx, FALSE); 
+  REQUIRE_VECTOR_FLT (vy, FALSE); 
+  REQUIRE_VECTOR_FLT (vz, FALSE); 
 
   Xmin = atof (argv[5]);
@@ -39 +46 @@
   strcpy (bf[0].file, "(empty)");
 
-  ALLOCATE (val, float, Nx*Ny);
-  bzero (val, Nx*Ny*sizeof(float));
+  ALLOCATE (val, opihi_flt, Nx*Ny);
+  bzero (val, Nx*Ny*sizeof(opihi_flt));
   ALLOCATE (Nval, int, Nx*Ny);
   bzero (Nval, Nx*Ny*sizeof(int));
 
-  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;
   for (i = 0; i < vx[0].Nelements; i++, x++, y++, z++) {
     Xb = (*x - Xmin) / dX;