Skip to content
Snippets Groups Projects
Commit 7e27c698 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Move NexusFileLoader into API

parent 492fa205
No related branches found
No related tags found
No related merge requests found
...@@ -106,6 +106,7 @@ set(SRC_FILES ...@@ -106,6 +106,7 @@ set(SRC_FILES
src/MultiPeriodGroupWorker.cpp src/MultiPeriodGroupWorker.cpp
src/MultipleExperimentInfos.cpp src/MultipleExperimentInfos.cpp
src/MultipleFileProperty.cpp src/MultipleFileProperty.cpp
src/NexusFileLoader.cpp
src/NotebookBuilder.cpp src/NotebookBuilder.cpp
src/NotebookWriter.cpp src/NotebookWriter.cpp
src/NullCoordTransform.cpp src/NullCoordTransform.cpp
...@@ -305,6 +306,7 @@ set(INC_FILES ...@@ -305,6 +306,7 @@ set(INC_FILES
inc/MantidAPI/MultiPeriodGroupWorker.h inc/MantidAPI/MultiPeriodGroupWorker.h
inc/MantidAPI/MultipleExperimentInfos.h inc/MantidAPI/MultipleExperimentInfos.h
inc/MantidAPI/MultipleFileProperty.h inc/MantidAPI/MultipleFileProperty.h
inc/MantidAPI/NexusFileLoader.h
inc/MantidAPI/NotebookBuilder.h inc/MantidAPI/NotebookBuilder.h
inc/MantidAPI/NotebookWriter.h inc/MantidAPI/NotebookWriter.h
inc/MantidAPI/NullCoordTransform.h inc/MantidAPI/NullCoordTransform.h
......
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
// NScD Oak Ridge National Laboratory, European Spallation Source // NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin // & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 + // SPDX - License - Identifier: GPL - 3.0 +
#include "MantidDataHandling/NexusFileLoader.h" #include "MantidAPI/NexusFileLoader.h"
#include "MantidDataHandling/Load.h" //include "MantidDataHandling/Load.h"
namespace Mantid::DataHandling { namespace Mantid::DataHandling {
void NexusFileLoader::exec() { void NexusFileLoader::exec() {
// make sure the descriptor is initialized // make sure the descriptor is initialized
if (!m_fileInfo) { if (!m_fileInfo) {
const std::string filePropName = Load::findFilenamePropertyName(this); // TODO move this functionality elsewhere
const std::string filePropName = "Filename"; //Load::findFilenamePropertyName(this);
const std::string filename = this->getPropertyValue(filePropName); const std::string filename = this->getPropertyValue(filePropName);
m_fileInfo = m_fileInfo =
std::make_shared<Mantid::Kernel::NexusHDF5Descriptor>(filename); std::make_shared<Mantid::Kernel::NexusHDF5Descriptor>(filename);
......
...@@ -132,7 +132,6 @@ set(SRC_FILES ...@@ -132,7 +132,6 @@ set(SRC_FILES
src/MeshFileIO.cpp src/MeshFileIO.cpp
src/ModifyDetectorDotDatFile.cpp src/ModifyDetectorDotDatFile.cpp
src/MoveInstrumentComponent.cpp src/MoveInstrumentComponent.cpp
src/NexusFileLoader.cpp
src/NexusTester.cpp src/NexusTester.cpp
src/ORNLDataArchive.cpp src/ORNLDataArchive.cpp
src/PDLoadCharacterizations.cpp src/PDLoadCharacterizations.cpp
...@@ -337,7 +336,6 @@ set(INC_FILES ...@@ -337,7 +336,6 @@ set(INC_FILES
inc/MantidDataHandling/ModifyDetectorDotDatFile.h inc/MantidDataHandling/ModifyDetectorDotDatFile.h
inc/MantidDataHandling/MoveInstrumentComponent.h inc/MantidDataHandling/MoveInstrumentComponent.h
inc/MantidDataHandling/NXcanSASDefinitions.h inc/MantidDataHandling/NXcanSASDefinitions.h
inc/MantidDataHandling/NexusFileLoader.h
inc/MantidDataHandling/NexusTester.h inc/MantidDataHandling/NexusTester.h
inc/MantidDataHandling/ORNLDataArchive.h inc/MantidDataHandling/ORNLDataArchive.h
inc/MantidDataHandling/PDLoadCharacterizations.h inc/MantidDataHandling/PDLoadCharacterizations.h
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment