Refs #4024 progress towards removing C++ nexus API

mantidproject · Oct 27, 2011 · 33b40c2 · 33b40c2
1 parent eaa915a
commit 33b40c2
Show file tree

Hide file tree

Showing 61 changed files with 79 additions and 3,275 deletions.
diff --git a/Code/Mantid/Build/CMake/CommonVatesSetup.cmake b/Code/Mantid/Build/CMake/CommonVatesSetup.cmake
@@ -14,7 +14,6 @@ Framework/DataHandling
 Framework/MDEvents
 Framework/MDAlgorithms
 Framework/Nexus
-Framework/NexusCPP
 )
 
 set ( COMMONVATES_SETUP_DONE TRUE )
diff --git a/Code/Mantid/CMakeLists.txt b/Code/Mantid/CMakeLists.txt
@@ -48,7 +48,6 @@ add_subdirectory ( Framework )
 include_directories ( Framework/Kernel/inc )
 include_directories ( Framework/Geometry/inc )
 include_directories ( Framework/API/inc )
-include_directories ( Framework/NexusCPP/inc )
 set ( CORE_MANTIDLIBS Kernel Geometry API )
 
 add_subdirectory ( MantidQt )

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h b/Code/Mantid/Framework/API/inc/MantidAPI/MatrixWorkspace.h
@@ -23,7 +23,7 @@
 #include <set>
 #include "MantidAPI/ISpectrum.h"
 #include "MantidKernel/DateAndTime.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/PropertyNexus.h b/Code/Mantid/Framework/API/inc/MantidAPI/PropertyNexus.h
@@ -3,7 +3,7 @@
 
 #include "MantidKernel/System.h"
 #include "MantidKernel/Property.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 
 namespace Mantid

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/Run.h b/Code/Mantid/Framework/API/inc/MantidAPI/Run.h
@@ -7,7 +7,7 @@
 #include "MantidKernel/TimeSplitter.h"
 #include <vector>
 #include "MantidKernel/Matrix.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 
 namespace Mantid

diff --git a/Code/Mantid/Framework/API/src/MatrixWorkspace.cpp b/Code/Mantid/Framework/API/src/MatrixWorkspace.cpp
@@ -20,7 +20,7 @@
 #include <numeric>
 #include "MantidAPI/NumericAxis.h"
 #include "MantidKernel/DateAndTime.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 using Mantid::Kernel::DateAndTime;
 using Mantid::Kernel::TimeSeriesProperty;

diff --git a/Code/Mantid/Framework/API/src/PropertyNexus.cpp b/Code/Mantid/Framework/API/src/PropertyNexus.cpp
@@ -1,7 +1,7 @@
 #include "MantidAPI/PropertyNexus.h"
 #include "MantidKernel/System.h"
-#include "MantidNexusCPP/NeXusException.hpp"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusException.hpp"
+#include "nexus/NeXusFile.hpp"
 #include "MantidKernel/DateAndTime.h"
 #include "MantidKernel/TimeSeriesProperty.h"
 #include "MantidKernel/PropertyWithValue.h"

diff --git a/Code/Mantid/Framework/API/src/Sample.cpp b/Code/Mantid/Framework/API/src/Sample.cpp
@@ -7,7 +7,7 @@
 #include "MantidGeometry/IComponent.h"
 #include "MantidGeometry/Crystal/OrientedLattice.h"
 #include "MantidGeometry/Objects/ShapeFactory.h"
-#include "MantidNexusCPP/NeXusException.hpp"
+#include "nexus/NeXusException.hpp"
 
 using namespace Mantid::Kernel;
 using Mantid::Geometry::ShapeFactory;

