Changeset 13439

Timestamp:

May 20, 2007, 10:55:35 AM (19 years ago)

Author:

eugene

Message:

working towards boolean selections

Location:

branches/kapa-mods-2007-05/Ohana/src/opihi/dvo

Files:

• avextract.c (modified) (1 diff)
• dvodb.c (added)
• dvofields.c (added)

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

@@ -68 +68 @@
     for (j = 0; j < catalog.Naverage; j++) {
       m = catalog.average[j].offset;
-      vec[0].elements[N] = ExtractAverages (code, mode, &catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], param);
+      // extract the relevant values
+      for (n = 0; n < Nfields; n++) {
+        value[n] = ExtractAveragesNew (&catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], field[n]);
+      }
+      // test the conditional statement
+      if (!CheckBooleanCond (stack, Nstack, value, field, Nfield)) continue;
+      for (n = 0; n < Nfields; n++) {
+        vec[n].elements[N] = value[n];
+      }
       N++;
       CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 2000);