Build and cppcheck fixes - ornl-next (#39129)

* Cppcheck suppressions set 56 (#38744)

* Cppcheck suppressions set 56

* Remove lines from suppressions and other fixes

Py_RETURN_NONE renamed to Py_NONE and return removed (now to be done manually) as not used anywhere else and was confusing cppcheck with missing return.

Had to make lambda function wrapper if wanted to return const pointer in AlgorithmProperty.cpp

Co-authored-by: Mohamed Almaki <MohamedAlmaki@users.noreply.github.com>

* Not use macro to return

* Replace std::function pointer with a C style function pointer

* Update Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp

Co-authored-by: Gui Maciel Pereira <80104863+GuiMacielPereira@users.noreply.github.com>

* Update Framework/PythonInterface/mantid/api/src/Exports/IFunction1D.cpp

Co-authored-by: Gui Maciel Pereira <80104863+GuiMacielPereira@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update Framework/PythonInterface/mantid/api/src/Exports/IFunction1D.cpp

Co-authored-by: Gui Maciel Pereira <80104863+GuiMacielPereira@users.noreply.github.com>

* Update Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp

Co-authored-by: Gui Maciel Pereira <80104863+GuiMacielPereira@users.noreply.github.com>

* Revert constParameterCallback suppression fix

---------

Co-authored-by: Mohamed Almaki <MohamedAlmaki@users.noreply.github.com>
Co-authored-by: Mohammed Almakki <mohammed.almakki@stfc.ac.uk>
Co-authored-by: Gui Maciel Pereira <80104863+GuiMacielPereira@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* fix some of the simpler knownConditionTrueFalse warnings (#39004)

* fix some knownConditionTrueFalse warnings

* fix cascading ccpcheck warnings

* Review suggestions

Co-authored-by: James Clarke <james.clarke@stfc.ac.uk>

---------

Co-authored-by: James Clarke <james.clarke@stfc.ac.uk>

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/pre-commit/mirrors-clang-format: v19.1.7 → v20.1.0](pre-commit/mirrors-clang-format@v19.1.7...v20.1.0)
- [github.com/astral-sh/ruff-pre-commit: v0.9.10 → v0.11.2](astral-sh/ruff-pre-commit@v0.9.10...v0.11.2)

remove unnecessary brackets

Update cppcheck suppression line number

* Pin conda=25.1.1 to avoid CMake FindPython error in Windows packaging (#39119)

* A variety of Cppcheck fixes (#39115)

* Delete unnecessary virtual destructors.

* Fixes for ImportMDHistoWorkspaceBase

The member variable nbins is unused, and was shadowed inside a method.
Also made some variables in that method const.

* AlgorithmDialog missing const in a few places

* Fix some return by reference in FitPropertyBrowser

* Fix several passedByValue Cppcheck warnings

* Further Cppcheck fixes

* Some stl related cppcheck fixes (#39072)

* some stl related cppchecks

* additional ccpcheck fixes from line numbers moving

* remove fix that I think is causing the test failure

* use std optional to avoid uninitialised warning

* Pin pydantic to fix failing test

---------

Co-authored-by: RichardWaiteSTFC <55979119+RichardWaiteSTFC@users.noreply.github.com>
Co-authored-by: Mohamed Almaki <MohamedAlmaki@users.noreply.github.com>
Co-authored-by: Mohammed Almakki <mohammed.almakki@stfc.ac.uk>
Co-authored-by: Gui Maciel Pereira <80104863+GuiMacielPereira@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Haigh <35813666+jhaigh0@users.noreply.github.com>
Co-authored-by: James Clarke <james.clarke@stfc.ac.uk>
Co-authored-by: thomashampson <thomas.hampson@stfc.ac.uk>
Co-authored-by: James Clarke <139879523+jclarkeSTFC@users.noreply.github.com>
Co-authored-by: sf1919 <sarah.foxley@stfc.ac.uk>

Author: 9 people

.pre-commit-config.yaml

@@ -24,7 +24,7 @@ repos:
         exclude: .md5$|^external/|^tools/|Testing/Tools/cxxtest
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v19.1.7
+    rev: v20.1.0
     hooks:
     - id: clang-format
       exclude: Testing/Tools/cxxtest|tools|qt/icons/resources/
@@ -59,7 +59,7 @@ repos:
           )$
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.10
+    rev: v0.11.2
     # ruff must appear before black in the list of hooks
     hooks:
       - id: ruff

Framework/API/src/FileFinder.cpp

@@ -145,7 +145,7 @@ const Kernel::InstrumentInfo FileFinderImpl::getInstrument(const string &hint,
     string instrName(hint);
     Poco::Path path(instrName);
     instrName = path.getFileName();
-    if ((instrName.find("PG3") == 0) || (instrName.find("pg3") == 0)) {
+    if (instrName.starts_with("PG3") || instrName.starts_with("pg3")) {
       instrName = "PG3";
     }
     // We're extending this nasty hack to accomodate data archive searching for
@@ -157,7 +157,7 @@ const Kernel::InstrumentInfo FileFinderImpl::getInstrument(const string &hint,
     // code gets an overhaul as part of that ticket.  Please think twice before
     // adding
     // any more instruments to this list.
-    else if ((instrName.find("SANS2D") == 0) || (instrName.find("sans2d") == 0)) {
+    else if (instrName.starts_with("SANS2D") || instrName.starts_with("sans2d")) {
       instrName = "SANS2D";
     } else {
       // go forwards looking for the run number to start

Framework/API/src/FunctionFactory.cpp

@@ -264,9 +264,7 @@ FunctionFactoryImpl::createComposite(const Expression &expr,
     }
   }
 
-  if (cfun) {
-    cfun->applyTies();
-  }
+  cfun->applyTies();
   return cfun;
 }
 

Framework/Algorithms/inc/MantidAlgorithms/ExtractMaskToTable.h

@@ -35,7 +35,7 @@ class MANTID_ALGORITHMS_DLL ExtractMaskToTable final : public API::Algorithm {
   const std::string category() const override { return "Transforms\\Masking"; }
 
   /// Remove the items appeared in a vector from another
-  std::vector<detid_t> subtractVector(std::vector<detid_t> minuend, std::vector<detid_t> subtrahend);
+  std::vector<detid_t> subtractVector(const std::vector<detid_t> &minuend, std::vector<detid_t> subtrahend);
 
 private:
   /// Initialisation code

Framework/Algorithms/inc/MantidAlgorithms/GeneratePeaks.h

@@ -68,7 +68,7 @@ class MANTID_ALGORITHMS_DLL GeneratePeaks final : public API::Algorithm {
   /// Create output workspace
   API::MatrixWorkspace_sptr createOutputWorkspace();
 
-  API::MatrixWorkspace_sptr createDataWorkspace(std::vector<double> binparameters);
+  API::MatrixWorkspace_sptr createDataWorkspace(const std::vector<double> &binparameters) const;
 
   void createFunction(std::string &peaktype, std::string &bkgdtype);
 

Framework/Algorithms/inc/MantidAlgorithms/GetAllEi.h

@@ -65,7 +65,7 @@ class MANTID_ALGORITHMS_DLL GetAllEi : public API::Algorithm {
 
   /**Return average time series log value for the appropriately filtered log*/
   double getAvrgLogValue(const API::MatrixWorkspace_sptr &inputWS, const std::string &propertyName,
-                         Kernel::TimeROI &timeroi);
+                         const Kernel::TimeROI &timeroi);
   /**process logs and retrieve chopper speed and chopper delay*/
   void findChopSpeedAndDelay(const API::MatrixWorkspace_sptr &inputWS, double &chop_speed, double &chop_delay);
   void findGuessOpeningTimes(const std::pair<double, double> &TOF_range, double ChopDelay, double Period,

Framework/Algorithms/inc/MantidAlgorithms/SampleCorrections/SparseWorkspace.h

@@ -49,7 +49,7 @@ class MANTID_ALGORITHMS_DLL SparseWorkspace : public DataObjects::Workspace2D {
   static HistogramData::Histogram modelHistogram(const API::MatrixWorkspace &modelWS, const size_t wavelengthPoints);
   static std::tuple<double, double> extremeWavelengths(const API::MatrixWorkspace &ws);
   static std::tuple<double, double, double, double> extremeAngles(const API::MatrixWorkspace &ws);
-  HistogramData::HistogramY secondDerivative(const std::array<size_t, 3> indices, const double distanceStep) const;
+  HistogramData::HistogramY secondDerivative(const std::array<size_t, 3> &indices, const double distanceStep) const;
   HistogramData::HistogramE esq(const HistogramData::HistogramE &e) const;
   HistogramData::HistogramE esqrt(HistogramData::HistogramE e) const;
 

Framework/Algorithms/src/DiffractionFocussing2.cpp

@@ -94,7 +94,7 @@ std::map<std::string, std::string> DiffractionFocussing2::validateInputs() {
   if (unitid == "TOF") {
     g_log.error(
         "Support for TOF data in DiffractionFocussing is deprecated (on 29/04/21) - use GroupDetectors instead)");
-  } else if (unitid != "dSpacing" && unitid != "MomentumTransfer" && unitid != "TOF") {
+  } else if (unitid != "dSpacing" && unitid != "MomentumTransfer") {
     std::stringstream msg;
     msg << "UnitID " << unitid << " is not a supported spacing";
     issues["InputWorkspace"] = msg.str();

Framework/Algorithms/src/ExtractMaskToTable.cpp

@@ -360,7 +360,8 @@ void ExtractMaskToTable::addToTableWorkspace(const TableWorkspace_sptr &outws, s
  * @param minuend :: vector with items to be removed from
  * @param subtrahend :: vector containing the items to be removed from minuend
  */
-std::vector<detid_t> ExtractMaskToTable::subtractVector(std::vector<detid_t> minuend, std::vector<detid_t> subtrahend) {
+std::vector<detid_t> ExtractMaskToTable::subtractVector(const std::vector<detid_t> &minuend,
+                                                        std::vector<detid_t> subtrahend) {
   // Define some variables
   std::vector<detid_t>::iterator firstsubiter, fiter;
   firstsubiter = subtrahend.begin();

Framework/Algorithms/src/FilterEvents.cpp

@@ -617,8 +617,7 @@ void FilterEvents::createOutputWorkspaces() {
   int delta_wsindex{0}; // an index shift
   if (getProperty("OutputWorkspaceIndexedFrom1")) {
     // Determine the minimum valid target index. Note that the set is sorted and guaranteed to start with -1.
-    const int min_wsindex = m_targetWorkspaceIndexSet.size() == 1 ? *m_targetWorkspaceIndexSet.begin()
-                                                                  : *std::next(m_targetWorkspaceIndexSet.begin(), 1);
+    const int min_wsindex = *std::next(m_targetWorkspaceIndexSet.begin(), 1);
     g_log.debug() << "Minimum target workspace index = " << min_wsindex << "\n";
     delta_wsindex = 1 - min_wsindex;
   }