Changeset 294 in Idarraga

Timestamp:

May 1, 2012, 3:07:56 PM (12 years ago)

Author:

idarraga

Message:

 

File:

• mafalda/MAFTools/TimePixCalibrationHandler.cpp (modified) (4 diffs)

mafalda/MAFTools/TimePixCalibrationHandler.cpp

@@ -11 +11 @@
 #include <iostream>
 #include <fstream>
-
+#include <math.h>
 #include <stdlib.h>
 
@@ -112 +112 @@
         int index = XYtoC(pix, m_width);
 
-        double par[] = { m_a[index], m_b[index], m_c[index], m_t[index] };
+        //double par[] = { m_a[index], m_b[index], m_c[index], m_t[index] };
+
+        // cuadratic solution
+        double a = m_a[index];
+        double b = m_b[index] - m_a[index]*m_t[index] - (double)tot;
+        double c = -m_c[index] - m_t[index]*m_b[index];
+
+        double sol1 = -b + sqrt(b*b - 4*a*c);
+        sol1 /= 2*a;
+        double sol2 = -b - sqrt(b*b - 4*a*c);
+        sol2 /= 2*a;
+
+        cout << "sol1 = " << sol1 << " , sol2 = " << sol2 << endl;
+
+        if(sol2 <= 0) return sol1;
+        else return sol2;
+
+        return 0.;
 
         /*
@@ -122 +139 @@
         }*/
 
-
+/*
         double evalTOT = 0.;
         double prev_e = 0.;
@@ -143 +160 @@
 
         return prev_e;
+        */
 }