From b9cbff3ec792a2286e52650cbfbb23db91f1345c Mon Sep 17 00:00:00 2001 From: Gesner Passos <gesner.passos@stfc.ac.uk> Date: Mon, 11 Feb 2013 09:54:33 +0000 Subject: [PATCH] Adjust the Unit Test for propagation error Q1D2 re #6538 --- Code/Mantid/Framework/Algorithms/test/Q1D2Test.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Code/Mantid/Framework/Algorithms/test/Q1D2Test.h b/Code/Mantid/Framework/Algorithms/test/Q1D2Test.h index 0cf1187474b..d9659d35f68 100644 --- a/Code/Mantid/Framework/Algorithms/test/Q1D2Test.h +++ b/Code/Mantid/Framework/Algorithms/test/Q1D2Test.h @@ -250,7 +250,7 @@ public: TS_ASSERT( boost::math::isnan(gravity->readY(0)[78]) ) TS_ASSERT_DELTA( gravity->readE(0).front(), 329383, 1 ) - TS_ASSERT_DELTA( gravity->readE(0)[10], 489710, 1 ) + TS_ASSERT_DELTA( gravity->readE(0)[10], 489708, 1 ) //489710 TS_ASSERT( boost::math::isnan(gravity->readE(0)[77]) ) Mantid::API::AnalysisDataService::Instance().remove(outputWS); @@ -292,8 +292,8 @@ public: TS_ASSERT_DELTA( result->readY(0)[12], 503242.79, 0.1) TS_ASSERT( boost::math::isnan(result->readY(0).back()) ) - TS_ASSERT_DELTA( result->readE(0)[2], 404981, 1 ) - TS_ASSERT_DELTA( result->readE(0)[10], 489710, 100 ) + TS_ASSERT_DELTA( result->readE(0)[2], 404980, 1 ) + TS_ASSERT_DELTA( result->readE(0)[10], 489708, 100 ) TS_ASSERT( boost::math::isnan(result->readE(0)[7]) ) } @@ -331,9 +331,10 @@ public: for ( size_t i = 0; i < nocuts->readY(0).size(); ++i ) { TS_ASSERT_EQUALS( nocuts->readX(0)[i], noGrav->readX(0)[i] ) - if ( ! boost::math::isnan(nocuts->readY(0)[i]) ) + if ( ! boost::math::isnan(nocuts->readY(0)[i]) && !boost::math::isnan(nocuts->readE(0)[i]) ) { TS_ASSERT_EQUALS( nocuts->readY(0)[i], noGrav->readY(0)[i] ) + TS_ASSERT_EQUALS( nocuts->readE(0)[i], noGrav->readE(0)[i] ) } } -- GitLab