Skip to content

Commit

Permalink
refs #6449 should fix MDEvent performance test
Browse files Browse the repository at this point in the history
as there are sum of really large numbers which will not be calculated with abserr=1.e-7. Reller ~1.e-7 is more appropriate.
  • Loading branch information
abuts committed Apr 17, 2013
1 parent 08511ce commit b29d5ae
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions Code/Mantid/Framework/MDEvents/test/MDEventTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,10 @@ class MDEventTestPerformance : public CxxTest::TestSuite
TS_ASSERT_THROWS_NOTHING(MDLeanEvent<3>::eventsToData(events,data,ncols,totalSignal,totalErrSq));
TS_ASSERT_EQUALS(3+2,ncols);
TS_ASSERT_EQUALS((3+2)*nPoints,data.size());
TS_ASSERT_DELTA(sumGuess,totalSignal,1.e-7);
TS_ASSERT_DELTA(errGuess,totalErrSq,1.e-7);
double relerr = 2*std::fabs(sumGuess-totalSignal)/(sumGuess+totalSignal);
TS_ASSERT_DELTA(0.,relerr,1.e-7);
relerr = 2*std::fabs(errGuess-totalErrSq)/(errGuess+totalErrSq);
TS_ASSERT_DELTA(0,relerr,1.e-7);


std::vector<MDLeanEvent<3> > transfEvents;
Expand Down Expand Up @@ -353,8 +355,12 @@ class MDEventTestPerformance : public CxxTest::TestSuite
TS_ASSERT_THROWS_NOTHING(MDEvent<4>::eventsToData(events,data,ncols,totalSignal,totalErrSq));
TS_ASSERT_EQUALS(4+4,ncols);
TS_ASSERT_EQUALS((4+4)*nPoints,data.size());
TS_ASSERT_DELTA(sumGuess,totalSignal,1.e-7);
TS_ASSERT_DELTA(errGuess,totalErrSq,1.e-7);

double relerr = 2*std::fabs(sumGuess-totalSignal)/(sumGuess+totalSignal);
TS_ASSERT_DELTA(0.,relerr,1.e-7);
relerr = 2*std::fabs(errGuess-totalErrSq)/(errGuess+totalErrSq);
TS_ASSERT_DELTA(0,relerr,1.e-7);


std::vector<MDEvent<4> > transfEvents;
TS_ASSERT_THROWS_NOTHING(MDEvent<4>::dataToEvents(data,transfEvents));
Expand Down

0 comments on commit b29d5ae

Please sign in to comment.