Merge branch 'main' into 39617_remove_boost_optional_matrixvectorpairparser

Author: SilkeSchomann

.pre-commit-config.yaml

@@ -59,7 +59,7 @@ repos:
           )$
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.1
+    rev: v0.12.2
     # ruff must appear before black in the list of hooks
     hooks:
       - id: ruff

CITATION.cff

@@ -6,9 +6,9 @@ authors:
     email: mantid-help@mantidproject.org
     website: https://www.mantidproject.org/
 title: Manipulation and Analysis Toolkit for Instrument Data
-version: 6.12.0
-doi: 10.5286/Software/Mantid6.12
-date-released: 2025-02-26
+version: 6.13.0
+doi: 10.5286/Software/Mantid6.13
+date-released: 2025-07-07
 keywords:
   - mantid
   - neutron

Framework/API/inc/MantidAPI/AlgorithmProperties.h

@@ -14,7 +14,6 @@
 #include "MantidAPI/Workspace.h"
 #include "MantidKernel/Strings.h"
 
-#include <boost/optional.hpp>
 #include <map>
 #include <optional>
 #include <string>
@@ -25,9 +24,7 @@ namespace Mantid::API::AlgorithmProperties {
 // strings to set the relevant property in an AlgorithmRuntimeProps
 
 void MANTID_API_DLL update(std::string const &property, std::string const &value, IAlgorithmRuntimeProps &properties);
-// TODO this method should no longer exist - migrate code to std::optional
-void MANTID_API_DLL update(std::string const &property, boost::optional<std::string> const &value,
-                           IAlgorithmRuntimeProps &properties);
+
 void MANTID_API_DLL update(std::string const &property, std::optional<std::string> const &value,
                            IAlgorithmRuntimeProps &properties);
 
@@ -39,9 +36,6 @@ void MANTID_API_DLL update(std::string const &property, size_t value, IAlgorithm
 
 void MANTID_API_DLL update(std::string const &property, double value, IAlgorithmRuntimeProps &properties);
 
-// TODO this method should no longer exist - migrate code to std::optional
-void MANTID_API_DLL update(std::string const &property, boost::optional<double> const &value,
-                           IAlgorithmRuntimeProps &properties);
 void MANTID_API_DLL update(std::string const &property, std::optional<double> const &value,
                            IAlgorithmRuntimeProps &properties);
 

Framework/API/inc/MantidAPI/WorkspaceHistory.h

@@ -77,7 +77,7 @@ class MANTID_API_DLL WorkspaceHistory {
   /// Parse an algorithm history string loaded from file
   AlgorithmHistory_sptr parseAlgorithmHistory(const std::string &rawData);
   /// Find the history entries at this level in the file.
-  std::set<int> findHistoryEntries(Nexus::File *file);
+  std::set<int> findHistoryEntries(Nexus::File const *file);
   /// The environment of the workspace
   const Kernel::EnvironmentHistory m_environment;
   /// The algorithms which have been called on the workspace

Framework/API/src/AlgorithmProperties.cpp

@@ -20,13 +20,6 @@ void update(std::string const &property, std::string const &value, IAlgorithmRun
     properties.setPropertyValue(property, value);
 }
 
-// TODO code that uses this should move to std::optional
-[[deprecated("use version with std::optional instead")]] void
-update(std::string const &property, boost::optional<std::string> const &value, IAlgorithmRuntimeProps &properties) {
-  if (value)
-    update(property, value.get(), properties);
-}
-
 void update(std::string const &property, std::optional<std::string> const &value, IAlgorithmRuntimeProps &properties) {
   if (value)
     update(property, value.value(), properties);
@@ -48,13 +41,6 @@ void update(std::string const &property, double value, IAlgorithmRuntimeProps &p
   properties.setProperty(property, value);
 }
 
-// TODO code that uses this should move to std::optional
-[[deprecated("use version with std::optional instead")]] void
-update(std::string const &property, boost::optional<double> const &value, IAlgorithmRuntimeProps &properties) {
-  if (value)
-    update(property, value.get(), properties);
-}
-
 void update(std::string const &property, std::optional<double> const &value, IAlgorithmRuntimeProps &properties) {
   if (value)
     update(property, value.value(), properties);

Framework/API/src/IFunction.cpp

@@ -259,7 +259,7 @@ void IFunction::addTies(const std::string &ties, bool isDefault) {
       const std::string expr = t[n].str();
       for (size_t i = n; i != 0;) {
         --i;
-        auto parName = t[i].name();
+        const auto &parName = t[i].name();
         auto parTie = createAndProcessTie(parName, expr, isDefault);
 
         if (parTie) {

Framework/API/src/Sample.cpp

@@ -329,17 +329,17 @@ int Sample::loadNexus(Nexus::File *file, const std::string &group) {
 
   // Version 0 = saveNexusProcessed before Sep 8, 2011
   int version = 0;
-  try {
+  if (file->hasAttr("version")) {
     file->getAttr("version", version);
-  } catch (Nexus::Exception const &) {
+  } else {
     version = 0;
   }
 
   if (version == 0) {
     // Sample NAME field may/may not be present
-    try {
+    if (file->hasData("name")) {
       file->readData("name", m_name);
-    } catch (Nexus::Exception const &) {
+    } else {
       m_name = "";
     }
   }

Framework/API/src/WorkspaceHistory.cpp

@@ -309,7 +309,7 @@ void WorkspaceHistory::loadNestedHistory(Nexus::File *file, const AlgorithmHisto
  * @param file :: The handle to the nexus file
  * @returns set of integers. One for each algorithm at the level in the file.
  */
-std::set<int> WorkspaceHistory::findHistoryEntries(Nexus::File *file) {
+std::set<int> WorkspaceHistory::findHistoryEntries(Nexus::File const *file) {
   std::set<int> historyNumbers;
   std::map<std::string, std::string> entries;
   file->getEntries(entries);

Framework/Algorithms/CMakeLists.txt

@@ -77,6 +77,7 @@ set(SRC_FILES
     src/CorrectKiKf.cpp
     src/CorrectTOFAxis.cpp
     src/CorrectToFile.cpp
+    src/CreateBootstrapWorkspaces.cpp
     src/CreateCalFileByNames.cpp
     src/CreateDetectorTable.cpp
     src/CreateDummyCalFile.cpp
@@ -87,7 +88,6 @@ set(SRC_FILES
     src/CreateLogPropertyTable.cpp
     src/CreateLogTimeCorrection.cpp
     src/CreateMonteCarloWorkspace.cpp
-    src/CreateBootstrapWorkspaces.cpp
     src/CreatePSDBleedMask.cpp
     src/CreatePeaksWorkspace.cpp
     src/CreateSampleWorkspace.cpp
@@ -108,6 +108,7 @@ set(SRC_FILES
     src/DetectorEfficiencyCor.cpp
     src/DetectorEfficiencyCorUser.cpp
     src/DetectorEfficiencyVariation.cpp
+    src/DetermineSpinStateOrder.cpp
     src/DiffractionEventCalibrateDetectors.cpp
     src/DiffractionFocussing.cpp
     src/DiffractionFocussing2.cpp
@@ -428,6 +429,7 @@ set(INC_FILES
     inc/MantidAlgorithms/CorrectKiKf.h
     inc/MantidAlgorithms/CorrectTOFAxis.h
     inc/MantidAlgorithms/CorrectToFile.h
+    inc/MantidAlgorithms/CreateBootstrapWorkspaces.h
     inc/MantidAlgorithms/CreateCalFileByNames.h
     inc/MantidAlgorithms/CreateDetectorTable.h
     inc/MantidAlgorithms/CreateDummyCalFile.h
@@ -438,7 +440,6 @@ set(INC_FILES
     inc/MantidAlgorithms/CreateLogPropertyTable.h
     inc/MantidAlgorithms/CreateLogTimeCorrection.h
     inc/MantidAlgorithms/CreateMonteCarloWorkspace.h
-    inc/MantidAlgorithms/CreateBootstrapWorkspaces.h
     inc/MantidAlgorithms/CreatePSDBleedMask.h
     inc/MantidAlgorithms/CreatePeaksWorkspace.h
     inc/MantidAlgorithms/CreateSampleWorkspace.h
@@ -459,6 +460,7 @@ set(INC_FILES
     inc/MantidAlgorithms/DetectorEfficiencyCor.h
     inc/MantidAlgorithms/DetectorEfficiencyCorUser.h
     inc/MantidAlgorithms/DetectorEfficiencyVariation.h
+    inc/MantidAlgorithms/DetermineSpinStateOrder.h
     inc/MantidAlgorithms/DiffractionEventCalibrateDetectors.h
     inc/MantidAlgorithms/DiffractionFocussing.h
     inc/MantidAlgorithms/DiffractionFocussing2.h
@@ -786,6 +788,7 @@ set(TEST_FILES
     CorrectKiKfTest.h
     CorrectTOFAxisTest.h
     CorrectToFileTest.h
+    CreateBootstrapWorkspacesTest.h
     CreateCalFileByNamesTest.h
     CreateDetectorTableTest.h
     CreateDummyCalFileTest.h
@@ -795,7 +798,6 @@ set(TEST_FILES
     CreateLogPropertyTableTest.h
     CreateLogTimeCorrectionTest.h
     CreateMonteCarloWorkspaceTest.h
-    CreateBootstrapWorkspacesTest.h
     CreatePSDBleedMaskTest.h
     CreatePeaksWorkspaceTest.h
     CreateSampleWorkspaceTest.h
@@ -817,6 +819,7 @@ set(TEST_FILES
     DetectorEfficiencyCorUserTest.h
     DetectorEfficiencyVariationTest.h
     DetectorGridDefinitionTest.h
+    DetermineSpinStateOrderTest.h
     DiffractionEventCalibrateDetectorsTest.h
     DiffractionFocussing2Test.h
     DiffractionFocussingTest.h

Framework/Algorithms/inc/MantidAlgorithms/DetectorDiagnostic.h

@@ -20,7 +20,7 @@ namespace Mantid {
 namespace Algorithms {
 /**
   A base class for a detector diagnostic algorithm. It has not exec
-  implemenation but provides functions
+  implementation but provides functions
   that are common among these algorithms such as calculating the median and
   writing to a file.