Changeset 20860 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/mextract.c

Timestamp:

Nov 30, 2008, 2:46:46 PM (18 years ago)

Author:

eugene

Message:

set vectors to use INT or FLT types as needed; cleanup type information in dbStack (use enum)

File:

• branches/eam_branch_20081124/Ohana/src/opihi/dvo/mextract.c (modified) (3 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/dvo/mextract.c

@@ -88 +88 @@
 
   /* create storage vector */
+  Npts = 0;
+  NPTS = 1000;
   ALLOCATE (values, dbValue, Nfields);
   ALLOCATE (vec, Vector *, Nreturn);
@@ -97 +99 @@
     }
     if ((vec[i] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) goto escape;
-    ResetVector (vec[i], fields[i].type, NNN);
-  }
-
-  Npts = 0;
-  NPTS = 1;
+    ResetVector (vec[i], fields[i].type, NPTS);
+  }
 
   // grab data from all selected sky regions
@@ -166 +165 @@
 
   for (n = 0; n < Nreturn; n++) {
-    vec[n][0].Nelements = Npts;
-    REALLOCATE (vec[n][0].elements.Flt, opihi_flt, MAX(1,Npts));
+    ResetVector (vec[n], fields[n].type, MAX(1,Npts));
   }