From 7de1a348840d31a1861372fa337970533914a3c6 Mon Sep 17 00:00:00 2001 From: Caila Finn Date: Fri, 16 Aug 2024 12:23:02 +0100 Subject: [PATCH] Make const position consistent Wildes file uses const west... *grumble* RE #35067 --- .../PolarizationCorrections/SpinStateValidator.h | 4 ++-- Framework/Algorithms/src/PolarizationCorrectionWildes.cpp | 2 +- .../src/PolarizationCorrections/SpinStateValidator.cpp | 4 ++-- Framework/Algorithms/test/PolarizationCorrectionWildesTest.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PolarizationCorrections/SpinStateValidator.h b/Framework/Algorithms/inc/MantidAlgorithms/PolarizationCorrections/SpinStateValidator.h index c7d151f550135..7a936a5a71680 100644 --- a/Framework/Algorithms/inc/MantidAlgorithms/PolarizationCorrections/SpinStateValidator.h +++ b/Framework/Algorithms/inc/MantidAlgorithms/PolarizationCorrections/SpinStateValidator.h @@ -53,8 +53,8 @@ class MANTID_ALGORITHMS_DLL SpinStateValidator : public Kernel::TypedValidator getAllowedPairStates() const; const std::unordered_set getAllowedSingleStates() const; bool m_acceptSingleStates = false; - std::string const m_para; - std::string const m_anti; + const std::string m_para; + const std::string m_anti; bool m_optional = false; }; } // namespace Mantid::Algorithms diff --git a/Framework/Algorithms/src/PolarizationCorrectionWildes.cpp b/Framework/Algorithms/src/PolarizationCorrectionWildes.cpp index 6f902aa043021..e7be23c7813cf 100644 --- a/Framework/Algorithms/src/PolarizationCorrectionWildes.cpp +++ b/Framework/Algorithms/src/PolarizationCorrectionWildes.cpp @@ -562,7 +562,7 @@ void PolarizationCorrectionWildes::addSpinStateOutput(std::vector & throw std::invalid_argument("Required spin state (" + spinState + ") not found in spin state order (" + spinStateOrder + ")."); } - auto const index = maybeIndex.value(); + const auto index = maybeIndex.value(); names[index] = baseName + "_" + spinState; API::AnalysisDataService::Instance().addOrReplace(names[index], ws); } diff --git a/Framework/Algorithms/src/PolarizationCorrections/SpinStateValidator.cpp b/Framework/Algorithms/src/PolarizationCorrections/SpinStateValidator.cpp index 930584103858b..8b0156997da17 100644 --- a/Framework/Algorithms/src/PolarizationCorrections/SpinStateValidator.cpp +++ b/Framework/Algorithms/src/PolarizationCorrections/SpinStateValidator.cpp @@ -29,8 +29,8 @@ std::string SpinStateValidator::checkValidity(const std::string &input) const { return "Enter a spin state string, it should be a comma-separated list, e.g. " + m_para + m_anti + ", " + m_anti + m_anti + ", " + m_anti + m_para + ", " + m_para + m_para + "."; } - auto const &allowedPairs = getAllowedPairStates(); - auto const &allowedSingles = getAllowedSingleStates(); + const auto &allowedPairs = getAllowedPairStates(); + const auto &allowedSingles = getAllowedSingleStates(); std::vector spinStates = PolarizationCorrectionsHelpers::splitSpinStateString(input); diff --git a/Framework/Algorithms/test/PolarizationCorrectionWildesTest.h b/Framework/Algorithms/test/PolarizationCorrectionWildesTest.h index a85f9dbc06cba..440561fb1e8bf 100644 --- a/Framework/Algorithms/test/PolarizationCorrectionWildesTest.h +++ b/Framework/Algorithms/test/PolarizationCorrectionWildesTest.h @@ -584,7 +584,7 @@ class PolarizationCorrectionWildesTest : public CxxTest::TestSuite { setupWorkspaceData(wsNames, wsList, nHist); // Re-order the input workspace names to match the input flipper configuration - auto const &flipperConfigVec = splitSpinStateString(flipperConfig); + const auto &flipperConfigVec = splitSpinStateString(flipperConfig); wsNames[indexOfWorkspaceForSpinState(flipperConfigVec, "00").value()] = ws00->getName(); wsNames[indexOfWorkspaceForSpinState(flipperConfigVec, "01").value()] = ws01->getName(); wsNames[indexOfWorkspaceForSpinState(flipperConfigVec, "10").value()] = ws10->getName(); @@ -624,7 +624,7 @@ class PolarizationCorrectionWildesTest : public CxxTest::TestSuite { setupWorkspaceData(wsNames, wsList, nHist); // Re-order the input workspace names to match the input flipper configuration - auto const &flipperConfigVec = splitSpinStateString(flipperConfig); + const auto &flipperConfigVec = splitSpinStateString(flipperConfig); wsNames[indexOfWorkspaceForSpinState(flipperConfigVec, "00").value()] = ws00->getName(); wsNames[indexOfWorkspaceForSpinState(flipperConfigVec, presentFlipperConf).value()] = wsXX->getName(); wsNames[indexOfWorkspaceForSpinState(flipperConfigVec, "11").value()] = ws11->getName();