diff --git a/Code/Mantid/Framework/Algorithms/test/MuonAlphaCalcTest.h b/Code/Mantid/Framework/Algorithms/test/MuonAlphaCalcTest.h
index 2b060c534df9bafc28d279da24178292012763f8..b68012b7cd98e2bb427a2d8778269fc2358d8b29 100644
--- a/Code/Mantid/Framework/Algorithms/test/MuonAlphaCalcTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/MuonAlphaCalcTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidNexus/LoadMuonNexus.h"
+#include "MantidDataHandling/LoadMuonNexus.h"
#include "MantidDataHandling/LoadInstrument.h"
#include "MantidDataHandling/GroupDetectors.h"
#include "MantidAPI/IAlgorithm.h"
@@ -93,7 +93,7 @@ public:
private:
MuonAlphaCalc alphaCalc;
- Mantid::NeXus::LoadMuonNexus loader;
+ Mantid::DataHandling::LoadMuonNexus loader;
};
diff --git a/Code/Mantid/Framework/Algorithms/test/MuonAsymmetryCalcTest.h b/Code/Mantid/Framework/Algorithms/test/MuonAsymmetryCalcTest.h
index 9d0659589124a682db51c0f7592c45dccd0972b2..75c3205b0288a7a17b77eb9b43be8dc874b7b9cc 100644
--- a/Code/Mantid/Framework/Algorithms/test/MuonAsymmetryCalcTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/MuonAsymmetryCalcTest.h
@@ -3,7 +3,7 @@
#include <cxxtest/TestSuite.h>
-#include "MantidNexus/LoadMuonNexus.h"
+#include "MantidDataHandling/LoadMuonNexus.h"
#include "MantidDataHandling/LoadInstrument.h"
#include "MantidDataHandling/GroupDetectors.h"
#include "MantidAPI/IAlgorithm.h"
@@ -91,7 +91,7 @@ public:
private:
MuonAsymmetryCalc asymCalc;
- Mantid::NeXus::LoadMuonNexus loader;
+ Mantid::DataHandling::LoadMuonNexus loader;
Mantid::DataHandling::GroupDetectors group1;
Mantid::DataHandling::GroupDetectors group2;
diff --git a/Code/Mantid/Framework/Algorithms/test/MuonRemoveExpDecayTest.h b/Code/Mantid/Framework/Algorithms/test/MuonRemoveExpDecayTest.h
index 34250a847a564a58ae9dfe7c6535b6e4132f0de3..e66f67291e3d79613b650518ebab0522eb2f097e 100644
--- a/Code/Mantid/Framework/Algorithms/test/MuonRemoveExpDecayTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/MuonRemoveExpDecayTest.h
@@ -4,7 +4,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidDataHandling/LoadInstrument.h"
-#include "MantidNexus/LoadMuonNexus.h"
+#include "MantidDataHandling/LoadMuonNexus.h"
#include "MantidAlgorithms/MuonRemoveExpDecay.h"
#include "MantidAPI/Workspace.h"
#include "MantidDataObjects/Workspace2D.h"
@@ -93,7 +93,7 @@ public:
private:
MuonRemoveExpDecay alg;
- Mantid::NeXus::LoadMuonNexus loader;
+ Mantid::DataHandling::LoadMuonNexus loader;
};
diff --git a/Code/Mantid/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h b/Code/Mantid/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h
index 9637fca9fce70ca728d428f6ab8c8c77c27f8544..0f91c103f8a9df440fac27b79b809f971ac51501 100644
--- a/Code/Mantid/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h
@@ -7,7 +7,7 @@
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/TextAxis.h"
-#include "MantidNexus/LoadMuonNexus.h"
+#include "MantidDataHandling/LoadMuonNexus.h"
#include "MantidDataHandling/LoadInstrument.h"
#include <iostream>
diff --git a/Code/Mantid/Framework/Algorithms/test/RemoveBinsTest.h b/Code/Mantid/Framework/Algorithms/test/RemoveBinsTest.h
index d8fc5b08bdaa01895cca3578110783af7c18c499..8cd1e283cd807dbb5b2f19cf693f987a50706d43 100644
--- a/Code/Mantid/Framework/Algorithms/test/RemoveBinsTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/RemoveBinsTest.h
@@ -9,7 +9,7 @@
#include <stdexcept>
#include "MantidAlgorithms/RemoveBins.h"
-#include "MantidNexus/LoadMuonNexus.h"
+#include "MantidDataHandling/LoadMuonNexus.h"
#include "MantidDataHandling/LoadInstrument.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidKernel/UnitFactory.h"
@@ -182,7 +182,7 @@ public:
void xtestRealData()
{
- Mantid::NeXus::LoadMuonNexus loader;
+ Mantid::DataHandling::LoadMuonNexus loader;
loader.initialize();
loader.setPropertyValue("Filename", "emu00006473.nxs");
loader.setPropertyValue("OutputWorkspace", "EMU6473");
diff --git a/Code/Mantid/Framework/DataHandling/CMakeLists.txt b/Code/Mantid/Framework/DataHandling/CMakeLists.txt
index 976c2e64ea7e8d98607683beecda415f8b94cb01..51719e2b0748f57b4d1cd563d4357c81c45ba819 100644
--- a/Code/Mantid/Framework/DataHandling/CMakeLists.txt
+++ b/Code/Mantid/Framework/DataHandling/CMakeLists.txt
@@ -31,6 +31,8 @@ set ( SRC_FILES
src/LoadLOQDistancesFromRaw.cpp
src/LoadLog.cpp
src/LoadMappingTable.cpp
+ src/LoadMuonNexus.cpp
+ src/LoadMuonNexus2.cpp
src/LoadParameterFile.cpp
src/LoadPreNeXusMonitors.cpp
src/LoadRKH.cpp
@@ -117,6 +119,8 @@ set ( INC_FILES
inc/MantidDataHandling/LoadLOQDistancesFromRaw.h
inc/MantidDataHandling/LoadLog.h
inc/MantidDataHandling/LoadMappingTable.h
+ inc/MantidDataHandling/LoadMuonNexus.h
+ inc/MantidDataHandling/LoadMuonNexus2.h
inc/MantidDataHandling/LoadParameterFile.h
inc/MantidDataHandling/LoadPreNeXusMonitors.h
inc/MantidDataHandling/LoadRKH.h
@@ -187,6 +191,8 @@ set ( TEST_FILES
test/LoadInstrumentTest.h
test/LoadLogTest.h
test/LoadMappingTableTest.h
+ test/LoadMuonNexus2Test.h
+ test/LoadMuonNexusTest.h
test/LoadParameterFileTest.h
test/LoadPreNeXusMonitorsTest.h
test/LoadRKHTest.h
diff --git a/Code/Mantid/Framework/Nexus/inc/MantidNexus/LoadMuonNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h
similarity index 96%
rename from Code/Mantid/Framework/Nexus/inc/MantidNexus/LoadMuonNexus.h
rename to Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h
index 7194cd14c0702c1ab34c4c2029f44298865d87ba..de072ce016b1000681a8da75fce89381b81e1c88 100644
--- a/Code/Mantid/Framework/Nexus/inc/MantidNexus/LoadMuonNexus.h
+++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h
@@ -17,9 +17,9 @@ class MuonNexusReader;
namespace Mantid
{
- namespace NeXus
+ namespace DataHandling
{
- /** @class LoadMuonNexus LoadMuonNexus.h NeXus/LoadMuonNexus.h
+ /** @class LoadMuonNexus LoadMuonNexus.h DataHandling/LoadMuonNexus.h
Loads an file in Nexus Muon format and stores it in a 2D workspace
(Workspace2D class). LoadMuonNexus is an algorithm and as such inherits
@@ -28,7 +28,7 @@ namespace Mantid
Required Properties:
<UL>
- <LI> Filename - The name of and path to the input Nexus file </LI>
+ <LI> Filename - The name of and path to the input NeXus file </LI>
<LI> OutputWorkspace - The name of the workspace in which to store the imported data
(a multiperiod file will store higher periods in workspaces called OutputWorkspace_PeriodNo)
[ not yet implemented for Nexus ]</LI>
@@ -128,7 +128,7 @@ namespace Mantid
void loadRunDetails(DataObjects::Workspace2D_sptr localWorkspace);
};
- } // namespace NeXus
+ } // namespace DataHandling
} // namespace Mantid
#endif /*MANTID_DATAHANDLING_LOADMUONNEXUS_H_*/
diff --git a/Code/Mantid/Framework/Nexus/inc/MantidNexus/LoadMuonNexus2.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus2.h
similarity index 84%
rename from Code/Mantid/Framework/Nexus/inc/MantidNexus/LoadMuonNexus2.h
rename to Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus2.h
index f5fa12e63e3830769fc2a65f59beb1296a9f397e..f21dc32a2cb8475fc3c33be649b38dbcb6a82a8b 100644
--- a/Code/Mantid/Framework/Nexus/inc/MantidNexus/LoadMuonNexus2.h
+++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus2.h
@@ -4,31 +4,40 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidNexus/LoadMuonNexus.h"
+#include "MantidDataHandling/LoadMuonNexus.h"
#include "MantidAPI/IDataFileChecker.h"
+#include "MantidNexus/NexusClasses.h"
namespace Mantid
{
- namespace NeXus
+namespace NeXus
+{
+ // Forward declarations
+ template<class T>
+ class NXDataSetTyped;
+ typedef NXDataSetTyped<int> NXInt;
+}
+
+
+ namespace DataHandling
{
// Forward declarations
template<class T>
class NXDataSetTyped;
typedef NXDataSetTyped<int> NXInt;
- class NXEntry;
/**
- Loads an file in Nexus Muon format and stores it in a 2D workspace
+ Loads an file in NeXus Muon format and stores it in a 2D workspace
(Workspace2D class). LoadMuonNexus is an algorithm and as such inherits
from the Algorithm class, via DataHandlingCommand, and overrides
the init() & exec() methods.
Required Properties:
<UL>
- <LI> Filename - The name of and path to the input Nexus file </LI>
+ <LI> Filename - The name of and path to the input NeXus file </LI>
<LI> OutputWorkspace - The name of the workspace in which to store the imported data
(a multiperiod file will store higher periods in workspaces called OutputWorkspace_PeriodNo)
- [ not yet implemented for Nexus ]</LI>
+ [ not yet implemented for NeXus ]</LI>
</UL>
Optional Properties: (note that these options are not available if reading a multiperiod file)
@@ -83,13 +92,13 @@ namespace Mantid
/// Overwrites Algorithm method
void exec();
- void loadData(const NXInt& counts,const std::vector<double>& timeBins,int wsIndex,
+ void loadData(const Mantid::NeXus::NXInt& counts,const std::vector<double>& timeBins,int wsIndex,
int period,int spec,API::MatrixWorkspace_sptr localWorkspace);
- void loadLogs(API::MatrixWorkspace_sptr ws, NXEntry & entry,int period);
+ void loadLogs(API::MatrixWorkspace_sptr ws, Mantid::NeXus::NXEntry & entry,int period);
void loadRunDetails(DataObjects::Workspace2D_sptr localWorkspace);
};
- } // namespace NeXus
+ } // namespace DataHandling
} // namespace Mantid
#endif /*MANTID_DATAHANDLING_LOADMUONNEXUS2_H_*/
diff --git a/Code/Mantid/Framework/Nexus/src/LoadMuonNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus.cpp
similarity index 98%
rename from Code/Mantid/Framework/Nexus/src/LoadMuonNexus.cpp
rename to Code/Mantid/Framework/DataHandling/src/LoadMuonNexus.cpp
index 5d19a7953cbdb34a8cd2dd7e32b76b127df095f6..35cbe2f640fb819eb8754c8d5006dc2ee30c007b 100644
--- a/Code/Mantid/Framework/Nexus/src/LoadMuonNexus.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidNexus/LoadMuonNexus.h"
+#include "MantidDataHandling/LoadMuonNexus.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidKernel/ConfigService.h"
@@ -23,7 +23,7 @@
namespace Mantid
{
- namespace NeXus
+ namespace DataHandling
{
// Register the algorithm into the algorithm factory
DECLARE_ALGORITHM(LoadMuonNexus)
@@ -31,14 +31,15 @@ namespace Mantid
/// Sets documentation strings for this algorithm
void LoadMuonNexus::initDocs()
{
- this->setWikiSummary("The LoadMuonNexus algorithm will read the given Nexus Muon data file Version 1 and use the results to populate the named workspace. LoadMuonNexus may be invoked by [[LoadNexus]] if it is given a Nexus file of this type. ");
- this->setOptionalMessage("The LoadMuonNexus algorithm will read the given Nexus Muon data file Version 1 and use the results to populate the named workspace. LoadMuonNexus may be invoked by LoadNexus if it is given a Nexus file of this type.");
+ this->setWikiSummary("The LoadMuonNexus algorithm will read the given NeXus Muon data file Version 1 and use the results to populate the named workspace. LoadMuonNexus may be invoked by [[LoadNexus]] if it is given a NeXus file of this type. ");
+ this->setOptionalMessage("The LoadMuonNexus algorithm will read the given NeXus Muon data file Version 1 and use the results to populate the named workspace. LoadMuonNexus may be invoked by LoadNexus if it is given a NeXus file of this type.");
}
using namespace Kernel;
using namespace API;
using Geometry::IInstrument;
+ using namespace Mantid::NeXus;
/// Empty default constructor
LoadMuonNexus::LoadMuonNexus() :
diff --git a/Code/Mantid/Framework/Nexus/src/LoadMuonNexus2.cpp b/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus2.cpp
similarity index 95%
rename from Code/Mantid/Framework/Nexus/src/LoadMuonNexus2.cpp
rename to Code/Mantid/Framework/DataHandling/src/LoadMuonNexus2.cpp
index 9985ce413134a0a355346ca2171cc22ed5ab0b56..067b563d64b9c94b89233d2705b54f5f7438d1c3 100644
--- a/Code/Mantid/Framework/Nexus/src/LoadMuonNexus2.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadMuonNexus2.cpp
@@ -1,7 +1,7 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
-#include "MantidNexus/LoadMuonNexus2.h"
+#include "MantidDataHandling/LoadMuonNexus2.h"
#include "MantidDataObjects/Workspace2D.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidKernel/ConfigService.h"
@@ -12,10 +12,10 @@
#include "MantidAPI/Progress.h"
#include "MantidAPI/SpectraDetectorMap.h"
#include "MantidNexus/NexusClasses.h"
-
#include "MantidNexus/NeXusFile.hpp"
#include "MantidNexus/NeXusException.hpp"
+
#include "MantidAPI/LoadAlgorithmFactory.h"
#include <Poco/Path.h>
#include <boost/lexical_cast.hpp>
@@ -26,20 +26,22 @@
namespace Mantid
{
- namespace NeXus
+ namespace DataHandling
{
// Register the algorithm into the algorithm factory
DECLARE_ALGORITHM(LoadMuonNexus2)
DECLARE_LOADALGORITHM(LoadMuonNexus2)
+
using namespace Kernel;
using namespace API;
using Geometry::IInstrument;
+ using namespace Mantid::NeXus;
/// Sets documentation strings for this algorithm
void LoadMuonNexus2::initDocs()
{
- this->setWikiSummary("The LoadMuonNexus algorithm will read the given Nexus Muon data file Version 1 and use the results to populate the named workspace. LoadMuonNexus may be invoked by [[LoadNexus]] if it is given a Nexus file of this type. ");
- this->setOptionalMessage("The LoadMuonNexus algorithm will read the given Nexus Muon data file Version 1 and use the results to populate the named workspace. LoadMuonNexus may be invoked by LoadNexus if it is given a Nexus file of this type.");
+ this->setWikiSummary("The LoadMuonNexus algorithm will read the given NeXus Muon data file Version 1 and use the results to populate the named workspace. LoadMuonNexus may be invoked by [[LoadNexus]] if it is given a NeXus file of this type. ");
+ this->setOptionalMessage("The LoadMuonNexus algorithm will read the given NeXus Muon data file Version 1 and use the results to populate the named workspace. LoadMuonNexus may be invoked by LoadNexus if it is given a NeXus file of this type.");
}
@@ -79,7 +81,7 @@ namespace Mantid
}
else
{
- throw std::runtime_error("Unknown Muon Nexus file format");
+ throw std::runtime_error("Unknown Muon NeXus file format");
}
}
else
@@ -118,7 +120,7 @@ namespace Mantid
}
NXData dataGroup = entry.openNXData(detectorName);
- NXInt spectrum_index = dataGroup.openNXInt("spectrum_index");
+ Mantid::NeXus::NXInt spectrum_index = dataGroup.openNXInt("spectrum_index");
spectrum_index.load();
m_numberOfSpectra = spectrum_index.dim0();
@@ -174,10 +176,10 @@ namespace Mantid
setProperty("OutputWorkspace",boost::dynamic_pointer_cast<Workspace>(wsGrpSptr));
}
- NXInt period_index = dataGroup.openNXInt("period_index");
+ Mantid::NeXus::NXInt period_index = dataGroup.openNXInt("period_index");
period_index.load();
- NXInt counts = dataGroup.openIntData();
+ Mantid::NeXus::NXInt counts = dataGroup.openIntData();
counts.load();
@@ -283,7 +285,7 @@ namespace Mantid
/** loadData
* Load the counts data from an NXInt into a workspace
*/
- void LoadMuonNexus2::loadData(const NXInt& counts,const std::vector<double>& timeBins,int wsIndex,
+ void LoadMuonNexus2::loadData(const Mantid::NeXus::NXInt& counts,const std::vector<double>& timeBins,int wsIndex,
int period,int spec,API::MatrixWorkspace_sptr localWorkspace)
{
MantidVec& X = localWorkspace->dataX(wsIndex);
diff --git a/Code/Mantid/Framework/DataHandling/test/GroupDetectors2Test.h b/Code/Mantid/Framework/DataHandling/test/GroupDetectors2Test.h
index b08c35b4843c876cbda26fe2f3c6d0937f03628e..ca037eefa313dafa1b6a54c9803f344bd423f34b 100644
--- a/Code/Mantid/Framework/DataHandling/test/GroupDetectors2Test.h
+++ b/Code/Mantid/Framework/DataHandling/test/GroupDetectors2Test.h
@@ -11,7 +11,7 @@
#include "MantidKernel/ArrayProperty.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/UnitFactory.h"
-#include "MantidNexus/LoadMuonNexus2.h"
+#include "MantidDataHandling/LoadMuonNexus2.h"
#include <cxxtest/TestSuite.h>
#include <fstream>
#include <iostream>
@@ -324,7 +324,7 @@ public:
void testReadingFromXML()
{
- LoadMuonNexus2 nxLoad;
+ Mantid::DataHandling::LoadMuonNexus2 nxLoad;
nxLoad.initialize();
// Now set required filename and output workspace name
@@ -364,7 +364,7 @@ public:
void testReadingFromXMLCheckDublicateIndex()
{
- LoadMuonNexus2 nxLoad;
+ Mantid::DataHandling::LoadMuonNexus2 nxLoad;
nxLoad.initialize();
// Now set required filename and output workspace name
@@ -404,7 +404,7 @@ public:
void testReadingFromXMLCheckDublicateIndex2()
{
- LoadMuonNexus2 nxLoad;
+ Mantid::DataHandling::LoadMuonNexus2 nxLoad;
nxLoad.initialize();
// Now set required filename and output workspace name
diff --git a/Code/Mantid/Framework/Nexus/test/LoadMuonNexus2Test.h b/Code/Mantid/Framework/DataHandling/test/LoadMuonNexus2Test.h
similarity index 99%
rename from Code/Mantid/Framework/Nexus/test/LoadMuonNexus2Test.h
rename to Code/Mantid/Framework/DataHandling/test/LoadMuonNexus2Test.h
index f667102772dd0ecff9fc997c3f0470c9f8529d0f..b0b79239edb9920765bb030054804c22596edd17 100644
--- a/Code/Mantid/Framework/Nexus/test/LoadMuonNexus2Test.h
+++ b/Code/Mantid/Framework/DataHandling/test/LoadMuonNexus2Test.h
@@ -11,7 +11,7 @@
#include <fstream>
#include <cxxtest/TestSuite.h>
-#include "MantidNexus/LoadMuonNexus2.h"
+#include "MantidDataHandling/LoadMuonNexus2.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidDataObjects/ManagedWorkspace2D.h"
#include "MantidAPI/AnalysisDataService.h"
@@ -24,6 +24,7 @@ using namespace Mantid;
using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::NeXus;
+using namespace Mantid::DataHandling;
using namespace Mantid::DataObjects;
class LoadMuonNexus2Test : public CxxTest::TestSuite
diff --git a/Code/Mantid/Framework/Nexus/test/LoadMuonNexusTest.h b/Code/Mantid/Framework/DataHandling/test/LoadMuonNexusTest.h
similarity index 99%
rename from Code/Mantid/Framework/Nexus/test/LoadMuonNexusTest.h
rename to Code/Mantid/Framework/DataHandling/test/LoadMuonNexusTest.h
index b449ca6eb10523c8eb7faa854c4ab18e61c19d8b..a81d61e376d468b686411567851bfdb10f00cec5 100644
--- a/Code/Mantid/Framework/Nexus/test/LoadMuonNexusTest.h
+++ b/Code/Mantid/Framework/DataHandling/test/LoadMuonNexusTest.h
@@ -12,7 +12,7 @@
#include <fstream>
#include <cxxtest/TestSuite.h>
-#include "MantidNexus/LoadMuonNexus.h"
+#include "MantidDataHandling/LoadMuonNexus.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidDataObjects/ManagedWorkspace2D.h"
#include "MantidAPI/AnalysisDataService.h"
@@ -24,7 +24,6 @@
using namespace Mantid::API;
using namespace Mantid::Kernel;
-using namespace Mantid::NeXus;
using namespace Mantid::DataHandling;
using namespace Mantid::DataObjects;
diff --git a/Code/Mantid/Framework/DataHandling/test/OrbiterDataArchiveTest.h b/Code/Mantid/Framework/DataHandling/test/OrbiterDataArchiveTest.h
index a2b05f99145566f10b467950278511e9a836ceb0..a7d2c5dc860952482b4cf9919295cd9cab5dcc5f 100755
--- a/Code/Mantid/Framework/DataHandling/test/OrbiterDataArchiveTest.h
+++ b/Code/Mantid/Framework/DataHandling/test/OrbiterDataArchiveTest.h
@@ -13,7 +13,7 @@ class OrbiterDataArchiveTest : public CxxTest::TestSuite
{
public:
- void xtestSearch()
+ void testSearch()
{
OrbiterDataArchive arch;
std::string path = arch.getPath("cncs_23412_event.nxs");
diff --git a/Code/Mantid/Framework/Nexus/CMakeLists.txt b/Code/Mantid/Framework/Nexus/CMakeLists.txt
index d8e5f3a4bf4d70696ae19d035b724cdad1b83aae..66a85102ddefac19097f2a0dd0a1e1db1091a9ec 100644
--- a/Code/Mantid/Framework/Nexus/CMakeLists.txt
+++ b/Code/Mantid/Framework/Nexus/CMakeLists.txt
@@ -3,8 +3,6 @@ set ( SRC_FILES
src/LoadISISNexus2.cpp
src/LoadLogsFromSNSNexus.cpp
src/LoadMuonLog.cpp
- src/LoadMuonNexus.cpp
- src/LoadMuonNexus2.cpp
src/LoadNeXus.cpp
src/LoadNexusMonitors.cpp
src/LoadNexusProcessed.cpp
@@ -26,7 +24,6 @@ set ( SRC_FILES
src/SaveNexusProcessed.cpp
)
-
set ( SRC_UNITY_IGNORE_FILES src/NeXusFile.cpp)
set ( INC_FILES
@@ -35,8 +32,6 @@ set ( INC_FILES
inc/MantidNexus/LoadISISNexus2.h
inc/MantidNexus/LoadLogsFromSNSNexus.h
inc/MantidNexus/LoadMuonLog.h
- inc/MantidNexus/LoadMuonNexus.h
- inc/MantidNexus/LoadMuonNexus2.h
inc/MantidNexus/LoadNeXus.h
inc/MantidNexus/LoadNexusMonitors.h
inc/MantidNexus/LoadNexusProcessed.h
@@ -55,8 +50,6 @@ set ( TEST_FILES
test/LoadISISNexusTest.h
test/LoadLogsFromSNSNexusTest.h
test/LoadMuonLogTest.h
- test/LoadMuonNexus2Test.h
- test/LoadMuonNexusTest.h
test/LoadNeXusTest.h
test/LoadNexusMonitorsTest.h
test/LoadNexusProcessedTest.h
diff --git a/Code/Mantid/Framework/Nexus/test/LoadRSaveNLoadNcspTest.h b/Code/Mantid/Framework/Nexus/test/LoadRSaveNLoadNcspTest.h
index 3c2efc46880498a37cf1ba24738aca9092d81d3a..b66c505369283bcbfb21850926fd6cdec3a0cdff 100644
--- a/Code/Mantid/Framework/Nexus/test/LoadRSaveNLoadNcspTest.h
+++ b/Code/Mantid/Framework/Nexus/test/LoadRSaveNLoadNcspTest.h
@@ -12,7 +12,7 @@
#include "MantidGeometry/IComponent.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/UnitFactory.h"
-#include "MantidNexus/LoadMuonNexus.h"
+#include "MantidDataHandling/LoadMuonNexus.h"
#include "MantidNexus/LoadNeXus.h"
#include "MantidNexus/LoadNexusProcessed.h"
#include "MantidNexus/SaveNexusProcessed.h"
diff --git a/Code/Mantid/Framework/Nexus/test/SaveNeXusTest.h b/Code/Mantid/Framework/Nexus/test/SaveNeXusTest.h
index 96431846a9fcb49395542e2796908465a0bbdc3e..5326dafdf9fc6328af5e2b7dd17ba2e2a93b69b3 100644
--- a/Code/Mantid/Framework/Nexus/test/SaveNeXusTest.h
+++ b/Code/Mantid/Framework/Nexus/test/SaveNeXusTest.h
@@ -15,7 +15,7 @@
#include "MantidDataObjects/Workspace1D.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidNexus/SaveNeXus.h"
-#include "MantidNexus/LoadMuonNexus.h"
+#include "MantidDataHandling/LoadMuonNexus.h"
#include "MantidNexus/LoadNeXus.h"
#include <Poco/Path.h>
diff --git a/Code/Mantid/Framework/Nexus/test/SaveNexusProcessedTest.h b/Code/Mantid/Framework/Nexus/test/SaveNexusProcessedTest.h
index 84965150a3d4de12397f7de83a22df038d6ee08e..1ab8e2a9d15591c287c84b9f43e1797a84c9a306 100644
--- a/Code/Mantid/Framework/Nexus/test/SaveNexusProcessedTest.h
+++ b/Code/Mantid/Framework/Nexus/test/SaveNexusProcessedTest.h
@@ -13,7 +13,7 @@
#include "MantidDataHandling/LoadEventPreNeXus.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidNexus/SaveNexusProcessed.h"
-#include "MantidNexus/LoadMuonNexus.h"
+#include "MantidDataHandling/LoadMuonNexus.h"
#include "MantidNexus/LoadNeXus.h"
#include "MantidDataHandling/LoadSNSEventNexus.h"
#include "MantidKernel/UnitFactory.h"