maybe?

Author: rboston628

Framework/Algorithms/test/CreateUserDefinedBackgroundTest.h

@@ -24,7 +24,7 @@ using Mantid::API::MatrixWorkspace_sptr;
 
 namespace {
 // flag for absolute or relative comparison
-enum Comparison : bool { RELATIVE = true, ABSOLUTE = false };
+enum Comparison : bool { CMP_RELATIVE = true, CMP_ABSOLUTE = false };
 
 // Gaussian
 double gauss(double x, double height, double centre, double fwhm) {
@@ -111,7 +111,7 @@ class CreateUserDefinedBackgroundTest : public CxxTest::TestSuite {
 
     // The expected result
     const auto expected = createExpectedResults(true);
-    TS_ASSERT(workspacesEqual(expected, outputWS, 0.105, Comparison::RELATIVE));
+    TS_ASSERT(workspacesEqual(expected, outputWS, 0.105, Comparison::CMP_RELATIVE));
   }
 
   void test_exec_HistoWS_NormalisePlotsOn() {
@@ -137,7 +137,7 @@ class CreateUserDefinedBackgroundTest : public CxxTest::TestSuite {
 
     // The expected result
     const auto expected = createExpectedResults(true, true);
-    TS_ASSERT(workspacesEqual(expected, outputWS, 5e-2, Comparison::ABSOLUTE));
+    TS_ASSERT(workspacesEqual(expected, outputWS, 5e-2, Comparison::CMP_ABSOLUTE));
   }
 
   void test_exec_PointsWS_extend() {
@@ -247,7 +247,7 @@ class CreateUserDefinedBackgroundTest : public CxxTest::TestSuite {
     const auto expected = createExpectedResults(true, false);
     Mantid::API::WorkspaceHelpers::makeDistribution(expected);
 
-    TS_ASSERT(workspacesEqual(expected, outputWS, 0.105, Comparison::RELATIVE));
+    TS_ASSERT(workspacesEqual(expected, outputWS, 0.105, Comparison::CMP_RELATIVE));
   }
 
 private:
@@ -305,7 +305,7 @@ class CreateUserDefinedBackgroundTest : public CxxTest::TestSuite {
 
   /// Compare workspaces
   bool workspacesEqual(const MatrixWorkspace_sptr &lhs, const MatrixWorkspace_sptr &rhs, double tolerance,
-                       bool const relativeError = Comparison::ABSOLUTE) {
+                       bool const relativeError = Comparison::CMP_ABSOLUTE) {
     auto alg = Mantid::API::AlgorithmFactory::Instance().create("CompareWorkspaces", 1);
     alg->setChild(true);
     alg->initialize();
@@ -339,7 +339,7 @@ class CreateUserDefinedBackgroundTest : public CxxTest::TestSuite {
 
     // The expected result
     const auto expected = createExpectedResults(false);
-    TS_ASSERT(workspacesEqual(expected, outputWS, 1e-4, Comparison::ABSOLUTE));
+    TS_ASSERT(workspacesEqual(expected, outputWS, 1e-4, Comparison::CMP_ABSOLUTE));
   }
 
   /// Cached string for option

Testing/SystemTests/tests/framework/ILLDirectGeometryReductionTest.py

@@ -164,7 +164,7 @@ def runTest(self):
 
     def validate(self):
         self.tolerance = 1e-2
-        self.tolerance_is_rel_err = True
+        self.tolerance_is_rel_err = False
         self.disableChecking = ["Instrument", "Sample"]
         return ["cropped", "ILL_IN6_SofQW.nxs"]