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

Timestamp:

Nov 30, 2008, 7:45:21 AM (18 years ago)

Author:

eugene

Message:

modify functions to use both int and flt vectors

File:

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

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

@@ -1 +1 @@
 # include "data.h"
 
+// XXX adapt this to accept an optional region to limit the areas, otherwise use the whole image
 int ungridify (int argc, char **argv) {
 
@@ -13 +14 @@
   if (argc != 9) {
     gprint (GP_ERR, "USAGE: ungridify buffer Xmin Xmax Ymin Ymax x y z\n");
+    gprint (GP_ERR, "  convert a portion of an image to a collection a triplet of vectors\n");
     return (FALSE);
   }
@@ -30 +32 @@
   if ((vy = SelectVector (argv[7], ANYVECTOR, TRUE)) == NULL) return (FALSE);
   if ((vz = SelectVector (argv[8], ANYVECTOR, TRUE)) == NULL) return (FALSE);
-  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);
+
+  ResetVector (vx, OPIHI_FLT, Nx*Ny);
+  ResetVector (vy, OPIHI_FLT, Nx*Ny);
+  ResetVector (vz, OPIHI_FLT, Nx*Ny);
 
   x = vx[0].elements.Flt;
@@ -52 +55 @@
   if (n != Nx*Ny) {
     gprint (GP_ERR, "error in ungrid: %d vs %d (%d x %d)\n", n, Nx*Ny, Nx, Ny);
+    gprint (GP_ERR, "(this is probably a programming error in ungridify)\n");
   }
   vx[0].Nelements = vy[0].Nelements = vz[0].Nelements = n;