Merge branch 'main' into 38405_capture_cpp_stacktraces_from_core_dumps

Author: jhaigh0

.githooks/commit-msg

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

.pre-commit-config.yaml

@@ -76,8 +76,6 @@ class MANTID_API_DLL FrameworkManagerImpl {
   void loadPluginsUsingKey(const std::string &locationKey, const std::string &excludeKey);
   /// Set up the global locale
   void setGlobalNumericLocaleToC();
-  /// Silence NeXus output
-  void disableNexusOutput();
   /// Starts asynchronous tasks that are done as part of Start-up
   void asynchronousStartupTasks();
   /// Setup Usage Reporting if enabled

Framework/API/inc/MantidAPI/FrameworkManager.h

@@ -16,7 +16,6 @@
 #include "MantidKernel/MultiThreaded.h"
 #include "MantidKernel/PropertyManagerDataService.h"
 #include "MantidKernel/UsageService.h"
-#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -64,15 +63,6 @@ const char *PLUGINS_DIR_KEY = "framework.plugins.directory";
 const char *PLUGINS_EXCLUDE_KEY = "framework.plugins.exclude";
 } // namespace
 
-/** This is a function called every time NeXuS raises an error.
- * This swallows the errors and outputs nothing.
- */
-// Prevent clang-tidy trying to change the signature for ext. interface
-// NOLINTNEXTLINE(readability-non-const-parameter)
-void NexusErrorFunction(void *, const char *) {
-  // Do nothing.
-}
-
 #ifdef __linux__
 /**
  * Print current backtrace to the given stream
@@ -133,7 +123,6 @@ FrameworkManagerImpl::FrameworkManagerImpl() {
   ConfigService::Instance();
   g_log.notice() << Mantid::welcomeMessage() << '\n';
   loadPlugins();
-  disableNexusOutput();
   setNumOMPThreadsToConfigValue();
 
   g_log.debug() << "FrameworkManager created.\n";
@@ -339,9 +328,6 @@ void FrameworkManagerImpl::setGlobalNumericLocaleToC() {
   setlocale(LC_NUMERIC, "C");
 }
 
-/// Silence NeXus output
-void FrameworkManagerImpl::disableNexusOutput() { ::NeXus::setError(nullptr, NexusErrorFunction); }
-
 /// Starts asynchronous tasks that are done as part of Start-up.
 void FrameworkManagerImpl::asynchronousStartupTasks() {
   auto instrumentUpdates = Kernel::ConfigService::Instance().getValue<bool>("UpdateInstrumentDefinitions.OnStartup");

Framework/API/src/FrameworkManager.cpp

@@ -333,15 +333,12 @@ void MatrixWorkspace::setPlotType(const std::string &t) {
   StringListValidator v(validPlotTypes);
 
   if (v.isValid(t) == "") {
-    if (run.hasProperty("plot_type"))
-      run.addProperty("plot_type", t, true);
-    else
-      run.addProperty("plot_type", t, false);
+    run.addProperty("plot_type", t, true);
   } else {
     std::string validValues = std::accumulate(
         validPlotTypes.begin() + 1, validPlotTypes.end(), validPlotTypes.front(),
         [](const std::string &valuesString, const std::string &plotType) { return valuesString + ", " + plotType; });
-    g_log.warning("Invalid plot type '" + t + "'. Must be one of: " + validValues);
+    throw std::invalid_argument("Invalid plot type '" + t + "'. Must be one of: " + validValues);
   }
 }
 
@@ -375,7 +372,7 @@ void MatrixWorkspace::setMarkerStyle(const std::string &markerType) {
                         [](const std::string &valuesString, const std::string &markerStyle) {
                           return valuesString + ", " + markerStyle;
                         });
-    g_log.warning("Invalid marker type '" + markerType + "'. Must be one of: " + validValues);
+    throw std::invalid_argument("Invalid marker type '" + markerType + "'. Must be one of: " + validValues);
   }
 }
 

Framework/API/src/MatrixWorkspace.cpp

@@ -407,7 +407,7 @@ class MatrixWorkspaceTest : public CxxTest::TestSuite {
     TS_ASSERT_EQUALS(ws->getPlotType(), "plot");
 
     // test invalid is rejected
-    ws->setPlotType("invalid");
+    TS_ASSERT_THROWS(ws->setPlotType("invalid"), const std::invalid_argument &);
     TS_ASSERT_EQUALS(ws->getPlotType(), "plot");
 
     // test valid is accepted
@@ -419,6 +419,9 @@ class MatrixWorkspaceTest : public CxxTest::TestSuite {
     // test default
     TS_ASSERT_EQUALS(ws->getMarkerStyle(), "vline");
 
+    TS_ASSERT_THROWS(ws->setMarkerStyle("invalid"), const std::invalid_argument &);
+    TS_ASSERT_EQUALS(ws->getMarkerStyle(), "vline");
+
     // test set
     ws->setMarkerStyle("square");
     TS_ASSERT_EQUALS(ws->getMarkerStyle(), "square");

Framework/API/test/MatrixWorkspaceTest.h

@@ -5,7 +5,6 @@ set(SRC_FILES
     src/AddPeak.cpp
     src/AddSampleLog.cpp
     src/AddTimeSeriesLog.cpp
-    src/AlignDetectors.cpp
     src/AnnularRingAbsorption.cpp
     src/AnyShapeAbsorption.cpp
     src/ApodizationFunctions.cpp
@@ -356,7 +355,6 @@ set(INC_FILES
     inc/MantidAlgorithms/AddPeak.h
     inc/MantidAlgorithms/AddSampleLog.h
     inc/MantidAlgorithms/AddTimeSeriesLog.h
-    inc/MantidAlgorithms/AlignDetectors.h
     inc/MantidAlgorithms/AnnularRingAbsorption.h
     inc/MantidAlgorithms/AnyShapeAbsorption.h
     inc/MantidAlgorithms/ApodizationFunctions.h
@@ -714,7 +712,6 @@ set(TEST_FILES
     AddPeakTest.h
     AddSampleLogTest.h
     AddTimeSeriesLogTest.h
-    AlignDetectorsTest.h
     AnnularRingAbsorptionTest.h
     AnyShapeAbsorptionTest.h
     AppendSpectraTest.h

Framework/Algorithms/CMakeLists.txt

@@ -22,8 +22,8 @@ namespace Algorithms {
  *  The offsets are all sets to zero and all detectors are selected. Detectors
  not assigned
  *  to any group will appear as group 0, i.e. not included when using
- AlignDetector or
- *  DiffractionFocussing algorithms.
+ the
+ *  DiffractionFocussing algorithm.
  *  The group number is assigned based on a descent in the instrument tree
  assembly.
  *  If two assemblies are parented, say Bank1 and module1, and both assembly
@@ -59,7 +59,7 @@ class MANTID_ALGORITHMS_DLL CreateCalFileByNames final : public API::Algorithm {
   /// Algorithm's version
   int version() const override { return (1); }
   const std::vector<std::string> seeAlso() const override {
-    return {"ReadGroupsFromFile", "CreateDummyCalFile", "AlignDetectors", "DiffractionFocussing",
+    return {"ReadGroupsFromFile", "CreateDummyCalFile", "DiffractionFocussing",
             "LoadCalFile",        "SaveCalFile",        "MergeCalFiles"};
   }
   /// Algorithm's category for identification