Merge release-next into ornl-next

mantidproject · May 10, 2024 · 149d5f8 · 149d5f8
2 parents e34140c + b837b6b
commit 149d5f8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/Framework/Algorithms/src/FindPeaks.cpp b/Framework/Algorithms/src/FindPeaks.cpp
@@ -403,6 +403,12 @@ void FindPeaks::findPeaksUsingMariscotti() {
   if (!(w % 2))
     ++w;
 
+  if (!m_dataWS->isRaggedWorkspace() && (m_dataWS->blocksize() <= static_cast<size_t>(w))) {
+    std::stringstream errss;
+    errss << "Block size of the workspace should be greater than:" << w;
+    throw std::runtime_error(errss.str());
+  }
+
   smoothData(smoothedData, w, g_z);
 
   // Now calculate the errors on the smoothed data

diff --git a/Framework/Algorithms/test/FindPeaksTest.h b/Framework/Algorithms/test/FindPeaksTest.h
@@ -302,6 +302,20 @@ class FindPeaksTest : public CxxTest::TestSuite {
     AnalysisDataService::Instance().remove(WKSP_NAME_OUTPUT);
   }
 
+  void testWhenSingleBinWs() {
+    MatrixWorkspace_sptr dataws = WorkspaceCreationHelper::create2DWorkspace(10, 1);
+    std::string wsName("SingleBinTestData");
+    AnalysisDataService::Instance().addOrReplace(wsName, dataws);
+    FindPeaks finder;
+    finder.setRethrows(true);
+
+    if (!finder.isInitialized())
+      finder.initialize();
+    TS_ASSERT_THROWS_NOTHING(finder.setPropertyValue("InputWorkspace", wsName));
+    TS_ASSERT_THROWS_NOTHING(finder.setPropertyValue("PeaksList", "peakslist"));
+    TSM_ASSERT_THROWS("Block size is not sufficient to run FindSXPeaks", finder.execute(), std::runtime_error &);
+  }
+
   //----------------------------------------------------------------------------------------------
   /** Parse a row in output parameter tableworkspace to a string/double
    * parameter name/value map

diff --git a/buildconfig/CMake/CppCheck_Suppressions.txt.in b/buildconfig/CMake/CppCheck_Suppressions.txt.in
@@ -208,8 +208,8 @@ constParameterReference:${CMAKE_SOURCE_DIR}/Framework/Algorithms/src/GetEiMonDet
 knownConditionTrueFalse:${CMAKE_SOURCE_DIR}/Framework/Algorithms/src/FilterEvents.cpp:620
 constVariableReference:${CMAKE_SOURCE_DIR}/Framework/Algorithms/src/FilterEvents.cpp:304
 shadowVariable:${CMAKE_SOURCE_DIR}/Framework/Algorithms/src/GetDetectorOffsets.cpp:148
-knownConditionTrueFalse:${CMAKE_SOURCE_DIR}/Framework/Algorithms/src/FindPeaks.cpp:886
-knownConditionTrueFalse:${CMAKE_SOURCE_DIR}/Framework/Algorithms/src/FindPeaks.cpp:993
+knownConditionTrueFalse:${CMAKE_SOURCE_DIR}/Framework/Algorithms/src/FindPeaks.cpp:892
+knownConditionTrueFalse:${CMAKE_SOURCE_DIR}/Framework/Algorithms/src/FindPeaks.cpp:999
 constVariableReference:${CMAKE_SOURCE_DIR}/Framework/Algorithms/src/GetEi2.cpp:213
 knownConditionTrueFalse:${CMAKE_SOURCE_DIR}/Framework/Algorithms/src/MaskBinsIf.cpp:107
 passedByValue:${CMAKE_SOURCE_DIR}/Framework/Algorithms/src/GeneratePeaks.cpp:662

diff --git a/docs/source/release/v6.10.0/Framework/Algorithms/Bugfixes/32679.rst b/docs/source/release/v6.10.0/Framework/Algorithms/Bugfixes/32679.rst
@@ -0,0 +1 @@
+- Fixed a crash in :ref:`FindPeaks <algm-FindPeaks>` when the number of bins in the workspace are not sufficient to run SmoothData:ref:`algm-SmoothData` algorithm and raise the error instead.