Merge pull request #38762 from mantidproject/ewm9268-ornl-next

Remove usage of napi in SaveNXTomo and SaveNXTomoTest -- `ornl-next`
mantidproject · Jan 30, 2025 · edaf021 · edaf021
2 parents fa4d4d4 + 12aab9c
commit edaf021
Show file tree

Hide file tree

Showing 3 changed files with 197 additions and 229 deletions.
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h
@@ -83,16 +83,16 @@ class MANTID_DATAHANDLING_DLL SaveNXTomo final : public API::Algorithm {
   bool processGroups() override;
 
   /// Creates the format for the output file if it doesn't exist
-  ::NeXus::File setupFile();
+  void setupFile();
 
   /// Writes a single workspace into the file
-  void writeSingleWorkspace(const DataObjects::Workspace2D_sptr &workspace, ::NeXus::File &nxFile);
+  void writeSingleWorkspace(const DataObjects::Workspace2D_sptr &workspace);
 
   /// Write various pieces of data from the workspace log with checks on the
   /// structure of the nexus file
-  void writeLogValues(const DataObjects::Workspace2D_sptr &workspace, ::NeXus::File &nxFile, int thisFileInd);
-  void writeIntensityValue(const DataObjects::Workspace2D_sptr &workspace, ::NeXus::File &nxFile, int thisFileInd);
-  void writeImageKeyValue(const DataObjects::Workspace2D_sptr &workspace, ::NeXus::File &nxFile, int thisFileInd);
+  void writeLogValues(const DataObjects::Workspace2D_sptr &workspace, int thisFileInd);
+  void writeIntensityValue(const DataObjects::Workspace2D_sptr &workspace, int thisFileInd);
+  void writeImageKeyValue(const DataObjects::Workspace2D_sptr &workspace, int thisFileInd);
 
   /// Main exec routine, called for group or individual workspace processing.
   void processAll();
@@ -114,6 +114,9 @@ class MANTID_DATAHANDLING_DLL SaveNXTomo final : public API::Algorithm {
   static const std::string NXTOMO_VER;
 
   std::vector<DataObjects::Workspace2D_sptr> m_workspaces;
+
+  // hold reference to NeXusFile;
+  std::unique_ptr<::NeXus::File> m_nxFile;
 };
 
 } // namespace DataHandling