Changeset 13443

Timestamp:

May 21, 2007, 8:52:42 AM (19 years ago)

Author:

eugene

Message:

cleanup names, ready to compile

Location:

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

Files:

• avextract.c (modified) (5 diffs)
• dbBooleanCond.c (added)
• dbCheckStack.c (added)
• dbCmdlineFields.c (added)
• dbFields.c (added)
• dbRPN.c (added)
• dbStackMath.c (modified) (2 diffs)
• dbStackOps.c (added)

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, param;
+  int i, j, m, N, NPTS, last, Nfields;
   int Nsecfilt, mode;
   char *RegionName, *RegionList, *p;
@@ -11 +11 @@
   PhotCode *code;
   Vector *vec;
+
+  dvoFields *fields;
 
   /* defaults */
@@ -27 +29 @@
 
   // parse the fields to be extracted and returned
-  narg = argc;
-  fields = ParseCmdlineFields (argc, argv, DVO_TABLE_AVERAGE, &last, &Nfields);
+  fields = dbCmdlineFields (argc, argv, DVO_TABLE_AVERAGE, &last, &Nfields);
   if (fields == NULL) return (FALSE);
 
-  // require 'where' before boolean math
-  if ((last != argc) && (strcasecmp(argv[last], "where") || (last >= argc - 2))) {
-    gprint (GP_ERR, "syntax error\n");
-    free (fields);
-    return (FALSE);
-  }
-
   // parse the remainder of the line as a boolean math expression
-  cstack = isolate_elements (argv-last, &argv[last+1], &Ncstack);
+  cstack = isolate_elements (argv-last, &argv[last], &Ncstack);
   
-  // construct the db Boolean math stack
-  dbStack = db_convert_to_RPN (Ncstack, cstack, &NdbStack);
+  // construct the db Boolean math stack (frees cstack)
+  dbStack = dbRPN (Ncstack, cstack, &NdbStack);
 
   Nreturn = Nfields; 
-  db_check_stack (dbStack, NdbStack, DVO_TABLE_AVERAGE, fields, &Nfields);
+  dbCheckStack (dbStack, NdbStack, DVO_TABLE_AVERAGE, &fields, &Nfields);
+  // XXX handle errors
 
   /* interpret command-line options */
-  SetSelectionParam (0);
+  // this needs to explicitly handles -qregion and -skyregion
   if (!SetRegionSelection (&argc, argv, &RegionName, &RegionList)) goto escape;
 
@@ -55 +50 @@
 
   /* create output storage vectors */
-  ALLOCATE (return, float, Nreturn);
+  ALLOCATE (values, float, Nfields);
   ALLOCATE (vec, Vector, Nreturn);
   for (i = 0; i < Nreturn; i++) {
@@ -81 +76 @@
       m = catalog.average[j].offset;
       // extract the relevant values
+      // 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]);
       }
       // test the conditional statement
-      if (!CheckBooleanCond (dbStack, NdbStack, values, fields, Nfields)) continue;
+      if (!dbBooleanCond (dbStack, NdbStack, values, fields, Nfields)) continue;
       for (n = 0; n < Nreturn; n++) {
         vec[n].elements[N] = values[n];
       }
       N++;
-      CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 2000);
+      if (N >= NPTS) {
+        NPTS += 2000;
+        for (n = 0; n < Nreturn; n++) {
+          REALLOCATE (vec[n].elements, float, NPTS);
+        }
+      }
     }
     dvo_catalog_free (&catalog);
   }
-  vec[0].Nelements = N;
-  REALLOCATE (vec[0].elements, float, MAX(1,N));
+  for (n = 0; n < Nreturn; n++) {
+    vec[n].Nelements = N;
+    REALLOCATE (vec[n].elements, float, MAX(1,N));
+  }
 
   SkyListFree (skylist, ((RegionName != NULL) || (RegionList != NULL)));

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

@@ -1 +1 @@
 # include "opihi.h"
 
-dvoStack *db_binary (dvoStack *V1, dvoStack *V2, char *op, float *fields, int Nfields) {
+dvoStack *dbBinary (dvoStack *V1, dvoStack *V2, char *op, float *fields, int Nfields) {
 
   float M1, M2;
@@ -85 +85 @@
 }
 
-dvoStack *db_unary (dvoStack *V1, dvoStack *V2, char *op, float *fields, int Nfields) {
+dvoStack *dbUnary (dvoStack *V1, dvoStack *V2, char *op, float *fields, int Nfields) {
 
   float M1;