Changeset 20936 for trunk/Ohana/src/opihi/dvo/imrough.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/imrough.c (modified) (3 diffs)

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

@@ -13 +13 @@
   char DataBase[256], *Filter;
   double trange;
-  float *Vec;
+  opihi_flt *Vec;
   time_t tzero, tend, TimeReference;
   RegImage *image;
   Vector *vec;
 
+  // XXX this function is only valid for the Elixir db system, not the IPP db system
+  // this function should exit gracefully if the REGISTRATION_DATABASE is missing
   VarConfig ("REGISTRATION_DATABASE", "%s", DataBase);
 
@@ -132 +134 @@
   N = 0;
   NVEC = 1000;
-  REALLOCATE (vec[0].elements, float, NVEC);
-  Vec = vec[0].elements;
+  ResetVector (vec, OPIHI_FLT, NVEC);
+  Vec = vec[0].elements.Flt;
 
   GetTimeFormat (&TimeReference, &TimeFormat);
@@ -216 +218 @@
     if (N >= NVEC - 1) {
       NVEC += 1000;
-      REALLOCATE (vec[0].elements, float, NVEC);
-      Vec = vec[0].elements;
-    }
-  }
-
-  REALLOCATE (vec[0].elements, float, MAX (1,N));
+      REALLOCATE (vec[0].elements.Flt, opihi_flt, NVEC);
+      Vec = vec[0].elements.Flt;
+    }
+  }
+
+  REALLOCATE (vec[0].elements.Flt, opihi_flt, MAX (1,N));
   vec[0].Nelements = N;