Changeset 20857 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/mmextract.c

Timestamp:

Nov 30, 2008, 7:45:21 AM (18 years ago)

Author:

eugene

Message:

modify functions to use both int and flt vectors

File:

• branches/eam_branch_20081124/Ohana/src/opihi/dvo/mmextract.c (modified) (9 diffs)

branches/eam_branch_20081124/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;
 
@@ -139 +139 @@
 
   /* create storage vector */
-  ALLOCATE (values, float, Nfields);
+  ALLOCATE (values, dbValue, Nfields);
   ALLOCATE (vec, Vector *, Nreturn);
 
@@ -152 +152 @@
     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, NNN);
-    ResetVector (vec[2*i+1], fields[i].type, NNN);
+    ResetVector (vec[2*i+0], fields[i].type, fields[i].type);
+    ResetVector (vec[2*i+1], fields[i].type, fields[i].type);
   }
 
@@ -160 +160 @@
 
   // 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);
   }
 
@@ -196 +197 @@
         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);
         }
       }
@@ -208 +209 @@
         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]);
         }
@@ -234 +236 @@
         for (n2 = 0; n2 < Nt2; n2++) {
           for (n = 0; n < Nreturn_base; n++) {
-            vec[2*n+0][0].elements.Flt[Npts] = table1[n][n1];
-            vec[2*n+1][0].elements.Flt[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++;
@@ -241 +248 @@
             NPTS += 2000;
             for (n = 0; n < Nreturn; n++) {
-              REALLOCATE (vec[n][0].elements.Flt, opihi_flt, 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);
+              }
             }
           }
@@ -257 +268 @@
   interrupt = FALSE;
 
+  // free excess memory
   for (n = 0; n < Nreturn; n++) {
     vec[n][0].Nelements = Npts;
-    REALLOCATE (vec[n][0].elements.Flt, opihi_flt, 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));
+    }
   }