Changeset 20839 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/calmextract.c

Timestamp:

Nov 25, 2008, 4:51:39 PM (18 years ago)

Author:

eugene

Message:

convert opihi vectors to double type, add option for int type as well

File:

• branches/eam_branch_20081124/Ohana/src/opihi/dvo/calmextract.c (modified) (4 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/dvo/calmextract.c

@@ -61 +61 @@
   if ((vec[Nd2] = SelectVector ("cal:dm2",      ANYVECTOR, TRUE)) == NULL) goto escape;
   for (k = 0; k < NVEC; k++) {
-    REALLOCATE (vec[k][0].elements, float, NSTAR);
+    REALLOCATE (vec[k][0].elements.Flt, opihi_flt, NSTAR);
     vec[k][0].Nelements = 0;
   }
@@ -110 +110 @@
         NSTAR += N1 + 100;
         for (k = 0; k < NVEC; k++) {
-          REALLOCATE (vec[k][0].elements, float, NSTAR);
+          REALLOCATE (vec[k][0].elements.Flt, opihi_flt, NSTAR);
         }
       }
@@ -125 +125 @@
 
       for (j = 0; j < N1; j++, N++) {
-        vec[Nd ][0].elements[N] = M1[j] - M2;
-        vec[Nm1][0].elements[N] = M1[j];
-        vec[Nm2][0].elements[N] = M2;
-        vec[Nd2][0].elements[N] = dM2;
-        vec[Nc ][0].elements[N] = color;
-        vec[Ns ][0].elements[N] = Nstar;
-        vec[NR ][0].elements[N] = catalog.average[i].R;
-        vec[ND ][0].elements[N] = catalog.average[i].D;
+        vec[Nd ][0].elements.Flt[N] = M1[j] - M2;
+        vec[Nm1][0].elements.Flt[N] = M1[j];
+        vec[Nm2][0].elements.Flt[N] = M2;
+        vec[Nd2][0].elements.Flt[N] = dM2;
+        vec[Nc ][0].elements.Flt[N] = color;
+        vec[Ns ][0].elements.Flt[N] = Nstar;
+        vec[NR ][0].elements.Flt[N] = catalog.average[i].R;
+        vec[ND ][0].elements.Flt[N] = catalog.average[i].D;
       }
       Nstar ++; 
@@ -178 +178 @@
   Ns = vec[0].Nelements;
   for (i = 0; i < N; i++) {
-    vec[0].elements[Ns+i] = value[i];
+    vec[0].elements.Flt[Ns+i] = value[i];
   }
   vec[0].Nelements = Ns + N;