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

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

@@ -70 +70 @@
       return (FALSE);    
     }
+    // XXX we could allow flags (eg, N.i) to specify INT vs FLT types vectors...
     colstr = argv[2*i+2];
     for (j = 0; j < strlen (colstr); j++) {
@@ -81 +82 @@
     col[i] = atof (colstr);
   }
-  
+
+  // currently, all read vectors are forced to be type FLT
   NELEM = 1000;
   for (i = 0; i < Nvec; i++) {
-    REALLOCATE (vec[i][0].elements, float, NELEM);
+    ResetVector (vec[i], OPIHI_FLT, NELEM);
   }
   
@@ -121 +123 @@
         for (i = 0; (i < Nvec) && status; i++) {
           status = dparse (&value, col[i], c0);
-          vec[i][0].elements[N] = value;
-          if (!status) vec[i][0].elements[N] = 0.0/0.0;
+          vec[i][0].elements.Flt[N] = value;
+          if (!status) vec[i][0].elements.Flt[N] = NAN;
         }
         if (status) N++;
@@ -130 +132 @@
         NELEM += 1000;
         for (i = 0; i < Nvec; i++) {
-          REALLOCATE (vec[i][0].elements, float, NELEM);
+          REALLOCATE (vec[i][0].elements.Flt, opihi_flt, NELEM);
         }
       }
@@ -137 +139 @@
   }
   for (i = 0; i < Nvec; i++) {
-    REALLOCATE (vec[i][0].elements, float, MAX (N,1));
+    REALLOCATE (vec[i][0].elements.Flt, opihi_flt, MAX (N,1));
     vec[i][0].Nelements = N;
   }
@@ -157 +159 @@
 int read_table_vectors (int argc, char **argv, char *extname) {
 
-  int i, j, k, N, Nbytes, Nextend, Ny, Binary;
+  int i, j, k, N, Nbytes, Nextend, Ny, Binary, vecType;
   char type[16], ID[80], *CCDKeyword;
   FTable table;
@@ -260 +262 @@
     }
     if (Nval == 0) ESCAPE ("no data for field in table");
-
+    
+    vecType = OPIHI_INT;
+    if (!strcmp (type, "double") || !strcmp (type, "float")) {
+      vecType = OPIHI_FLT;
+    }
+        
+    // define the multifield vector names
     ALLOCATE (vec, Vector *, Nval);
     for (j = 0; j < Nval; j++) {
@@ -268 +276 @@
         sprintf (name, "%s:%d", argv[i], j);
       if ((vec[j] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) ESCAPE ("bad vector name");
-      REALLOCATE (vec[j][0].elements, float, MAX (Ny,1));
-      vec[j][0].Nelements = Ny;
+      ResetVector (vec[j], vecType, MAX (Ny,1));
     }
 
@@ -276 +283 @@
       for (j = 0; j < Ny; j++) {
         for (k = 0; k < Nval; k++, Pd++) {
-          vec[k][0].elements[j] = *Pd;
+          vec[k][0].elements.Flt[j] = *Pd;
         }
       }
@@ -284 +291 @@
       for (j = 0; j < Ny; j++) {
         for (k = 0; k < Nval; k++, Pf++) {
-          vec[k][0].elements[j] = *Pf;
+          vec[k][0].elements.Flt[j] = *Pf;
         }
       }
@@ -292 +299 @@
       for (j = 0; j < Ny; j++) {
         for (k = 0; k < Nval; k++, Pi++) {
-          vec[k][0].elements[j] = *Pi;
+          vec[k][0].elements.Int[j] = *Pi;
         }
       }
@@ -300 +307 @@
       for (j = 0; j < Ny; j++) {
         for (k = 0; k < Nval; k++, Ps++) {
-          vec[k][0].elements[j] = *Ps;
+          vec[k][0].elements.Int[j] = *Ps;
         }
       }
@@ -308 +315 @@
       for (j = 0; j < Ny; j++) {
         for (k = 0; k < Nval; k++, Pc++) {
-          vec[k][0].elements[j] = *Pc;
+          vec[k][0].elements.Int[j] = *Pc;
         }
       }