Skip to content

Create LegacyNexusClasses #38825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 20, 2025
Merged

Create LegacyNexusClasses #38825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
606fe66
Create LegacyNexusClasses
rosswhitfield Feb 12, 2025
ae2bcd1
Move LoadMuonNexus2 to LegacyNexus
rosswhitfield Feb 12, 2025
77f6e1f
Move LoadMuonNexus1 to LegacyNexus
rosswhitfield Feb 12, 2025
2fc2f4b
Cleanup includes in LoadMuonNexus.cpp
rosswhitfield Feb 12, 2025
ec12df8
Move MuonNexusReader to LegacyNexus
rosswhitfield Feb 12, 2025
35b097f
Move to Muon
rosswhitfield Feb 13, 2025
fd08894
Migrate LoadMuonNexus3 over
peterfpeterson Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Framework/DataHandling/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,7 @@ target_link_libraries(
Mantid::Kernel
Mantid::Indexing
Mantid::Parallel
Mantid::Muon
PRIVATE Mantid::Json Boost::filesystem Mantid::NexusGeometry
)

Expand Down
2 changes: 1 addition & 1 deletion Framework/DataHandling/inc/MantidDataHandling/LoadMuonLog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidDataHandling/DllConfig.h"
#include "MantidNexus/MuonNexusReader.h"
#include "MantidMuon/MuonNexusReader.h"

namespace Mantid {

Expand Down
2 changes: 1 addition & 1 deletion Framework/DataHandling/src/LoadInstrumentFromNexus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "MantidGeometry/Instrument/Component.h"
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidKernel/ConfigService.h"
#include "MantidNexus/MuonNexusReader.h"
#include "MantidMuon/MuonNexusReader.h"

#include <fstream>

Expand Down
6 changes: 5 additions & 1 deletion Framework/Muon/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ set(SRC_FILES
src/PlotAsymmetryByLogValue.cpp
src/RemoveExpDecay.cpp
src/RRFMuon.cpp
src/LegacyNexusClasses.cpp
src/MuonNexusReader.cpp
)

set(INC_FILES
Expand Down Expand Up @@ -56,6 +58,8 @@ set(INC_FILES
inc/MantidMuon/PlotAsymmetryByLogValue.h
inc/MantidMuon/RemoveExpDecay.h
inc/MantidMuon/RRFMuon.h
inc/MantidMuon/LegacyNexusClasses.h
inc/MantidMuon/MuonNexusReader.h
)

set(TEST_FILES
Expand Down Expand Up @@ -115,7 +119,7 @@ set_property(TARGET Muon PROPERTY FOLDER "MantidFramework")
target_link_libraries(
Muon
PUBLIC Mantid::API Mantid::Kernel Mantid::Geometry
PRIVATE Mantid::DataObjects Mantid::Indexing Mantid::Nexus
PRIVATE Mantid::DataObjects Mantid::Indexing
)
# Add the unit tests directory
add_subdirectory(test)
Expand Down
Loading