Refs #10828 Don't use qmath in slit calculator

mantidproject · Jan 27, 2015 · d4f2299 · d4f2299
1 parent a221f82
commit d4f2299
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/SlitCalculator.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/SlitCalculator.cpp
@@ -1,5 +1,5 @@
 #include "MantidQtMantidWidgets/SlitCalculator.h"
-#include <qmath.h>
+#include <math.h>
 
 namespace MantidQt
 {
@@ -19,16 +19,15 @@ namespace MantidQt
     void SlitCalculator::on_recalculate_triggered()
     {
       //Gather input
-      const double PI = 2*qAsin(1);
       const double s1s2 = ui.spinSlit1Slit2->value();
       const double s2sa = ui.spinSlit2Sample->value();
       const double res = ui.spinResolution->value();
       const double footprint = ui.spinFootprint->value();
       const double angle = ui.spinAngle->value();
 
       //Calculate values
-      const double s1 = 2 * (s1s2 + s2sa) * qTan(res * angle * PI / 180) - footprint * qSin(angle * PI / 180);
-      const double s2 = s1s2 * (footprint * qSin(angle * PI / 180) + s1) / (s1s2 + s2sa) - s1;
+      const double s1 = 2 * (s1s2 + s2sa) * tan(res * angle * M_PI / 180) - footprint * sin(angle * M_PI / 180);
+      const double s2 = s1s2 * (footprint * sin(angle * M_PI / 180) + s1) / (s1s2 + s2sa) - s1;
 
       //Update output
       ui.slit1Text->setText(QString::number(s1,'f',3));