Changed according to review comments

mantidproject · Feb 3, 2025 · 974182c · 974182c
1 parent 396df43
commit 974182c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/Framework/SINQ/inc/MantidSINQ/SliceMDHisto.h b/Framework/SINQ/inc/MantidSINQ/SliceMDHisto.h
@@ -43,8 +43,8 @@ class MANTID_SINQ_DLL SliceMDHisto : public Mantid::API::Algorithm {
   unsigned int m_rank;
   std::vector<int> m_dim;
   void cutData(const Mantid::API::IMDHistoWorkspace_sptr &inWS, const Mantid::API::IMDHistoWorkspace_sptr &outWS,
-               Mantid::coord_t *sourceDim, Mantid::coord_t *targetDim, std::vector<int> &start, std::vector<int> &end,
-               unsigned int dim);
+               Mantid::coord_t *sourceDim, Mantid::coord_t *targetDim, const std::vector<int> &start,
+               const std::vector<int> &end, unsigned int dim);
 
   void copyMetaData(const Mantid::API::IMDHistoWorkspace_sptr &inws, const Mantid::API::IMDHistoWorkspace_sptr &outws);
 };
diff --git a/Framework/SINQ/src/PoldiPeakSearch.cpp b/Framework/SINQ/src/PoldiPeakSearch.cpp
@@ -113,9 +113,10 @@ std::list<MantidVec::const_iterator> PoldiPeakSearch::findPeaks(MantidVec::const
    */
   rawPeaks.sort(&PoldiPeakSearch::vectorElementGreaterThan);
 
-  auto usedPeakCount = std::next(rawPeaks.begin(), std::min(m_maximumPeakNumber, static_cast<int>(rawPeaks.size())));
+  size_t usedPeakCount = std::min(m_maximumPeakNumber, static_cast<int>(rawPeaks.size()));
+  auto lastPeakIter = std::next(rawPeaks.begin(), usedPeakCount);
 
-  return std::list<MantidVec::const_iterator>(rawPeaks.begin(), usedPeakCount);
+  return std::list<MantidVec::const_iterator>(rawPeaks.begin(), lastPeakIter);
 }
 
 /** Actual recursive peak search method

diff --git a/Framework/SINQ/src/SliceMDHisto.cpp b/Framework/SINQ/src/SliceMDHisto.cpp
@@ -92,7 +92,7 @@ void SliceMDHisto::exec() {
 
 void SliceMDHisto::cutData(const Mantid::API::IMDHistoWorkspace_sptr &inWS,
                            const Mantid::API::IMDHistoWorkspace_sptr &outWS, Mantid::coord_t *sourceDim,
-                           Mantid::coord_t *targetDim, std::vector<int> &start, std::vector<int> &end,
+                           Mantid::coord_t *targetDim, const std::vector<int> &start, const std::vector<int> &end,
                            unsigned int dim) {
   int length;
 

diff --git a/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h b/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
@@ -106,7 +106,7 @@ class SCRIPT_DLL_EXPORT ScriptRepositoryImpl : public ScriptRepository {
 
   void setIgnorePatterns(const std::string &patterns) override;
 
-  std::string ignorePatterns() override final;
+  std::string ignorePatterns() final;
 
   int setAutoUpdate(const std::string &input_path, bool option = true) override;
 

diff --git a/Framework/TestHelpers/inc/MantidFrameworkTestHelpers/FakeObjects.h b/Framework/TestHelpers/inc/MantidFrameworkTestHelpers/FakeObjects.h
@@ -142,13 +142,12 @@ class AxeslessWorkspaceTester : public MatrixWorkspace {
   size_t blocksize() const override {
     if (m_vec.empty()) {
       return 0;
-    } else {
-      size_t numY = m_vec[0].dataY().size();
-      if (std::any_of(m_vec.cbegin(), m_vec.cend(), [numY](auto it) { return it.dataY().size() != numY; })) {
-        throw std::logic_error("non-constant number of bins");
-      }
-      return numY;
     }
+    size_t numY = m_vec[0].dataY().size();
+    if (std::any_of(m_vec.cbegin(), m_vec.cend(), [numY](auto it) { return it.dataY().size() != numY; })) {
+      throw std::logic_error("non-constant number of bins");
+    }
+    return numY;
   }
 
   std::size_t getNumberBins(const std::size_t &index) const override {