Resolve merge re #7072

mantidproject · Oct 21, 2013 · bf1e89b · bf1e89b
2 parents 0f2ef8a + 81b5942
commit bf1e89b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 107 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/CMakeLists.txt b/Code/Mantid/Framework/DataHandling/CMakeLists.txt
@@ -77,7 +77,6 @@ set ( SRC_FILES
 	src/LoadRawHelper.cpp
 	src/LoadRawSpectrum0.cpp
 	src/LoadSINQ.cpp
-	src/LoadSNSNexus.cpp
 	src/LoadSNSspec.cpp
 	src/LoadSPE.cpp
 	src/LoadSampleDetailsFromRaw.cpp
@@ -202,7 +201,6 @@ set ( INC_FILES
 	inc/MantidDataHandling/LoadRawHelper.h
 	inc/MantidDataHandling/LoadRawSpectrum0.h
 	inc/MantidDataHandling/LoadSINQ.h
-	inc/MantidDataHandling/LoadSNSNexus.h
 	inc/MantidDataHandling/LoadSNSspec.h
 	inc/MantidDataHandling/LoadSPE.h
 	inc/MantidDataHandling/LoadSampleDetailsFromRaw.h
@@ -259,7 +257,6 @@ set ( INC_FILES
 )
 
 set ( TEST_FILES
-	#LoadSNSNexusTest.h # TODO has no active tests in it
 	AppendGeometryToSNSNexusTest.h
 	ApplyGroupingFromMuonNexusTest.h
 	CompressEventsTest.h

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNexus.h
@@ -95,8 +95,8 @@ namespace Mantid
       /// run LoadNexusProcessed
       void runLoadNexusProcessed();
 
-        /// run LoadSNSNexus
-      void runLoadSNSNexus();
+        /// run LoadTOFRawNexus
+      void runLoadTOFRawNexus();
     };
   } // namespace DataHandling
 } // namespace Mantid

diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSNSNexus.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSNSNexus.h
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadNexus.cpp
@@ -145,7 +145,7 @@ namespace Mantid
           g_log.error("File " + m_filename + " is a currently unsupported type of NeXus file");
           throw Exception::FileError("Unable to read File:" , m_filename);
         }
-        runLoadSNSNexus();
+        runLoadTOFRawNexus();
       }
       return;
     }
@@ -337,9 +337,9 @@ namespace Mantid
       }
     }
 
-    void LoadNexus::runLoadSNSNexus()
+    void LoadNexus::runLoadTOFRawNexus()
     {
-      IAlgorithm_sptr loadNexusPro = createChildAlgorithm("LoadSNSNexus",0.,1.);
+      IAlgorithm_sptr loadNexusPro = createChildAlgorithm("LoadTOFRawNexus",0.,1.);
       // Pass through the same input filename
       loadNexusPro->setPropertyValue("Filename",m_filename);
       // Set the workspace property
@@ -364,9 +364,9 @@ namespace Mantid
       }
       catch (std::runtime_error&)
       {
-        g_log.error("Unable to successfully run LoadSNSNexus Child Algorithm");
+        g_log.error("Unable to successfully run LoadTOFRawNexus Child Algorithm");
       }
-      if ( ! loadNexusPro->isExecuted() ) g_log.error("Unable to successfully run LoadSNSNexus Child Algorithm");
+      if ( ! loadNexusPro->isExecuted() ) g_log.error("Unable to successfully run LoadTOFRawNexus Child Algorithm");
       // Get pointer to the workspace created
       Workspace_sptr localWorkspace = loadNexusPro->getProperty(outputWorkspace); 
       setProperty(outputWorkspace,localWorkspace);

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadSNSNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadSNSNexus.cpp