Merge pull request #38766 from peterfpeterson/38332_LoadILLDiffractio…

…n_refactor Refactor LoadHelper to use NeXus::File
mantidproject · Feb 3, 2025 · 3eb3f10 · 3eb3f10
2 parents 110aa7a + 514b1e8
commit 3eb3f10
Show file tree

Hide file tree

Showing 14 changed files with 220 additions and 263 deletions.
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadHelper.h b/Framework/DataHandling/inc/MantidDataHandling/LoadHelper.h
@@ -11,6 +11,7 @@
 #include "MantidDataHandling/DllConfig.h"
 #include "MantidKernel/Quat.h"
 #include "MantidNexus/NexusClasses.h"
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 namespace Mantid {
 
@@ -27,7 +28,7 @@ std::vector<double> getTimeBinningFromNexusPath(const Mantid::NeXus::NXEntry &,
 double calculateEnergy(double);
 double calculateTOF(double, double);
 double getInstrumentProperty(const API::MatrixWorkspace_sptr &, const std::string &);
-void addNexusFieldsToWsRun(NXhandle nxfileID, API::Run &runDetails, const std::string &entryName = "",
+void addNexusFieldsToWsRun(::NeXus::File &filehandle, API::Run &runDetails, const std::string &entryName = "",
                            bool useFullPath = false);
 std::string dateTimeInIsoFormat(const std::string &);
 
@@ -57,7 +58,7 @@ NeXus::NXDouble getDoubleDataset(const NeXus::NXEntry &, const std::string &);
 
 void replaceZeroErrors(const API::MatrixWorkspace_sptr &, double);
 
-void recurseAndAddNexusFieldsToWsRun(NXhandle nxfileID, API::Run &runDetails, const std::string &parent_name,
+void recurseAndAddNexusFieldsToWsRun(::NeXus::File &filehandle, API::Run &runDetails, const std::string &parent_name,
                                      const std::string &parent_class, int level, bool useFullPath);
 } // namespace LoadHelper
 } // namespace DataHandling

diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadILLIndirect2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadILLIndirect2.h
@@ -36,12 +36,12 @@ class MANTID_DATAHANDLING_DLL LoadILLIndirect2 : public API::IFileLoader<Kernel:
   void init() override;
   void exec() override;
 
-  void loadDataDetails(NeXus::NXEntry &entry);
+  void loadDataDetails(const NeXus::NXEntry &entry);
   void initWorkSpace();
   void setInstrumentName(const NeXus::NXEntry &firstEntry, const std::string &instrumentNamePath);
   std::string getDataPath(const NeXus::NXEntry &entry);
   void loadNexusEntriesIntoProperties(const std::string &nexusfilename);
-  void loadDataIntoWorkspace(NeXus::NXEntry &entry);
+  void loadDataIntoWorkspace(const NeXus::NXEntry &entry);
   void loadDiffractionData(NeXus::NXEntry &entry);
   void moveComponent(const std::string &, double);
   void moveSingleDetectors(const NeXus::NXEntry &entry);

diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h b/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h
@@ -70,7 +70,7 @@ class MANTID_DATAHANDLING_DLL LoadILLSANS : public API::IFileLoader<Kernel::Nexu
                               const MultichannelType type = MultichannelType::TOF);
   size_t loadDataFromD16ScanMonitors(const NeXus::NXEntry &firstEntry, size_t firstIndex,
                                      const std::vector<double> &binning);
-  size_t loadDataFromTubes(NeXus::NXInt &, const std::vector<double> &, size_t,
+  size_t loadDataFromTubes(NeXus::NXInt const &, const std::vector<double> &, size_t,
                            const MultichannelType type = MultichannelType::TOF);
   void runLoadInstrument();
   void moveDetectorsD33(const DetectorPosition &);

diff --git a/Framework/DataHandling/src/LoadEventNexus.cpp b/Framework/DataHandling/src/LoadEventNexus.cpp
@@ -34,6 +34,8 @@
 #include "MantidKernel/UnitFactory.h"
 #include "MantidKernel/VisibleWhenProperty.h"
 #include "MantidNexus/NexusIOHelper.h"
+#include "MantidNexusCpp/NeXusException.hpp"
+#include "MantidNexusCpp/NeXusFile.hpp"
 
 #include <H5Cpp.h>
 #include <boost/format.hpp>
@@ -947,13 +949,12 @@ void LoadEventNexus::loadEvents(API::Progress *const prog, const bool monitors)
       }
     } else {
       prog->doReport("Loading all logs");
-      // Open NeXus file
-      NXhandle nxHandle;
-      NXstatus nxStat = NXopen(m_filename.c_str(), NXACC_READ, &nxHandle);
-
-      if (nxStat != NXstatus::NX_ERROR) {
+      try {
+        // Open NeXus file
+        ::NeXus::File nxHandle(m_filename, NXACC_READ);
         LoadHelper::addNexusFieldsToWsRun(nxHandle, m_ws->mutableRun(), "", true);
-        NXclose(&nxHandle);
+      } catch (const ::NeXus::Exception &e) {
+        g_log.debug() << "Failed to open nexus file \"" << m_filename << "\" in read mode: " << e.what() << "\n";
       }
     }
   } else {