From f4307dd8823afe916a0544fa5c90516a79a38f99 Mon Sep 17 00:00:00 2001 From: Martyn Gigg Date: Mon, 3 Mar 2014 10:03:04 +0000 Subject: [PATCH] Fix broken Scale*Tests Refs #8983 --- Code/Mantid/Framework/Algorithms/test/ScaleTest.h | 2 +- Code/Mantid/Framework/Algorithms/test/ScaleXTest.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Code/Mantid/Framework/Algorithms/test/ScaleTest.h b/Code/Mantid/Framework/Algorithms/test/ScaleTest.h index cfea88bb3c79..181c5819810a 100644 --- a/Code/Mantid/Framework/Algorithms/test/ScaleTest.h +++ b/Code/Mantid/Framework/Algorithms/test/ScaleTest.h @@ -95,7 +95,7 @@ class ScaleTest : public CxxTest::TestSuite TS_ASSERT_DELTA(outputWS->readX(i)[j], inputWS->readX(i)[j], 1e-12); double resultY = (multiply) ? factor*inputWS->readY(i)[j] : factor + inputWS->readY(i)[j]; TS_ASSERT_DELTA(outputWS->readY(i)[j], resultY, 1e-12); - double resultE = (multiply) ? factor*inputWS->readE(i)[j] : factor + inputWS->readE(i)[j]; + double resultE = (multiply) ? factor*inputWS->readE(i)[j] : inputWS->readE(i)[j]; TS_ASSERT_DELTA(outputWS->readE(i)[j], resultE, 1e-12); } } diff --git a/Code/Mantid/Framework/Algorithms/test/ScaleXTest.h b/Code/Mantid/Framework/Algorithms/test/ScaleXTest.h index d5df88c8a6bf..6461f92f02f6 100755 --- a/Code/Mantid/Framework/Algorithms/test/ScaleXTest.h +++ b/Code/Mantid/Framework/Algorithms/test/ScaleXTest.h @@ -206,7 +206,7 @@ class ScaleXTest : public CxxTest::TestSuite double algFactor(2.0); bool combine(true); auto result = runScaleX(inputWS, "Add", algFactor, parname, combine); - testScaleFactorApplied(inputWS, result, algFactor*instFactor, false); //multiply=true + testScaleFactorApplied(inputWS, result, algFactor+instFactor, false); //multiply=true }