Changeset 20839 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/lcurve.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/lcurve.c (modified) (5 diffs)

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

@@ -103 +103 @@
 
   NPTS = 100;
-  ALLOCATE (Xvec.elements, float, NPTS);
-  ALLOCATE (Yvec.elements, float, NPTS);
-  dYvec.elements = NULL;
-  if (ErrorBars) { ALLOCATE (dYvec.elements, float, NPTS); }
+  ALLOCATE (Xvec.elements.Flt, opihi_flt, NPTS);
+  ALLOCATE (Yvec.elements.Flt, opihi_flt, NPTS);
+  dYvec.elements.Flt = NULL;
+  if (ErrorBars) { ALLOCATE (dYvec.elements.Flt, opihi_flt, NPTS); }
   N = 0;
 
@@ -124 +124 @@
       m = catalog.average[N1[i]].measureOffset;
       for (j = 0; j < catalog.average[N1[i]].Nmeasure; j++, m++) {
-        if (ErrorBars) dYvec.elements[N] = catalog.measure[m].dM;
-        Xvec.elements[N] = TimeValue (catalog.measure[m].t, TimeReference, TimeFormat);
-        Yvec.elements[N] = PhotCat (&catalog.measure[m]);
+        if (ErrorBars) dYvec.elements.Flt[N] = catalog.measure[m].dM;
+        Xvec.elements.Flt[N] = TimeValue (catalog.measure[m].t, TimeReference, TimeFormat);
+        Yvec.elements.Flt[N] = PhotCat (&catalog.measure[m]);
         /**** need to use PhotRel optionally here ****/
         N++; 
         if (N == NPTS) {
           NPTS += 100;
-          REALLOCATE (Xvec.elements, float, NPTS);
-          REALLOCATE (Yvec.elements, float, NPTS);
-          if (ErrorBars) { REALLOCATE (dYvec.elements, float, NPTS); }
+          REALLOCATE (Xvec.elements.Flt, opihi_flt, NPTS);
+          REALLOCATE (Yvec.elements.Flt, opihi_flt, NPTS);
+          if (ErrorBars) { REALLOCATE (dYvec.elements.Flt, opihi_flt, NPTS); }
         }
       }      
@@ -142 +142 @@
   
   if (ErrorBars)
-    fsortthree (Xvec.elements, Yvec.elements, dYvec.elements, N);
+    dsortthree (Xvec.elements.Flt, Yvec.elements.Flt, dYvec.elements.Flt, N);
   else
-    fsortpair (Xvec.elements, Yvec.elements, N);
+    dsortpair (Xvec.elements.Flt, Yvec.elements.Flt, N);
 
   /* autoscale the plot */
@@ -154 +154 @@
     graphmode.etype = 0;  
 
-  KapaPrepPlot (kapa, N, &graphmode);
-  KapaPlotVector (kapa, N, Xvec.elements, "x");
-  KapaPlotVector (kapa, N, Yvec.elements, "y");
   if (ErrorBars) {
-    KapaPlotVector (kapa, N, dYvec.elements, "dym");
-    KapaPlotVector (kapa, N, dYvec.elements, "dyp");
+    PlotVectorPairErrors (kapa, N, Xvec.elements.Flt, Yvec.elements.Flt, dYvec.elements.Flt, &graphmode);
+  } else {
+    PlotVectorPair (kapa, N, Xvec.elements.Flt, Yvec.elements.Flt, &graphmode);
   }
 
@@ -175 +173 @@
 
   if (SaveVectors) {
-    free (xvec[0].elements);
-    free (yvec[0].elements);
-    xvec[0].elements = Xvec.elements;
-    yvec[0].elements = Yvec.elements;
+    free (xvec[0].elements.Flt);
+    free (yvec[0].elements.Flt);
+    xvec[0].elements.Flt = Xvec.elements.Flt;
+    yvec[0].elements.Flt = Yvec.elements.Flt;
     xvec[0].Nelements = yvec[0].Nelements = Xvec.Nelements;
   } else {
-    free (Xvec.elements);
-    free (Yvec.elements);
+    free (Xvec.elements.Flt);
+    free (Yvec.elements.Flt);
   }
 
-  if (ErrorBars) free (dYvec.elements);
+  if (ErrorBars) free (dYvec.elements.Flt);
   dvo_catalog_free (&catalog);