Skip to content

Commit

Permalink
Rename to end in XML instead of Xml re #7617
Browse files Browse the repository at this point in the history
Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
  • Loading branch information
KarlPalmen committed Sep 9, 2013
1 parent 03bdf2a commit 043f6cb
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/DataHandling/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set ( SRC_FILES
src/AppendGeometryToSNSNexus.cpp
src/CompressEvents.cpp
src/ConvertFullprofToXml.cpp
src/ConvertFullprofToXML.cpp
src/CreateChopperModel.cpp
src/CreateModeratorModel.cpp
src/CreateSampleShape.cpp
Expand Down Expand Up @@ -135,7 +135,7 @@ set ( SRC_FILES
set ( INC_FILES
inc/MantidDataHandling/AppendGeometryToSNSNexus.h
inc/MantidDataHandling/CompressEvents.h
inc/MantidDataHandling/ConvertFullprofToXml.h
inc/MantidDataHandling/ConvertFullprofToXML.h
inc/MantidDataHandling/CreateChopperModel.h
inc/MantidDataHandling/CreateModeratorModel.h
inc/MantidDataHandling/CreateSampleShape.h
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ namespace DataHandling
File change history is stored at: <https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
class DLLExport ConvertFullprofToXml : public API::Algorithm
class DLLExport ConvertFullprofToXML : public API::Algorithm
{
public:
ConvertFullprofToXml();
virtual ~ConvertFullprofToXml();
ConvertFullprofToXML();
virtual ~ConvertFullprofToXML();

/// Algorithm's name for identification overriding a virtual method
virtual const std::string name() const { return "ConvertFullprofToXml";}
virtual const std::string name() const { return "ConvertFullprofToXML";}

/// Algorithm's version for identification overriding a virtual method
virtual int version() const { return 1;}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,26 @@ namespace Mantid
namespace DataHandling
{

DECLARE_ALGORITHM(ConvertFullprofToXml)
DECLARE_ALGORITHM(ConvertFullprofToXML)

//----------------------------------------------------------------------------------------------
/** Constructor
*/
ConvertFullprofToXml::ConvertFullprofToXml()
ConvertFullprofToXML::ConvertFullprofToXML()
{
}

//----------------------------------------------------------------------------------------------
/** Destructor
*/
ConvertFullprofToXml::~ConvertFullprofToXml()
ConvertFullprofToXML::~ConvertFullprofToXML()
{
}

//----------------------------------------------------------------------------------------------
/** Sets documentation strings for this algorithm
*/
void ConvertFullprofToXml::initDocs()
void ConvertFullprofToXML::initDocs()
{
setWikiSummary("Convert the initial fitting parameters in a Fullprof file to XML format in an Instrument Parameter File");
setOptionalMessage("Convert the initial fitting parameters in a Fullprof file to XML format in an Instrument Parameter File");
Expand All @@ -57,7 +57,7 @@ namespace DataHandling
//----------------------------------------------------------------------------------------------
/** Implement abstract Algorithm methods
*/
void ConvertFullprofToXml::init()
void ConvertFullprofToXML::init()
{
// Input file name
vector<std::string> exts;
Expand All @@ -78,7 +78,7 @@ namespace DataHandling
//----------------------------------------------------------------------------------------------
/** Implement abstract Algorithm methods
*/
void ConvertFullprofToXml::exec()
void ConvertFullprofToXML::exec()
{
// Get input
string datafile = getProperty("Filename");
Expand All @@ -102,7 +102,7 @@ namespace DataHandling
* @param filename :: string for name of the .irf file
* @param lines :: vector of strings for each non-empty line in .irf file
*/
void ConvertFullprofToXml::loadFile(string filename, vector<string>& lines)
void ConvertFullprofToXML::loadFile(string filename, vector<string>& lines)
{
string line;

Expand Down Expand Up @@ -147,7 +147,7 @@ namespace DataHandling
* @param bankstartindexmap :: [output] map to indicate the first line of each bank in vector lines.
* @param bankendindexmap :: [output] map to indicate the last lie of each bank in vector lines
*/
void ConvertFullprofToXml::scanBanks(const vector<string>& lines, vector<int>& banks,
void ConvertFullprofToXML::scanBanks(const vector<string>& lines, vector<int>& banks,
map<int, int>& bankstartindexmap, map<int, int>& bankendindexmap)
{
int startindex = -1;
Expand Down Expand Up @@ -207,7 +207,7 @@ namespace DataHandling
* @param startlineindex :: [input] index of the first line of the bank in vector of lines
* @param endlineindex :: [input] index of the last line of the bank in vector of lines
*/
void ConvertFullprofToXml::parseResolutionStrings(map<string, double>& parammap, const vector<string>& lines,
void ConvertFullprofToXML::parseResolutionStrings(map<string, double>& parammap, const vector<string>& lines,
int bankid, int startlineindex, int endlineindex)
{
string bankline = lines[startlineindex];
Expand Down Expand Up @@ -473,7 +473,7 @@ namespace DataHandling
//----------------------------------------------------------------------------------------------
/** Parse a line containig bank information
*/
void ConvertFullprofToXml::parseBankLine(string line, double& cwl, int& bankid)
void ConvertFullprofToXML::parseBankLine(string line, double& cwl, int& bankid)
{
// 1. Split along 'Bank'
std::vector<std::string> v;
Expand Down

0 comments on commit 043f6cb

Please sign in to comment.