From d78749b670636db9f6f8665005de6f9faa82443f Mon Sep 17 00:00:00 2001 From: Daniel Caballero Date: Tue, 10 Jun 2025 12:56:26 -0400 Subject: [PATCH 1/2] Undo UnwrapMonitor deprecation --- Framework/Algorithms/inc/MantidAlgorithms/UnwrapMonitor.h | 3 +-- Framework/Algorithms/src/UnwrapMonitor.cpp | 5 ++--- .../v6.13.0/Framework/Algorithms/Deprecated/Used/39218.rst | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 docs/source/release/v6.13.0/Framework/Algorithms/Deprecated/Used/39218.rst diff --git a/Framework/Algorithms/inc/MantidAlgorithms/UnwrapMonitor.h b/Framework/Algorithms/inc/MantidAlgorithms/UnwrapMonitor.h index c15a524623fa..dd3f723cffa4 100644 --- a/Framework/Algorithms/inc/MantidAlgorithms/UnwrapMonitor.h +++ b/Framework/Algorithms/inc/MantidAlgorithms/UnwrapMonitor.h @@ -7,7 +7,6 @@ #pragma once #include "MantidAPI/Algorithm.h" -#include "MantidAPI/DeprecatedAlgorithm.h" #include "MantidAlgorithms/DllConfig.h" #include "MantidHistogramData/HistogramX.h" #include "MantidKernel/cow_ptr.h" @@ -30,7 +29,7 @@ namespace Algorithms { @author Russell Taylor, Tessella Support Services plc @date 25/07/2008 */ -class MANTID_ALGORITHMS_DLL UnwrapMonitor final : public API::Algorithm, public API::DeprecatedAlgorithm { +class MANTID_ALGORITHMS_DLL UnwrapMonitor final : public API::Algorithm { public: UnwrapMonitor(); ~UnwrapMonitor() override = default; diff --git a/Framework/Algorithms/src/UnwrapMonitor.cpp b/Framework/Algorithms/src/UnwrapMonitor.cpp index 1d2ae99bf5c7..55b65c13d475 100644 --- a/Framework/Algorithms/src/UnwrapMonitor.cpp +++ b/Framework/Algorithms/src/UnwrapMonitor.cpp @@ -28,9 +28,8 @@ using namespace Kernel; using namespace API; /// Default constructor -UnwrapMonitor::UnwrapMonitor() : m_conversionConstant(0.), m_inputWS(), m_LRef(0.), m_Tmin(0.), m_Tmax(0.), m_XSize(0) { - deprecatedDate("2025-04-16"); -} +UnwrapMonitor::UnwrapMonitor() + : m_conversionConstant(0.), m_inputWS(), m_LRef(0.), m_Tmin(0.), m_Tmax(0.), m_XSize(0) {} /// Initialisation method void UnwrapMonitor::init() { diff --git a/docs/source/release/v6.13.0/Framework/Algorithms/Deprecated/Used/39218.rst b/docs/source/release/v6.13.0/Framework/Algorithms/Deprecated/Used/39218.rst deleted file mode 100644 index 3726cb845266..000000000000 --- a/docs/source/release/v6.13.0/Framework/Algorithms/Deprecated/Used/39218.rst +++ /dev/null @@ -1 +0,0 @@ -- :ref:`UnwrapMonitor ` has been deprecated. There is no replacement. From 790a8211868a292fb82e7c817835c5c5150b5147 Mon Sep 17 00:00:00 2001 From: Daniel Caballero Date: Tue, 10 Jun 2025 13:10:55 -0400 Subject: [PATCH 2/2] Updated release note --- docs/source/release/v6.13.0/framework.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/source/release/v6.13.0/framework.rst b/docs/source/release/v6.13.0/framework.rst index c8a3841d5460..e9a75497299d 100644 --- a/docs/source/release/v6.13.0/framework.rst +++ b/docs/source/release/v6.13.0/framework.rst @@ -53,7 +53,6 @@ Deprecated and :ref:`SNSPowderReduction `. - :ref:`LoadEventPreNexus ` has been deprecated. There is no replacement. - :ref:`IntegratePeaksCWSD ` has been deprecated. There is no replacement. -- :ref:`UnwrapMonitor ` has been deprecated. There is no replacement. Removed ############