Move LegacyNexusClasses into LegacyNexus

Author: peterfpeterson

Framework/DataHandling/src/LoadNexus.cpp

@@ -20,7 +20,7 @@
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidLegacyNexus/NeXusException.hpp"
 #include "MantidLegacyNexus/NeXusFile.hpp"
-#include "MantidMuon/LegacyNexusClasses.h"
+#include "MantidLegacyNexus/NexusClasses.h"
 
 #include <cmath>
 #include <memory>

Framework/LegacyNexus/CMakeLists.txt

@@ -4,6 +4,7 @@ set(SRC_FILES
     src/napi.cpp
     src/napi4.cpp
     src/napi5.cpp
+    src/NexusClasses.cpp
     src/NeXusException.cpp
     src/NeXusFile.cpp
     src/nxstack.cpp
@@ -17,6 +18,7 @@ set(INC_FILES
     inc/MantidLegacyNexus/napi5.h
     inc/MantidLegacyNexus/napiconfig.h
     inc/MantidLegacyNexus/napi_internal.h
+    inc/MantidLegacyNexus/NexusClasses.h
     inc/MantidLegacyNexus/NeXusException.hpp
     inc/MantidLegacyNexus/NeXusFile.hpp
     inc/MantidLegacyNexus/nx_stptok.h

Framework/Muon/inc/MantidMuon/LegacyNexusClasses.h Framework/LegacyNexus/inc/MantidLegacyNexus/NexusClasses.h

@@ -6,9 +6,9 @@
 // SPDX - License - Identifier: GPL - 3.0 +
 #pragma once
 
+#include "MantidLegacyNexus/DllConfig.h"
 #include "MantidLegacyNexus/NeXusFile_fwd.h"
 #include "MantidLegacyNexus/napi.h"
-#include "MantidMuon/DllConfig.h"
 
 #include <boost/container/vector.hpp>
 #include <ios>
@@ -63,7 +63,7 @@ const int g_processed_blocksize = 8;
 
 /**  Nexus attributes. The type of each attribute is NX_CHAR
  */
-class MANTID_MUON_DLL NXAttributes {
+class MANTID_LEGACYNEXUS_DLL NXAttributes {
 public:
   int n() const { return int(m_values.size()); }         ///< number of attributes
   std::vector<std::string> names() const;                ///< Returns the list of attribute names
@@ -83,7 +83,7 @@ class NXClass;
 /**  The base abstract class for NeXus classes and data sets.
  *    NX classes and data sets are defined at www.nexusformat.org
  */
-class MANTID_MUON_DLL NXObject {
+class MANTID_LEGACYNEXUS_DLL NXObject {
   friend class NXDataSet; ///< a friend class declaration
   friend class NXClass;   ///< a friend class declaration
   friend class NXRoot;    ///< a friend class declaration
@@ -125,7 +125,7 @@ class MANTID_MUON_DLL NXObject {
  *  There is no need to free the memory allocated by the NXDataSet as it is done
  * at the destruction.
  */
-class MANTID_MUON_DLL NXDataSet : public NXObject {
+class MANTID_LEGACYNEXUS_DLL NXDataSet : public NXObject {
 public:
   // Constructor
   NXDataSet(const NXClass &parent, const std::string &name);
@@ -477,7 +477,7 @@ using NXUInt = NXDataSetTyped<unsigned int>;
  * (groups) can be created and loaded from
  *   NeXus files.
  */
-class MANTID_MUON_DLL NXClass : public NXObject {
+class MANTID_LEGACYNEXUS_DLL NXClass : public NXObject {
   friend class NXRoot;
 
 public:
@@ -619,7 +619,7 @@ class MANTID_MUON_DLL NXClass : public NXObject {
 
 /**  Implements NXdata Nexus class.
  */
-class MANTID_MUON_DLL NXData : public NXClass {
+class MANTID_LEGACYNEXUS_DLL NXData : public NXClass {
 public:
   /**  Constructor.
    *   @param parent :: The parent Nexus class. In terms of HDF it is the group
@@ -661,7 +661,7 @@ class MANTID_MUON_DLL NXData : public NXClass {
 
 /**  Implements NXdetector Nexus class.
  */
-class MANTID_MUON_DLL NXDetector : public NXClass {
+class MANTID_LEGACYNEXUS_DLL NXDetector : public NXClass {
 public:
   /**  Constructor.
    *   @param parent :: The parent Nexus class. In terms of HDF it is the group
@@ -681,7 +681,7 @@ class MANTID_MUON_DLL NXDetector : public NXClass {
 
 /**  Implements NXinstrument Nexus class.
  */
-class MANTID_MUON_DLL NXInstrument : public NXClass {
+class MANTID_LEGACYNEXUS_DLL NXInstrument : public NXClass {
 public:
   /**  Constructor.
    *   @param parent :: The parent Nexus class. In terms of HDF it is the group
@@ -700,7 +700,7 @@ class MANTID_MUON_DLL NXInstrument : public NXClass {
 
 /**  Implements NXentry Nexus class.
  */
-class MANTID_MUON_DLL NXEntry : public NXClass {
+class MANTID_LEGACYNEXUS_DLL NXEntry : public NXClass {
 public:
   /**  Constructor.
    *   @param parent :: The parent Nexus class. In terms of HDF it is the group
@@ -724,7 +724,7 @@ class MANTID_MUON_DLL NXEntry : public NXClass {
 
 /**  Implements NXroot Nexus class.
  */
-class MANTID_MUON_DLL NXRoot : public NXClass {
+class MANTID_LEGACYNEXUS_DLL NXRoot : public NXClass {
 public:
   // Constructor
   NXRoot(std::string fname);

Framework/Muon/src/LegacyNexusClasses.cpp Framework/LegacyNexus/src/NexusClasses.cpp

@@ -4,11 +4,10 @@
 //   NScD Oak Ridge National Laboratory, European Spallation Source,
 //   Institut Laue - Langevin & CSNS, Institute of High Energy Physics, CAS
 // SPDX - License - Identifier: GPL - 3.0 +
-#include "MantidMuon/LegacyNexusClasses.h"
-
-#include "MantidKernel/Exception.h"
-#include "MantidKernel/PropertyWithValue.h"
+#include "MantidLegacyNexus/NexusClasses.h"
+#include "MantidLegacyNexus/NeXusException.hpp"
 
+#include <algorithm>
 #include <memory>
 #include <utility>
 
@@ -306,7 +305,7 @@ NXRoot::NXRoot(std::string fname) : m_filename(std::move(fname)) {
   NXstatus stat = NXopen(m_filename.c_str(), NXACC_READ, &m_fileID);
   if (stat == NXstatus::NX_ERROR) {
     std::cout << "NXRoot: Error loading " << m_filename;
-    throw Kernel::Exception::FileError("Unable to open File:", m_filename);
+    throw Exception("Unable to open File: " + m_filename);
   }
   readAllInfo();
 }
@@ -321,7 +320,7 @@ NXRoot::NXRoot(std::string fname, const std::string &entry) : m_filename(std::mo
   // Open NeXus file
   NXstatus stat = NXopen(m_filename.c_str(), NXACC_CREATE5, &m_fileID);
   if (stat == NXstatus::NX_ERROR) {
-    throw Kernel::Exception::FileError("Unable to open File:", m_filename);
+    throw Exception("Unable to open File: " + m_filename);
   }
 }
 

Framework/Muon/CMakeLists.txt

@@ -26,7 +26,6 @@ set(SRC_FILES
     src/PlotAsymmetryByLogValue.cpp
     src/RemoveExpDecay.cpp
     src/RRFMuon.cpp
-    src/LegacyNexusClasses.cpp
     src/MuonNexusReader.cpp
 )
 
@@ -58,7 +57,6 @@ set(INC_FILES
     inc/MantidMuon/PlotAsymmetryByLogValue.h
     inc/MantidMuon/RemoveExpDecay.h
     inc/MantidMuon/RRFMuon.h
-    inc/MantidMuon/LegacyNexusClasses.h
     inc/MantidMuon/MuonNexusReader.h
 )
 

Framework/Muon/inc/MantidMuon/LoadMuonNexus2.h

@@ -12,8 +12,8 @@
 #include "MantidDataObjects/Histogram1D.h"
 #include "MantidKernel/DateAndTimeHelpers.h"
 #include "MantidKernel/TimeSeriesProperty.h"
+#include "MantidLegacyNexus/NexusClasses.h"
 #include "MantidMuon/DllConfig.h"
-#include "MantidMuon/LegacyNexusClasses.h"
 #include "MantidMuon/LoadMuonNexus.h"
 
 namespace Mantid {

Framework/Muon/src/LoadMuonNexus1.cpp

@@ -30,7 +30,7 @@
 #include "MantidKernel/UnitLabelTypes.h"
 #include "MantidLegacyNexus/NeXusException.hpp"
 #include "MantidLegacyNexus/NeXusFile.hpp"
-#include "MantidMuon/LegacyNexusClasses.h"
+#include "MantidLegacyNexus/NexusClasses.h"
 #include "MantidMuon/MuonNexusReader.h"
 
 #include <boost/iterator/counting_iterator.hpp>

Framework/Muon/src/LoadMuonNexus2.cpp

@@ -19,13 +19,14 @@
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/ConfigService.h"
 #include "MantidKernel/DateAndTimeHelpers.h"
+#include "MantidKernel/PropertyWithValue.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 #include "MantidKernel/Unit.h"
 #include "MantidKernel/UnitFactory.h"
 #include "MantidKernel/UnitLabelTypes.h"
 #include "MantidLegacyNexus/NeXusException.hpp"
 #include "MantidLegacyNexus/NeXusFile.hpp"
-#include "MantidMuon/LegacyNexusClasses.h"
+#include "MantidLegacyNexus/NexusClasses.h"
 
 #include <Poco/Path.h>
 #include <cmath>

Framework/Muon/src/LoadMuonNexus3.cpp

@@ -11,7 +11,7 @@
 #include "MantidAPI/Progress.h"
 #include "MantidAPI/RegisterFileLoader.h"
 #include "MantidKernel/Logger.h"
-#include "MantidMuon/LegacyNexusClasses.h"
+#include "MantidLegacyNexus/NexusClasses.h"
 #include <H5Cpp.h>
 #include <string>