Skip to content

Commit 959064b

Browse files
Merge pull request #38908 from rosswhitfield/LegacyNexusClasses
Create LegacyNexusClasses - ornl-next
2 parents 7ca9284 + fd08894 commit 959064b

15 files changed

+1645
-81
lines changed

Framework/DataHandling/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,7 @@ target_link_libraries(
684684
Mantid::Kernel
685685
Mantid::Indexing
686686
Mantid::Parallel
687+
Mantid::Muon
687688
PRIVATE Mantid::Json Boost::filesystem Mantid::NexusGeometry
688689
)
689690

Framework/DataHandling/inc/MantidDataHandling/LoadMuonLog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "MantidAPI/Algorithm.h"
1313
#include "MantidAPI/MatrixWorkspace.h"
1414
#include "MantidDataHandling/DllConfig.h"
15-
#include "MantidNexus/MuonNexusReader.h"
15+
#include "MantidMuon/MuonNexusReader.h"
1616

1717
namespace Mantid {
1818

Framework/DataHandling/src/LoadInstrumentFromNexus.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "MantidGeometry/Instrument/Component.h"
1616
#include "MantidGeometry/Instrument/Detector.h"
1717
#include "MantidKernel/ConfigService.h"
18-
#include "MantidNexus/MuonNexusReader.h"
18+
#include "MantidMuon/MuonNexusReader.h"
1919

2020
#include <fstream>
2121

Framework/Muon/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ set(SRC_FILES
2626
src/PlotAsymmetryByLogValue.cpp
2727
src/RemoveExpDecay.cpp
2828
src/RRFMuon.cpp
29+
src/LegacyNexusClasses.cpp
30+
src/MuonNexusReader.cpp
2931
)
3032

3133
set(INC_FILES
@@ -56,6 +58,8 @@ set(INC_FILES
5658
inc/MantidMuon/PlotAsymmetryByLogValue.h
5759
inc/MantidMuon/RemoveExpDecay.h
5860
inc/MantidMuon/RRFMuon.h
61+
inc/MantidMuon/LegacyNexusClasses.h
62+
inc/MantidMuon/MuonNexusReader.h
5963
)
6064

6165
set(TEST_FILES
@@ -115,7 +119,7 @@ set_property(TARGET Muon PROPERTY FOLDER "MantidFramework")
115119
target_link_libraries(
116120
Muon
117121
PUBLIC Mantid::API Mantid::Kernel Mantid::Geometry
118-
PRIVATE Mantid::DataObjects Mantid::Indexing Mantid::Nexus
122+
PRIVATE Mantid::DataObjects Mantid::Indexing
119123
)
120124
# Add the unit tests directory
121125
add_subdirectory(test)

0 commit comments

Comments
 (0)