diff --git a/Code/Mantid/Framework/CMakeLists.txt b/Code/Mantid/Framework/CMakeLists.txt
@@ -90,10 +90,6 @@ set ( MANTIDLIBS  ${Boost_LIBRARIES} ${POCO_LIBRARIES} ${TCMALLOC_LIBRARY} ${MPI
 add_custom_target ( FrameworkTests ) # target for all framework tests
 add_dependencies ( check FrameworkTests )
 
-include_directories (NexusCPP/inc)
-add_subdirectory (NexusCPP)
-set ( MANTIDLIBS ${MANTIDLIBS} NexusCPP )
-
 include_directories (Kernel/inc)
 add_subdirectory (Kernel)
 set ( MANTIDLIBS ${MANTIDLIBS} Kernel )
@@ -154,8 +150,8 @@ add_subdirectory (MDEvents)
 ###########################################################################
 
 set ( FRAMEWORK_LIBS Kernel Geometry API PythonAPI PythonKernelModule PythonAPIModule DataObjects
-                     DataHandling Nexus NexusCPP Algorithms CurveFitting ICat
-                     Crystal MDAlgorithms MDEvents WorkflowAlgorithms
+                     DataHandling Nexus Algorithms CurveFitting ICat
+                     Crystal MDAlgorithms MDEvents WorkflowAlgorithms NeXus
 )
 
 add_custom_target( Framework DEPENDS ${FRAMEWORK_LIBS} ) 

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
@@ -12,8 +12,8 @@
 #include "MantidDataObjects/EventWorkspace.h"
 
 //Copy of the NexusCpp API was placed in MantidNexus
-#include "MantidNexusCPP/NeXusFile.hpp"
-#include "MantidNexusCPP/NeXusException.hpp"
+#include "nexus/NeXusFile.hpp"
+#include "nexus/NeXusException.hpp"
 #include "MantidDataObjects/Events.h"
 
 

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadLogsFromSNSNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadLogsFromSNSNexus.h
@@ -11,8 +11,8 @@
 #include "MantidDataObjects/Workspace2D.h"
 
 //Copy of the NexusCpp API was placed in MantidNexus
-#include "MantidNexusCPP/NeXusFile.hpp"
-#include "MantidNexusCPP/NeXusException.hpp"
+#include "nexus/NeXusFile.hpp"
+#include "nexus/NeXusException.hpp"
 
 #include "MantidAPI/DeprecatedAlgorithm.h"
 

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusLogs.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusLogs.h
@@ -5,7 +5,7 @@
 // Includes
 //----------------------------------------------------------------------
 #include "MantidAPI/Algorithm.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h
@@ -5,8 +5,8 @@
 #include "MantidAPI/MatrixWorkspace.h"
 #include <boost/scoped_array.hpp>
 //Copy of the NexusCpp API was placed in MantidNexus
-#include "MantidNexusCPP/NeXusFile.hpp"
-#include "MantidNexusCPP/NeXusException.hpp"
+#include "nexus/NeXusFile.hpp"
+#include "nexus/NeXusException.hpp"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h
@@ -8,7 +8,7 @@
 #include "MantidAPI/IDataFileChecker.h"
 
 #include "MantidNexus/NexusClasses.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/PrecompiledHeader.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/PrecompiledHeader.h
@@ -2,7 +2,7 @@
 #define MANTID_DATAHANDLING_PRECOMPILEDHEADER_H_
 
 #include "MantidAPI/Algorithm.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
-#include "MantidNexusCPP/NeXusException.hpp"
+#include "nexus/NeXusFile.hpp"
+#include "nexus/NeXusException.hpp"
 
 #endif // MANTID_DATAHANDLING_PRECOMPILEDHEADER_H_
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SaveNXSPE.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SaveNXSPE.h
@@ -12,8 +12,8 @@
 #include "MantidDataObjects/EventWorkspace.h"
 
 //Copy of the NexusCpp API was placed in MantidNexus
-#include "MantidNexusCPP/NeXusFile.hpp"
-#include "MantidNexusCPP/NeXusException.hpp"
+#include "nexus/NeXusFile.hpp"
+#include "nexus/NeXusException.hpp"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h
@@ -14,8 +14,8 @@
 #include "MantidGeometry/Instrument/RectangularDetector.h"
 
 //Copy of the NexusCpp API was placed in MantidNexus
-#include "MantidNexusCPP/NeXusFile.hpp"
-#include "MantidNexusCPP/NeXusException.hpp"
+#include "nexus/NeXusFile.hpp"
+#include "nexus/NeXusException.hpp"
 
 using namespace ::NeXus;
 

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadISISNexus2.cpp b/Code/Mantid/Framework/DataHandling/src/LoadISISNexus2.cpp
@@ -12,8 +12,8 @@
 #include "MantidGeometry/Instrument/XMLlogfile.h"
 #include "MantidGeometry/Instrument/Detector.h"
 
-#include "MantidNexusCPP/NeXusFile.hpp"
-#include "MantidNexusCPP/NeXusException.hpp"
+#include "nexus/NeXusFile.hpp"
+#include "nexus/NeXusException.hpp"
 
 #include "MantidAPI/LoadAlgorithmFactory.h"
 #include <Poco/Path.h>

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus.cpp
@@ -60,8 +60,8 @@ The subalgorithms used by LoadMuonNexus are:
 #include <boost/shared_ptr.hpp>
 #include "MantidNexus/MuonNexusReader.h"
 #include "MantidNexus/NexusClasses.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
-#include "MantidNexusCPP/NeXusException.hpp"
+#include "nexus/NeXusFile.hpp"
+#include "nexus/NeXusException.hpp"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus2.cpp b/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus2.cpp
@@ -12,8 +12,8 @@
 #include "MantidAPI/Progress.h"
 #include "MantidAPI/SpectraDetectorMap.h"
 #include "MantidNexus/NexusClasses.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
-#include "MantidNexusCPP/NeXusException.hpp"
+#include "nexus/NeXusFile.hpp"
+#include "nexus/NeXusException.hpp"
 
 
 #include "MantidAPI/LoadAlgorithmFactory.h"

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadNXSPE.cpp b/Code/Mantid/Framework/DataHandling/src/LoadNXSPE.cpp
@@ -10,8 +10,8 @@ Algorithm to load an NXSPE file into a workspace2D. It will create a new instrum
 #include "MantidAPI/LoadAlgorithmFactory.h"
 
 //Copy of the NexusCpp API was placed in MantidNexus
-#include "MantidNexusCPP/NeXusFile.hpp"
-#include "MantidNexusCPP/NeXusException.hpp"
+#include "nexus/NeXusFile.hpp"
+#include "nexus/NeXusException.hpp"
 #include "MantidNexus/NexusClasses.h"
 #include <vector>
 #include <map>

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadNexusLogs.cpp b/Code/Mantid/Framework/DataHandling/src/LoadNexusLogs.cpp
@@ -12,7 +12,7 @@ If you use [[LoadSNSEventNexus]] or [[LoadISISNexus]], calling this algorithm is
 // Includes
 //----------------------------------------------------------------------
 #include "MantidDataHandling/LoadNexusLogs.h"
-#include "MantidNexusCPP/NeXusException.hpp"
+#include "nexus/NeXusException.hpp"
 #include "MantidKernel/TimeSeriesProperty.h"
 #include "MantidKernel/LogParser.h"
 #include "MantidAPI/FileProperty.h"

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp b/Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp
@@ -48,7 +48,7 @@ The subalgorithms used by LoadMuonNexus are:
 #include "MantidKernel/UnitFactory.h"
 #include "MantidNexus/NexusClasses.h"
 #include "MantidNexus/NexusFileIO.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 #include <boost/shared_ptr.hpp>
 #include <cmath>
 #include <Poco/DateTimeParser.h>

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadTOFRawNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadTOFRawNexus.cpp
@@ -12,7 +12,7 @@
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/BoundedValidator.h"
 #include "MantidKernel/cow_ptr.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 #include <boost/algorithm/string/detail/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 
@@ -235,7 +235,7 @@ void LoadTOFRawNexus::countPixels(const std::string &nexusfilename, const std::s
 
           // Count how many pixels in the bank
           file->openData("pixel_id");
-          std::vector<int> dims = file->getInfo().dims;
+          std::vector<int64_t> dims = file->getInfo().dims;
           file->closeData();
 
           size_t newPixels = 1;
@@ -251,7 +251,7 @@ void LoadTOFRawNexus::countPixels(const std::string &nexusfilename, const std::s
         {
           // Get the size of the X vector
           file->openData(m_axisField);
-          std::vector<int> dims = file->getInfo().dims;
+          std::vector<int64_t> dims = file->getInfo().dims;
           // Find the units, if available
           if (file->hasAttr("units"))
             file->getAttr("units", m_xUnits);

diff --git a/Code/Mantid/Framework/DataHandling/src/SaveNexusProcessed.cpp b/Code/Mantid/Framework/DataHandling/src/SaveNexusProcessed.cpp
@@ -40,7 +40,7 @@ None
 #include "MantidKernel/ArrayProperty.h"
 #include "MantidKernel/ConfigService.h"
 #include "MantidNexus/NexusFileIO.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 #include <boost/shared_ptr.hpp>
 #include <cmath>
 #include <Poco/File.h>

diff --git a/Code/Mantid/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp b/Code/Mantid/Framework/DataHandling/src/UpdateInstrumentFromFile.cpp
@@ -16,8 +16,8 @@ It is assumed that the positions specified in the raw file are all with respect
 #include "MantidAPI/MatrixWorkspace.h"
 #include "MantidAPI/SpectraDetectorMap.h"
 #include "LoadRaw/isisraw2.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
-#include "MantidNexusCPP/NeXusException.hpp"
+#include "nexus/NeXusFile.hpp"
+#include "nexus/NeXusException.hpp"
 #include <boost/scoped_ptr.hpp>
 
 namespace Mantid

diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Crystal/OrientedLattice.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Crystal/OrientedLattice.h
@@ -1,7 +1,7 @@
 #ifndef MANTID_GEOMETRY_ORIENTEDLATTICE_H_
 #define MANTID_GEOMETRY_ORIENTEDLATTICE_H_
 #include <MantidGeometry/Crystal/UnitCell.h>
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/Goniometer.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/Goniometer.h
@@ -5,7 +5,7 @@
 #include <MantidKernel/V3D.h>
 #include <MantidGeometry/Crystal/UnitCell.h> //for angle units
 #include <string>
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
@@ -19,7 +19,7 @@
 
 #include <vector>
 #include <typeinfo>
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Material.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Material.h
@@ -8,7 +8,7 @@
 #include "MantidKernel/NeutronAtom.h"
 #include "MantidKernel/PhysicalConstants.h"
 #include <boost/shared_ptr.hpp>
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 
 namespace Mantid

diff --git a/Code/Mantid/Framework/Geometry/test/ComponentParserTest.h b/Code/Mantid/Framework/Geometry/test/ComponentParserTest.h
@@ -15,7 +15,7 @@
 #include "MantidKernel/CPUTimer.h"
 #include "MantidKernel/Strings.h"
 #include <Poco/SAX/AttributesImpl.h>
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 using namespace Mantid;
 using namespace Mantid::Kernel;

diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/NexusTestHelper.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/NexusTestHelper.h
@@ -2,7 +2,7 @@
 #define MANTID_NEXUSCPP_NEXUSTESTHELPER_H_
 
 #include "MantidKernel/System.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 
 namespace Mantid

diff --git a/Code/Mantid/Framework/Kernel/inc/MantidKernel/V3D.h b/Code/Mantid/Framework/Kernel/inc/MantidKernel/V3D.h
@@ -7,7 +7,7 @@
 #include <vector>
 #include "MantidKernel/DllConfig.h"
 #include "MantidKernel/Matrix.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/BoxController.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/BoxController.h
@@ -5,7 +5,7 @@
 #include "MantidKernel/MultiThreaded.h"
 #include "MantidKernel/System.h"
 #include "MantidKernel/ThreadPool.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 #include <boost/shared_ptr.hpp>
 #include <vector>
 

diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/IMDBox.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/IMDBox.h
@@ -10,7 +10,7 @@
 #include "MantidAPI/CoordTransform.h"
 #include "MantidMDEvents/MDBin.h"
 #include "MantidMDEvents/MDLeanEvent.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 #include <iosfwd>
 #include "MantidKernel/VMD.h"
 

diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/LoadMD.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/LoadMD.h
@@ -5,7 +5,7 @@
 #include "MantidAPI/IMDEventWorkspace.h"
 #include "MantidKernel/System.h"
 #include "MantidMDEvents/MDEventWorkspace.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 #include "MantidAPI/IDataFileChecker.h"
 
 namespace Mantid

diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDEvent.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDEvent.h
@@ -5,7 +5,7 @@
 #include "MantidGeometry/MDGeometry/MDTypes.h"
 #include "MantidKernel/System.h"
 #include "MantidMDEvents/MDLeanEvent.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 #include <cmath>
 #include <numeric>
 

diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDGridBox.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDGridBox.h
@@ -12,7 +12,7 @@
 #include "MantidMDEvents/IMDBox.h"
 #include "MantidMDEvents/MDBox.h"
 #include "MantidMDEvents/MDLeanEvent.h"
-#include "MantidNexusCPP/NeXusFile.hpp"
+#include "nexus/NeXusFile.hpp"
 
 namespace Mantid
 {