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

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

@@ -4 +4 @@
   
   int i, Nx, Ny, Npix, xdir, Nset;
-  float *in, *out;
+  float *in;
+  opihi_flt *out;
   Buffer *buf;
   Vector *vec;
@@ -32 +33 @@
 
   if (xdir) {
-    vec[0].Nelements = Npix = Nx;
-    REALLOCATE (vec[0].elements, float, Npix);
+    Npix = Nx;
+    ResetVector (vec, OPIHI_FLT, Nx);
     if (Nset >= Ny) {
       gprint (GP_ERR, "row out of range\n");
@@ -39 +40 @@
     }
     in  = (float *) buf[0].matrix.buffer + Nx*Nset;
-    out = vec[0].elements;
+    out = vec[0].elements.Flt;
     for (i = 0; i < Npix; i++, in++, out++) {
       *out = *in;
     }
-    return (TRUE);
   } else {
-    vec[0].Nelements = Npix = Ny;
-    REALLOCATE (vec[0].elements, float, Npix);
+    Npix = Ny;
+    ResetVector (vec, OPIHI_FLT, Ny);
     if (Nset >= Nx) {
       gprint (GP_ERR, "column out of range\n");
@@ -52 +52 @@
     }
     in  = (float *) buf[0].matrix.buffer + Nset;
-    out = vec[0].elements;
+    out = vec[0].elements.Flt;
     for (i = 0; i < Npix; i++, in+=Nx, out++) {
       *out = *in;
     }
-    return (TRUE);
-  }    
+  }
+  return (TRUE);
 }
-