Changeset 19579 for trunk/Ohana/src/opihi/dvo/mmextract.c

Timestamp:

Sep 16, 2008, 9:16:26 AM (18 years ago)

Author:

eugene

Message:

adding mmextract and supporting api changes to dbCmdlineField.c functions

File:

• trunk/Ohana/src/opihi/dvo/mmextract.c (modified) (11 diffs)

trunk/Ohana/src/opihi/dvo/mmextract.c

@@ -3 +3 @@
 int mmextract (int argc, char **argv) {
   
-  int i, j, k, m, n, N, Npts, NPTS, last, Nfields, Nreturn, Ncstack, Nstack;
+  int i, j, k, m, n, N, Npts, NPTS, last, next, state;
+  int Nfields, Nreturn, Nreturn_base, Ncstack1, Ncstack2, Nstack1, Nstack2;
+  int Nwhere, Iwhere, Nmatch, Imatch, NTABLE, Nt1, Nt2, n1, n2;
   int Nsecfilt, VERBOSE, loadImages, mosaicMode;
-  char **cstack, name1[1024], name2[1024];
-  float *values;
+  char **cstack1, **cstack2, name1[1024], name2[1024];
+  float *values, **table1, **table2;
   void *Signal;
 
@@ -14 +16 @@
   Vector **vec;
   dbField *fields;
-  dbStack *stack;
+  dbStack *stack1;
+  dbStack *stack2;
   SkyRegionSelection *selection;
 
@@ -21 +24 @@
   code = NULL;
   fields = NULL;
-  stack = NULL;
+  stack1 = NULL;
+  stack2 = NULL;
 
   if ((N = get_argument (argc, argv, "-h"))) goto help;
@@ -51 +55 @@
   // -noauto means imageID is not matched
 
-  // parse the fields to be extracted and returned
+  // parse the fields to be extracted and returned : last points to end, or first 'where' or 'matched'
   fields = dbCmdlineFields (argc, argv, DVO_TABLE_MEASURE, &last, &Nfields);
   if (fields == NULL) return (FALSE);
 
-  // XXX require a 'where' and a 'matched to'? if not, all are cross-matched (that's ok)
-  // XXX add the skyregion limits as if it were a where statement
-
-  // need to find the location of 'where' and 'matched to' expressions
-  for (i = last; i < argc; i++) {
-    if (!strcasecmp (argv[i], "matched")) {
-    }
-  }
-
-  whereS = N; whereE = N;
-  matchS = N; matchE = N;
+  // examine line for 'where' and 'match to'.  neither is required, but order is fixed
+  state = dbCmdlineConditions (argc, argv, last, &next);
+  if (state == DVO_DB_CMDLINE_ERROR) goto escape;
+
+  if (state == DVO_DB_CMDLINE_IS_END) {
+      Nwhere = Nmatch = 0;
+      Iwhere = Imatch = 0;
+  }
+
+  if (state == DVO_DB_CMDLINE_IS_MATCH) {
+      Nwhere = 0;
+      Iwhere = 0;
+      Imatch = next;
+      Nmatch = argc - next;
+  }
+
+  if (state == DVO_DB_CMDLINE_IS_WHERE) {
+      Iwhere = next;
+      // find the end or the 'match to'
+      for (last = next; (last < argc) && strcasecmp (argv[last], "match"); last++);
+      state = dbCmdlineConditions (argc, argv, last, &next);
+      if (state == DVO_DB_CMDLINE_ERROR) goto escape;
+      if (state == DVO_DB_CMDLINE_IS_WHERE) goto escape;
+      if (state == DVO_DB_CMDLINE_IS_END) {
+          Nwhere = argc - Iwhere;
+          Imatch = Nmatch = 0;
+      } else {
+          Nwhere = last - Iwhere;
+          Imatch = next;
+          Nmatch = argc - Imatch;
+      }
+  }
 
   // parse the 'where' and 'matched to' segments of the line as boolean math expressions
-  cstack1 = isolate_elements (Nwhere, &argv[whereS], &Ncstack1);
-  cstack2 = isolate_elements (Nmatch, &argv[matchS], &Ncstack2);
+  cstack1 = isolate_elements (Nwhere, &argv[Iwhere], &Ncstack1);
+  cstack2 = isolate_elements (Nmatch, &argv[Imatch], &Ncstack2);
   
   // construct the db Boolean math stack (frees cstack)
@@ -88 +113 @@
 
   // add the skyregion limits to the where statement (or create)
-  dbAstroRegionLimits (&stack, &Nstack, selection, DVO_TABLE_MEASURE);
+  dbAstroRegionLimits (&stack1, &Nstack1, selection, DVO_TABLE_MEASURE);
+  dbAstroRegionLimits (&stack2, &Nstack2, selection, DVO_TABLE_MEASURE);
 
   // parse stack elements into fields and scalars as needed
@@ -133 +159 @@
   // we save the selected measures for each average to temporary tables 1 and 2
   NTABLE = 100;
-  ALLOCATE (table1, double *, Nreturn_base);
-  ALLOCATE (table2, double *, Nreturn_base);
+  ALLOCATE (table1, float *, Nreturn_base);
+  ALLOCATE (table2, float *, Nreturn_base);
   for (i = 0; i < Nreturn_base; i++) {
-    ALLOCATE (table1[i], double, NTABLE);
-    ALLOCATE (table2[i], double, NTABLE);
+    ALLOCATE (table1[i], float, NTABLE);
+    ALLOCATE (table2[i], float, NTABLE);
   }
 
@@ -188 +214 @@
           for (n = 0; n < Nreturn_base; n++) {
             table1[n][Nt1] = values[n];
-            Nt1 ++;
             // fprintf (stderr, "keep : field: %s, value: %f\n", fields[n].name, values[n]);
           }
+          Nt1 ++;
         }
         // test the second conditional statement
