merge conflict resolved re #7072

mantidproject · Oct 17, 2013 · 3b8f6ab · 3b8f6ab
2 parents 3af2a9d + e29e7b3
commit 3b8f6ab
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 697 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/test/ModeratorTzeroLinearTest.h b/Code/Mantid/Framework/Algorithms/test/ModeratorTzeroLinearTest.h
@@ -4,7 +4,6 @@
 #include <cxxtest/TestSuite.h>
 #include "MantidKernel/Timer.h"
 #include "MantidKernel/System.h"
-#include "MantidDataHandling/LoadSNSEventNexus.h"
 #include "MantidDataHandling/LoadAscii.h"
 #include "MantidDataHandling/LoadInstrument.h"
 #include "MantidAlgorithms/ModeratorTzeroLinear.h"

diff --git a/Code/Mantid/Framework/Algorithms/test/SumNeighboursTest.h b/Code/Mantid/Framework/Algorithms/test/SumNeighboursTest.h
@@ -7,7 +7,6 @@
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/WorkspaceFactory.h"
 #include "MantidDataObjects/Workspace2D.h"
-#include "MantidDataHandling/LoadSNSEventNexus.h"
 
 using namespace Mantid::API;
 using namespace Mantid::Geometry;

diff --git a/Code/Mantid/Framework/DataHandling/CMakeLists.txt b/Code/Mantid/Framework/DataHandling/CMakeLists.txt
@@ -46,7 +46,6 @@ set ( SRC_FILES
 	src/LoadLOQDistancesFromRaw.cpp
 	src/LoadLog.cpp
 	src/LoadLogsForSNSPulsedMagnet.cpp
-	src/LoadLogsFromSNSNexus.cpp
 	src/LoadMappingTable.cpp
 	src/LoadMask.cpp
 	src/LoadMcStasEventNexus.cpp
@@ -78,7 +77,6 @@ set ( SRC_FILES
 	src/LoadRawHelper.cpp
 	src/LoadRawSpectrum0.cpp
 	src/LoadSINQ.cpp
-	src/LoadSNSEventNexus.cpp
 	src/LoadSNSNexus.cpp
 	src/LoadSNSspec.cpp
 	src/LoadSPE.cpp
@@ -178,7 +176,6 @@ set ( INC_FILES
 	inc/MantidDataHandling/LoadLOQDistancesFromRaw.h
 	inc/MantidDataHandling/LoadLog.h
 	inc/MantidDataHandling/LoadLogsForSNSPulsedMagnet.h
-	inc/MantidDataHandling/LoadLogsFromSNSNexus.h
 	inc/MantidDataHandling/LoadMappingTable.h
 	inc/MantidDataHandling/LoadMask.h
 	inc/MantidDataHandling/LoadMcStasEventNexus.h
@@ -205,7 +202,6 @@ set ( INC_FILES
 	inc/MantidDataHandling/LoadRawHelper.h
 	inc/MantidDataHandling/LoadRawSpectrum0.h
 	inc/MantidDataHandling/LoadSINQ.h
-	inc/MantidDataHandling/LoadSNSEventNexus.h
 	inc/MantidDataHandling/LoadSNSNexus.h
 	inc/MantidDataHandling/LoadSNSspec.h
 	inc/MantidDataHandling/LoadSPE.h
@@ -303,7 +299,6 @@ set ( TEST_FILES
 	LoadIsawDetCalTest.h
 	LoadLLBTest.h
 	LoadLogTest.h
-	LoadLogsFromSNSNexusTest.h
 	LoadMappingTableTest.h
 	LoadMaskTest.h
 	LoadMcStasEventNexusTest.h
@@ -329,7 +324,6 @@ set ( TEST_FILES
 	LoadRawSpectrum0Test.h
 	LoadRawTest.h
 	LoadSINQTest.h
-	LoadSNSEventNexusTest.h
 	LoadSNSspecTest.h
 	LoadSPETest.h
 	LoadSassenaTest.h

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadLogsFromSNSNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadLogsFromSNSNexus.h
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSNSEventNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSNSEventNexus.h