Commit b6acee90 authored by Gemma Guest's avatar Gemma Guest
Browse files

Move LoadHelper back to DataHandling

This no longer needs to be moved now that the original algorithms are back in DataHandling.

Re #23012
parent 2de5f44b
......@@ -61,6 +61,7 @@ set(SRC_FILES
src/LoadGSS.cpp
src/LoadGeometry.cpp
src/LoadHFIRSANS.cpp
src/LoadHelper.cpp
src/LoadIDFFromNexus.cpp
src/LoadILLDiffraction.cpp
src/LoadILLIndirect2.cpp
......@@ -275,6 +276,7 @@ set(INC_FILES
inc/MantidDataHandling/LoadGSS.h
inc/MantidDataHandling/LoadGeometry.h
inc/MantidDataHandling/LoadHFIRSANS.h
inc/MantidDataHandling/LoadHelper.h
inc/MantidDataHandling/LoadIDFFromNexus.h
inc/MantidDataHandling/LoadILLDiffraction.h
inc/MantidDataHandling/LoadILLIndirect2.h
......
......@@ -16,7 +16,7 @@ namespace Kernel {
class Quat;
}
namespace Nexus {
namespace DataHandling {
/** LoadHelper : Auxiliary File for Loading Files
*/
......@@ -55,5 +55,6 @@ private:
std::string &parent_name,
std::string &parent_class, int level);
};
} // namespace Nexus
} // namespace DataHandling
// namespace DataHandling
} // namespace Mantid
......@@ -10,10 +10,10 @@
#include "MantidAPI/IFileLoader.h"
#include "MantidDataHandling/DllConfig.h"
#include "MantidDataHandling/LoadHelper.h"
#include "MantidKernel/DateAndTime.h"
#include "MantidKernel/NexusDescriptor.h"
#include "MantidKernel/V3D.h"
#include "MantidNexus/LoadHelper.h"
#include "MantidNexus/NexusClasses.h"
namespace Mantid {
......@@ -114,7 +114,7 @@ private:
double m_maxHeight{0.}; ///< maximum absolute height of the D2B tubes
std::vector<ScannedVariables> m_scanVar; ///< holds the scan info
Nexus::LoadHelper m_loadHelper; ///< a helper for metadata
LoadHelper m_loadHelper; ///< a helper for metadata
API::MatrixWorkspace_sptr m_outWorkspace; ///< output workspace
bool m_useCalibratedData{false}; ///< whether to use the calibrated data in
///< the nexus (D2B only)
......
......@@ -7,8 +7,8 @@
#pragma once
#include "MantidAPI/IFileLoader.h"
#include "MantidDataHandling/LoadHelper.h"
#include "MantidKernel/NexusDescriptor.h"
#include "MantidNexus/LoadHelper.h"
#include "MantidNexus/NexusClasses.h"
namespace Mantid {
......@@ -69,7 +69,7 @@ private:
251}; // A flag holding the rounded angle of the first tube
std::vector<std::string> m_supportedInstruments{"IN16B"};
Nexus::LoadHelper m_loader;
LoadHelper m_loader;
};
} // namespace DataHandling
......
......@@ -8,8 +8,8 @@
#include "MantidAPI/IFileLoader.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidDataHandling/LoadHelper.h"
#include "MantidKernel/NexusDescriptor.h"
#include "MantidNexus/LoadHelper.h"
#include "MantidNexus/NexusClasses.h"
namespace Mantid {
......@@ -94,7 +94,7 @@ private:
const static double PIXEL_CENTER;
double m_pixelWidth{0.0};
double m_sampleZOffset{0.0};
Mantid::Nexus::LoadHelper m_loader;
Mantid::DataHandling::LoadHelper m_loader;
};
} // namespace DataHandling
......
......@@ -7,9 +7,9 @@
#pragma once
#include "MantidAPI/IFileLoader.h"
#include "MantidDataHandling/LoadHelper.h"
#include "MantidKernel/NexusDescriptor.h"
#include "MantidKernel/System.h"
#include "MantidNexus/LoadHelper.h"
#include "MantidNexus/NexusClasses.h"
namespace Mantid {
......@@ -81,7 +81,7 @@ private:
void adjustTOF();
void moveSource();
Nexus::LoadHelper m_loader; ///< Load helper for metadata
LoadHelper m_loader; ///< Load helper for metadata
std::string m_instrumentName; ///< Name of the instrument
std::vector<std::string>
m_supportedInstruments; ///< List of supported instruments
......
......@@ -7,9 +7,9 @@
#pragma once
#include "MantidAPI/IFileLoader.h"
#include "MantidDataHandling/LoadHelper.h"
#include "MantidGeometry/IDTypes.h"
#include "MantidKernel/NexusDescriptor.h"
#include "MantidNexus/LoadHelper.h"
#include "MantidNexus/NexusClasses.h"
namespace Mantid {
......@@ -87,7 +87,7 @@ private:
double m_timeOfFlightDelay = 0;
std::string m_monitorName;
Nexus::LoadHelper m_loader;
LoadHelper m_loader;
};
} // namespace DataHandling
......
......@@ -7,10 +7,10 @@
#pragma once
#include "MantidAPI/IFileLoader.h"
#include "MantidDataHandling/LoadHelper.h"
#include "MantidHistogramData/Histogram.h"
#include "MantidKernel/NexusDescriptor.h"
#include "MantidKernel/System.h"
#include "MantidNexus/LoadHelper.h"
#include "MantidNexus/NexusClasses.h"
namespace Mantid {
......@@ -60,7 +60,7 @@ private:
double m_wavelength;
double m_channelWidth;
Nexus::LoadHelper m_loader;
LoadHelper m_loader;
};
} // namespace DataHandling
......
......@@ -10,8 +10,8 @@
// Includes
//---------------------------------------------------
#include "MantidAPI/IFileLoader.h"
#include "MantidDataHandling/LoadHelper.h"
#include "MantidKernel/NexusDescriptor.h"
#include "MantidNexus/LoadHelper.h"
#include "MantidNexus/NexusClasses.h"
namespace Mantid {
......@@ -82,7 +82,7 @@ private:
double m_t1; // time of flight from source to sample
std::vector<std::string> m_supportedInstruments;
Nexus::LoadHelper m_mlzloader;
LoadHelper m_mlzloader;
};
} // namespace DataHandling
......
......@@ -11,8 +11,8 @@
//---------------------------------------------------
#include "MantidAPI/DeprecatedAlgorithm.h"
#include "MantidAPI/IFileLoader.h"
#include "MantidDataHandling/LoadHelper.h"
#include "MantidKernel/NexusDescriptor.h"
#include "MantidNexus/LoadHelper.h"
#include "MantidNexus/NexusClasses.h"
namespace Mantid {
......@@ -68,7 +68,7 @@ private:
size_t m_numberOfChannels; // time channels - Z
size_t m_numberOfHistograms;
Nexus::LoadHelper m_loader;
LoadHelper m_loader;
};
} // namespace DataHandling
......
......@@ -8,7 +8,7 @@
* Helper file to gather common routines to the Loaders
* */
#include "MantidNexus/LoadHelper.h"
#include "MantidDataHandling/LoadHelper.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/SpectrumInfo.h"
#include "MantidGeometry/Instrument.h"
......@@ -20,7 +20,7 @@
#include <boost/algorithm/string/predicate.hpp> //assert(boost::algorithm::ends_with("mystring", "ing"));
namespace Mantid {
namespace Nexus {
namespace DataHandling {
namespace {
/// static logger
......@@ -588,5 +588,5 @@ V3D LoadHelper::getComponentPosition(const API::MatrixWorkspace_sptr &ws,
return pos;
}
} // namespace Nexus
} // namespace DataHandling
} // namespace Mantid
......@@ -12,13 +12,13 @@
#include "MantidAPI/RegisterFileLoader.h"
#include "MantidAPI/SpectrumInfo.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidDataHandling/LoadHelper.h"
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidKernel/EmptyValues.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidNexus/LoadHelper.h"
#include <algorithm>
#include <cmath>
......
......@@ -6,10 +6,10 @@
// SPDX - License - Identifier: GPL - 3.0 +
#include "MantidDataHandling/LoadSwans.h"
#include "MantidAPI/FileProperty.h"
#include "MantidDataHandling/LoadHelper.h"
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/OptionalBool.h"
#include "MantidKernel/StringTokenizer.h"
#include "MantidNexus/LoadHelper.h"
#include <algorithm>
#include <boost/tokenizer.hpp>
......@@ -139,7 +139,7 @@ void LoadSwans::placeDetectorInSpace() {
g_log.information() << "Moving detector " << componentName << " " << distance
<< " meters and " << angle << " degrees.\n";
Nexus::LoadHelper helper;
LoadHelper helper;
constexpr double deg2rad = M_PI / 180.0;
V3D pos = helper.getComponentPosition(m_ws, componentName);
double angle_rad = angle * deg2rad;
......
set(SRC_FILES
src/LoadHelper.cpp
src/MuonNexusReader.cpp
src/NexusClasses.cpp
src/NexusFileIO.cpp)
set(SRC_FILES src/MuonNexusReader.cpp src/NexusClasses.cpp src/NexusFileIO.cpp)
set(INC_FILES
inc/MantidNexus/LoadHelper.h
inc/MantidNexus/MuonNexusReader.h
inc/MantidNexus/NexusClasses.h
inc/MantidNexus/NexusFileIO.h
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment