Changeset 13454 for branches/kapa-mods-2007-05/Ohana/src/opihi/dvo/avextract.c

Timestamp:

May 21, 2007, 3:38:16 PM (19 years ago)

Author:

eugene

Message:

boolean db extractions now working

File:

• branches/kapa-mods-2007-05/Ohana/src/opihi/dvo/avextract.c (modified) (6 diffs)

branches/kapa-mods-2007-05/Ohana/src/opihi/dvo/avextract.c

@@ -3 +3 @@
 int avextract (int argc, char **argv) {
   
-  int i, j, m, N, NPTS, last, Nfields;
+  int i, j, n, m, Npts, NPTS, last, Nfields, Nreturn, Ncstack, Nstack;
   int Nsecfilt, mode;
   char *RegionName, *RegionList, *p;
+  char **cstack;
+  float *values;
 
   Catalog catalog;
   SkyList *skylist;
   PhotCode *code;
-  Vector *vec;
+  Vector **vec;
 
-  dvoFields *fields;
+  dbField *fields;
+  dbStack *stack;
 
   /* defaults */
@@ -26 +29 @@
   Nsecfilt = GetPhotcodeNsecfilt ();
 
+  // remove skyregion options
+  // XXX this needs to explicitly handle -qregion and -skyregion
+  if (!SetRegionSelection (&argc, argv, &RegionName, &RegionList)) goto escape;
+
   // command-line is of the form: avextract field,field, field [where (field op value)...]
 
@@ -33 +40 @@
 
   // parse the remainder of the line as a boolean math expression
-  cstack = isolate_elements (argv-last, &argv[last], &Ncstack);
+  cstack = isolate_elements (argc-last, &argv[last], &Ncstack);
   
   // construct the db Boolean math stack (frees cstack)
-  dbStack = dbRPN (Ncstack, cstack, &NdbStack);
+  stack = dbRPN (Ncstack, cstack, &Nstack);
 
   Nreturn = Nfields; 
-  dbCheckStack (dbStack, NdbStack, DVO_TABLE_AVERAGE, &fields, &Nfields);
+  dbCheckStack (stack, Nstack, DVO_TABLE_AVERAGE, &fields, &Nfields);
   // XXX handle errors
-
-  /* interpret command-line options */
-  // this needs to explicitly handles -qregion and -skyregion
-  if (!SetRegionSelection (&argc, argv, &RegionName, &RegionList)) goto escape;
 
   /* load region corresponding to selection above */
@@ -51 +54 @@
   /* create output storage vectors */
   ALLOCATE (values, float, Nfields);
-  ALLOCATE (vec, Vector, Nreturn);
+  ALLOCATE (vec, Vector *, Nreturn);
   for (i = 0; i < Nreturn; i++) {
     if ((vec[i] = SelectVector (fields[i].name, ANYVECTOR, TRUE)) == NULL) goto escape;
@@ -78 +81 @@
       // XXX for measure values, this could be optimized for one loop over measures...
       for (n = 0; n < Nfields; n++) {
-        values[n] = ExtractAveragesNew (&catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], fields[n]);
+        values[n] = dbExtractAverages (&catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], &fields[n]);
       }
       // test the conditional statement
-      if (!dbBooleanCond (dbStack, NdbStack, values, fields, Nfields)) continue;
+      if (!dbBooleanCond (stack, Nstack, values)) continue;
       for (n = 0; n < Nreturn; n++) {
-        vec[n].elements[N] = values[n];
+        vec[n][0].elements[Npts] = values[n];
       }
-      N++;
-      if (N >= NPTS) {
+      Npts++;
+      if (Npts >= NPTS) {
         NPTS += 2000;
         for (n = 0; n < Nreturn; n++) {
-          REALLOCATE (vec[n].elements, float, NPTS);
+          REALLOCATE (vec[n][0].elements, float, NPTS);
         }
       }
@@ -96 +99 @@
   }
   for (n = 0; n < Nreturn; n++) {
-    vec[n].Nelements = N;
-    REALLOCATE (vec[n].elements, float, MAX(1,N));
+    vec[n][0].Nelements = Npts;
+    REALLOCATE (vec[n][0].elements, float, MAX(1,Npts));
   }
+
+  // XXX free fields and stack 
 
   SkyListFree (skylist, ((RegionName != NULL) || (RegionList != NULL)));