From 8f6f16950ed1348f4f80be3d7bde9f163cdff6f5 Mon Sep 17 00:00:00 2001 From: Peter Peterson Date: Thu, 13 Mar 2014 16:15:50 -0400 Subject: [PATCH] Re #8675. Finished the rename of PDLoadCharacterizations. --- .../Framework/DataHandling/CMakeLists.txt | 12 +++++----- .../PDLoadCharacterizations.h | 12 +++++----- .../src/PDLoadCharacterizations.cpp | 24 +++++++++---------- .../test/PDLoadCharacterizationsTest.h | 24 +++++++++---------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Code/Mantid/Framework/DataHandling/CMakeLists.txt b/Code/Mantid/Framework/DataHandling/CMakeLists.txt index 4fffc9832d78..a5156f5370fa 100644 --- a/Code/Mantid/Framework/DataHandling/CMakeLists.txt +++ b/Code/Mantid/Framework/DataHandling/CMakeLists.txt @@ -58,7 +58,6 @@ set ( SRC_FILES src/LoadNexusLogs.cpp src/LoadNexusMonitors.cpp src/LoadNexusProcessed.cpp - src/LoadPDCharacterizations.cpp src/LoadPDFgetNFile.cpp src/LoadParameterFile.cpp src/LoadPreNexus.cpp @@ -91,7 +90,8 @@ set ( SRC_FILES src/ModifyDetectorDotDatFile.cpp src/MoveInstrumentComponent.cpp src/NexusTester.cpp - src/ProcessDasNexusLog.cpp + src/PDLoadCharacterizations.cpp + src/ProcessDasNexusLog.cpp src/RawFileInfo.cpp src/RemoveLogs.cpp src/RenameLog.cpp @@ -189,7 +189,6 @@ set ( INC_FILES inc/MantidDataHandling/LoadNexusLogs.h inc/MantidDataHandling/LoadNexusMonitors.h inc/MantidDataHandling/LoadNexusProcessed.h - inc/MantidDataHandling/LoadPDCharacterizations.h inc/MantidDataHandling/LoadPDFgetNFile.h inc/MantidDataHandling/LoadParameterFile.h inc/MantidDataHandling/LoadPreNexus.h @@ -217,7 +216,8 @@ set ( INC_FILES inc/MantidDataHandling/ModifyDetectorDotDatFile.h inc/MantidDataHandling/MoveInstrumentComponent.h inc/MantidDataHandling/NexusTester.h - inc/MantidDataHandling/ProcessDasNexusLog.h + inc/MantidDataHandling/PDLoadCharacterizations.h + inc/MantidDataHandling/ProcessDasNexusLog.h inc/MantidDataHandling/RawFileInfo.h inc/MantidDataHandling/RemoveLogs.h inc/MantidDataHandling/RenameLog.h @@ -312,7 +312,6 @@ set ( TEST_FILES LoadNexusMonitorsTest.h LoadNexusProcessedTest.h LoadNexusTest.h - LoadPDCharacterizationsTest.h LoadPDFgetNFileTest.h LoadParameterFileTest.h LoadPreNexusMonitorsTest.h @@ -340,7 +339,8 @@ set ( TEST_FILES ModifyDetectorDotDatFileTest.h MoveInstrumentComponentTest.h NexusTesterTest.h - ProcessDasNexusLogTest.h + PDLoadCharacterizationsTest.h + ProcessDasNexusLogTest.h RawFileInfoTest.h RemoveLogsTest.h RenameLogTest.h diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/PDLoadCharacterizations.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/PDLoadCharacterizations.h index 5017b147e865..27279e442389 100644 --- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/PDLoadCharacterizations.h +++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/PDLoadCharacterizations.h @@ -1,5 +1,5 @@ -#ifndef MANTID_DATAHANDLING_LOADPDCHARACTERIZATIONS_H_ -#define MANTID_DATAHANDLING_LOADPDCHARACTERIZATIONS_H_ +#ifndef MANTID_DATAHANDLING_PDLOADCHARACTERIZATIONS_H_ +#define MANTID_DATAHANDLING_PDLOADCHARACTERIZATIONS_H_ #include "MantidKernel/System.h" #include "MantidAPI/Algorithm.h" @@ -32,11 +32,11 @@ namespace DataHandling File change history is stored at: Code Documentation is available at: */ - class DLLExport LoadPDCharacterizations : public API::Algorithm + class DLLExport PDLoadCharacterizations : public API::Algorithm { public: - LoadPDCharacterizations(); - virtual ~LoadPDCharacterizations(); + PDLoadCharacterizations(); + virtual ~PDLoadCharacterizations(); virtual const std::string name() const; virtual int version() const; @@ -54,4 +54,4 @@ namespace DataHandling } // namespace DataHandling } // namespace Mantid -#endif /* MANTID_DATAHANDLING_LOADPDCHARACTERIZATIONS_H_ */ +#endif /* MANTID_DATAHANDLING_PDLOADCHARACTERIZATIONS_H_ */ diff --git a/Code/Mantid/Framework/DataHandling/src/PDLoadCharacterizations.cpp b/Code/Mantid/Framework/DataHandling/src/PDLoadCharacterizations.cpp index c18dc791bc57..ade3d2fe47d1 100644 --- a/Code/Mantid/Framework/DataHandling/src/PDLoadCharacterizations.cpp +++ b/Code/Mantid/Framework/DataHandling/src/PDLoadCharacterizations.cpp @@ -5,7 +5,7 @@ in [[EditInstrumentGeometry]]. If a section is missing then those parameters wil empty. This includes an empty table (zero rows) if that information is missing. *WIKI*/ -#include "MantidDataHandling/LoadPDCharacterizations.h" +#include "MantidDataHandling/PDLoadCharacterizations.h" #include "MantidAPI/FileProperty.h" #include "MantidAPI/TableRow.h" #include "MantidAPI/WorkspaceFactory.h" @@ -24,7 +24,7 @@ namespace DataHandling { // Register the algorithm into the AlgorithmFactory - DECLARE_ALGORITHM(LoadPDCharacterizations) + DECLARE_ALGORITHM(PDLoadCharacterizations) /// key for a instrument parameter file being listed static const std::string IPARM_KEY("Instrument parameter file:"); @@ -34,31 +34,31 @@ namespace DataHandling //---------------------------------------------------------------------------------------------- /** Constructor */ - LoadPDCharacterizations::LoadPDCharacterizations() + PDLoadCharacterizations::PDLoadCharacterizations() { } //---------------------------------------------------------------------------------------------- /** Destructor */ - LoadPDCharacterizations::~LoadPDCharacterizations() + PDLoadCharacterizations::~PDLoadCharacterizations() { } //---------------------------------------------------------------------------------------------- /// Algorithm's name for identification. @see Algorithm::name - const std::string LoadPDCharacterizations::name() const { return "LoadPDCharacterizations";}; + const std::string PDLoadCharacterizations::name() const { return "PDLoadCharacterizations";}; /// Algorithm's version for identification. @see Algorithm::version - int LoadPDCharacterizations::version() const { return 1;}; + int PDLoadCharacterizations::version() const { return 1;}; /// Algorithm's category for identification. @see Algorithm::category - const std::string LoadPDCharacterizations::category() const { return "Workflow\\DataHandling";} + const std::string PDLoadCharacterizations::category() const { return "Workflow\\DataHandling";} //---------------------------------------------------------------------------------------------- /// Sets documentation strings for this algorithm - void LoadPDCharacterizations::initDocs() + void PDLoadCharacterizations::initDocs() { std::string descr("Load a characterization file used in Powder Diffraction Reduction."); this->setWikiSummary(descr); @@ -68,7 +68,7 @@ namespace DataHandling //---------------------------------------------------------------------------------------------- /** Initialize the algorithm's properties. */ - void LoadPDCharacterizations::init() + void PDLoadCharacterizations::init() { std::vector exts; exts.push_back(".txt"); @@ -97,7 +97,7 @@ namespace DataHandling //---------------------------------------------------------------------------------------------- /** Execute the algorithm. */ - void LoadPDCharacterizations::exec() + void PDLoadCharacterizations::exec() { // open the file for reading std::string filename = this->getProperty("Filename"); @@ -143,7 +143,7 @@ namespace DataHandling * * @param file The stream to parse. */ - void LoadPDCharacterizations::readFocusInfo(std::ifstream &file) + void PDLoadCharacterizations::readFocusInfo(std::ifstream &file) { // end early if already at the end of the file if (file.eof()) return; @@ -193,7 +193,7 @@ namespace DataHandling * @param file The stream to parse. * @param wksp The table workspace to fill in. */ - void LoadPDCharacterizations::readCharInfo(std::ifstream &file, ITableWorkspace_sptr &wksp) + void PDLoadCharacterizations::readCharInfo(std::ifstream &file, ITableWorkspace_sptr &wksp) { // end early if already at the end of the file if (file.eof()) return; diff --git a/Code/Mantid/Framework/DataHandling/test/PDLoadCharacterizationsTest.h b/Code/Mantid/Framework/DataHandling/test/PDLoadCharacterizationsTest.h index 169df3a3350e..443ceafa6aeb 100644 --- a/Code/Mantid/Framework/DataHandling/test/PDLoadCharacterizationsTest.h +++ b/Code/Mantid/Framework/DataHandling/test/PDLoadCharacterizationsTest.h @@ -4,20 +4,20 @@ #include #include -#include "MantidDataHandling/LoadPDCharacterizations.h" +#include "MantidDataHandling/PDLoadCharacterizations.h" using Mantid::API::ITableWorkspace; using Mantid::API::ITableWorkspace_sptr; -using Mantid::DataHandling::LoadPDCharacterizations; -class LoadPDCharacterizationsTest : public CxxTest::TestSuite +using Mantid::DataHandling::PDLoadCharacterizations; +class PDLoadCharacterizationsTest : public CxxTest::TestSuite { public: // This pair of boilerplate methods prevent the suite being created statically // This means the constructor isn't called when running other tests - static LoadPDCharacterizationsTest *createSuite() { return new LoadPDCharacterizationsTest(); } - static void destroySuite( LoadPDCharacterizationsTest *suite ) { delete suite; } + static PDLoadCharacterizationsTest *createSuite() { return new PDLoadCharacterizationsTest(); } + static void destroySuite( PDLoadCharacterizationsTest *suite ) { delete suite; } - void runAlg(LoadPDCharacterizations &alg, ITableWorkspace_sptr &wksp, const std::string &filename) + void runAlg(PDLoadCharacterizations &alg, ITableWorkspace_sptr &wksp, const std::string &filename) { TS_ASSERT_THROWS_NOTHING( alg.initialize() ); TS_ASSERT( alg.isInitialized() ); @@ -35,7 +35,7 @@ class LoadPDCharacterizationsTest : public CxxTest::TestSuite } // checks the focus positions for NOMAD - void checkNOMAD(LoadPDCharacterizations &alg) + void checkNOMAD(PDLoadCharacterizations &alg) { TS_ASSERT_EQUALS(alg.getPropertyValue("IParmFilename"), std::string("NOMAD_11_22_11.prm")); double l1 = alg.getProperty("PrimaryFlightPath"); @@ -112,7 +112,7 @@ class LoadPDCharacterizationsTest : public CxxTest::TestSuite void test_Init() { - LoadPDCharacterizations alg; + PDLoadCharacterizations alg; TS_ASSERT_THROWS_NOTHING( alg.initialize() ) TS_ASSERT( alg.isInitialized() ) } @@ -123,7 +123,7 @@ class LoadPDCharacterizationsTest : public CxxTest::TestSuite ITableWorkspace_sptr wksp; // initialize and run the algorithm - LoadPDCharacterizations alg; + PDLoadCharacterizations alg; runAlg(alg, wksp, CHAR_FILE); // test the table workspace @@ -161,7 +161,7 @@ class LoadPDCharacterizationsTest : public CxxTest::TestSuite ITableWorkspace_sptr wksp; // initialize and run the algorithm - LoadPDCharacterizations alg; + PDLoadCharacterizations alg; runAlg(alg, wksp, CHAR_FILE); // test the table workspace @@ -190,7 +190,7 @@ class LoadPDCharacterizationsTest : public CxxTest::TestSuite ITableWorkspace_sptr wksp; // initialize and run the algorithm - LoadPDCharacterizations alg; + PDLoadCharacterizations alg; runAlg(alg, wksp, CHAR_FILE); // test the table workspace @@ -207,7 +207,7 @@ class LoadPDCharacterizationsTest : public CxxTest::TestSuite ITableWorkspace_sptr wksp; // initialize and run the algorithm - LoadPDCharacterizations alg; + PDLoadCharacterizations alg; runAlg(alg, wksp, CHAR_FILE); // test the table workspace