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

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

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

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

@@ -8 +8 @@
   int Nsecfilt, VERBOSE, loadImages, mosaicMode;
   char **cstack1, **cstack2, name1[1024], name2[1024];
-  float *values, **table1, **table2;
+  dbValue *values, **table1, **table2;
   void *Signal;
 
   Catalog catalog;
   SkyList *skylist;
-  PhotCode *code;
   Vector **vec;
   dbField *fields;
@@ -21 +20 @@
 
   /* defaults */
-  skylist = NULL;
-  code = NULL;
-  fields = NULL;
+  vec = NULL;
   stack1 = NULL;
   stack2 = NULL;
+  fields = NULL;
+  values = NULL;
+  skylist = NULL;
+  selection = NULL;
 
   if ((N = get_argument (argc, argv, "-h"))) goto help;
@@ -57 +58 @@
   // 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);
+  if (fields == NULL) goto escape;
+  if (Nfields == 0) {
+    FreeSkyRegionSelection (selection);
+    dbFreeFields (fields, Nfields);
+    dvo_catalog_free (&catalog);
+    goto help;
+  }
 
   // examine line for 'where' and 'match to'.  neither is required, but order is fixed
@@ -139 +146 @@
 
   /* create storage vector */
-  ALLOCATE (values, float, Nfields);
+  ALLOCATE (values, dbValue, Nfields);
   ALLOCATE (vec, Vector *, Nreturn);
 
@@ -152 +159 @@
     if ((vec[2*i+0] = SelectVector (name1, ANYVECTOR, TRUE)) == NULL) goto escape;
     if ((vec[2*i+1] = SelectVector (name2, ANYVECTOR, TRUE)) == NULL) goto escape;
+    ResetVector (vec[2*i+0], fields[i].type, fields[i].type);
+    ResetVector (vec[2*i+1], fields[i].type, fields[i].type);
   }
 
@@ -158 +167 @@
 
   // we save the selected measures for each average to temporary tables 1 and 2
+  // XXX need to deal with the INT / DBL difference here...
   NTABLE = 100;
-  ALLOCATE (table1, float *, Nreturn_base);
-  ALLOCATE (table2, float *, Nreturn_base);
+  ALLOCATE (table1, dbValue *, Nreturn_base);
+  ALLOCATE (table2, dbValue *, Nreturn_base);
   for (i = 0; i < Nreturn_base; i++) {
-    ALLOCATE (table1[i], float, NTABLE);
-    ALLOCATE (table2[i], float, NTABLE);
+    ALLOCATE (table1[i], dbValue, NTABLE);
+    ALLOCATE (table2[i], dbValue, NTABLE);
   }
 
@@ -194 +204 @@
         NTABLE = catalog.average[j].Nmeasure;
         for (n = 0; n < Nreturn_base; n++) {
-          REALLOCATE (table1[n], float, NTABLE);
-          REALLOCATE (table2[n], float, NTABLE);
+          REALLOCATE (table1[n], dbValue, NTABLE);
+          REALLOCATE (table2[n], dbValue, NTABLE);
         }
       }
@@ -206 +216 @@
         dbExtractMeasuresInitMeas (); // reset counters for saved fields 
         for (n = 0; n < Nfields; n++) {
+          // values needs to be a pointer to a type with FLT and INT (with a union, we would save a bit of memory...)
           values[n] = dbExtractMeasures (&catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], &fields[n]);
         }
@@ -232 +243 @@
         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];
+            if (vec[2*n+0][0].type == OPIHI_FLT) {
+              vec[2*n+0][0].elements.Flt[Npts] = table1[n][n1].Flt;
+              vec[2*n+1][0].elements.Flt[Npts] = table2[n][n2].Flt;
+            } else {
+              vec[2*n+0][0].elements.Int[Npts] = table1[n][n1].Int;
+              vec[2*n+1][0].elements.Int[Npts] = table2[n][n2].Int;
+            }
           }
           Npts++;
@@ -239 +255 @@
             NPTS += 2000;
             for (n = 0; n < Nreturn; n++) {
-              REALLOCATE (vec[n][0].elements, float, NPTS);
+              if (vec[n][0].type == OPIHI_FLT) {
+                REALLOCATE (vec[n][0].elements.Flt, opihi_flt, NPTS);
+              } else {
+                REALLOCATE (vec[n][0].elements.Int, opihi_int, NPTS);
+              }
             }
           }
@@ -255 +275 @@
   interrupt = FALSE;
 
+  // free excess memory
   for (n = 0; n < Nreturn; n++) {
     vec[n][0].Nelements = Npts;
-    REALLOCATE (vec[n][0].elements, float, MAX(1,Npts));
+    if (vec[n][0].type == OPIHI_FLT) {
+      REALLOCATE (vec[n][0].elements.Flt, opihi_flt, MAX(1,Npts));
+    } else {
+      REALLOCATE (vec[n][0].elements.Int, opihi_int, MAX(1,Npts));
+    }
   }
 
@@ -280 +305 @@
 
 escape:
+  if (vec) free (vec);
+  if (values) free (values);
   dbFreeFields (fields, Nfields);
   dbFreeStack (stack1, Nstack1);
@@ -292 +319 @@
 
  help:
-  gprint (GP_ERR, "USAGE: mextract field[,field,field...] where (expression)\n");
+  gprint (GP_ERR, "USAGE: mmextract field[,field,field...] where (expression) match to (expression)\n");
+  gprint (GP_ERR, "  pairs of fields are returned: the first set are restricted by the 'where' expression, the second by the 'match to' expression\n");
 
   if ((argc > N + 1) && !strcasecmp (argv[N+1], "fields")) {
@@ -344 +372 @@
     return (FALSE);
   }
-  gprint (GP_ERR, " mextract --help fields : for a complete listing of allowed fields\n");
+  gprint (GP_ERR, " mmextract --help fields : for a complete listing of allowed fields\n");
   return (FALSE);
 }