From 7ef6c6f72629551273da5dc194c2c1dda3b9d10f Mon Sep 17 00:00:00 2001 From: Michael Wedel Date: Thu, 22 May 2014 08:52:40 +0200 Subject: [PATCH] Refs #9445. Added profile function check to PoldiPeakCollection --- .../SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h | 1 + .../SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp | 5 +++++ Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h | 2 ++ 3 files changed, 8 insertions(+) diff --git a/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h b/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h index c7cd6215da31..3ea83a429aed 100644 --- a/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h +++ b/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h @@ -62,6 +62,7 @@ class MANTID_SINQ_DLL PoldiPeakCollection void setProfileFunctionName(std::string newProfileFunction); std::string getProfileFunctionName() const; + bool hasProfileFunctionName() const; TableWorkspace_sptr asTableWorkspace(); diff --git a/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp b/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp index 58af6bbdd0fb..e214bde3db8e 100644 --- a/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp +++ b/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PoldiPeakCollection.cpp @@ -63,6 +63,11 @@ std::string PoldiPeakCollection::getProfileFunctionName() const return m_profileFunctionName; } +bool PoldiPeakCollection::hasProfileFunctionName() const +{ + return !m_profileFunctionName.empty(); +} + TableWorkspace_sptr PoldiPeakCollection::asTableWorkspace() { TableWorkspace_sptr peaks = boost::dynamic_pointer_cast(WorkspaceFactory::Instance().createTable()); diff --git a/Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h b/Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h index 21944645078b..3bc8eecf7897 100644 --- a/Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h +++ b/Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h @@ -112,11 +112,13 @@ class PoldiPeakCollectionTest : public CxxTest::TestSuite TestablePoldiPeakCollection other(table); TS_ASSERT_EQUALS(other.getProfileFunctionName(), "Gaussian"); + TS_ASSERT(other.hasProfileFunctionName()); } void testMissingProfileFunction() { TestablePoldiPeakCollection collection(m_dummyData); + TS_ASSERT(!collection.hasProfileFunctionName()); TS_ASSERT(collection.getProfileFunctionName().empty()); }