@@ -196 +222 @@
           for (n = 0; n < Nreturn_base; n++) {
             table2[n][Nt2] = values[n];
-            Nt2 ++;
             // fprintf (stderr, "keep : field: %s, value: %f\n", fields[n].name, values[n]);
           }
-        }
-
-        // XXX now do the join :: need to filter against automatch if -noauto is selected (record the index value k to test)
-        for (n1 = 0; n1 < Nt1; n1++) {
-          for (n2 = 0; n2 < Nt2; n2++) {
-            for (n = 0; n < Nreturn_base; n++) {
-              vec[n][0].elements[Npts] = table1[n][n1];
-            }
-            for (n = 0; n < Nreturn_base; n++) {
-              vec[n+Nreturn_base][0].elements[Npts] = table2[n][n2];
-            }
-            Npts++;
-            if (Npts >= NPTS) {
-              NPTS += 2000;
-              for (n = 0; n < Nreturn; n++) {
-                REALLOCATE (vec[n][0].elements, float, NPTS);
-              }
+          Nt2 ++;
+        }
+      }
+
+      // XXX now do the join :: need to filter against automatch if -noauto is selected (record the index value k to test)
+      for (n1 = 0; n1 < Nt1; n1++) {
+        for (n2 = 0; n2 < Nt2; n2++) {
+          for (n = 0; n < Nreturn_base; n++) {
+            vec[2*n+0][0].elements[Npts] = table1[n][n1];
+            vec[2*n+1][0].elements[Npts] = table2[n][n2];
+          }
+          Npts++;
+          if (Npts >= NPTS) {
+            NPTS += 2000;
+            for (n = 0; n < Nreturn; n++) {
+              REALLOCATE (vec[n][0].elements, float, NPTS);
             }
           }
@@ -221 +245 @@
       }
     }
+
     dvo_catalog_free (&catalog);
     // dbStackAllocPrint ();
@@ -235 +260 @@
   }
 
+  for (n = 0; n < Nreturn_base; n++) {
+    free (table1[n]);
+    free (table2[n]);
+  }
+  free (table1);
+  free (table2);
+
+  free (values);
+
   dbFreeFields (fields, Nfields);
-  dbFreeStack (stack, Nstack);
-  free (stack);
+  dbFreeStack (stack1, Nstack1);
+  dbFreeStack (stack2, Nstack2);
+  free (stack1);
+  free (stack2);
   FreeImageSelection ();
   SkyListFree (skylist);
@@ -245 +281 @@
 escape:
   dbFreeFields (fields, Nfields);
-  dbFreeStack (stack, Nstack);
-  free (stack);
+  dbFreeStack (stack1, Nstack1);
+  dbFreeStack (stack2, Nstack2);
+  free (stack1);
+  free (stack2);
   FreeImageSelection ();
   SkyListFree (skylist);