From e758270df24511cc7460f03837d05cc29e865ed7 Mon Sep 17 00:00:00 2001 From: Dominik Arominski Date: Wed, 15 Jun 2022 13:40:27 +0200 Subject: [PATCH 1/2] Wrap call to mask bins in try-catch --- qt/widgets/instrumentview/src/InstrumentActor.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qt/widgets/instrumentview/src/InstrumentActor.cpp b/qt/widgets/instrumentview/src/InstrumentActor.cpp index 511b404e2b1c..803ac075923c 100644 --- a/qt/widgets/instrumentview/src/InstrumentActor.cpp +++ b/qt/widgets/instrumentview/src/InstrumentActor.cpp @@ -327,8 +327,11 @@ void InstrumentActor::applyMaskWorkspace() { } // Mask bins - m_maskBinsData.mask(m_workspace); - + try { + m_maskBinsData.mask(m_workspace); + } catch (std::logic_error &) { + m_messageHandler.giveUserWarning("An error occurred when applying the mask to bins.", "Mantid - Warning"); + } clearMasks(); } From cce776f07741beec076fb88f84333d60ac8fac13 Mon Sep 17 00:00:00 2001 From: Dominik Arominski Date: Wed, 15 Jun 2022 13:45:07 +0200 Subject: [PATCH 2/2] MaskBinsData: set MaskBins outputWorkspace via string --- qt/widgets/instrumentview/src/MaskBinsData.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt/widgets/instrumentview/src/MaskBinsData.cpp b/qt/widgets/instrumentview/src/MaskBinsData.cpp index ef6955c61e6f..7524dfaf524b 100644 --- a/qt/widgets/instrumentview/src/MaskBinsData.cpp +++ b/qt/widgets/instrumentview/src/MaskBinsData.cpp @@ -33,7 +33,7 @@ void MaskBinsData::mask(std::shared_ptr &workspace [](const size_t spec) -> int { return static_cast(spec); }); auto alg = Mantid::API::AlgorithmManager::Instance().create("MaskBins", -1); alg->setProperty("InputWorkspace", workspace); - alg->setProperty("OutputWorkspace", workspace); + alg->setPropertyValue("OutputWorkspace", workspace->getName()); alg->setProperty("InputWorkspaceIndexSet", spectraList); alg->setProperty("XMin", mask.start); alg->setProperty("XMax", mask.end);