diff --git a/Code/Mantid/Framework/DataHandling/CMakeLists.txt b/Code/Mantid/Framework/DataHandling/CMakeLists.txt index 0bc1fb6b0ecea44a5fbf1003ff8bf0e511dbb7b4..227c110c1d4e6b4483411dc28932fc568b443a5e 100644 --- a/Code/Mantid/Framework/DataHandling/CMakeLists.txt +++ b/Code/Mantid/Framework/DataHandling/CMakeLists.txt @@ -42,7 +42,7 @@ set ( SRC_FILES src/LoadNexusMonitors.cpp src/LoadNexusProcessed.cpp src/LoadParameterFile.cpp - src/LoadPreNeXusMonitors.cpp + src/LoadPreNexusMonitors.cpp src/LoadRKH.cpp src/LoadRaw.cpp src/LoadRaw/byte_rel_comp.cpp @@ -137,7 +137,7 @@ set ( INC_FILES inc/MantidDataHandling/LoadNexusMonitors.h inc/MantidDataHandling/LoadNexusProcessed.h inc/MantidDataHandling/LoadParameterFile.h - inc/MantidDataHandling/LoadPreNeXusMonitors.h + inc/MantidDataHandling/LoadPreNexusMonitors.h inc/MantidDataHandling/LoadRKH.h inc/MantidDataHandling/LoadRaw.h inc/MantidDataHandling/LoadRaw2.h @@ -225,7 +225,7 @@ set ( TEST_FILES test/LoadNexusMonitorsTest.h test/LoadNexusProcessedTest.h test/LoadParameterFileTest.h - test/LoadPreNeXusMonitorsTest.h + test/LoadPreNexusMonitorsTest.h test/LoadRKHTest.h test/LoadRaw2Test.h test/LoadRaw3Test.h diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPreNeXusMonitors.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexusMonitors.h similarity index 94% rename from Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPreNeXusMonitors.h rename to Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexusMonitors.h index ed003b153f075a738dbeb22cd7ab07c4aa6f8780..91ce7ff476a168a5de1c558c156a76a4d3c5fa94 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPreNeXusMonitors.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexusMonitors.h @@ -34,16 +34,16 @@ namespace DataHandling File change history is stored at: <https://svn.mantidproject.org/mantid/trunk/Code/Mantid> */ -class DLLExport LoadPreNeXusMonitors: public Mantid::API::Algorithm +class DLLExport LoadPreNexusMonitors: public Mantid::API::Algorithm { public: /// (Empty) Constructor - LoadPreNeXusMonitors() : + LoadPreNexusMonitors() : Mantid::API::Algorithm() { } /// Virtual destructor - virtual ~LoadPreNeXusMonitors() + virtual ~LoadPreNexusMonitors() { } /// Algorithm's name diff --git a/Code/Mantid/Framework/DataHandling/src/LoadPreNeXusMonitors.cpp b/Code/Mantid/Framework/DataHandling/src/LoadPreNexusMonitors.cpp similarity index 97% rename from Code/Mantid/Framework/DataHandling/src/LoadPreNeXusMonitors.cpp rename to Code/Mantid/Framework/DataHandling/src/LoadPreNexusMonitors.cpp index 6c0e5b0bf0c178c73a4586669859c940b115aeea..76f2abd0d452f99d323cbd692e4ca6a992785a7f 100644 --- a/Code/Mantid/Framework/DataHandling/src/LoadPreNeXusMonitors.cpp +++ b/Code/Mantid/Framework/DataHandling/src/LoadPreNexusMonitors.cpp @@ -1,4 +1,4 @@ -#include "MantidDataHandling/LoadPreNeXusMonitors.h" +#include "MantidDataHandling/LoadPreNexusMonitors.h" #include "MantidAPI/FileProperty.h" #include "MantidKernel/ConfigService.h" #include "MantidKernel/UnitFactory.h" @@ -31,7 +31,7 @@ namespace DataHandling { // Register the algorithm into the AlgorithmFactory -DECLARE_ALGORITHM( LoadPreNeXusMonitors) +DECLARE_ALGORITHM( LoadPreNexusMonitors) using namespace Mantid::Kernel; using namespace Mantid::API; @@ -44,7 +44,7 @@ static const std::string WORKSPACE_OUT("OutputWorkspace"); // A reference to the logger is provided by the base class, it is called g_log. // It is used to print out information, warning and error messages -void LoadPreNeXusMonitors::init() +void LoadPreNexusMonitors::init() { // Filename for the runinfo file. declareProperty(new FileProperty(RUNINFO_FILENAME, "", FileProperty::Load, "_runinfo.xml")); @@ -57,7 +57,7 @@ void LoadPreNeXusMonitors::init() } -void LoadPreNeXusMonitors::exec() +void LoadPreNexusMonitors::exec() { // time of flight channel parameters double tmin = 0.0; @@ -241,7 +241,7 @@ void LoadPreNeXusMonitors::exec() * @param instrument :: instrument name. * @param localWorkspace :: MatrixWorkspace in which to put the instrument geometry */ -void LoadPreNeXusMonitors::runLoadInstrument(const std::string &instrument, +void LoadPreNexusMonitors::runLoadInstrument(const std::string &instrument, MatrixWorkspace_sptr localWorkspace) { diff --git a/Code/Mantid/Framework/DataHandling/test/LoadPreNeXusMonitorsTest.h b/Code/Mantid/Framework/DataHandling/test/LoadPreNexusMonitorsTest.h similarity index 82% rename from Code/Mantid/Framework/DataHandling/test/LoadPreNeXusMonitorsTest.h rename to Code/Mantid/Framework/DataHandling/test/LoadPreNexusMonitorsTest.h index d50ebf2672250a404a30099073d19cd2a847d137..0981f3d908d205dcfd0b09b7fd037bcc8b713a53 100644 --- a/Code/Mantid/Framework/DataHandling/test/LoadPreNeXusMonitorsTest.h +++ b/Code/Mantid/Framework/DataHandling/test/LoadPreNexusMonitorsTest.h @@ -3,19 +3,19 @@ #include <cxxtest/TestSuite.h> -#include "MantidDataHandling/LoadPreNeXusMonitors.h" +#include "MantidDataHandling/LoadPreNexusMonitors.h" #include "MantidAPI/AnalysisDataService.h" #include "MantidAPI/MatrixWorkspace.h" #include <Poco/Path.h> -class LoadPreNeXusMonitorsTest: public CxxTest::TestSuite +class LoadPreNexusMonitorsTest: public CxxTest::TestSuite { public: - static LoadPreNeXusMonitorsTest *createSuite() { return new LoadPreNeXusMonitorsTest(); } - static void destroySuite(LoadPreNeXusMonitorsTest *suite) { delete suite; } + static LoadPreNexusMonitorsTest *createSuite() { return new LoadPreNexusMonitorsTest(); } + static void destroySuite(LoadPreNexusMonitorsTest *suite) { delete suite; } - LoadPreNeXusMonitorsTest() + LoadPreNexusMonitorsTest() { // Path to test input file assumes Test directory checked out from SVN // You will need to make sure the bmon* files are in the same directory @@ -63,7 +63,7 @@ public: } private: - Mantid::DataHandling::LoadPreNeXusMonitors loader; + Mantid::DataHandling::LoadPreNexusMonitors loader; std::string runinfoFile; };