From 7ba76936967aa5e256dc9e68516cabe1e17093ab Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Mon, 23 Mar 2020 16:40:47 -0400
Subject: [PATCH] Update NexusFileLoader
Signed-off-by: Steven Hahn <hahnse@ornl.gov>
---
.../inc/MantidDataHandling/NexusFileLoader.h | 8 +++++---
Framework/DataHandling/src/NexusFileLoader.cpp | 11 +++++++++++
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h b/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
index 61b83884ef3..3eb6faeac33 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/NexusFileLoader.h
@@ -7,13 +7,13 @@
#pragma once
#include "MantidAPI/IFileLoader.h"
-#include "MantidKernel/NexusDescriptor.h"
+#include "MantidNexus/HDF5Descriptor.h"
#include "MantidKernel/System.h"
namespace Mantid {
namespace API {
-class DLLExport NexusFileLoader : public IFileLoader<NexusDescriptor> {
+class DLLExport NexusFileLoader : public IFileLoader<Mantid::Nexus::HDF5Descriptor> {
public:
void exec() override;
void createChildAlgorithm(const std::string &name,
@@ -21,7 +21,9 @@ public:
const double endProgress = -1.,
const bool enableLogging = true,
const int &version = -1) override;
- setFileInfo() override;
+ void setFileInfo(std::shared_ptr<Mantid::Nexus::HDF5Descriptor> fileInfo);
+private:
+ std::shared_ptr<Mantid::Nexus::HDF5Descriptor> m_fileInfo;
};
} // namespace API
} // namespace Mantid
diff --git a/Framework/DataHandling/src/NexusFileLoader.cpp b/Framework/DataHandling/src/NexusFileLoader.cpp
index 28f3f336d7c..1816b8b0475 100644
--- a/Framework/DataHandling/src/NexusFileLoader.cpp
+++ b/Framework/DataHandling/src/NexusFileLoader.cpp
@@ -5,3 +5,14 @@
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#include "MantidDataHandling/NexusFileLoader.h"
+
+namespace Mantid::DataHandling {
+ void NexusFileLoader::exec() {}
+ void createChildAlgorithm(const std::string &name,
+ const double startProgress,
+ const double endProgress,
+ const bool enableLogging,
+ const int &version) {}
+ void setFileInfo(std::shared_ptr<Mantid::Nexus::HDF5Descriptor> fileInfo)
+ {}
+}
--
GitLab