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

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

@@ -136 +136 @@
     N = 0;
     NPTS = 1000;
-    ALLOCATE (vec1[0].elements, float, NPTS);
-    ALLOCATE (vec2[0].elements, float, NPTS);
-    ALLOCATE (vec3[0].elements, float, NPTS);
-    ALLOCATE (vec4[0].elements, float, NPTS);
+    ResetVector (vec1, OPIHI_FLT, NPTS);
+    ResetVector (vec2, OPIHI_FLT, NPTS);
+    ResetVector (vec3, OPIHI_FLT, NPTS);
+    ResetVector (vec4, OPIHI_FLT, NPTS);
   }
 
@@ -250 +250 @@
           
           if (SaveVectors) {
-            vec1[0].elements[N] = Mcat;
-            vec2[0].elements[N] = TimeValue (catalog.measure[m].t, TimeReference, TimeFormat);
-            vec3[0].elements[N] = catalog.measure[m].airmass;
-            vec4[0].elements[N] = catalog.measure[m].photcode;
+            vec1[0].elements.Flt[N] = Mcat;
+            vec2[0].elements.Flt[N] = TimeValue (catalog.measure[m].t, TimeReference, TimeFormat);
+            vec3[0].elements.Flt[N] = catalog.measure[m].airmass;
+            vec4[0].elements.Flt[N] = catalog.measure[m].photcode;
             N ++;
             if (N == NPTS - 1) {
               NPTS += 2000;
-              REALLOCATE (vec1[0].elements, float, NPTS);
-              REALLOCATE (vec2[0].elements, float, NPTS);
-              REALLOCATE (vec3[0].elements, float, NPTS);
-              REALLOCATE (vec4[0].elements, float, NPTS);
+              REALLOCATE (vec1[0].elements.Flt, opihi_flt, NPTS);
+              REALLOCATE (vec2[0].elements.Flt, opihi_flt, NPTS);
+              REALLOCATE (vec3[0].elements.Flt, opihi_flt, NPTS);
+              REALLOCATE (vec4[0].elements.Flt, opihi_flt, NPTS);
             }
           }