diff --git a/Framework/API/inc/MantidAPI/Algorithm.h b/Framework/API/inc/MantidAPI/Algorithm.h
index 3fef8ba4448f263506134943072da692dbad261f..478df0eb33363b44b2d7777e5b87e84b3aa64f4c 100644
--- a/Framework/API/inc/MantidAPI/Algorithm.h
+++ b/Framework/API/inc/MantidAPI/Algorithm.h
@@ -106,7 +106,7 @@ public:
public:
StartedNotification(const Algorithm *const alg)
: AlgorithmNotification(alg) {} ///< Constructor
- virtual std::string name() const {
+ std::string name() const override {
return "StartedNotification";
} ///< class name
};
@@ -116,7 +116,7 @@ public:
public:
FinishedNotification(const Algorithm *const alg, bool res)
: AlgorithmNotification(alg), success(res) {} ///< Constructor
- virtual std::string name() const {
+ std::string name() const override {
return "FinishedNotification";
} ///< class name
bool success; ///< true if the finished algorithm was successful or false if
@@ -133,7 +133,7 @@ public:
int progressPrecision)
: AlgorithmNotification(alg), progress(p), message(msg),
estimatedTime(estimatedTime), progressPrecision(progressPrecision) {}
- virtual std::string name() const {
+ std::string name() const override {
return "ProgressNotification";
} ///< class name
double progress; ///< Current progress. Value must be between 0 and 1.
@@ -150,7 +150,7 @@ public:
/// Constructor
ErrorNotification(const Algorithm *const alg, const std::string &str)
: AlgorithmNotification(alg), what(str) {}
- virtual std::string name() const {
+ std::string name() const override {
return "ErrorNotification";
} ///< class name
std::string what; ///< message string
@@ -171,10 +171,10 @@ public:
/// Assignment operator
CancelException &operator=(const CancelException &A);
/// Destructor
- ~CancelException() throw() {}
+ ~CancelException() throw() override {}
/// Returns the message string.
- const char *what() const throw() { return outMessage.c_str(); }
+ const char *what() const throw() override { return outMessage.c_str(); }
private:
/// The message returned by what()
@@ -183,99 +183,101 @@ public:
//============================================================================
Algorithm();
- virtual ~Algorithm();
+ ~Algorithm() override;
/** @name Algorithm Information */
/// function to return a name of the algorithm, must be overridden in all
/// algorithms
- virtual const std::string name() const = 0;
+ const std::string name() const override = 0;
/// function to return a version of the algorithm, must be overridden in all
/// algorithms
- virtual int version() const = 0;
+ int version() const override = 0;
/// function returns a summary message that will be displayed in the default
/// GUI, and in the help.
- virtual const std::string summary() const = 0;
+ const std::string summary() const override = 0;
/// function to return a category of the algorithm. A default implementation
/// is provided
- virtual const std::string category() const { return "Misc"; }
+ const std::string category() const override { return "Misc"; }
/// Function to return all of the categories that contain this algorithm
- virtual const std::vector<std::string> categories() const;
+ const std::vector<std::string> categories() const override;
/// Function to return the separator token for the category string. A default
/// implementation ';' is provided
- virtual const std::string categorySeparator() const { return ";"; }
+ const std::string categorySeparator() const override { return ";"; }
/// function to return any aliases to the algorithm; A default implementation
/// is provided
- virtual const std::string alias() const { return ""; }
+ const std::string alias() const override { return ""; }
- const std::string workspaceMethodName() const;
- const std::vector<std::string> workspaceMethodOn() const;
- const std::string workspaceMethodInputProperty() const;
+ const std::string workspaceMethodName() const override;
+ const std::vector<std::string> workspaceMethodOn() const override;
+ const std::string workspaceMethodInputProperty() const override;
/// Algorithm ID. Unmanaged algorithms return 0 (or NULL?) values. Managed
/// ones have non-zero.
- AlgorithmID getAlgorithmID() const { return m_algorithmID; }
+ AlgorithmID getAlgorithmID() const override { return m_algorithmID; }
/** @name IAlgorithm methods */
- void initialize();
- bool execute();
- void executeAsChildAlg();
- virtual std::map<std::string, std::string> validateInputs();
- virtual bool isInitialized() const;
- virtual bool isExecuted() const;
- bool isRunning() const;
+ void initialize() override;
+ bool execute() override;
+ void executeAsChildAlg() override;
+ std::map<std::string, std::string> validateInputs() override;
+ bool isInitialized() const override;
+ bool isExecuted() const override;
+ bool isRunning() const override;
using Kernel::PropertyManagerOwner::getProperty;
- bool isChild() const;
- void setChild(const bool isChild);
- void enableHistoryRecordingForChild(const bool on);
+ bool isChild() const override;
+ void setChild(const bool isChild) override;
+ void enableHistoryRecordingForChild(const bool on) override;
bool isRecordingHistoryForChild() { return m_recordHistoryForChild; }
- void setAlwaysStoreInADS(const bool doStore);
- void setRethrows(const bool rethrow);
+ void setAlwaysStoreInADS(const bool doStore) override;
+ void setRethrows(const bool rethrow) override;
/** @name Asynchronous Execution */
- Poco::ActiveResult<bool> executeAsync();
+ Poco::ActiveResult<bool> executeAsync() override;
/// Add an observer for a notification
- void addObserver(const Poco::AbstractObserver &observer) const;
+ void addObserver(const Poco::AbstractObserver &observer) const override;
/// Remove an observer
- void removeObserver(const Poco::AbstractObserver &observer) const;
+ void removeObserver(const Poco::AbstractObserver &observer) const override;
/// Raises the cancel flag.
- virtual void cancel();
+ void cancel() override;
/// Returns the cancellation state
bool getCancel() const { return m_cancel; }
/// Returns a reference to the logger.
Kernel::Logger &getLogger() const { return g_log; }
/// Logging can be disabled by passing a value of false
- void setLogging(const bool value) { g_log.setEnabled(value); }
+ void setLogging(const bool value) override { g_log.setEnabled(value); }
/// returns the status of logging, True = enabled
- bool isLogging() const { return g_log.getEnabled(); }
+ bool isLogging() const override { return g_log.getEnabled(); }
/// sets the logging priority offset
- void setLoggingOffset(const int value) { g_log.setLevelOffset(value); }
+ void setLoggingOffset(const int value) override {
+ g_log.setLevelOffset(value);
+ }
/// returns the logging priority offset
- int getLoggingOffset() const { return g_log.getLevelOffset(); }
+ int getLoggingOffset() const override { return g_log.getLevelOffset(); }
/// disable Logging of start and end messages
- void setAlgStartupLogging(const bool enabled);
+ void setAlgStartupLogging(const bool enabled) override;
/// get the state of Logging of start and end messages
- bool getAlgStartupLogging() const;
+ bool getAlgStartupLogging() const override;
/// setting the child start progress
- void setChildStartProgress(const double startProgress) const {
+ void setChildStartProgress(const double startProgress) const override {
m_startChildProgress = startProgress;
}
/// setting the child end progress
- void setChildEndProgress(const double endProgress) const {
+ void setChildEndProgress(const double endProgress) const override {
m_endChildProgress = endProgress;
}
/** @name Serialization functions */
//@{
/// Serialize an object to a string
- virtual std::string toString() const;
+ std::string toString() const override;
/// Serialize an object to a json object
::Json::Value toJson() const;
/// De-serialize an object from a string
diff --git a/Framework/API/inc/MantidAPI/AlgorithmFactory.h b/Framework/API/inc/MantidAPI/AlgorithmFactory.h
index e4dad97580ddaa1d31c2a63add10fecba1f79cdc..4e35e283e1f853b1f9a356224c706d8718316ab7 100644
--- a/Framework/API/inc/MantidAPI/AlgorithmFactory.h
+++ b/Framework/API/inc/MantidAPI/AlgorithmFactory.h
@@ -119,7 +119,7 @@ public:
bool exists(const std::string &algorithmName, const int version = -1);
/// Get the algorithm names and version - mangled use decodeName to separate
- const std::vector<std::string> getKeys() const;
+ const std::vector<std::string> getKeys() const override;
const std::vector<std::string> getKeys(bool includeHidden) const;
/// Returns the highest version of the algorithm currently registered
@@ -158,7 +158,7 @@ private:
/// Private assignment operator - NO ASSIGNMENT ALLOWED
AlgorithmFactoryImpl &operator=(const AlgorithmFactoryImpl &);
/// Private Destructor
- virtual ~AlgorithmFactoryImpl();
+ ~AlgorithmFactoryImpl() override;
/// creates an algorithm name convolved from an name and version
std::string createName(const std::string &, const int &) const;
/// fills a set with the hidden categories
diff --git a/Framework/API/inc/MantidAPI/AlgorithmHasProperty.h b/Framework/API/inc/MantidAPI/AlgorithmHasProperty.h
index ca36fd6d8ff19b5a168afb38fad9a26d0d540bd4..f9d896a6922d5e95440aeac0897c20b9555a19aa 100644
--- a/Framework/API/inc/MantidAPI/AlgorithmHasProperty.h
+++ b/Framework/API/inc/MantidAPI/AlgorithmHasProperty.h
@@ -49,14 +49,14 @@ public:
/// Constructor
AlgorithmHasProperty(const std::string &propName);
/// Destructor
- ~AlgorithmHasProperty();
+ ~AlgorithmHasProperty() override;
/**
* Get a string representation of the type
* @returns A string containing the validator type
*/
inline std::string getType() const { return "AlgorithmHasProperty"; }
/// Make a copy of the present type of validator
- inline Kernel::IValidator_sptr clone() const {
+ inline Kernel::IValidator_sptr clone() const override {
return boost::make_shared<AlgorithmHasProperty>(*this);
}
@@ -67,8 +67,8 @@ protected:
* @returns An error message to display to users or an empty string on no
* error
*/
- virtual std::string
- checkValidity(const boost::shared_ptr<IAlgorithm> &value) const;
+ std::string
+ checkValidity(const boost::shared_ptr<IAlgorithm> &value) const override;
private:
/// Default constructor
diff --git a/Framework/API/inc/MantidAPI/AlgorithmProperty.h b/Framework/API/inc/MantidAPI/AlgorithmProperty.h
index 6b6339e6c34def85a13bded575347a9ba1b79693..c2abf4bef9b510aaf1f8db467aa1a7cb29f07701 100644
--- a/Framework/API/inc/MantidAPI/AlgorithmProperty.h
+++ b/Framework/API/inc/MantidAPI/AlgorithmProperty.h
@@ -67,24 +67,24 @@ public:
/// Copy-Assignment operator
AlgorithmProperty &operator=(const AlgorithmProperty &rhs);
/// 'Virtual copy constructor'
- inline AlgorithmProperty *clone() const {
+ inline AlgorithmProperty *clone() const override {
return new AlgorithmProperty(*this);
}
/// Destructor
- ~AlgorithmProperty();
+ ~AlgorithmProperty() override;
/// Add the value of another property. Doesn't make sense here.
- virtual AlgorithmProperty &operator+=(Kernel::Property const *) {
+ AlgorithmProperty &operator+=(Kernel::Property const *) override {
throw Kernel::Exception::NotImplementedError(
"+= operator is not implemented for AlgorithmProperty.");
return *this;
}
/// Return the algorithm as string
- virtual std::string value() const;
+ std::string value() const override;
/// Get the default
- virtual std::string getDefault() const;
+ std::string getDefault() const override;
/// Sets the value of the algorithm
- virtual std::string setValue(const std::string &value);
+ std::string setValue(const std::string &value) override;
private:
/// Default constructor
diff --git a/Framework/API/inc/MantidAPI/AlgorithmProxy.h b/Framework/API/inc/MantidAPI/AlgorithmProxy.h
index cc2c06272044a8d3aee5889ffdb1da9975de73aa..a9405805a7cf03cb18429e738f61a0ae8c24c318 100644
--- a/Framework/API/inc/MantidAPI/AlgorithmProxy.h
+++ b/Framework/API/inc/MantidAPI/AlgorithmProxy.h
@@ -67,89 +67,94 @@ class MANTID_API_DLL AlgorithmProxy : public IAlgorithm,
public Kernel::PropertyManagerOwner {
public:
AlgorithmProxy(Algorithm_sptr alg);
- virtual ~AlgorithmProxy();
+ ~AlgorithmProxy() override;
/// The name of the algorithm
- const std::string name() const { return m_name; }
+ const std::string name() const override { return m_name; }
/// The version of the algorithm
- int version() const { return m_version; }
+ int version() const override { return m_version; }
/// The category of the algorithm
- const std::string category() const { return m_category; }
+ const std::string category() const override { return m_category; }
/// Function to return all of the categories that contain this algorithm
- const std::vector<std::string> categories() const;
+ const std::vector<std::string> categories() const override;
/// Function to return the sperator token for the category string. A default
/// implementation ',' is provided
- const std::string categorySeparator() const { return m_categorySeparator; }
+ const std::string categorySeparator() const override {
+ return m_categorySeparator;
+ }
/// Aliases to the algorithm
- const std::string alias() const { return m_alias; }
+ const std::string alias() const override { return m_alias; }
/// function returns a summary message that will be displayed in the default
/// GUI, and in the help.
- const std::string summary() const { return m_summary; }
+ const std::string summary() const override { return m_summary; }
/// The algorithmID
- AlgorithmID getAlgorithmID() const;
-
- void initialize();
- std::map<std::string, std::string> validateInputs();
- bool execute();
- void executeAsChildAlg() { throw std::runtime_error("Not implemented."); }
- Poco::ActiveResult<bool> executeAsync();
- bool isInitialized() const;
- bool isExecuted() const;
+ AlgorithmID getAlgorithmID() const override;
+
+ void initialize() override;
+ std::map<std::string, std::string> validateInputs() override;
+ bool execute() override;
+ void executeAsChildAlg() override {
+ throw std::runtime_error("Not implemented.");
+ }
+ Poco::ActiveResult<bool> executeAsync() override;
+ bool isInitialized() const override;
+ bool isExecuted() const override;
/// To query whether algorithm is a child. A proxy is always at top level,
/// returns false
- bool isChild() const { return m_isChild; }
- void setAlwaysStoreInADS(const bool) {}
- void setChild(const bool val) { m_isChild = val; }
+ bool isChild() const override { return m_isChild; }
+ void setAlwaysStoreInADS(const bool) override {}
+ void setChild(const bool val) override { m_isChild = val; }
/// Proxies only manage parent algorithms
- void enableHistoryRecordingForChild(const bool){};
- void setRethrows(const bool rethrow);
+ void enableHistoryRecordingForChild(const bool) override{};
+ void setRethrows(const bool rethrow) override;
- const std::string workspaceMethodName() const;
- const std::vector<std::string> workspaceMethodOn() const;
- const std::string workspaceMethodInputProperty() const;
+ const std::string workspaceMethodName() const override;
+ const std::vector<std::string> workspaceMethodOn() const override;
+ const std::string workspaceMethodInputProperty() const override;
/** @name PropertyManager methods */
//@{
/// Set the property value
- void setPropertyValue(const std::string &name, const std::string &value);
+ void setPropertyValue(const std::string &name,
+ const std::string &value) override;
/// Do something after a property was set
- void afterPropertySet(const std::string &);
+ void afterPropertySet(const std::string &) override;
/// Make m_properties point to the same PropertyManager as po.
- void copyPropertiesFrom(const PropertyManagerOwner &po);
+ void copyPropertiesFrom(const PropertyManagerOwner &po) override;
//@}
- void cancel();
- bool isRunning() const;
+ void cancel() override;
+ bool isRunning() const override;
- void addObserver(const Poco::AbstractObserver &observer) const;
- void removeObserver(const Poco::AbstractObserver &observer) const;
+ void addObserver(const Poco::AbstractObserver &observer) const override;
+ void removeObserver(const Poco::AbstractObserver &observer) const override;
/// Set logging on or off
///@param value :: true = logging enabled
- void setLogging(const bool value) { m_isLoggingEnabled = value; }
+ void setLogging(const bool value) override { m_isLoggingEnabled = value; }
/// Is the algorithm have logging enabled
- bool isLogging() const { return m_isLoggingEnabled; }
+ bool isLogging() const override { return m_isLoggingEnabled; }
/// returns the logging priority offset
- void setLoggingOffset(const int value) { m_loggingOffset = value; }
+ void setLoggingOffset(const int value) override { m_loggingOffset = value; }
/// returns the logging priority offset
- int getLoggingOffset() const { return m_loggingOffset; }
+ int getLoggingOffset() const override { return m_loggingOffset; }
/// disable Logging of start and end messages
- void setAlgStartupLogging(const bool enabled);
+ void setAlgStartupLogging(const bool enabled) override;
/// get the state of Logging of start and end messages
- bool getAlgStartupLogging() const;
+ bool getAlgStartupLogging() const override;
/// setting the child start progress
- void setChildStartProgress(const double startProgress) const;
+ void setChildStartProgress(const double startProgress) const override;
/// setting the child end progress
- void setChildEndProgress(const double endProgress) const;
+ void setChildEndProgress(const double endProgress) const override;
/** @name String serialization */
//@{
/// Serialize an object to a string
- virtual std::string toString() const;
+ std::string toString() const override;
//@}
private:
diff --git a/Framework/API/inc/MantidAPI/AnalysisDataService.h b/Framework/API/inc/MantidAPI/AnalysisDataService.h
index 2c1452e99ad8e996a24c79ef7a18b89bcc5e5e41..20f3c363da02cacd4a8a07091198ec1dd4ada9c3 100644
--- a/Framework/API/inc/MantidAPI/AnalysisDataService.h
+++ b/Framework/API/inc/MantidAPI/AnalysisDataService.h
@@ -112,12 +112,13 @@ public:
const std::string isValid(const std::string &name) const;
/// Overridden add member to attach the name to the workspace when a workspace
/// object is added to the service
- virtual void add(const std::string &name,
- const boost::shared_ptr<API::Workspace> &workspace);
+ void add(const std::string &name,
+ const boost::shared_ptr<API::Workspace> &workspace) override;
/// Overridden addOrReplace member to attach the name to the workspace when a
/// workspace object is added to the service
- virtual void addOrReplace(const std::string &name,
- const boost::shared_ptr<API::Workspace> &workspace);
+ void
+ addOrReplace(const std::string &name,
+ const boost::shared_ptr<API::Workspace> &workspace) override;
/// Overridden rename member to attach the new name to the workspace when a
/// workspace object is renamed
virtual void rename(const std::string &oldName, const std::string &newName);
@@ -156,7 +157,7 @@ public:
/// Return a lookup of the top level items
std::map<std::string, Workspace_sptr> topLevelItems() const;
- void shutdown();
+ void shutdown() override;
private:
/// Checks the name is valid, throwing if not
@@ -170,7 +171,7 @@ private:
/// Private, unimplemented copy assignment operator
AnalysisDataServiceImpl &operator=(const AnalysisDataServiceImpl &);
/// Private destructor
- virtual ~AnalysisDataServiceImpl();
+ ~AnalysisDataServiceImpl() override;
/// The string of illegal characters
std::string m_illegalChars;
diff --git a/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h b/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
index f7979de3f85fef40641c77b21b4b77129fe1bfb9..97af714bb5dabe21af937052ec255d0de34a2f59 100644
--- a/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
+++ b/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
@@ -52,7 +52,7 @@ private:
/// Private assignment operator - NO ASSIGNMENT ALLOWED
ArchiveSearchFactoryImpl &operator=(const ArchiveSearchFactoryImpl &);
/// Private Destructor
- virtual ~ArchiveSearchFactoryImpl() {}
+ ~ArchiveSearchFactoryImpl() override {}
};
/// Forward declaration of a specialisation of SingletonHolder for
diff --git a/Framework/API/inc/MantidAPI/BinEdgeAxis.h b/Framework/API/inc/MantidAPI/BinEdgeAxis.h
index 31d318130535c263b05dee0af0c76bd6858cd39f..0e660994a50acd996b2165ce2b58422b7df0a9c3 100644
--- a/Framework/API/inc/MantidAPI/BinEdgeAxis.h
+++ b/Framework/API/inc/MantidAPI/BinEdgeAxis.h
@@ -37,15 +37,15 @@ class MANTID_API_DLL BinEdgeAxis : public NumericAxis {
public:
BinEdgeAxis(const std::size_t &length);
BinEdgeAxis(const std::vector<double> &edges);
- virtual ~BinEdgeAxis() {}
+ ~BinEdgeAxis() override {}
- virtual Axis *clone(const MatrixWorkspace *const parentWorkspace);
- virtual Axis *clone(const std::size_t length,
- const MatrixWorkspace *const parentWorkspace);
+ Axis *clone(const MatrixWorkspace *const parentWorkspace) override;
+ Axis *clone(const std::size_t length,
+ const MatrixWorkspace *const parentWorkspace) override;
- virtual std::vector<double> createBinBoundaries() const;
- void setValue(const std::size_t &index, const double &value);
- size_t indexOfValue(const double value) const;
+ std::vector<double> createBinBoundaries() const override;
+ void setValue(const std::size_t &index, const double &value) override;
+ size_t indexOfValue(const double value) const override;
private:
/// Private, undefined copy assignment operator
diff --git a/Framework/API/inc/MantidAPI/CatalogFactory.h b/Framework/API/inc/MantidAPI/CatalogFactory.h
index b8731b92a903057603d26c04e06b83f3886bf01d..58c44020ec95b33bd6410c7d95a381d21f8d6a06 100644
--- a/Framework/API/inc/MantidAPI/CatalogFactory.h
+++ b/Framework/API/inc/MantidAPI/CatalogFactory.h
@@ -70,7 +70,7 @@ private:
/// Private assignment operator
CatalogFactoryImpl &operator=(const CatalogFactoryImpl &);
/// Private Destructor
- virtual ~CatalogFactoryImpl();
+ ~CatalogFactoryImpl() override;
/// Stores pointers to already created Catalog instances, with their name as
/// the key
mutable std::map<std::string, boost::shared_ptr<ICatalog>> m_createdCatalogs;
diff --git a/Framework/API/inc/MantidAPI/ColumnFactory.h b/Framework/API/inc/MantidAPI/ColumnFactory.h
index f3ef9607b54abfb4811d5c6f46220ce269895d20..2de3c1c6dff1d3e1b5e882286666f9ea622919b8 100644
--- a/Framework/API/inc/MantidAPI/ColumnFactory.h
+++ b/Framework/API/inc/MantidAPI/ColumnFactory.h
@@ -50,7 +50,7 @@ class Column;
class MANTID_API_DLL ColumnFactoryImpl : public Kernel::DynamicFactory<Column> {
public:
/// Creates an instance of a column
- boost::shared_ptr<Column> create(const std::string &type) const;
+ boost::shared_ptr<Column> create(const std::string &type) const override;
private:
friend struct Mantid::Kernel::CreateUsingNew<ColumnFactoryImpl>;
@@ -62,7 +62,7 @@ private:
/// Private assignment operator - NO ASSIGNMENT ALLOWED
ColumnFactoryImpl &operator=(const ColumnFactoryImpl &);
/// Private Destructor
- virtual ~ColumnFactoryImpl();
+ ~ColumnFactoryImpl() override;
};
/// Forward declaration of a specialisation of SingletonHolder for
diff --git a/Framework/API/inc/MantidAPI/CommonBinsValidator.h b/Framework/API/inc/MantidAPI/CommonBinsValidator.h
index 491e1fb63f0be05d84dc65edf01712a834195f4b..53d623eadfd01a9369914f1ff4f5b59d53437ca3 100644
--- a/Framework/API/inc/MantidAPI/CommonBinsValidator.h
+++ b/Framework/API/inc/MantidAPI/CommonBinsValidator.h
@@ -39,11 +39,11 @@ public:
/// Gets the type of the validator
std::string getType() const { return "commonbins"; }
/// Clone the current state
- Kernel::IValidator_sptr clone() const;
+ Kernel::IValidator_sptr clone() const override;
private:
/// Check for validity
- std::string checkValidity(const MatrixWorkspace_sptr &value) const;
+ std::string checkValidity(const MatrixWorkspace_sptr &value) const override;
};
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/CompositeCatalog.h b/Framework/API/inc/MantidAPI/CompositeCatalog.h
index 97f99fcb48950a065653508000876b85fa495868..696d94d83e1297afaa936e159fea0dc8504435f0 100644
--- a/Framework/API/inc/MantidAPI/CompositeCatalog.h
+++ b/Framework/API/inc/MantidAPI/CompositeCatalog.h
@@ -42,33 +42,33 @@ public:
/// Adds a catalog to the list of catalogs (m_catalogs)
void add(const ICatalog_sptr catalog);
/// Log the user into the catalog system.
- virtual CatalogSession_sptr login(const std::string &username,
- const std::string &password,
- const std::string &endpoint,
- const std::string &facility);
+ CatalogSession_sptr login(const std::string &username,
+ const std::string &password,
+ const std::string &endpoint,
+ const std::string &facility) override;
/// Log the user out of the catalog system.
- virtual void logout();
+ void logout() override;
/// Search the catalog for data.
- virtual void search(const ICat::CatalogSearchParam &inputs,
- ITableWorkspace_sptr &outputws, const int &offset,
- const int &limit);
+ void search(const ICat::CatalogSearchParam &inputs,
+ ITableWorkspace_sptr &outputws, const int &offset,
+ const int &limit) override;
/// Obtain the number of results returned by the search method.
- virtual int64_t
- getNumberOfSearchResults(const ICat::CatalogSearchParam &inputs);
+ int64_t
+ getNumberOfSearchResults(const ICat::CatalogSearchParam &inputs) override;
/// Show the logged in user's investigations search results.
- virtual void myData(ITableWorkspace_sptr &outputws);
+ void myData(ITableWorkspace_sptr &outputws) override;
/// Get datasets.
- virtual void getDataSets(const std::string &investigationId,
- ITableWorkspace_sptr &outputws);
+ void getDataSets(const std::string &investigationId,
+ ITableWorkspace_sptr &outputws) override;
/// Get datafiles
- virtual void getDataFiles(const std::string &investigationId,
- ITableWorkspace_sptr &outputws);
+ void getDataFiles(const std::string &investigationId,
+ ITableWorkspace_sptr &outputws) override;
/// Get instruments list
- virtual void listInstruments(std::vector<std::string> &instruments);
+ void listInstruments(std::vector<std::string> &instruments) override;
/// Get investigationtypes list
- virtual void listInvestigationTypes(std::vector<std::string> &invstTypes);
+ void listInvestigationTypes(std::vector<std::string> &invstTypes) override;
/// Keep current session alive
- virtual void keepAlive();
+ void keepAlive() override;
private:
std::list<ICatalog_sptr> m_catalogs;
diff --git a/Framework/API/inc/MantidAPI/CompositeDomainMD.h b/Framework/API/inc/MantidAPI/CompositeDomainMD.h
index 4d1ab7daa3dbe4452d227b62294097afd0f8ee20..aadf666d4ec8e7b7fbcc29ab358cb4af56cd7e26 100644
--- a/Framework/API/inc/MantidAPI/CompositeDomainMD.h
+++ b/Framework/API/inc/MantidAPI/CompositeDomainMD.h
@@ -44,13 +44,13 @@ class FunctionDomainMD;
class MANTID_API_DLL CompositeDomainMD : public CompositeDomain {
public:
CompositeDomainMD(IMDWorkspace_const_sptr ws, size_t maxDomainSize);
- ~CompositeDomainMD();
+ ~CompositeDomainMD() override;
/// Return the total number of arguments in the domain
- virtual size_t size() const { return m_totalSize; }
+ size_t size() const override { return m_totalSize; }
/// Return the number of parts in the domain
- virtual size_t getNParts() const { return m_domains.size(); }
+ size_t getNParts() const override { return m_domains.size(); }
/// Return i-th domain
- virtual const FunctionDomain &getDomain(size_t i) const;
+ const FunctionDomain &getDomain(size_t i) const override;
protected:
mutable IMDIterator *m_iterator; ///< IMDIterator
diff --git a/Framework/API/inc/MantidAPI/CompositeFunction.h b/Framework/API/inc/MantidAPI/CompositeFunction.h
index 29f8b6acd8697864aaad6c470170da3a69975bf1..a766fb0f26c17d5432d046ea11b6ec16e91188ff 100644
--- a/Framework/API/inc/MantidAPI/CompositeFunction.h
+++ b/Framework/API/inc/MantidAPI/CompositeFunction.h
@@ -62,103 +62,104 @@ public:
/// Default constructor
CompositeFunction();
/// Destructor
- virtual ~CompositeFunction();
+ ~CompositeFunction() override;
/* Overriden methods */
/// Returns the function's name
- virtual std::string name() const { return "CompositeFunction"; }
+ std::string name() const override { return "CompositeFunction"; }
/// Writes itself into a string
- std::string asString() const;
+ std::string asString() const override;
/// Sets the workspace for each member function
- void setWorkspace(boost::shared_ptr<const Workspace> ws);
+ void setWorkspace(boost::shared_ptr<const Workspace> ws) override;
/// Set matrix workspace
void
setMatrixWorkspace(boost::shared_ptr<const API::MatrixWorkspace> workspace,
- size_t wi, double startX, double endX);
+ size_t wi, double startX, double endX) override;
/// Function you want to fit to.
- virtual void function(const FunctionDomain &domain,
- FunctionValues &values) const;
+ void function(const FunctionDomain &domain,
+ FunctionValues &values) const override;
/// Derivatives of function with respect to active parameters
- virtual void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian);
+ void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian) override;
/// Set i-th parameter
- void setParameter(size_t, const double &value, bool explicitlySet = true);
+ void setParameter(size_t, const double &value,
+ bool explicitlySet = true) override;
/// Set i-th parameter description
- void setParameterDescription(size_t, const std::string &description);
+ void setParameterDescription(size_t, const std::string &description) override;
/// Get i-th parameter
- double getParameter(size_t i) const;
+ double getParameter(size_t i) const override;
/// Set parameter by name.
void setParameter(const std::string &name, const double &value,
- bool explicitlySet = true);
+ bool explicitlySet = true) override;
/// Set description of parameter by name.
void setParameterDescription(const std::string &name,
- const std::string &description);
+ const std::string &description) override;
/// Get parameter by name.
- double getParameter(const std::string &name) const;
+ double getParameter(const std::string &name) const override;
/// Total number of parameters
- size_t nParams() const;
+ size_t nParams() const override;
/// Returns the index of parameter name
- size_t parameterIndex(const std::string &name) const;
+ size_t parameterIndex(const std::string &name) const override;
/// Returns the name of parameter i
- std::string parameterName(size_t i) const;
+ std::string parameterName(size_t i) const override;
/// Returns the description of parameter i
- std::string parameterDescription(size_t i) const;
+ std::string parameterDescription(size_t i) const override;
/// Checks if a parameter has been set explicitly
- bool isExplicitlySet(size_t i) const;
+ bool isExplicitlySet(size_t i) const override;
/// Get the fitting error for a parameter
- virtual double getError(size_t i) const;
+ double getError(size_t i) const override;
/// Set the fitting error for a parameter
- virtual void setError(size_t i, double err);
+ void setError(size_t i, double err) override;
/// Check if a parameter is active
- bool isFixed(size_t i) const;
+ bool isFixed(size_t i) const override;
/// Removes a parameter from the list of active
- void fix(size_t i);
+ void fix(size_t i) override;
/// Restores a declared parameter i to the active status
- void unfix(size_t i);
+ void unfix(size_t i) override;
/// Value of i-th active parameter. Override this method to make fitted
/// parameters different from the declared
- double activeParameter(size_t i) const;
+ double activeParameter(size_t i) const override;
/// Set new value of i-th active parameter. Override this method to make
/// fitted parameters different from the declared
- void setActiveParameter(size_t i, double value);
+ void setActiveParameter(size_t i, double value) override;
/// Update parameters after a fitting iteration
void updateActive(const double *in);
/// Returns the name of active parameter i
- std::string nameOfActive(size_t i) const;
+ std::string nameOfActive(size_t i) const override;
/// Returns the name of active parameter i
- std::string descriptionOfActive(size_t i) const;
+ std::string descriptionOfActive(size_t i) const override;
/// Check if an active parameter i is actually active
- bool isActive(size_t i) const;
+ bool isActive(size_t i) const override;
/// Return parameter index from a parameter reference.
- size_t getParameterIndex(const ParameterReference &ref) const;
+ size_t getParameterIndex(const ParameterReference &ref) const override;
/// Get the containing function
IFunction_sptr getContainingFunction(const ParameterReference &ref) const;
/// Apply the ties
- void applyTies();
+ void applyTies() override;
/// Remove all ties
- void clearTies();
+ void clearTies() override;
// Unhide base class function: removeTie(string). Avoids Intel compiler
// warning
using IFunction::removeTie;
/// Removes i-th parameter's tie
- bool removeTie(size_t i);
+ bool removeTie(size_t i) override;
/// Get the tie of i-th parameter
- ParameterTie *getTie(size_t i) const;
+ ParameterTie *getTie(size_t i) const override;
/// Overwrite IFunction methods
- void addConstraint(IConstraint *ic);
+ void addConstraint(IConstraint *ic) override;
/// Get constraint of i-th parameter
- virtual IConstraint *getConstraint(size_t i) const;
+ IConstraint *getConstraint(size_t i) const override;
/// Prepare function for a fit
- void setUpForFit();
+ void setUpForFit() override;
/// Remove a constraint
- void removeConstraint(const std::string &parName);
+ void removeConstraint(const std::string &parName) override;
/* CompositeFunction own methods */
@@ -217,12 +218,12 @@ public:
protected:
/// Function initialization. Declare function parameters in this method.
- void init();
+ void init() override;
/// Declare a new parameter
- virtual void declareParameter(const std::string &name, double initValue = 0,
- const std::string &description = "");
+ void declareParameter(const std::string &name, double initValue = 0,
+ const std::string &description = "") override;
/// Add a new tie
- virtual void addTie(ParameterTie *tie);
+ void addTie(ParameterTie *tie) override;
size_t paramOffset(size_t i) const { return m_paramOffsets[i]; }
@@ -282,7 +283,7 @@ public:
* @param iP :: The parameter index of an individual function.
* @param value :: The derivative value
*/
- void set(size_t iY, size_t iP, double value) {
+ void set(size_t iY, size_t iP, double value) override {
m_J->set(m_iY0 + iY, m_iP0 + iP, value);
}
/**
@@ -290,12 +291,14 @@ public:
* @param iY :: The index of the data point
* @param iP :: The parameter index of an individual function.
*/
- double get(size_t iY, size_t iP) { return m_J->get(m_iY0 + iY, m_iP0 + iP); }
+ double get(size_t iY, size_t iP) override {
+ return m_J->get(m_iY0 + iY, m_iP0 + iP);
+ }
/** Add number to all iY (data) Jacobian elements for a given iP (parameter)
* @param value :: Value to add
* @param iP :: The index of an active parameter.
*/
- virtual void addNumberToColumn(const double &value, const size_t &iP) {
+ void addNumberToColumn(const double &value, const size_t &iP) override {
m_J->addNumberToColumn(value, m_iP0 + iP);
}
};
diff --git a/Framework/API/inc/MantidAPI/ConstraintFactory.h b/Framework/API/inc/MantidAPI/ConstraintFactory.h
index 2a0f9c6c90f6e5227e08bd34cb6f7a9c0ea3e40c..a60ec97ad88e937d7ea02a61e342673f5083f2d8 100644
--- a/Framework/API/inc/MantidAPI/ConstraintFactory.h
+++ b/Framework/API/inc/MantidAPI/ConstraintFactory.h
@@ -71,7 +71,7 @@ private:
/// Private assignment operator - NO ASSIGNMENT ALLOWED
ConstraintFactoryImpl &operator=(const ConstraintFactoryImpl &);
/// Private Destructor
- virtual ~ConstraintFactoryImpl();
+ ~ConstraintFactoryImpl() override;
};
/// Forward declaration of a specialisation of SingletonHolder for
diff --git a/Framework/API/inc/MantidAPI/DataProcessorAlgorithm.h b/Framework/API/inc/MantidAPI/DataProcessorAlgorithm.h
index 41605ef88cadad0fb33b631d110568d4bee7f4b8..5e81c998a293215ce310accd2f387b929bffc1f6 100644
--- a/Framework/API/inc/MantidAPI/DataProcessorAlgorithm.h
+++ b/Framework/API/inc/MantidAPI/DataProcessorAlgorithm.h
@@ -42,15 +42,15 @@ namespace API {
class DLLExport DataProcessorAlgorithm : public Algorithm {
public:
DataProcessorAlgorithm();
- virtual ~DataProcessorAlgorithm();
- virtual std::string getPropertyValue(const std::string &name) const;
- virtual TypedValue getProperty(const std::string &name) const;
+ ~DataProcessorAlgorithm() override;
+ std::string getPropertyValue(const std::string &name) const override;
+ TypedValue getProperty(const std::string &name) const override;
protected:
- virtual boost::shared_ptr<Algorithm> createChildAlgorithm(
+ boost::shared_ptr<Algorithm> createChildAlgorithm(
const std::string &name, const double startProgress = -1.,
const double endProgress = -1., const bool enableLogging = true,
- const int &version = -1);
+ const int &version = -1) override;
void setLoadAlg(const std::string &alg);
void setLoadAlgFileProp(const std::string &filePropName);
void setAccumAlg(const std::string &alg);
diff --git a/Framework/API/inc/MantidAPI/DomainCreatorFactory.h b/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
index 0b232c59f0d87ea764047d9ec93bc4b8dafacfb6..2ebfb4473b932bcb36f132de1ac48c423323e240 100644
--- a/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
+++ b/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
@@ -61,7 +61,7 @@ private:
/// No copying
DISABLE_COPY_AND_ASSIGN(DomainCreatorFactoryImpl)
/// Private Destructor for singleton
- virtual ~DomainCreatorFactoryImpl();
+ ~DomainCreatorFactoryImpl() override;
// Do not use default methods
using Kernel::DynamicFactory<IDomainCreator>::create;
diff --git a/Framework/API/inc/MantidAPI/EnabledWhenWorkspaceIsType.h b/Framework/API/inc/MantidAPI/EnabledWhenWorkspaceIsType.h
index f19e831ea30248c71201ce9daa56fafdf999ce4e..41d8fc23d5a807f55fb2e495e932c109d2fb18e0 100644
--- a/Framework/API/inc/MantidAPI/EnabledWhenWorkspaceIsType.h
+++ b/Framework/API/inc/MantidAPI/EnabledWhenWorkspaceIsType.h
@@ -55,7 +55,7 @@ public:
m_enabledSetting(enabledSetting) {}
/// Destructor
- virtual ~EnabledWhenWorkspaceIsType() {}
+ ~EnabledWhenWorkspaceIsType() override {}
//--------------------------------------------------------------------------------------------
/** Does the validator fulfill the criterion based on the
@@ -98,19 +98,19 @@ public:
//--------------------------------------------------------------------------------------------
/// Return true/false based on whether the other property satisfies the
/// criterion
- virtual bool isEnabled(const Kernel::IPropertyManager *algo) const {
+ bool isEnabled(const Kernel::IPropertyManager *algo) const override {
return fulfillsCriterion(algo);
}
//--------------------------------------------------------------------------------------------
/// Return true always
- virtual bool isVisible(const Kernel::IPropertyManager *) const {
+ bool isVisible(const Kernel::IPropertyManager *) const override {
return true;
}
//--------------------------------------------------------------------------------------------
/// Make a copy of the present type of validator
- virtual IPropertySettings *clone() {
+ IPropertySettings *clone() override {
EnabledWhenWorkspaceIsType *out =
new EnabledWhenWorkspaceIsType<T>(m_otherPropName, m_enabledSetting);
return out;
diff --git a/Framework/API/inc/MantidAPI/FermiChopperModel.h b/Framework/API/inc/MantidAPI/FermiChopperModel.h
index 3a10ae0c2a110b58b26f5ccf8b96e5b8c1aad774..6c9685a62e20fe4da7222e6a06d853a092afecc4 100644
--- a/Framework/API/inc/MantidAPI/FermiChopperModel.h
+++ b/Framework/API/inc/MantidAPI/FermiChopperModel.h
@@ -34,7 +34,7 @@ public:
/// Default constructor required by the factory
FermiChopperModel();
/// Returns a clone of the current object
- virtual boost::shared_ptr<ChopperModel> clone() const;
+ boost::shared_ptr<ChopperModel> clone() const override;
/// Set the radius of the chopper in metres
void setChopperRadius(const double value);
@@ -56,16 +56,17 @@ public:
double getIncidentEnergy() const;
/// Returns a time sample from the distribution given a flat random number
- double sampleTimeDistribution(const double randomNo) const;
+ double sampleTimeDistribution(const double randomNo) const override;
/// Returns a time sampled from the jitter distribution
- double sampleJitterDistribution(const double randomNo) const;
+ double sampleJitterDistribution(const double randomNo) const override;
private:
/// Set a parameter value from a string
- void setParameterValue(const std::string &name, const std::string &value);
+ void setParameterValue(const std::string &name,
+ const std::string &value) override;
/// Returns the variance of a the time pulse through this chopper in seconds^2
- double calculatePulseTimeVariance() const;
+ double calculatePulseTimeVariance() const override;
/// Computes the value of the regime-dependent portion of the pulse variance
double regimeFactor(const double gamma) const;
/// Map a flat random number to a triangular distibution of unit area
diff --git a/Framework/API/inc/MantidAPI/FileBackedExperimentInfo.h b/Framework/API/inc/MantidAPI/FileBackedExperimentInfo.h
index c755f27fa5a78349e0786a12d503dbc92c6a8ad5..68763508abbc1035ad424c8bbfe85d0f36502d02 100644
--- a/Framework/API/inc/MantidAPI/FileBackedExperimentInfo.h
+++ b/Framework/API/inc/MantidAPI/FileBackedExperimentInfo.h
@@ -40,60 +40,62 @@ public:
FileBackedExperimentInfo(const std::string &filename,
const std::string &path);
- ExperimentInfo *cloneExperimentInfo() const;
+ ExperimentInfo *cloneExperimentInfo() const override;
- const std::string toString() const;
+ const std::string toString() const override;
- Geometry::Instrument_const_sptr getInstrument() const;
+ Geometry::Instrument_const_sptr getInstrument() const override;
- const Geometry::ParameterMap &instrumentParameters() const;
+ const Geometry::ParameterMap &instrumentParameters() const override;
- Geometry::ParameterMap &instrumentParameters();
+ Geometry::ParameterMap &instrumentParameters() override;
- const Geometry::ParameterMap &constInstrumentParameters() const;
+ const Geometry::ParameterMap &constInstrumentParameters() const override;
- void populateInstrumentParameters();
+ void populateInstrumentParameters() override;
- void replaceInstrumentParameters(const Geometry::ParameterMap &pmap);
+ void replaceInstrumentParameters(const Geometry::ParameterMap &pmap) override;
- void swapInstrumentParameters(Geometry::ParameterMap &pmap);
+ void swapInstrumentParameters(Geometry::ParameterMap &pmap) override;
- void cacheDetectorGroupings(const det2group_map &mapping);
+ void cacheDetectorGroupings(const det2group_map &mapping) override;
- const std::vector<detid_t> &getGroupMembers(const detid_t detID) const;
+ const std::vector<detid_t> &
+ getGroupMembers(const detid_t detID) const override;
- Geometry::IDetector_const_sptr getDetectorByID(const detid_t detID) const;
+ Geometry::IDetector_const_sptr
+ getDetectorByID(const detid_t detID) const override;
- void setModeratorModel(ModeratorModel *source);
+ void setModeratorModel(ModeratorModel *source) override;
- ModeratorModel &moderatorModel() const;
+ ModeratorModel &moderatorModel() const override;
- void setChopperModel(ChopperModel *chopper, const size_t index = 0);
+ void setChopperModel(ChopperModel *chopper, const size_t index = 0) override;
- ChopperModel &chopperModel(const size_t index = 0) const;
+ ChopperModel &chopperModel(const size_t index = 0) const override;
- const Sample &sample() const;
+ const Sample &sample() const override;
- Sample &mutableSample();
+ Sample &mutableSample() override;
- const Run &run() const;
+ const Run &run() const override;
- Run &mutableRun();
+ Run &mutableRun() override;
- Kernel::Property *getLog(const std::string &log) const;
+ Kernel::Property *getLog(const std::string &log) const override;
- double getLogAsSingleValue(const std::string &log) const;
+ double getLogAsSingleValue(const std::string &log) const override;
- int getRunNumber() const;
+ int getRunNumber() const override;
- Kernel::DeltaEMode::Type getEMode() const;
+ Kernel::DeltaEMode::Type getEMode() const override;
- double getEFixed(const detid_t detID) const;
+ double getEFixed(const detid_t detID) const override;
double getEFixed(const Geometry::IDetector_const_sptr detector =
- Geometry::IDetector_const_sptr()) const;
+ Geometry::IDetector_const_sptr()) const override;
- void setEFixed(const detid_t detID, const double value);
+ void setEFixed(const detid_t detID, const double value) override;
private:
void populateIfNotLoaded() const;
diff --git a/Framework/API/inc/MantidAPI/FileProperty.h b/Framework/API/inc/MantidAPI/FileProperty.h
index c6907c3192a91e6f6e05acc03b2b0df999b09946..7b6c63f2e1cae9ee176071242323d2720b1aae41 100644
--- a/Framework/API/inc/MantidAPI/FileProperty.h
+++ b/Framework/API/inc/MantidAPI/FileProperty.h
@@ -67,7 +67,7 @@ public:
unsigned int direction = Kernel::Direction::Input);
/// 'Virtual copy constructor
- virtual FileProperty *clone() const { return new FileProperty(*this); }
+ FileProperty *clone() const override { return new FileProperty(*this); }
/// Check if this is a load type property.
bool isLoadProperty() const;
@@ -78,10 +78,10 @@ public:
/// Check if this property is optional
bool isOptional() const;
/// Overridden setValue method
- virtual std::string setValue(const std::string &propValue);
+ std::string setValue(const std::string &propValue) override;
/// Returns an empty string if the property is valid, otherwise contains an
/// error message
- virtual std::string isValid() const;
+ std::string isValid() const override;
/// Returns the main file extension that's used
std::string getDefaultExt() const { return m_defaultExt; }
diff --git a/Framework/API/inc/MantidAPI/FunctionDomain1D.h b/Framework/API/inc/MantidAPI/FunctionDomain1D.h
index f3a34da22c9ed3bdeb42ae52bb2592e1fd1f0871..6a04f0eb830f92ac1000c40f3af43a1377ae187f 100644
--- a/Framework/API/inc/MantidAPI/FunctionDomain1D.h
+++ b/Framework/API/inc/MantidAPI/FunctionDomain1D.h
@@ -46,7 +46,7 @@ namespace API {
class MANTID_API_DLL FunctionDomain1D : public FunctionDomain {
public:
/// Return the number of arguments in the domain
- virtual size_t size() const { return m_n; }
+ size_t size() const override { return m_n; }
/// Get an x value.
/// @param i :: Index
double operator[](size_t i) const { return m_data[i]; }
diff --git a/Framework/API/inc/MantidAPI/FunctionDomainMD.h b/Framework/API/inc/MantidAPI/FunctionDomainMD.h
index 704381966dacf23d3c6e78c0808d7a24b4e83703..fa52a8a36689278f9a2ab7e01ee33a19badbbc9e 100644
--- a/Framework/API/inc/MantidAPI/FunctionDomainMD.h
+++ b/Framework/API/inc/MantidAPI/FunctionDomainMD.h
@@ -41,11 +41,11 @@ public:
FunctionDomainMD(IMDWorkspace_const_sptr ws, size_t start = 0,
size_t length = 0);
/// Destructor.
- ~FunctionDomainMD();
+ ~FunctionDomainMD() override;
/// Return the number of arguments in the domain
- virtual size_t size() const { return m_size; }
+ size_t size() const override { return m_size; }
/// Reset the iterator to point to the start of the domain.
- virtual void reset() const;
+ void reset() const override;
/// Next iterator.
const IMDIterator *getNextIterator() const;
/// Returns the pointer to the original workspace
diff --git a/Framework/API/inc/MantidAPI/FunctionFactory.h b/Framework/API/inc/MantidAPI/FunctionFactory.h
index 3de0ab5ae923cec749aeea74b52e0c08aca6ad55..04e55a4cffa5372b2b0c85b5a35fecf3145836db 100644
--- a/Framework/API/inc/MantidAPI/FunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/FunctionFactory.h
@@ -87,7 +87,7 @@ private:
/// Private assignment operator - NO ASSIGNMENT ALLOWED
FunctionFactoryImpl &operator=(const FunctionFactoryImpl &);
/// Private Destructor
- virtual ~FunctionFactoryImpl();
+ ~FunctionFactoryImpl() override;
/// These methods shouldn't be used to create functions
using Kernel::DynamicFactory<IFunction>::create;
diff --git a/Framework/API/inc/MantidAPI/FunctionParameterDecorator.h b/Framework/API/inc/MantidAPI/FunctionParameterDecorator.h
index 2394847650e753875a328d9b295b7443c943ef69..4b3084177bc1e758b2face84f533099992f9e097 100644
--- a/Framework/API/inc/MantidAPI/FunctionParameterDecorator.h
+++ b/Framework/API/inc/MantidAPI/FunctionParameterDecorator.h
@@ -43,112 +43,111 @@ namespace API {
class MANTID_API_DLL FunctionParameterDecorator : virtual public IFunction {
public:
FunctionParameterDecorator() : IFunction(), m_wrappedFunction() {}
- virtual ~FunctionParameterDecorator() {}
+ ~FunctionParameterDecorator() override {}
void setDecoratedFunction(const std::string &wrappedFunctionName);
IFunction_sptr getDecoratedFunction() const;
- IFunction_sptr clone() const;
+ IFunction_sptr clone() const override;
- virtual void setWorkspace(boost::shared_ptr<const Workspace> ws);
- virtual void
- setMatrixWorkspace(boost::shared_ptr<const MatrixWorkspace> workspace,
- size_t wi, double startX, double endX);
+ void setWorkspace(boost::shared_ptr<const Workspace> ws) override;
+ void setMatrixWorkspace(boost::shared_ptr<const MatrixWorkspace> workspace,
+ size_t wi, double startX, double endX) override;
/// Set i-th parameter of decorated function.
- virtual void setParameter(size_t i, const double &value,
- bool explicitlySet = true);
+ void setParameter(size_t i, const double &value,
+ bool explicitlySet = true) override;
/// Set i-th parameter description of decorated function.
- virtual void setParameterDescription(size_t i,
- const std::string &description);
+ void setParameterDescription(size_t i,
+ const std::string &description) override;
/// Get i-th parameter of decorated function.
- virtual double getParameter(size_t i) const;
+ double getParameter(size_t i) const override;
/// Set parameter of decorated function by name.
- virtual void setParameter(const std::string &name, const double &value,
- bool explicitlySet = true);
+ void setParameter(const std::string &name, const double &value,
+ bool explicitlySet = true) override;
/// Set description of parameter of decorated function by name.
- virtual void setParameterDescription(const std::string &name,
- const std::string &description);
+ void setParameterDescription(const std::string &name,
+ const std::string &description) override;
/// Value of i-th active parameter of the decorated function.
- virtual double activeParameter(size_t i) const;
+ double activeParameter(size_t i) const override;
/// Set new value of i-th active parameter of the decorated function.
- virtual void setActiveParameter(size_t i, double value);
+ void setActiveParameter(size_t i, double value) override;
/// Get parameter of decorated function by name.
- virtual double getParameter(const std::string &name) const;
+ double getParameter(const std::string &name) const override;
/// Total number of parameters of decorated function.
- virtual size_t nParams() const;
+ size_t nParams() const override;
/// Returns the index of parameter of decorated function name.
- virtual size_t parameterIndex(const std::string &name) const;
+ size_t parameterIndex(const std::string &name) const override;
/// Returns the name of parameter i of decorated function.
- virtual std::string parameterName(size_t i) const;
+ std::string parameterName(size_t i) const override;
/// Returns the description of parameter i of decorated function.
- virtual std::string parameterDescription(size_t i) const;
+ std::string parameterDescription(size_t i) const override;
/// Checks if a parameter of decorated function has been set explicitly
- virtual bool isExplicitlySet(size_t i) const;
+ bool isExplicitlySet(size_t i) const override;
/// Get the fitting error for a parameter of decorated function.
- virtual double getError(size_t i) const;
+ double getError(size_t i) const override;
/// Set the fitting error for a parameter of decorated function.
- virtual void setError(size_t i, double err);
+ void setError(size_t i, double err) override;
/// Check if a declared parameter i of decorated function is active.
- virtual bool isFixed(size_t i) const;
+ bool isFixed(size_t i) const override;
/// Removes a declared parameter i of decorated function from the list of
/// active.
- virtual void fix(size_t i);
+ void fix(size_t i) override;
/// Restores a declared parameter i of decorated function to the active
/// status.
- virtual void unfix(size_t i);
+ void unfix(size_t i) override;
/// Return parameter index of decorated function from a parameter reference.
/// Usefull for constraints and ties in composite functions.
- virtual size_t getParameterIndex(const ParameterReference &ref) const;
+ size_t getParameterIndex(const ParameterReference &ref) const override;
/// Returns the number of attributes associated with the decorated function.
- virtual size_t nAttributes() const;
+ size_t nAttributes() const override;
/// Returns a list of attribute names of decorated function.
- virtual std::vector<std::string> getAttributeNames() const;
+ std::vector<std::string> getAttributeNames() const override;
/// Return a value of attribute attName of decorated function-
- virtual IFunction::Attribute getAttribute(const std::string &attName) const;
+ IFunction::Attribute getAttribute(const std::string &attName) const override;
/// Set a value to attribute attName of decorated function.
- virtual void setAttribute(const std::string &attName,
- const IFunction::Attribute &attValue);
+ void setAttribute(const std::string &attName,
+ const IFunction::Attribute &attValue) override;
/// Check if attribute attName exists in decorated function
- virtual bool hasAttribute(const std::string &attName) const;
+ bool hasAttribute(const std::string &attName) const override;
/// Tie a parameter of decorated function to other parameters (or a constant).
- virtual ParameterTie *tie(const std::string &parName, const std::string &expr,
- bool isDefault = false);
+ ParameterTie *tie(const std::string &parName, const std::string &expr,
+ bool isDefault = false) override;
/// Apply the ties in decorated function.
- virtual void applyTies();
+ void applyTies() override;
/// Remove all ties of decorated function.
- virtual void clearTies();
- virtual void removeTie(const std::string &parName);
+ void clearTies() override;
+ void removeTie(const std::string &parName) override;
/// Removes i-th parameter's of decorated function tie.
- virtual bool removeTie(size_t i);
+ bool removeTie(size_t i) override;
/// Get the tie of i-th parameter of decorated function.
- virtual ParameterTie *getTie(size_t i) const;
+ ParameterTie *getTie(size_t i) const override;
/// Add a constraint to decorated function.
- virtual void addConstraint(IConstraint *ic);
+ void addConstraint(IConstraint *ic) override;
/// Get constraint of i-th parameter of decorated function.
- virtual IConstraint *getConstraint(size_t i) const;
+ IConstraint *getConstraint(size_t i) const override;
/// Remove a constraint of decorated function.
- virtual void removeConstraint(const std::string &parName);
+ void removeConstraint(const std::string &parName) override;
/// Set parameters of decorated function to satisfy constraints.
- void setUpForFit();
+ void setUpForFit() override;
protected:
/// Does nothing.
- void init() {}
+ void init() override {}
void throwIfNoFunctionSet() const;
void declareParameter(const std::string &name, double initValue,
- const std::string &description);
+ const std::string &description) override;
- virtual void addTie(ParameterTie *tie);
+ void addTie(ParameterTie *tie) override;
virtual void beforeDecoratedFunctionSet(const IFunction_sptr &fn);
void setDecoratedFunctionPrivate(const IFunction_sptr &fn);
diff --git a/Framework/API/inc/MantidAPI/FunctionProperty.h b/Framework/API/inc/MantidAPI/FunctionProperty.h
index 09ba14cb771dc94690634a75f551e7d8d0276628..c799c9d74b80353fae4d4816e13408f9c7174dbf 100644
--- a/Framework/API/inc/MantidAPI/FunctionProperty.h
+++ b/Framework/API/inc/MantidAPI/FunctionProperty.h
@@ -56,35 +56,37 @@ public:
/// Bring in the PropertyWithValue assignment operator explicitly (avoids
/// VSC++ warning)
- virtual boost::shared_ptr<IFunction> &
- operator=(const boost::shared_ptr<IFunction> &value);
+ boost::shared_ptr<IFunction> &
+ operator=(const boost::shared_ptr<IFunction> &value) override;
/// Add the value of another property
- virtual FunctionProperty &operator+=(Kernel::Property const *);
+ FunctionProperty &operator+=(Kernel::Property const *) override;
/// 'Virtual copy constructor'
- FunctionProperty *clone() const { return new FunctionProperty(*this); }
+ FunctionProperty *clone() const override {
+ return new FunctionProperty(*this);
+ }
/// Virtual destructor
- virtual ~FunctionProperty();
+ ~FunctionProperty() override;
/// Get the function definition string
- virtual std::string value() const;
+ std::string value() const override;
/// Get the value the property was initialised with -its default value
- virtual std::string getDefault() const;
+ std::string getDefault() const override;
/// Set the value of the property.
- virtual std::string setValue(const std::string &value);
+ std::string setValue(const std::string &value) override;
/// Checks whether the entered function is valid.
- std::string isValid() const;
+ std::string isValid() const override;
/// Is default
- bool isDefault() const;
+ bool isDefault() const override;
/// Create a history record
- virtual const Kernel::PropertyHistory createHistory() const;
+ const Kernel::PropertyHistory createHistory() const override;
private:
/// The function definition string (as used by the FunctionFactory)
diff --git a/Framework/API/inc/MantidAPI/GridDomain.h b/Framework/API/inc/MantidAPI/GridDomain.h
index 92742313c507346a142bd2a1289e6716e1effabd..73e645ff624f93dcc6635b432d18f5d7498bec26 100644
--- a/Framework/API/inc/MantidAPI/GridDomain.h
+++ b/Framework/API/inc/MantidAPI/GridDomain.h
@@ -43,9 +43,9 @@ namespace API {
class MANTID_API_DLL GridDomain : public API::FunctionDomain {
public:
GridDomain(){};
- virtual ~GridDomain(){};
+ ~GridDomain() override{};
/// number of grid points
- size_t size() const;
+ size_t size() const override;
/// number of dimensions in the grid
size_t nDimensions();
/// get the grid at specified index
diff --git a/Framework/API/inc/MantidAPI/GridDomain1D.h b/Framework/API/inc/MantidAPI/GridDomain1D.h
index 289037f05f58f4c522cf51f6cdb43e6b570f1528..bf72b0d680042dbd417b1933c59abc6a18f182a3 100644
--- a/Framework/API/inc/MantidAPI/GridDomain1D.h
+++ b/Framework/API/inc/MantidAPI/GridDomain1D.h
@@ -42,11 +42,11 @@ namespace API {
class MANTID_API_DLL GridDomain1D : public API::GridDomain {
public:
GridDomain1D(){};
- virtual ~GridDomain1D(){};
+ ~GridDomain1D() override{};
/// initialize
void initialize(double &startX, double &endX, size_t &n, std::string scaling);
/// number of grid point s
- size_t size() const { return m_points.size(); }
+ size_t size() const override { return m_points.size(); }
/// number of dimensions in the grid
size_t nDimensions() { return 1; }
void reScale(const std::string &scaling);
diff --git a/Framework/API/inc/MantidAPI/HistogramValidator.h b/Framework/API/inc/MantidAPI/HistogramValidator.h
index a576d266ab28b1e245530d693cfeb04cb16b4f80..8fc18dd4620566f7eea31aac4c6bff20658048db 100644
--- a/Framework/API/inc/MantidAPI/HistogramValidator.h
+++ b/Framework/API/inc/MantidAPI/HistogramValidator.h
@@ -38,11 +38,11 @@ public:
/// Gets the type of the validator
std::string getType() const { return "histogram"; }
/// Clone the current state
- Kernel::IValidator_sptr clone() const;
+ Kernel::IValidator_sptr clone() const override;
private:
/// Check for validity
- std::string checkValidity(const MatrixWorkspace_sptr &value) const;
+ std::string checkValidity(const MatrixWorkspace_sptr &value) const override;
/// A flag indicating whether this validator requires that the workspace be a
/// histogram (true) or not
diff --git a/Framework/API/inc/MantidAPI/IAlgorithm.h b/Framework/API/inc/MantidAPI/IAlgorithm.h
index bffe1ca7094c49ed8cf5828988ceda71ba3af2a3..afd7059d64db02ab6ef975c2094a18cd1cf0575e 100644
--- a/Framework/API/inc/MantidAPI/IAlgorithm.h
+++ b/Framework/API/inc/MantidAPI/IAlgorithm.h
@@ -57,7 +57,7 @@ typedef void *AlgorithmID;
class MANTID_API_DLL IAlgorithm : virtual public Kernel::IPropertyManager {
public:
/// Virtual destructor (always needed for abstract classes)
- virtual ~IAlgorithm() {}
+ ~IAlgorithm() override {}
/// function to return a name of the algorithm, must be overridden in all
/// algorithms
diff --git a/Framework/API/inc/MantidAPI/IBoxControllerIO.h b/Framework/API/inc/MantidAPI/IBoxControllerIO.h
index aab4228eb2fd634eb46800e72fd39d2875707aa1..3bdd0af6ed80d63835cc626e9b78b5ceed62c274 100644
--- a/Framework/API/inc/MantidAPI/IBoxControllerIO.h
+++ b/Framework/API/inc/MantidAPI/IBoxControllerIO.h
@@ -73,7 +73,7 @@ public:
/** Close the file */
virtual void closeFile() = 0;
- virtual ~IBoxControllerIO() {}
+ ~IBoxControllerIO() override {}
/// the method which returns the size of data block used in IO operations
virtual size_t getDataChunk() const = 0;
diff --git a/Framework/API/inc/MantidAPI/IEventList.h b/Framework/API/inc/MantidAPI/IEventList.h
index 8764602f453cee3a48639f0fd8cfb2a1401f12a1..be8fedf1d2e3e048ce4623af205ae172497ea056 100644
--- a/Framework/API/inc/MantidAPI/IEventList.h
+++ b/Framework/API/inc/MantidAPI/IEventList.h
@@ -39,7 +39,7 @@ public:
/// Get the number of events from the list
virtual std::size_t getNumberEvents() const = 0;
/// Get memory size of event list
- virtual size_t getMemorySize() const = 0;
+ size_t getMemorySize() const override = 0;
/// Get copy of counts and errors, rebinned using on the given X values
virtual void generateHistogram(const MantidVec &X, MantidVec &Y, MantidVec &E,
bool skipError = false) const = 0;
diff --git a/Framework/API/inc/MantidAPI/IEventWorkspace.h b/Framework/API/inc/MantidAPI/IEventWorkspace.h
index 2c2c8edfe29401c84b16358eafbe8235e3132b29..d255dc89540b1b2efaced9f106e33a887b56958c 100644
--- a/Framework/API/inc/MantidAPI/IEventWorkspace.h
+++ b/Framework/API/inc/MantidAPI/IEventWorkspace.h
@@ -43,7 +43,7 @@ public:
IEventWorkspace_uptr clone() const { return IEventWorkspace_uptr(doClone()); }
/// Return the workspace typeID
- virtual const std::string id() const { return "IEventWorkspace"; }
+ const std::string id() const override { return "IEventWorkspace"; }
virtual std::size_t getNumberEvents() const = 0;
virtual double getTofMin() const = 0;
virtual double getTofMax() const = 0;
@@ -55,9 +55,9 @@ public:
getTimeAtSampleMin(double tofOffset = 0) const = 0;
virtual EventType getEventType() const = 0;
virtual IEventList *getEventListPtr(const std::size_t workspace_index) = 0;
- virtual void generateHistogram(const std::size_t index, const MantidVec &X,
- MantidVec &Y, MantidVec &E,
- bool skipError = false) const = 0;
+ void generateHistogram(const std::size_t index, const MantidVec &X,
+ MantidVec &Y, MantidVec &E,
+ bool skipError = false) const override = 0;
virtual void clearMRU() const = 0;
@@ -67,10 +67,10 @@ protected:
/// Protected copy assignment operator. Assignment not implemented.
IEventWorkspace &operator=(const IEventWorkspace &other);
- virtual const std::string toString() const;
+ const std::string toString() const override;
private:
- virtual IEventWorkspace *doClone() const = 0;
+ IEventWorkspace *doClone() const override = 0;
};
}
}
diff --git a/Framework/API/inc/MantidAPI/IFileLoader.h b/Framework/API/inc/MantidAPI/IFileLoader.h
index 094fd3ddc0ed23dff676544bd69aa86dc729e590..2e5ceb236255e68da209062245d974759bf8093e 100644
--- a/Framework/API/inc/MantidAPI/IFileLoader.h
+++ b/Framework/API/inc/MantidAPI/IFileLoader.h
@@ -39,7 +39,7 @@ class MANTID_API_DLL IFileLoader : public Algorithm {
public:
/// Virtual destructor (required by linker on some versions of OS X/Intel
/// compiler)
- virtual ~IFileLoader() {}
+ ~IFileLoader() override {}
/// Returns a confidence value that this algorithm can load a file
virtual int confidence(DescriptorType &descriptor) const = 0;
/// Returns a value indicating whether or not loader wants to load multiple
diff --git a/Framework/API/inc/MantidAPI/IFuncMinimizer.h b/Framework/API/inc/MantidAPI/IFuncMinimizer.h
index 425c7f7c0308fb33001bcc69a71a70bb88455256..6cdfb17a496baa472ceaffbed191456f66243732 100644
--- a/Framework/API/inc/MantidAPI/IFuncMinimizer.h
+++ b/Framework/API/inc/MantidAPI/IFuncMinimizer.h
@@ -42,7 +42,7 @@ class IFitFunction;
class MANTID_API_DLL IFuncMinimizer : public Kernel::PropertyManager {
public:
/// Virtual destructor
- virtual ~IFuncMinimizer() {}
+ ~IFuncMinimizer() override {}
/// Initialize minimizer.
/// @param function :: Function to minimize
diff --git a/Framework/API/inc/MantidAPI/IFunction1D.h b/Framework/API/inc/MantidAPI/IFunction1D.h
index f40d2b454d6d8e75e3f252fc11caffee8d9a4249..7ddceeffb6730d58fd4f42bb1dc2d7e140281e97 100644
--- a/Framework/API/inc/MantidAPI/IFunction1D.h
+++ b/Framework/API/inc/MantidAPI/IFunction1D.h
@@ -61,16 +61,16 @@ public:
/// Virtual destructor
/// (avoids warnings about non-trivial move assignment in virtually inheriting
/// classes)
- virtual ~IFunction1D() {}
+ ~IFunction1D() override {}
/* Overidden methods */
- virtual void function(const FunctionDomain &domain,
- FunctionValues &values) const;
+ void function(const FunctionDomain &domain,
+ FunctionValues &values) const override;
virtual void derivative(const FunctionDomain &domain, FunctionValues &values,
const size_t order = 1) const;
- void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian);
+ void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian) override;
/// Function you want to fit to.
virtual void function1D(double *out, const double *xValues,
diff --git a/Framework/API/inc/MantidAPI/IFunction1DSpectrum.h b/Framework/API/inc/MantidAPI/IFunction1DSpectrum.h
index cd6cc4fcba16bd7eb9bafb077fed745e5f6a4b99..fd5e0eb8126f32b4215f9aac82ef5ed2eb0a3322 100644
--- a/Framework/API/inc/MantidAPI/IFunction1DSpectrum.h
+++ b/Framework/API/inc/MantidAPI/IFunction1DSpectrum.h
@@ -40,11 +40,11 @@ namespace API {
*/
class DLLExport IFunction1DSpectrum : public virtual IFunction {
public:
- virtual ~IFunction1DSpectrum() {}
+ ~IFunction1DSpectrum() override {}
- virtual void function(const FunctionDomain &domain,
- FunctionValues &values) const;
- virtual void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian);
+ void function(const FunctionDomain &domain,
+ FunctionValues &values) const override;
+ void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian) override;
/// Provide a concrete function in an implementation that operates on a
/// FunctionDomain1DSpectrum.
diff --git a/Framework/API/inc/MantidAPI/IFunctionMD.h b/Framework/API/inc/MantidAPI/IFunctionMD.h
index 5fbea01f25a5f18ae9ac854b653dde0396d63e3c..e28ad41ab719d0d170023dd750a9d60811c0c046 100644
--- a/Framework/API/inc/MantidAPI/IFunctionMD.h
+++ b/Framework/API/inc/MantidAPI/IFunctionMD.h
@@ -70,14 +70,15 @@ public:
/* Overidden methods */
/// Virtual copy constructor
- virtual boost::shared_ptr<IFunction> clone() const;
+ boost::shared_ptr<IFunction> clone() const override;
/// Set the workspace.
/// @param ws :: Shared pointer to a workspace
- virtual void setWorkspace(boost::shared_ptr<const Workspace> ws);
+ void setWorkspace(boost::shared_ptr<const Workspace> ws) override;
- virtual void function(const FunctionDomain &domain,
- FunctionValues &values) const;
- virtual void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian) {
+ void function(const FunctionDomain &domain,
+ FunctionValues &values) const override;
+ void functionDeriv(const FunctionDomain &domain,
+ Jacobian &jacobian) override {
calNumericalDeriv(domain, jacobian);
}
diff --git a/Framework/API/inc/MantidAPI/IFunctionMW.h b/Framework/API/inc/MantidAPI/IFunctionMW.h
index 4a30e198c40246cfed8600e48a91428f0a9fb2a9..f69213e4bb0656fb6d679b83287a1a179164d46d 100644
--- a/Framework/API/inc/MantidAPI/IFunctionMW.h
+++ b/Framework/API/inc/MantidAPI/IFunctionMW.h
@@ -48,7 +48,7 @@ public:
/// Set MatrixWorkspace
void
setMatrixWorkspace(boost::shared_ptr<const API::MatrixWorkspace> workspace,
- size_t wi, double startX, double endX);
+ size_t wi, double startX, double endX) override;
/// Get shared pointer to the workspace
boost::shared_ptr<const API::MatrixWorkspace> getMatrixWorkspace() const;
/// Get the workspace index
diff --git a/Framework/API/inc/MantidAPI/IFunctionWithLocation.h b/Framework/API/inc/MantidAPI/IFunctionWithLocation.h
index 97fdd55af05e5771b12df3fd7bc0b3680587d0be..c98c153b7229f61a2583519835ce57709c6560de 100644
--- a/Framework/API/inc/MantidAPI/IFunctionWithLocation.h
+++ b/Framework/API/inc/MantidAPI/IFunctionWithLocation.h
@@ -45,7 +45,7 @@ public:
/// Virtual destructor
/// (avoids warnings about non-trivial move assignment in virtually inheriting
/// classes)
- virtual ~IFunctionWithLocation() {}
+ ~IFunctionWithLocation() override {}
/// Returns the centre of the function, which may be something as simple as
/// the centre of
diff --git a/Framework/API/inc/MantidAPI/ILatticeFunction.h b/Framework/API/inc/MantidAPI/ILatticeFunction.h
index 52be615d677acb375881ade81835cd93bcc1edfb..7d0f2a3d60c1548f54ad72b5d33b2b42831ecf44 100644
--- a/Framework/API/inc/MantidAPI/ILatticeFunction.h
+++ b/Framework/API/inc/MantidAPI/ILatticeFunction.h
@@ -41,10 +41,11 @@ namespace API {
class MANTID_API_DLL ILatticeFunction : public FunctionParameterDecorator {
public:
ILatticeFunction();
- virtual ~ILatticeFunction() {}
+ ~ILatticeFunction() override {}
- void function(const FunctionDomain &domain, FunctionValues &values) const;
- void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian);
+ void function(const FunctionDomain &domain,
+ FunctionValues &values) const override;
+ void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian) override;
/// Function that should calculate d-values for the HKLs provided in the
/// domain.
diff --git a/Framework/API/inc/MantidAPI/ILiveListener.h b/Framework/API/inc/MantidAPI/ILiveListener.h
index 2ab608fa9e3befce0973d4cdea091c5dc47ca7e0..c384426eba122c90bc57a644d158dc14a2f0d1fa 100644
--- a/Framework/API/inc/MantidAPI/ILiveListener.h
+++ b/Framework/API/inc/MantidAPI/ILiveListener.h
@@ -142,7 +142,7 @@ public:
/// Constructor.
ILiveListener();
/// Destructor. Should handle termination of any socket connections.
- virtual ~ILiveListener();
+ ~ILiveListener() override;
protected:
bool m_dataReset; ///< Indicates the receipt of a reset signal from the DAS.
diff --git a/Framework/API/inc/MantidAPI/IMDEventWorkspace.h b/Framework/API/inc/MantidAPI/IMDEventWorkspace.h
index b202d235d853d225385a0b1f7846606be040a8e0..0d9443c74b66a1001e841eca0c3dcf9305eb2b93 100644
--- a/Framework/API/inc/MantidAPI/IMDEventWorkspace.h
+++ b/Framework/API/inc/MantidAPI/IMDEventWorkspace.h
@@ -32,7 +32,7 @@ class MANTID_API_DLL IMDEventWorkspace : public API::IMDWorkspace,
public API::MultipleExperimentInfos {
public:
IMDEventWorkspace();
- virtual ~IMDEventWorkspace() {}
+ ~IMDEventWorkspace() override {}
/// Returns a clone of the workspace
IMDEventWorkspace_uptr clone() const {
@@ -80,7 +80,7 @@ public:
void setFileNeedsUpdating(bool value);
- virtual bool threadSafe() const;
+ bool threadSafe() const override;
virtual void setCoordinateSystem(
const Mantid::Kernel::SpecialCoordinateSystem coordinateSystem) = 0;
@@ -89,12 +89,12 @@ public:
/// from this.
virtual void setDisplayNormalizationHisto(
Mantid::API::MDNormalization preferredNormalizationHisto) = 0;
- virtual Mantid::API::MDNormalization displayNormalizationHisto() const = 0;
+ Mantid::API::MDNormalization displayNormalizationHisto() const override = 0;
/// Preferred visual normalization method.
virtual void setDisplayNormalization(
Mantid::API::MDNormalization preferredNormalization) = 0;
- virtual Mantid::API::MDNormalization displayNormalization() const = 0;
+ Mantid::API::MDNormalization displayNormalization() const override = 0;
protected:
/// Protected copy constructor. May be used by childs for cloning.
@@ -102,13 +102,13 @@ protected:
/// Protected copy assignment operator. Assignment not implemented.
IMDEventWorkspace &operator=(const IMDEventWorkspace &other);
- virtual const std::string toString() const;
+ const std::string toString() const override;
/// Marker set to true when a file-backed workspace needs its back-end file
/// updated (by calling SaveMD(UpdateFileBackEnd=1) )
bool m_fileNeedsUpdating;
private:
- virtual IMDEventWorkspace *doClone() const = 0;
+ IMDEventWorkspace *doClone() const override = 0;
};
} // namespace MDEvents
diff --git a/Framework/API/inc/MantidAPI/IMDHistoWorkspace.h b/Framework/API/inc/MantidAPI/IMDHistoWorkspace.h
index 068be6ccaf0ae89bec751ebf0c4b317482e05979..8800b57f04eb6237e9a2ae47f643838c94da4eac 100644
--- a/Framework/API/inc/MantidAPI/IMDHistoWorkspace.h
+++ b/Framework/API/inc/MantidAPI/IMDHistoWorkspace.h
@@ -39,7 +39,7 @@ class DLLExport IMDHistoWorkspace : public IMDWorkspace,
public MultipleExperimentInfos {
public:
IMDHistoWorkspace();
- virtual ~IMDHistoWorkspace();
+ ~IMDHistoWorkspace() override;
/// Returns a clone of the workspace
IMDHistoWorkspace_uptr clone() const {
@@ -111,10 +111,10 @@ protected:
/// Protected copy assignment operator. Assignment not implemented.
IMDHistoWorkspace &operator=(const IMDHistoWorkspace &other);
- virtual const std::string toString() const;
+ const std::string toString() const override;
private:
- virtual IMDHistoWorkspace *doClone() const = 0;
+ IMDHistoWorkspace *doClone() const override = 0;
};
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/IMDWorkspace.h b/Framework/API/inc/MantidAPI/IMDWorkspace.h
index 7a7b6b8984aea6108f3c5ffce23c4d5fe80fba17..8cb1281f0600daad8c48b2208f452efe054fdb13 100644
--- a/Framework/API/inc/MantidAPI/IMDWorkspace.h
+++ b/Framework/API/inc/MantidAPI/IMDWorkspace.h
@@ -72,7 +72,7 @@ static const signal_t MDMaskValue = std::numeric_limits<double>::quiet_NaN();
class MANTID_API_DLL IMDWorkspace : public Workspace, public API::MDGeometry {
public:
IMDWorkspace();
- virtual ~IMDWorkspace();
+ ~IMDWorkspace() override;
/// Returns a clone of the workspace
std::unique_ptr<IMDWorkspace> clone() const {
@@ -163,11 +163,11 @@ protected:
/// Protected copy assignment operator. Assignment not implemented.
IMDWorkspace &operator=(const IMDWorkspace &other);
- virtual const std::string toString() const;
+ const std::string toString() const override;
private:
std::string m_convention;
- virtual IMDWorkspace *doClone() const = 0;
+ IMDWorkspace *doClone() const override = 0;
};
/// Shared pointer to the IMDWorkspace base class
diff --git a/Framework/API/inc/MantidAPI/IPawleyFunction.h b/Framework/API/inc/MantidAPI/IPawleyFunction.h
index ab3e39bd3474ed2f7542ec741780a601ed56549a..6396ba620ffa5722b11143350cfd61e6db3a28bb 100644
--- a/Framework/API/inc/MantidAPI/IPawleyFunction.h
+++ b/Framework/API/inc/MantidAPI/IPawleyFunction.h
@@ -41,7 +41,7 @@ class MANTID_API_DLL IPawleyFunction : public FunctionParameterDecorator {
public:
IPawleyFunction();
/// Virtual destructor.
- virtual ~IPawleyFunction() {}
+ ~IPawleyFunction() override {}
/// A string that names the crystal system.
virtual void setLatticeSystem(const std::string &crystalSystem) = 0;
diff --git a/Framework/API/inc/MantidAPI/IPeakFunction.h b/Framework/API/inc/MantidAPI/IPeakFunction.h
index 306029e845e1a68b5bf4180541c122e35b8602f8..15c1f49370010e8c72ec52a8880e28b0d3693f66 100644
--- a/Framework/API/inc/MantidAPI/IPeakFunction.h
+++ b/Framework/API/inc/MantidAPI/IPeakFunction.h
@@ -42,7 +42,7 @@ public:
/// Virtual destructor
/// (avoids warnings about non-trivial move assignment in virtually inheriting
/// classes)
- virtual ~IPeakFunction() {}
+ ~IPeakFunction() override {}
/// Returns the peak FWHM
virtual double fwhm() const = 0;
@@ -56,10 +56,11 @@ public:
virtual void setIntensity(const double newIntensity);
/// General implementation of the method for all peaks.
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// General implementation of the method for all peaks.
void functionDeriv1D(Jacobian *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
/// Set new peak radius
static void setPeakRadius(const int &r = 5);
diff --git a/Framework/API/inc/MantidAPI/IPeaksWorkspace.h b/Framework/API/inc/MantidAPI/IPeaksWorkspace.h
index a06d35fbb99061bc5a27982894e62ef7cc5150b3..9f4d495e93e4d9daab64dc8ddfd27d01a32683c2 100644
--- a/Framework/API/inc/MantidAPI/IPeaksWorkspace.h
+++ b/Framework/API/inc/MantidAPI/IPeaksWorkspace.h
@@ -54,7 +54,7 @@ public:
}
/// Destructor
- virtual ~IPeaksWorkspace();
+ ~IPeaksWorkspace() override;
/// Returns a clone of the workspace
IPeaksWorkspace_uptr clone() const { return IPeaksWorkspace_uptr(doClone()); }
@@ -169,10 +169,10 @@ protected:
/// Protected copy assignment operator. Assignment not implemented.
IPeaksWorkspace &operator=(const IPeaksWorkspace &other);
- virtual const std::string toString() const;
+ const std::string toString() const override;
private:
- virtual IPeaksWorkspace *doClone() const = 0;
+ IPeaksWorkspace *doClone() const override = 0;
};
}
}
diff --git a/Framework/API/inc/MantidAPI/IPowderDiffPeakFunction.h b/Framework/API/inc/MantidAPI/IPowderDiffPeakFunction.h
index d85968451a4c7b251e0745a20f53de60359943aa..a80ac692a3b0ef00815ad142afd369afcfd04bca 100644
--- a/Framework/API/inc/MantidAPI/IPowderDiffPeakFunction.h
+++ b/Framework/API/inc/MantidAPI/IPowderDiffPeakFunction.h
@@ -44,7 +44,7 @@ public:
/// Constructor and Destructor
IPowderDiffPeakFunction();
- virtual ~IPowderDiffPeakFunction();
+ ~IPowderDiffPeakFunction() override;
/// Overwrite IFunction base class methods
// virtual const std::string name() = 0;
@@ -86,12 +86,12 @@ public:
virtual bool isPhysical() { return m_parameterValid; }
/// Override setting a new value to the i-th parameter
- virtual void setParameter(size_t i, const double &value,
- bool explicitlySet = true);
+ void setParameter(size_t i, const double &value,
+ bool explicitlySet = true) override;
/// Override setting a new value to a parameter by name
- virtual void setParameter(const std::string &name, const double &value,
- bool explicitlySe = true);
+ void setParameter(const std::string &name, const double &value,
+ bool explicitlySe = true) override;
/// Check whether a parameter is a profile parameter
virtual bool hasProfileParameter(std::string paramname);
diff --git a/Framework/API/inc/MantidAPI/ITableWorkspace.h b/Framework/API/inc/MantidAPI/ITableWorkspace.h
index 53810eb88c17974008e9cb54a9df33510286c85b..74a9e026772866b5da455067c700220b3337eb98 100644
--- a/Framework/API/inc/MantidAPI/ITableWorkspace.h
+++ b/Framework/API/inc/MantidAPI/ITableWorkspace.h
@@ -121,14 +121,14 @@ public:
/// Constructor
ITableWorkspace() {}
/// Virtual destructor.
- virtual ~ITableWorkspace() {}
+ ~ITableWorkspace() override {}
/// Returns a clone of the workspace
ITableWorkspace_uptr clone() const { return ITableWorkspace_uptr(doClone()); }
/// Return the workspace typeID
- virtual const std::string id() const { return "ITableWorkspace"; }
- virtual const std::string toString() const;
+ const std::string id() const override { return "ITableWorkspace"; }
+ const std::string toString() const override;
/** Creates a new column
* @param type :: The datatype of the column
* @param name :: The name to assign to the column
@@ -331,7 +331,7 @@ protected:
void removeFromColumn(Column *c, size_t index) { c->remove(index); }
private:
- virtual ITableWorkspace *doClone() const = 0;
+ ITableWorkspace *doClone() const override = 0;
};
// =====================================================================================
diff --git a/Framework/API/inc/MantidAPI/IkedaCarpenterModerator.h b/Framework/API/inc/MantidAPI/IkedaCarpenterModerator.h
index ed52ddf40ff0819777195a477bfb7f31f5507838..cde710c5cfb9ae2921e16b7bb535168b1aaac7c3 100644
--- a/Framework/API/inc/MantidAPI/IkedaCarpenterModerator.h
+++ b/Framework/API/inc/MantidAPI/IkedaCarpenterModerator.h
@@ -45,7 +45,7 @@ public:
/// Default constructor required by the factory
IkedaCarpenterModerator();
/// Returns a clone of the current object
- boost::shared_ptr<ModeratorModel> clone() const;
+ boost::shared_ptr<ModeratorModel> clone() const override;
/// Sets the value of the \f$\alpha\f$ parameter
void setFastDecayCoefficent(const double value);
@@ -61,18 +61,19 @@ public:
double getMixingCoefficient() const;
/// Returns the mean time for emission in microseconds
- double emissionTimeMean() const;
+ double emissionTimeMean() const override;
/// Returns the variance of emission time in microseconds
- double emissionTimeVariance() const;
+ double emissionTimeVariance() const override;
/// Returns a time, in seconds, sampled from the distibution given a flat
/// random number
- double sampleTimeDistribution(const double flatRandomNo) const;
+ double sampleTimeDistribution(const double flatRandomNo) const override;
private:
/// Custom initialize function, called after parameters have been set
- void init();
+ void init() override;
/// Set a parameter value from a string
- void setParameterValue(const std::string &name, const std::string &value);
+ void setParameterValue(const std::string &name,
+ const std::string &value) override;
/// Initialize the area-to-time lookup table
void initLookupTable();
/// For area between [0,1] returns the interpolated value of x
diff --git a/Framework/API/inc/MantidAPI/ImmutableCompositeFunction.h b/Framework/API/inc/MantidAPI/ImmutableCompositeFunction.h
index 62064b7203c7dcf4746a2c00842ebfeb7ffac355..32a1c58f56dfb820d5fd04fe3b56ebb8f3bf4d46 100644
--- a/Framework/API/inc/MantidAPI/ImmutableCompositeFunction.h
+++ b/Framework/API/inc/MantidAPI/ImmutableCompositeFunction.h
@@ -44,38 +44,40 @@ public:
/// Default constructor
ImmutableCompositeFunction() : CompositeFunction() {}
// Destructor
- ~ImmutableCompositeFunction() {}
+ ~ImmutableCompositeFunction() override {}
/* Overriden methods */
/// Returns the function's name
- virtual std::string name() const { return "ImmutableCompositeFunction"; }
+ std::string name() const override { return "ImmutableCompositeFunction"; }
/// Writes itself into a string
- std::string asString() const;
+ std::string asString() const override;
/// Set i-th parameter
- void setParameter(size_t i, const double &value, bool explicitlySet = true) {
+ void setParameter(size_t i, const double &value,
+ bool explicitlySet = true) override {
CompositeFunction::setParameter(i, value, explicitlySet);
}
/// Set i-th parameter description
- void setParameterDescription(size_t i, const std::string &description) {
+ void setParameterDescription(size_t i,
+ const std::string &description) override {
CompositeFunction::setParameterDescription(i, description);
}
/// Set parameter by name.
void setParameter(const std::string &name, const double &value,
- bool explicitlySet = true);
+ bool explicitlySet = true) override;
/// Set description of parameter by name.
void setParameterDescription(const std::string &name,
- const std::string &description);
+ const std::string &description) override;
/// Get i-th parameter
- double getParameter(size_t i) const {
+ double getParameter(size_t i) const override {
return CompositeFunction::getParameter(i);
}
/// Get parameter by name.
- double getParameter(const std::string &name) const;
+ double getParameter(const std::string &name) const override;
/// Returns the index of parameter name
- size_t parameterIndex(const std::string &name) const;
+ size_t parameterIndex(const std::string &name) const override;
/// Returns the name of parameter i
- std::string parameterName(size_t i) const;
+ std::string parameterName(size_t i) const override;
protected:
/// Make it protected
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
index 716a1d4c17b88e9c4c7a40705ff9cda18eb3b363..36a25130afcc2285b65aa309a1d0bde9af2905b5 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
@@ -43,14 +43,14 @@ namespace API {
class MANTID_API_DLL ImplicitFunctionFactoryImpl
: public Kernel::DynamicFactory<Mantid::Geometry::MDImplicitFunction> {
public:
- virtual Mantid::Geometry::MDImplicitFunction_sptr
- create(const std::string &className) const;
+ Mantid::Geometry::MDImplicitFunction_sptr
+ create(const std::string &className) const override;
virtual Mantid::Geometry::MDImplicitFunction *
createUnwrapped(Poco::XML::Element *processXML) const;
- virtual Mantid::Geometry::MDImplicitFunction *
- createUnwrapped(const std::string &processXML) const;
+ Mantid::Geometry::MDImplicitFunction *
+ createUnwrapped(const std::string &processXML) const override;
friend struct Mantid::Kernel::CreateUsingNew<ImplicitFunctionFactoryImpl>;
@@ -61,7 +61,7 @@ public:
/// Private assignment operator - NO ASSIGNMENT ALLOWED
ImplicitFunctionFactoryImpl &operator=(const ImplicitFunctionFactoryImpl &);
/// Private Destructor
- virtual ~ImplicitFunctionFactoryImpl();
+ ~ImplicitFunctionFactoryImpl() override;
};
/// Forward declaration of a specialisation of SingletonHolder for
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
index da14fc189b95d70b8e9cb3225198d6f5f6ea5a7d..1495dfc8d4a89c076639c243ba9f792d7c32eb0f 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
@@ -42,8 +42,8 @@ namespace API {
class MANTID_API_DLL ImplicitFunctionParameterParserFactoryImpl
: public Kernel::DynamicFactory<ImplicitFunctionParameterParser> {
public:
- virtual boost::shared_ptr<ImplicitFunctionParameterParser>
- create(const std::string &xmlString) const;
+ boost::shared_ptr<ImplicitFunctionParameterParser>
+ create(const std::string &xmlString) const override;
ImplicitFunctionParameterParser *createImplicitFunctionParameterParserFromXML(
Poco::XML::Element *parametersElement) const;
@@ -61,7 +61,7 @@ private:
ImplicitFunctionParameterParserFactoryImpl &
operator=(const ImplicitFunctionParameterParserFactoryImpl &);
/// Private Destructor
- virtual ~ImplicitFunctionParameterParserFactoryImpl();
+ ~ImplicitFunctionParameterParserFactoryImpl() override;
};
/// Forward declaration of a specialisation of SingletonHolder for
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
index 9eb01680b9beae36d73f124b54925148774a3fce..b742ad67890cf4f454d99824c160bb24559cbbe9 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
@@ -44,8 +44,8 @@ namespace API {
class MANTID_API_DLL ImplicitFunctionParserFactoryImpl
: public Kernel::DynamicFactory<ImplicitFunctionParser> {
public:
- virtual boost::shared_ptr<ImplicitFunctionParser>
- create(const std::string &xmlString) const;
+ boost::shared_ptr<ImplicitFunctionParser>
+ create(const std::string &xmlString) const override;
ImplicitFunctionParser *
createImplicitFunctionParserFromXML(const std::string &configXML) const;
@@ -65,7 +65,7 @@ private:
ImplicitFunctionParserFactoryImpl &
operator=(const ImplicitFunctionParserFactoryImpl &);
/// Private Destructor
- virtual ~ImplicitFunctionParserFactoryImpl();
+ ~ImplicitFunctionParserFactoryImpl() override;
};
/// Forward declaration of a specialisation of SingletonHolder for
diff --git a/Framework/API/inc/MantidAPI/IncreasingAxisValidator.h b/Framework/API/inc/MantidAPI/IncreasingAxisValidator.h
index 95965219c77caeaf436903e4c4daba4a470940cd..0774c3073c28fc305163d6a112c09965188104af 100644
--- a/Framework/API/inc/MantidAPI/IncreasingAxisValidator.h
+++ b/Framework/API/inc/MantidAPI/IncreasingAxisValidator.h
@@ -36,11 +36,11 @@ public:
/// Get the type of the validator
std::string getType() const { return "IncreasingAxis"; }
/// Clone the current state
- Kernel::IValidator_sptr clone() const;
+ Kernel::IValidator_sptr clone() const override;
private:
/// Check for validity
- std::string checkValidity(const MatrixWorkspace_sptr &value) const;
+ std::string checkValidity(const MatrixWorkspace_sptr &value) const override;
};
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/InstrumentDataService.h b/Framework/API/inc/MantidAPI/InstrumentDataService.h
index 6df6598a33842ac8025568ec213fe957bf1ee2a0..f96f7c4b011031fab2cba55c68bbdc96dda437d1 100644
--- a/Framework/API/inc/MantidAPI/InstrumentDataService.h
+++ b/Framework/API/inc/MantidAPI/InstrumentDataService.h
@@ -46,7 +46,7 @@ private:
/// Private, unimplemented copy assignment operator
InstrumentDataServiceImpl &operator=(const InstrumentDataServiceImpl &);
/// Destructor
- ~InstrumentDataServiceImpl();
+ ~InstrumentDataServiceImpl() override;
};
/// Forward declaration of a specialisation of SingletonHolder for
diff --git a/Framework/API/inc/MantidAPI/InstrumentValidator.h b/Framework/API/inc/MantidAPI/InstrumentValidator.h
index 3362f8c80ce5ce06cd966bd0bdaab282e7b5d558..27c89d488ea7173bd156dda0751bd975c6c5f546 100644
--- a/Framework/API/inc/MantidAPI/InstrumentValidator.h
+++ b/Framework/API/inc/MantidAPI/InstrumentValidator.h
@@ -43,9 +43,9 @@ public:
// The default is historical so I don't break a lot of user code
InstrumentValidator(const unsigned int flags = SamplePosition);
std::string getType() const;
- Kernel::IValidator_sptr clone() const;
+ Kernel::IValidator_sptr clone() const override;
std::string
- checkValidity(const boost::shared_ptr<ExperimentInfo> &value) const;
+ checkValidity(const boost::shared_ptr<ExperimentInfo> &value) const override;
private:
unsigned int m_requires;
diff --git a/Framework/API/inc/MantidAPI/JointDomain.h b/Framework/API/inc/MantidAPI/JointDomain.h
index c96440eda50dec7da41588f8273096b7c1f8ded5..066879d0321ddcfc405fe424d9d95237059312d7 100644
--- a/Framework/API/inc/MantidAPI/JointDomain.h
+++ b/Framework/API/inc/MantidAPI/JointDomain.h
@@ -42,11 +42,11 @@ namespace API {
class MANTID_API_DLL JointDomain : public CompositeDomain {
public:
/// Return the number of points in the domain
- virtual size_t size() const;
+ size_t size() const override;
/// Return the number of parts in the domain
- virtual size_t getNParts() const;
+ size_t getNParts() const override;
/// Return i-th domain
- virtual const FunctionDomain &getDomain(size_t i) const;
+ const FunctionDomain &getDomain(size_t i) const override;
void addDomain(FunctionDomain_sptr domain);
protected:
diff --git a/Framework/API/inc/MantidAPI/LatticeDomain.h b/Framework/API/inc/MantidAPI/LatticeDomain.h
index 6df77d39914a11068ef786830ce9ecffb4c25ef6..d1e5464c329ba7f3515de49f1b1ea3eee8e659c3 100644
--- a/Framework/API/inc/MantidAPI/LatticeDomain.h
+++ b/Framework/API/inc/MantidAPI/LatticeDomain.h
@@ -39,9 +39,9 @@ namespace API {
class MANTID_API_DLL LatticeDomain : public FunctionDomain {
public:
LatticeDomain(const std::vector<Kernel::V3D> &hkls);
- virtual ~LatticeDomain() {}
+ ~LatticeDomain() override {}
- size_t size() const;
+ size_t size() const override;
const Kernel::V3D &operator[](size_t i) const;
diff --git a/Framework/API/inc/MantidAPI/LinearScale.h b/Framework/API/inc/MantidAPI/LinearScale.h
index aede18b6e659e8cfb6fdff5c6ae37711e15d0b3e..740eef423d7b8d16815ef95e4f01ec4a3fc64cd8 100644
--- a/Framework/API/inc/MantidAPI/LinearScale.h
+++ b/Framework/API/inc/MantidAPI/LinearScale.h
@@ -42,11 +42,11 @@ namespace API {
class MANTID_API_DLL LinearScale : public API::ITransformScale {
public:
LinearScale(){};
- virtual ~LinearScale(){};
+ ~LinearScale() override{};
/// The scaling transformation. First and last elements of the grid remain
/// unchanged
- virtual const std::string name() const { return "LinearScale"; }
- virtual void transform(std::vector<double> &gd);
+ const std::string name() const override { return "LinearScale"; }
+ void transform(std::vector<double> &gd) override;
}; // class LinearScale
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/LiveListenerFactory.h b/Framework/API/inc/MantidAPI/LiveListenerFactory.h
index f5e28249e04c72d10228c5ab7f49de498941334d..1475485f63d30a34346a70a2886ba96c204b93eb 100644
--- a/Framework/API/inc/MantidAPI/LiveListenerFactory.h
+++ b/Framework/API/inc/MantidAPI/LiveListenerFactory.h
@@ -65,13 +65,13 @@ private:
/// Private assignment operator - NO ASSIGNMENT ALLOWED
LiveListenerFactoryImpl &operator=(const LiveListenerFactoryImpl &);
/// Private destructor
- virtual ~LiveListenerFactoryImpl();
+ ~LiveListenerFactoryImpl() override;
// Unhide the base class method to avoid a warning, but make private.
using Kernel::DynamicFactory<ILiveListener>::create;
/// Override the DynamicFactory::createUnwrapped() method. We don't want it
/// used here.
- ILiveListener *createUnwrapped(const std::string &className) const;
+ ILiveListener *createUnwrapped(const std::string &className) const override;
};
/// Forward declaration of a specialisation of SingletonHolder (needed for
diff --git a/Framework/API/inc/MantidAPI/LogarithmScale.h b/Framework/API/inc/MantidAPI/LogarithmScale.h
index 3e6f6d065de2bfdeb763b1aedc29c173eb363571..ed8350b3ada475b495c2e633b0058872b0c2b1b8 100644
--- a/Framework/API/inc/MantidAPI/LogarithmScale.h
+++ b/Framework/API/inc/MantidAPI/LogarithmScale.h
@@ -43,9 +43,9 @@ namespace API {
class MANTID_API_DLL LogarithmScale : public ITransformScale {
public:
LogarithmScale() : m_base(M_E){};
- ~LogarithmScale(){};
- const std::string name() const { return "LogarithmScale"; }
- void transform(std::vector<double> &gd);
+ ~LogarithmScale() override{};
+ const std::string name() const override { return "LogarithmScale"; }
+ void transform(std::vector<double> &gd) override;
void setBase(double &base);
/// The scaling transformation. First and last elements of the grid remain
/// unchanged
diff --git a/Framework/API/inc/MantidAPI/MatrixWorkspace.h b/Framework/API/inc/MantidAPI/MatrixWorkspace.h
index 3a8274fce6c6fd1ef880a67f40ac817b90bcf8f0..ee0338d04c661cfc97253a3ecc31003b37c4cd95 100644
--- a/Framework/API/inc/MantidAPI/MatrixWorkspace.h
+++ b/Framework/API/inc/MantidAPI/MatrixWorkspace.h
@@ -80,14 +80,14 @@ public:
void initialize(const std::size_t &NVectors, const std::size_t &XLength,
const std::size_t &YLength);
/// Delete
- virtual ~MatrixWorkspace();
+ ~MatrixWorkspace() override;
/// Returns a clone of the workspace
MatrixWorkspace_uptr clone() const { return MatrixWorkspace_uptr(doClone()); }
using IMDWorkspace::toString;
/// String description of state
- const std::string toString() const;
+ const std::string toString() const override;
/**@name Instrument queries */
//@{
@@ -97,7 +97,7 @@ public:
//@}
- virtual void populateInstrumentParameters();
+ void populateInstrumentParameters() override;
/** @name Nearest neighbours */
/// Build and populate the NearestNeighbours object
@@ -145,7 +145,7 @@ public:
bool hasGroupedDetectors() const;
/// Get the footprint in memory in bytes.
- virtual size_t getMemorySize() const;
+ size_t getMemorySize() const override;
virtual size_t getMemorySizeForXAxes() const;
// Section required for iteration
@@ -157,9 +157,9 @@ public:
virtual std::size_t getNumberHistograms() const = 0;
/// Sets MatrixWorkspace title
- virtual void setTitle(const std::string &);
+ void setTitle(const std::string &) override;
/// Gets MatrixWorkspace title (same as Run object run_title property)
- virtual const std::string getTitle() const;
+ const std::string getTitle() const override;
virtual Kernel::DateAndTime getFirstPulseTime() const;
Kernel::DateAndTime getLastPulseTime() const;
@@ -385,11 +385,11 @@ public:
//=====================================================================================
// MD Geometry methods
//=====================================================================================
- virtual size_t getNumDims() const;
- virtual boost::shared_ptr<const Mantid::Geometry::IMDDimension>
- getDimension(size_t index) const;
- virtual boost::shared_ptr<const Mantid::Geometry::IMDDimension>
- getDimensionWithId(std::string id) const;
+ size_t getNumDims() const override;
+ boost::shared_ptr<const Mantid::Geometry::IMDDimension>
+ getDimension(size_t index) const override;
+ boost::shared_ptr<const Mantid::Geometry::IMDDimension>
+ getDimensionWithId(std::string id) const override;
//=====================================================================================
// End MD Geometry methods
//=====================================================================================
@@ -399,41 +399,42 @@ public:
//=====================================================================================
/// Gets the number of points available on the workspace.
- virtual uint64_t getNPoints() const;
+ uint64_t getNPoints() const override;
/// Get the number of points available on the workspace.
- virtual uint64_t getNEvents() const { return this->getNPoints(); }
+ uint64_t getNEvents() const override { return this->getNPoints(); }
/// Dimension id for x-dimension.
static const std::string xDimensionId;
/// Dimensin id for y-dimension.
static const std::string yDimensionId;
/// Generate a line plot through the matrix workspace.
- virtual void getLinePlot(const Mantid::Kernel::VMD &start,
- const Mantid::Kernel::VMD &end,
- Mantid::API::MDNormalization normalize,
- std::vector<coord_t> &x, std::vector<signal_t> &y,
- std::vector<signal_t> &e) const;
+ void getLinePlot(const Mantid::Kernel::VMD &start,
+ const Mantid::Kernel::VMD &end,
+ Mantid::API::MDNormalization normalize,
+ std::vector<coord_t> &x, std::vector<signal_t> &y,
+ std::vector<signal_t> &e) const override;
/// Get the signal at a coordinate in the workspace.
- virtual signal_t
- getSignalAtCoord(const coord_t *coords,
- const Mantid::API::MDNormalization &normalization) const;
+ signal_t getSignalAtCoord(
+ const coord_t *coords,
+ const Mantid::API::MDNormalization &normalization) const override;
/// Get the signal at a coordinate in the workspace
- virtual signal_t getSignalWithMaskAtCoord(
+ signal_t getSignalWithMaskAtCoord(
const coord_t *coords,
- const Mantid::API::MDNormalization &normalization) const;
+ const Mantid::API::MDNormalization &normalization) const override;
/// Create iterators. Partitions the iterators according to the number of
/// cores.
- virtual std::vector<IMDIterator *>
- createIterators(size_t suggestedNumCores = 1,
- Mantid::Geometry::MDImplicitFunction *function = NULL) const;
+ std::vector<IMDIterator *> createIterators(
+ size_t suggestedNumCores = 1,
+ Mantid::Geometry::MDImplicitFunction *function = NULL) const override;
/// Apply masking.
- void setMDMasking(Mantid::Geometry::MDImplicitFunction *maskingRegion);
+ void
+ setMDMasking(Mantid::Geometry::MDImplicitFunction *maskingRegion) override;
/// Clear exsting masking.
- void clearMDMasking();
+ void clearMDMasking() override;
/// @return the special coordinate system used if any.
- virtual Mantid::Kernel::SpecialCoordinateSystem
- getSpecialCoordinateSystem() const;
+ Mantid::Kernel::SpecialCoordinateSystem
+ getSpecialCoordinateSystem() const override;
//=====================================================================================
// End IMDWorkspace methods
@@ -486,7 +487,7 @@ protected:
std::vector<Axis *> m_axes;
private:
- virtual MatrixWorkspace *doClone() const = 0;
+ MatrixWorkspace *doClone() const override = 0;
/// Create an MantidImage instance.
MantidImage_sptr
diff --git a/Framework/API/inc/MantidAPI/MatrixWorkspaceMDIterator.h b/Framework/API/inc/MantidAPI/MatrixWorkspaceMDIterator.h
index a9c7d075e515c9930565609bbe8592360dbc33f0..b4fe12dd93dfc761ea982cadb554cc3dc314cb64 100644
--- a/Framework/API/inc/MantidAPI/MatrixWorkspaceMDIterator.h
+++ b/Framework/API/inc/MantidAPI/MatrixWorkspaceMDIterator.h
@@ -41,54 +41,53 @@ public:
MatrixWorkspaceMDIterator(const MatrixWorkspace *workspace,
Mantid::Geometry::MDImplicitFunction *function,
size_t beginWI = 0, size_t endWI = size_t(-1));
- virtual ~MatrixWorkspaceMDIterator();
- virtual size_t getDataSize() const;
+ ~MatrixWorkspaceMDIterator() override;
+ size_t getDataSize() const override;
- virtual bool valid() const;
+ bool valid() const override;
- virtual bool next();
+ bool next() override;
- virtual bool next(size_t skip);
+ bool next(size_t skip) override;
- virtual void jumpTo(size_t index);
+ void jumpTo(size_t index) override;
- virtual signal_t getNormalizedSignal() const;
+ signal_t getNormalizedSignal() const override;
- virtual signal_t getNormalizedError() const;
+ signal_t getNormalizedError() const override;
- virtual signal_t getSignal() const;
+ signal_t getSignal() const override;
- virtual signal_t getError() const;
+ signal_t getError() const override;
- virtual coord_t *getVertexesArray(size_t &numVertices) const;
+ coord_t *getVertexesArray(size_t &numVertices) const override;
- virtual coord_t *getVertexesArray(size_t &numVertices,
- const size_t outDimensions,
- const bool *maskDim) const;
+ coord_t *getVertexesArray(size_t &numVertices, const size_t outDimensions,
+ const bool *maskDim) const override;
- virtual Mantid::Kernel::VMD getCenter() const;
+ Mantid::Kernel::VMD getCenter() const override;
- virtual size_t getNumEvents() const;
+ size_t getNumEvents() const override;
- virtual uint16_t getInnerRunIndex(size_t index) const;
+ uint16_t getInnerRunIndex(size_t index) const override;
- virtual int32_t getInnerDetectorID(size_t index) const;
+ int32_t getInnerDetectorID(size_t index) const override;
- virtual coord_t getInnerPosition(size_t index, size_t dimension) const;
+ coord_t getInnerPosition(size_t index, size_t dimension) const override;
- virtual signal_t getInnerSignal(size_t index) const;
+ signal_t getInnerSignal(size_t index) const override;
- virtual signal_t getInnerError(size_t index) const;
+ signal_t getInnerError(size_t index) const override;
- virtual bool getIsMasked() const;
+ bool getIsMasked() const override;
- virtual std::vector<size_t> findNeighbourIndexes() const;
+ std::vector<size_t> findNeighbourIndexes() const override;
- virtual std::vector<size_t> findNeighbourIndexesFaceTouching() const;
+ std::vector<size_t> findNeighbourIndexesFaceTouching() const override;
- virtual size_t getLinearIndex() const;
+ size_t getLinearIndex() const override;
- virtual bool isWithinBounds(size_t index) const;
+ bool isWithinBounds(size_t index) const override;
private:
void calcWorkspacePos(size_t newWI);
diff --git a/Framework/API/inc/MantidAPI/MultiDomainFunction.h b/Framework/API/inc/MantidAPI/MultiDomainFunction.h
index 92b758647caef87a952825c86389421e9423def3..56576465e01ca5fe87229fcb310d7a954d550afd 100644
--- a/Framework/API/inc/MantidAPI/MultiDomainFunction.h
+++ b/Framework/API/inc/MantidAPI/MultiDomainFunction.h
@@ -47,19 +47,19 @@ public:
MultiDomainFunction() : m_nDomains(0), m_maxIndex(0) {}
/// Returns the function's name
- virtual std::string name() const { return "MultiDomainFunction"; }
+ std::string name() const override { return "MultiDomainFunction"; }
/// Function you want to fit to.
/// @param domain :: The input domain over which the function is to be
/// calculated
/// @param values :: A storage object for the calculated values
- virtual void function(const FunctionDomain &domain,
- FunctionValues &values) const;
+ void function(const FunctionDomain &domain,
+ FunctionValues &values) const override;
/// Derivatives of function with respect to active parameters
- virtual void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian);
+ void functionDeriv(const FunctionDomain &domain, Jacobian &jacobian) override;
/// Called at the start of each iteration
- virtual void iterationStarting();
+ void iterationStarting() override;
/// Called at the end of an iteration
- virtual void iterationFinished();
+ void iterationFinished() override;
/// Create a list of equivalent functions
virtual std::vector<IFunction_sptr> createEquivalentFunctions() const;
@@ -80,19 +80,19 @@ public:
/// Local attributes are attributes of MultiDomainFunction but describe
/// properties
/// of individual member functions.
- virtual size_t nLocalAttributes() const { return 1; }
+ size_t nLocalAttributes() const override { return 1; }
/// Returns a list of attribute names
- virtual std::vector<std::string> getLocalAttributeNames() const {
+ std::vector<std::string> getLocalAttributeNames() const override {
return std::vector<std::string>(1, "domains");
}
/// Return a value of attribute attName
- virtual Attribute getLocalAttribute(size_t i,
- const std::string &attName) const;
+ Attribute getLocalAttribute(size_t i,
+ const std::string &attName) const override;
/// Set a value to attribute attName
- virtual void setLocalAttribute(size_t i, const std::string &attName,
- const Attribute &);
+ void setLocalAttribute(size_t i, const std::string &attName,
+ const Attribute &) override;
/// Check if attribute attName exists
- virtual bool hasLocalAttribute(const std::string &attName) const {
+ bool hasLocalAttribute(const std::string &attName) const override {
return attName == "domains";
}
diff --git a/Framework/API/inc/MantidAPI/MultiPeriodGroupAlgorithm.h b/Framework/API/inc/MantidAPI/MultiPeriodGroupAlgorithm.h
index 4fa423c321f6b216523bd43abe9251cef6958c1c..7f53864fa9f949a86eb00818521c7045c4541ff2 100644
--- a/Framework/API/inc/MantidAPI/MultiPeriodGroupAlgorithm.h
+++ b/Framework/API/inc/MantidAPI/MultiPeriodGroupAlgorithm.h
@@ -39,13 +39,13 @@ National Laboratory & European Spallation Source
class DLLExport MultiPeriodGroupAlgorithm : public Algorithm {
public:
MultiPeriodGroupAlgorithm();
- virtual ~MultiPeriodGroupAlgorithm();
+ ~MultiPeriodGroupAlgorithm() override;
private:
/// Overriden from Algorithm base
- virtual bool checkGroups();
+ bool checkGroups() override;
/// Overriden from Algorithm base.
- virtual bool processGroups();
+ bool processGroups() override;
/// Method to provide the name for the input workspace property.
virtual std::string fetchInputPropertyName() const = 0;
/// Method to indicate that a non-standard property is taken as the input, so
diff --git a/Framework/API/inc/MantidAPI/MultipleFileProperty.h b/Framework/API/inc/MantidAPI/MultipleFileProperty.h
index 5e3b8950127ca5bf8d8fc4a2b17a3e1c24a6dc9f..4359aef418d6e1ef94cd6ee8e963d608e38bccc5 100644
--- a/Framework/API/inc/MantidAPI/MultipleFileProperty.h
+++ b/Framework/API/inc/MantidAPI/MultipleFileProperty.h
@@ -124,18 +124,18 @@ public:
const std::string &name,
const std::vector<std::string> &exts = std::vector<std::string>());
- ~MultipleFileProperty();
+ ~MultipleFileProperty() override;
/// 'Virtual copy constructor
- virtual MultipleFileProperty *clone() const {
+ MultipleFileProperty *clone() const override {
return new MultipleFileProperty(*this);
}
/// Overridden functions to accomodate std::vector<std::vector<std::string>>>
/// structure of this property.
- virtual std::string setValue(const std::string &propValue);
- virtual std::string value() const;
- virtual std::string getDefault() const;
+ std::string setValue(const std::string &propValue) override;
+ std::string value() const override;
+ std::string getDefault() const override;
/// @return the vector of suggested extensions. For use in GUIs showing files.
std::vector<std::string> getExts() const { return m_exts; }
diff --git a/Framework/API/inc/MantidAPI/NullCoordTransform.h b/Framework/API/inc/MantidAPI/NullCoordTransform.h
index b7a63638fa6ffad03bac6304a60d847d75d876c8..c5338a0cacdb6c7470c5ce49e93fcabffe04dc2e 100644
--- a/Framework/API/inc/MantidAPI/NullCoordTransform.h
+++ b/Framework/API/inc/MantidAPI/NullCoordTransform.h
@@ -15,12 +15,12 @@ namespace API {
class DLLExport NullCoordTransform : public Mantid::API::CoordTransform {
public:
NullCoordTransform(size_t ndims = 3);
- virtual ~NullCoordTransform();
- std::string toXMLString() const;
- std::string id() const;
+ ~NullCoordTransform() override;
+ std::string toXMLString() const override;
+ std::string id() const override;
void apply(const Mantid::coord_t *inputVector,
- Mantid::coord_t *outVector) const;
- virtual CoordTransform *clone() const;
+ Mantid::coord_t *outVector) const override;
+ CoordTransform *clone() const override;
private:
/// Number of dimensions.
diff --git a/Framework/API/inc/MantidAPI/NumericAxis.h b/Framework/API/inc/MantidAPI/NumericAxis.h
index e451fe04c6fbf1800470df868194684bc6aee06e..61ca7da81e775afc88a4fe14943e26a4e0fa9d5d 100644
--- a/Framework/API/inc/MantidAPI/NumericAxis.h
+++ b/Framework/API/inc/MantidAPI/NumericAxis.h
@@ -50,32 +50,32 @@ public:
NumericAxis(const std::size_t &length);
NumericAxis(const std::vector<double> ¢res);
- virtual ~NumericAxis() {}
+ ~NumericAxis() override {}
- virtual Axis *clone(const MatrixWorkspace *const parentWorkspace);
- virtual Axis *clone(const std::size_t length,
- const MatrixWorkspace *const parentWorkspace);
+ Axis *clone(const MatrixWorkspace *const parentWorkspace) override;
+ Axis *clone(const std::size_t length,
+ const MatrixWorkspace *const parentWorkspace) override;
/// Is the axis numeric - always true for this class
- virtual bool isNumeric() const { return true; }
- virtual std::size_t length() const { return m_values.size(); }
+ bool isNumeric() const override { return true; }
+ std::size_t length() const override { return m_values.size(); }
/// Get a value at the specified index
- virtual double operator()(const std::size_t &index,
- const std::size_t &verticalIndex = 0) const;
+ double operator()(const std::size_t &index,
+ const std::size_t &verticalIndex = 0) const override;
/// Set the value at a specific index
- virtual void setValue(const std::size_t &index, const double &value);
- virtual size_t indexOfValue(const double value) const;
- virtual bool operator==(const Axis &) const;
+ void setValue(const std::size_t &index, const double &value) override;
+ size_t indexOfValue(const double value) const override;
+ bool operator==(const Axis &) const override;
virtual bool equalWithinTolerance(const Axis &axis2,
const double tolerance) const;
- std::string label(const std::size_t &index) const;
+ std::string label(const std::size_t &index) const override;
/// Create bin boundaries from the point values
virtual std::vector<double> createBinBoundaries() const;
/// Return a const reference to the values
virtual const std::vector<double> &getValues() const;
/// returns min value defined on axis
- double getMin() const { return m_values.front(); }
+ double getMin() const override { return m_values.front(); }
/// returns max value defined on axis
- double getMax() const { return m_values.back(); }
+ double getMax() const override { return m_values.back(); }
protected:
/// Default constructor
diff --git a/Framework/API/inc/MantidAPI/NumericAxisValidator.h b/Framework/API/inc/MantidAPI/NumericAxisValidator.h
index e33deb71603395a8004fea88f9a049a9c2a8c14f..ff2920d5b210afb00903cd0de204aecc197c4143 100644
--- a/Framework/API/inc/MantidAPI/NumericAxisValidator.h
+++ b/Framework/API/inc/MantidAPI/NumericAxisValidator.h
@@ -38,11 +38,11 @@ public:
/// Gets the type of the validator
std::string getType() const { return "numericaaxis"; }
/// Clone the current state
- Kernel::IValidator_sptr clone() const;
+ Kernel::IValidator_sptr clone() const override;
private:
/// Check for validity
- std::string checkValidity(const MatrixWorkspace_sptr &value) const;
+ std::string checkValidity(const MatrixWorkspace_sptr &value) const override;
/// Axis number to check on, defaults to 1
const int m_axisNumber;
};
diff --git a/Framework/API/inc/MantidAPI/ParamFunction.h b/Framework/API/inc/MantidAPI/ParamFunction.h
index dfda8d4b43c378ebc73fbe6c56c68275d9da91c6..74066b97859bd29ca03826353f0c3e47ad68a9a4 100644
--- a/Framework/API/inc/MantidAPI/ParamFunction.h
+++ b/Framework/API/inc/MantidAPI/ParamFunction.h
@@ -52,81 +52,81 @@ public:
/// Default constructor
ParamFunction() {}
/// Virtual destructor
- virtual ~ParamFunction();
+ ~ParamFunction() override;
/// Set i-th parameter
- virtual void setParameter(size_t, const double &value,
- bool explicitlySet = true);
+ void setParameter(size_t, const double &value,
+ bool explicitlySet = true) override;
/// Set i-th parameter description
- virtual void setParameterDescription(size_t, const std::string &description);
+ void setParameterDescription(size_t, const std::string &description) override;
/// Get i-th parameter
- virtual double getParameter(size_t i) const;
+ double getParameter(size_t i) const override;
/// Set parameter by name.
- virtual void setParameter(const std::string &name, const double &value,
- bool explicitlySet = true);
+ void setParameter(const std::string &name, const double &value,
+ bool explicitlySet = true) override;
/// Set description of parameter by name.
- virtual void setParameterDescription(const std::string &name,
- const std::string &description);
+ void setParameterDescription(const std::string &name,
+ const std::string &description) override;
/// Get parameter by name.
- virtual double getParameter(const std::string &name) const;
+ double getParameter(const std::string &name) const override;
/// Total number of parameters
- virtual size_t nParams() const { return m_parameters.size(); }
+ size_t nParams() const override { return m_parameters.size(); }
/// Returns the index of parameter name
- virtual size_t parameterIndex(const std::string &name) const;
+ size_t parameterIndex(const std::string &name) const override;
/// Returns the name of parameter i
- virtual std::string parameterName(size_t i) const;
+ std::string parameterName(size_t i) const override;
/// Returns the description of parameter i
- virtual std::string parameterDescription(size_t i) const;
+ std::string parameterDescription(size_t i) const override;
/// Checks if a parameter has been set explicitly
- virtual bool isExplicitlySet(size_t i) const;
+ bool isExplicitlySet(size_t i) const override;
/// Get the fitting error for a parameter
- virtual double getError(size_t i) const;
+ double getError(size_t i) const override;
/// Set the fitting error for a parameter
- virtual void setError(size_t i, double err);
+ void setError(size_t i, double err) override;
/// Check if a declared parameter i is active
- virtual bool isFixed(size_t i) const;
+ bool isFixed(size_t i) const override;
/// Removes a declared parameter i from the list of active
- virtual void fix(size_t i);
+ void fix(size_t i) override;
/// Restores a declared parameter i to the active status
- virtual void unfix(size_t i);
+ void unfix(size_t i) override;
/// Return parameter index from a parameter reference. Usefull for constraints
/// and ties in composite functions
- virtual size_t getParameterIndex(const ParameterReference &ref) const;
+ size_t getParameterIndex(const ParameterReference &ref) const override;
/// Get the containing function
IFunction_sptr getContainingFunction(const ParameterReference &ref) const;
/// Get the containing function
IFunction_sptr getContainingFunction(IFunction_sptr fun);
/// Apply the ties
- virtual void applyTies();
+ void applyTies() override;
/// Remove all ties
- virtual void clearTies();
- virtual void removeTie(const std::string &parName) {
+ void clearTies() override;
+ void removeTie(const std::string &parName) override {
IFunction::removeTie(parName);
}
/// Removes i-th parameter's tie
- virtual bool removeTie(size_t i);
+ bool removeTie(size_t i) override;
/// Get the tie of i-th parameter
- virtual ParameterTie *getTie(size_t i) const;
+ ParameterTie *getTie(size_t i) const override;
/// Add a constraint to function
- virtual void addConstraint(IConstraint *ic);
+ void addConstraint(IConstraint *ic) override;
/// Get constraint of i-th parameter
- virtual IConstraint *getConstraint(size_t i) const;
+ IConstraint *getConstraint(size_t i) const override;
/// Remove a constraint
- virtual void removeConstraint(const std::string &parName);
+ void removeConstraint(const std::string &parName) override;
/// Set parameters to satisfy constraints
- void setUpForFit();
+ void setUpForFit() override;
protected:
/// Declare a new parameter
- virtual void declareParameter(const std::string &name, double initValue = 0,
- const std::string &description = "");
+ void declareParameter(const std::string &name, double initValue = 0,
+ const std::string &description = "") override;
/// Add a new tie
- virtual void addTie(ParameterTie *tie);
+ void addTie(ParameterTie *tie) override;
/// Get the address of the parameter. For use in UserFunction with mu::Parser
virtual double *getParameterAddress(size_t i);
diff --git a/Framework/API/inc/MantidAPI/Progress.h b/Framework/API/inc/MantidAPI/Progress.h
index 4ad1c1a5da9b659fddd2b029fe7997c960cc67f0..c8ac73e006a291bfdea2fdc58f3f8e1068922a48 100644
--- a/Framework/API/inc/MantidAPI/Progress.h
+++ b/Framework/API/inc/MantidAPI/Progress.h
@@ -44,10 +44,10 @@ public:
Progress(Algorithm *alg, double start, double end, int numSteps);
Progress(Algorithm *alg, double start, double end, int64_t numSteps);
Progress(Algorithm *alg, double start, double end, size_t numSteps);
- virtual ~Progress();
+ ~Progress() override;
- void doReport(const std::string &msg = "");
- bool hasCancellationBeenRequested() const;
+ void doReport(const std::string &msg = "") override;
+ bool hasCancellationBeenRequested() const override;
private:
/// Owning algorithm
diff --git a/Framework/API/inc/MantidAPI/PropertyManagerDataService.h b/Framework/API/inc/MantidAPI/PropertyManagerDataService.h
index de1f2c1ffd58dc9e0f3d5e16da751fa5fda39a27..15da7f7d89393e285d070f881390f0ace531640f 100644
--- a/Framework/API/inc/MantidAPI/PropertyManagerDataService.h
+++ b/Framework/API/inc/MantidAPI/PropertyManagerDataService.h
@@ -42,7 +42,7 @@ private:
PropertyManagerDataServiceImpl &
operator=(const PropertyManagerDataServiceImpl &);
/// Destructor
- ~PropertyManagerDataServiceImpl();
+ ~PropertyManagerDataServiceImpl() override;
};
/// Forward declaration of a specialisation of SingletonHolder for
diff --git a/Framework/API/inc/MantidAPI/RawCountValidator.h b/Framework/API/inc/MantidAPI/RawCountValidator.h
index fe3e2655ee66e7d611a2f2155281e3da5166451f..41331b6cddc669c811a086455e5bbcbb42f4cbe6 100644
--- a/Framework/API/inc/MantidAPI/RawCountValidator.h
+++ b/Framework/API/inc/MantidAPI/RawCountValidator.h
@@ -36,11 +36,11 @@ public:
/// Gets the type of the validator
std::string getType() const { return "rawcount"; }
/// Clone the current state
- Kernel::IValidator_sptr clone() const;
+ Kernel::IValidator_sptr clone() const override;
private:
/// Check for validity
- std::string checkValidity(const MatrixWorkspace_sptr &value) const;
+ std::string checkValidity(const MatrixWorkspace_sptr &value) const override;
/// A flag indicating whether this validator requires that the workspace must
/// be a distribution (false) or not (true, the default)
diff --git a/Framework/API/inc/MantidAPI/RefAxis.h b/Framework/API/inc/MantidAPI/RefAxis.h
index ea12816a706f7851289418509af127c4d44b23ea..4f7e9c79535f433764e6f5aee3805549e37e8929 100644
--- a/Framework/API/inc/MantidAPI/RefAxis.h
+++ b/Framework/API/inc/MantidAPI/RefAxis.h
@@ -43,26 +43,26 @@ class MANTID_API_DLL RefAxis : public NumericAxis {
public:
RefAxis(const std::size_t &length,
const MatrixWorkspace *const parentWorkspace);
- virtual ~RefAxis();
+ ~RefAxis() override;
- Axis *clone(const MatrixWorkspace *const parentWorkspace);
+ Axis *clone(const MatrixWorkspace *const parentWorkspace) override;
Axis *clone(const std::size_t length,
- const MatrixWorkspace *const parentWorkspace);
- virtual std::size_t length() const { return m_size; }
+ const MatrixWorkspace *const parentWorkspace) override;
+ std::size_t length() const override { return m_size; }
/// Get a value at the specified index
- virtual double operator()(const std::size_t &index,
- const std::size_t &verticalIndex) const;
- virtual void setValue(const std::size_t &index, const double &value);
- virtual bool operator==(const Axis &) const;
- virtual bool equalWithinTolerance(const Axis &axis2,
- const double tolerance) const;
+ double operator()(const std::size_t &index,
+ const std::size_t &verticalIndex) const override;
+ void setValue(const std::size_t &index, const double &value) override;
+ bool operator==(const Axis &) const override;
+ bool equalWithinTolerance(const Axis &axis2,
+ const double tolerance) const override;
// We must override these to prevent access to NumericAxis::m_values and
// m_edges, which are unused by RefAxis and thus do not hold sensible values.
- virtual size_t indexOfValue(const double value) const;
- virtual std::vector<double> createBinBoundaries() const;
- virtual const std::vector<double> &getValues() const;
- virtual double getMin() const;
- virtual double getMax() const;
+ size_t indexOfValue(const double value) const override;
+ std::vector<double> createBinBoundaries() const override;
+ const std::vector<double> &getValues() const override;
+ double getMin() const override;
+ double getMax() const override;
private:
RefAxis(const RefAxis &right, const MatrixWorkspace *const parentWorkspace);
diff --git a/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h b/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
index abd60bde318b5ba9ef1b8d92d0054586dc37de08..a87bb7e005e8ad725da714e635f3b6f0826a7aec 100644
--- a/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
+++ b/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
@@ -62,7 +62,8 @@ class MANTID_API_DLL RemoteJobManagerFactoryImpl
public:
/// Create a remote job manager that will know how to use the
/// underlying mechanism that suits the compute resource passed
- IRemoteJobManager_sptr create(const std::string &computeResourceName) const;
+ IRemoteJobManager_sptr
+ create(const std::string &computeResourceName) const override;
/// alternative (lower level) create where the specific type of
/// manager and base URL are directly given
@@ -81,7 +82,7 @@ private:
RemoteJobManagerFactoryImpl &operator=(const RemoteJobManagerFactoryImpl &);
/// Private Destructor
- virtual ~RemoteJobManagerFactoryImpl();
+ ~RemoteJobManagerFactoryImpl() override;
// Unhide the inherited create method but make it private
using Kernel::DynamicFactory<IRemoteJobManager>::create;
diff --git a/Framework/API/inc/MantidAPI/Run.h b/Framework/API/inc/MantidAPI/Run.h
index 8386fdff0040aaeb0aadcb1efb1d976f54a0c268..ad906c3fdbad15872310fbbf50dd5b2a565fc08f 100644
--- a/Framework/API/inc/MantidAPI/Run.h
+++ b/Framework/API/inc/MantidAPI/Run.h
@@ -49,7 +49,7 @@ public:
Run();
/// Destructor. Doesn't need to be virtual as long as nothing inherits from
/// this class.
- ~Run();
+ ~Run() override;
/// Copy constructor
Run(const Run ©);
/// Assignment operator
@@ -59,13 +59,13 @@ public:
/// Filter the logs by time
void filterByTime(const Kernel::DateAndTime start,
- const Kernel::DateAndTime stop);
+ const Kernel::DateAndTime stop) override;
/// Split the logs based on the given intervals
void splitByTime(Kernel::TimeSplitterType &splitter,
- std::vector<LogManager *> outputs) const;
+ std::vector<LogManager *> outputs) const override;
/// Return an approximate memory size for the object in bytes
- size_t getMemorySize() const;
+ size_t getMemorySize() const override;
/// Set the proton charge
void setProtonCharge(const double charge);
@@ -99,10 +99,10 @@ public:
/// Save the run to a NeXus file with a given group name
void saveNexus(::NeXus::File *file, const std::string &group,
- bool keepOpen = false) const;
+ bool keepOpen = false) const override;
/// Load the run from a NeXus file with a given group name
void loadNexus(::NeXus::File *file, const std::string &group,
- bool keepOpen = false);
+ bool keepOpen = false) override;
private:
/// Calculate the gonoimeter matrix
diff --git a/Framework/API/inc/MantidAPI/SampleShapeValidator.h b/Framework/API/inc/MantidAPI/SampleShapeValidator.h
index 8f26b759553ce08d19c8be636c2613e3872e1435..79aad2a9b3e2a897b76b4447d72ca4cf12dfe3f2 100644
--- a/Framework/API/inc/MantidAPI/SampleShapeValidator.h
+++ b/Framework/API/inc/MantidAPI/SampleShapeValidator.h
@@ -37,11 +37,11 @@ class MANTID_API_DLL SampleShapeValidator
: public Kernel::TypedValidator<boost::shared_ptr<ExperimentInfo>> {
public:
std::string getType() const;
- Kernel::IValidator_sptr clone() const;
+ Kernel::IValidator_sptr clone() const override;
private:
std::string
- checkValidity(const boost::shared_ptr<ExperimentInfo> &value) const;
+ checkValidity(const boost::shared_ptr<ExperimentInfo> &value) const override;
};
} // namespace API
diff --git a/Framework/API/inc/MantidAPI/SampleValidator.h b/Framework/API/inc/MantidAPI/SampleValidator.h
index 38685e032578314d1dad514b881a7df534630b1f..3d7f02d7e6ca04f236a68300035208c7f1cf35a3 100644
--- a/Framework/API/inc/MantidAPI/SampleValidator.h
+++ b/Framework/API/inc/MantidAPI/SampleValidator.h
@@ -37,8 +37,8 @@ public:
SampleValidator(const unsigned int flags = (Shape | Material));
std::string getType() const;
- Kernel::IValidator_sptr clone() const;
- std::string checkValidity(const MatrixWorkspace_sptr &value) const;
+ Kernel::IValidator_sptr clone() const override;
+ std::string checkValidity(const MatrixWorkspace_sptr &value) const override;
private:
unsigned int m_requires;
diff --git a/Framework/API/inc/MantidAPI/ScriptRepository.h b/Framework/API/inc/MantidAPI/ScriptRepository.h
index 97b91a4e7dc1fc4609df364d27ca050548fe7542..88feeefe611bcaf0bed3a38c1b3f7ba9f3a12de4 100644
--- a/Framework/API/inc/MantidAPI/ScriptRepository.h
+++ b/Framework/API/inc/MantidAPI/ScriptRepository.h
@@ -104,10 +104,10 @@ public:
const std::string &file = std::string(), int line = -1);
/// Destructor
- ~ScriptRepoException() throw() {}
+ ~ScriptRepoException() throw() override {}
/// Returns the message string.
- const char *what() const throw();
+ const char *what() const throw() override;
/// Returns the error description with technical details on the origin and
/// cause.
diff --git a/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h b/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
index bc820b726b5bb9da3a750cbd6babae0216c3cb3e..30b7301095e040abd60ec6e4cee2bc61d17dedb3 100644
--- a/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
+++ b/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
@@ -64,7 +64,7 @@ private:
/// Private assignment operator - NO ASSIGNMENT ALLOWED
ScriptRepositoryFactoryImpl &operator=(const ScriptRepositoryFactoryImpl &);
/// Private Destructor
- virtual ~ScriptRepositoryFactoryImpl();
+ ~ScriptRepositoryFactoryImpl() override;
};
/// Forward declaration of a specialisation of SingletonHolder for
diff --git a/Framework/API/inc/MantidAPI/SingleValueParameter.h b/Framework/API/inc/MantidAPI/SingleValueParameter.h
index 9b688d8493db330230899db8b0d8eb24cbe84df9..6f32d21fede7002a0a5dc7e5507aba365125111c 100644
--- a/Framework/API/inc/MantidAPI/SingleValueParameter.h
+++ b/Framework/API/inc/MantidAPI/SingleValueParameter.h
@@ -47,12 +47,12 @@ public:
SingleValueParameter(ValType value);
SingleValueParameter();
SingleValueParameter(const SingleValueParameter<Derived, ValType> &other);
- std::string toXMLString() const;
+ std::string toXMLString() const override;
Derived &operator=(const Derived &other);
bool operator==(const Derived &other) const;
bool operator!=(const Derived &other) const;
ValType getValue() const;
- virtual bool isValid() const;
+ bool isValid() const override;
protected:
ValType m_value;
diff --git a/Framework/API/inc/MantidAPI/SingleValueParameterParser.h b/Framework/API/inc/MantidAPI/SingleValueParameterParser.h
index 44405e41e86898a2d4b481b6f83bec8874a99ac8..2bed510087784705e9182a24c0c01e3935033938 100644
--- a/Framework/API/inc/MantidAPI/SingleValueParameterParser.h
+++ b/Framework/API/inc/MantidAPI/SingleValueParameterParser.h
@@ -60,15 +60,15 @@ public:
SingleValueParameterParser();
Mantid::API::ImplicitFunctionParameter *
- createParameter(Poco::XML::Element *parameterElement);
+ createParameter(Poco::XML::Element *parameterElement) override;
SingleValueParameterType *
createWithoutDelegation(Poco::XML::Element *parameterElement);
- void
- setSuccessorParser(Mantid::API::ImplicitFunctionParameterParser *paramParser);
+ void setSuccessorParser(
+ Mantid::API::ImplicitFunctionParameterParser *paramParser) override;
- ~SingleValueParameterParser();
+ ~SingleValueParameterParser() override;
};
//////////////////////////////////////////////////////////////////////////////////
diff --git a/Framework/API/inc/MantidAPI/SpectraAxis.h b/Framework/API/inc/MantidAPI/SpectraAxis.h
index 45aa7a76b868322f5d437a930a55014880b51413..65732a3121df5d57fad6bc54f6929b026e03e25c 100644
--- a/Framework/API/inc/MantidAPI/SpectraAxis.h
+++ b/Framework/API/inc/MantidAPI/SpectraAxis.h
@@ -47,27 +47,27 @@ class MatrixWorkspace;
class MANTID_API_DLL SpectraAxis : public Axis {
public:
explicit SpectraAxis(const MatrixWorkspace *const parentWorkspace);
- virtual ~SpectraAxis() {}
- virtual Axis *clone(const MatrixWorkspace *const parentWorkspace);
- virtual Axis *clone(const std::size_t length,
- const MatrixWorkspace *const parentWorkspace);
- virtual std::size_t length() const;
+ ~SpectraAxis() override {}
+ Axis *clone(const MatrixWorkspace *const parentWorkspace) override;
+ Axis *clone(const std::size_t length,
+ const MatrixWorkspace *const parentWorkspace) override;
+ std::size_t length() const override;
/// If this is a spectra Axis - always true for this class
- virtual bool isSpectra() const { return true; }
- virtual double operator()(const std::size_t &index,
- const std::size_t &verticalIndex = 0) const;
- virtual void setValue(const std::size_t &index, const double &value);
- size_t indexOfValue(const double value) const;
- virtual bool operator==(const Axis &) const;
- std::string label(const std::size_t &index) const;
+ bool isSpectra() const override { return true; }
+ double operator()(const std::size_t &index,
+ const std::size_t &verticalIndex = 0) const override;
+ void setValue(const std::size_t &index, const double &value) override;
+ size_t indexOfValue(const double value) const override;
+ bool operator==(const Axis &) const override;
+ std::string label(const std::size_t &index) const override;
- specid_t spectraNo(const std::size_t &index) const;
+ specid_t spectraNo(const std::size_t &index) const override;
// Get a map that contains the spectra index as the key and the index in the
// array as teh value
void getSpectraIndexMap(spec2index_map &) const;
- double getMin() const;
- double getMax() const;
+ double getMin() const override;
+ double getMax() const override;
private:
/// Default constructor
diff --git a/Framework/API/inc/MantidAPI/SpectraAxisValidator.h b/Framework/API/inc/MantidAPI/SpectraAxisValidator.h
index bb96d2e5a3c0ce8784bdb79c94882c1db5472018..79fca91616d85e7a2d086d8999d099a6f78079a5 100644
--- a/Framework/API/inc/MantidAPI/SpectraAxisValidator.h
+++ b/Framework/API/inc/MantidAPI/SpectraAxisValidator.h
@@ -38,11 +38,11 @@ public:
/// Gets the type of the validator
std::string getType() const { return "spectraaxis"; }
/// Clone the current validator
- Kernel::IValidator_sptr clone() const;
+ Kernel::IValidator_sptr clone() const override;
private:
/// Check for validity
- std::string checkValidity(const MatrixWorkspace_sptr &value) const;
+ std::string checkValidity(const MatrixWorkspace_sptr &value) const override;
/// Axis number to check on, defaults to 1
const int m_axisNumber;
};
diff --git a/Framework/API/inc/MantidAPI/TextAxis.h b/Framework/API/inc/MantidAPI/TextAxis.h
index c4deaddf8be9fb5e123be6f568b73945c17faf92..0834a2f4c73c52148303f3753cbddd8e93e43977 100644
--- a/Framework/API/inc/MantidAPI/TextAxis.h
+++ b/Framework/API/inc/MantidAPI/TextAxis.h
@@ -52,29 +52,29 @@ class MatrixWorkspace;
class MANTID_API_DLL TextAxis : public Axis {
public:
TextAxis(const std::size_t &length);
- virtual ~TextAxis() {}
- virtual Axis *clone(const MatrixWorkspace *const parentWorkspace);
- virtual Axis *clone(const std::size_t length,
- const MatrixWorkspace *const parentWorkspace);
- virtual std::size_t length() const { return m_values.size(); }
+ ~TextAxis() override {}
+ Axis *clone(const MatrixWorkspace *const parentWorkspace) override;
+ Axis *clone(const std::size_t length,
+ const MatrixWorkspace *const parentWorkspace) override;
+ std::size_t length() const override { return m_values.size(); }
/// If this is a TextAxis, always return true for this class
- virtual bool isText() const { return true; }
+ bool isText() const override { return true; }
/// Get a value at the specified index
- virtual double operator()(const std::size_t &index,
- const std::size_t &verticalIndex = 0) const;
+ double operator()(const std::size_t &index,
+ const std::size_t &verticalIndex = 0) const override;
/// Set the value at the specified index
- virtual void setValue(const std::size_t &index, const double &value);
- size_t indexOfValue(const double value) const;
+ void setValue(const std::size_t &index, const double &value) override;
+ size_t indexOfValue(const double value) const override;
- virtual bool operator==(const Axis &) const;
+ bool operator==(const Axis &) const override;
/// Get the label at the specified index
- std::string label(const std::size_t &index) const;
+ std::string label(const std::size_t &index) const override;
/// Set the label at the given index
void setLabel(const std::size_t &index, const std::string &lbl);
/// returns min value defined on axis
- double getMin() const;
+ double getMin() const override;
/// returns max value defined on axis
- double getMax() const;
+ double getMax() const override;
private:
/// Private, undefined copy assignment operator
diff --git a/Framework/API/inc/MantidAPI/TransformScaleFactory.h b/Framework/API/inc/MantidAPI/TransformScaleFactory.h
index 328089767f9ff38242c4d010ce4eb65ea2ca8e9d..6d25e855ba3c8a44396d1db5f8153b19a48c26e3 100644
--- a/Framework/API/inc/MantidAPI/TransformScaleFactory.h
+++ b/Framework/API/inc/MantidAPI/TransformScaleFactory.h
@@ -48,7 +48,8 @@ class MANTID_API_DLL TransformScaleFactoryImpl
: public Kernel::DynamicFactory<ITransformScale> {
public:
/// Returns scaling transform
- boost::shared_ptr<ITransformScale> create(const std::string &type) const;
+ boost::shared_ptr<ITransformScale>
+ create(const std::string &type) const override;
private:
friend struct Mantid::Kernel::CreateUsingNew<TransformScaleFactoryImpl>;
@@ -56,10 +57,10 @@ private:
/// Private Constructor for singleton class
TransformScaleFactoryImpl();
/// Private destructor for singleton
- virtual ~TransformScaleFactoryImpl();
+ ~TransformScaleFactoryImpl() override;
/// Override the DynamicFactory::createUnwrapped() method. We don't want it
/// used here.
- ITransformScale *createUnwrapped(const std::string &className) const;
+ ITransformScale *createUnwrapped(const std::string &className) const override;
/// Private copy constructor - NO COPY ALLOWED
TransformScaleFactoryImpl(const TransformScaleFactoryImpl &);
/// Private assignment operator - NO ASSIGNMENT ALLOWED
diff --git a/Framework/API/inc/MantidAPI/VectorParameter.h b/Framework/API/inc/MantidAPI/VectorParameter.h
index aa366ab129834dc251233212a5054650eb89c7ca..0ba618f1f154a32e5059d2c153fa817e04a021f3 100644
--- a/Framework/API/inc/MantidAPI/VectorParameter.h
+++ b/Framework/API/inc/MantidAPI/VectorParameter.h
@@ -43,13 +43,13 @@ public:
VectorParameter();
VectorParameter(size_t size);
VectorParameter(const VectorParameter<Derived, ElemType> &other);
- virtual ~VectorParameter();
+ ~VectorParameter() override;
void addValue(const size_t index, const ElemType &value);
- std::string toXMLString() const;
+ std::string toXMLString() const override;
Derived &assignFrom(const Derived &other);
bool operator==(const Derived &other) const;
bool operator!=(const Derived &other) const;
- virtual bool isValid() const;
+ bool isValid() const override;
ElemType &operator[](int index);
const ElemType *getPointerToStart();
size_t getSize() const;
diff --git a/Framework/API/inc/MantidAPI/VectorParameterParser.h b/Framework/API/inc/MantidAPI/VectorParameterParser.h
index 6fd8ead185f765fd82943804e375299bae0785d4..4804be123ec8ec71d732facd6440e12758e8d1d3 100644
--- a/Framework/API/inc/MantidAPI/VectorParameterParser.h
+++ b/Framework/API/inc/MantidAPI/VectorParameterParser.h
@@ -58,15 +58,15 @@ public:
VectorValueParameterType *parseVectorParameter(std::string value);
Mantid::API::ImplicitFunctionParameter *
- createParameter(Poco::XML::Element *parameterElement);
+ createParameter(Poco::XML::Element *parameterElement) override;
VectorValueParameterType *
createWithoutDelegation(Poco::XML::Element *parameterElement);
- void
- setSuccessorParser(Mantid::API::ImplicitFunctionParameterParser *paramParser);
+ void setSuccessorParser(
+ Mantid::API::ImplicitFunctionParameterParser *paramParser) override;
- ~VectorParameterParser();
+ ~VectorParameterParser() override;
};
////////////////////////////////////////////////////////////////////
diff --git a/Framework/API/inc/MantidAPI/Workspace.h b/Framework/API/inc/MantidAPI/Workspace.h
index cad7cf1551abe52f22053635b86abd9e21b3d081..688f9c9a15054e796eafd9484b45fdd2b85dc9d6 100644
--- a/Framework/API/inc/MantidAPI/Workspace.h
+++ b/Framework/API/inc/MantidAPI/Workspace.h
@@ -54,7 +54,7 @@ class AnalysisDataServiceImpl;
class MANTID_API_DLL Workspace : public Kernel::DataItem {
public:
Workspace();
- virtual ~Workspace();
+ ~Workspace() override;
/** Returns a clone (copy) of the workspace with covariant return type in all
* derived classes.
@@ -79,14 +79,14 @@ public:
// DataItem interface
/// Name
- virtual const std::string name() const { return this->getName(); }
+ const std::string name() const override { return this->getName(); }
/** Marks the workspace as safe for multiple threads to edit data
* simutaneously.
* Workspace creation is always considered to be a single threaded operation.
* @return true if the workspace is suitable for multithreaded operations,
* otherwise false.
*/
- virtual bool threadSafe() const { return true; }
+ bool threadSafe() const override { return true; }
void virtual setTitle(const std::string &);
void setComment(const std::string &);
diff --git a/Framework/API/inc/MantidAPI/WorkspaceFactory.h b/Framework/API/inc/MantidAPI/WorkspaceFactory.h
index d3b57390ffa5c06cfd32c06fde25aa48b174a61f..007b52e1f0c4d3fd0fb2b64ec4104cde75b7e5fb 100644
--- a/Framework/API/inc/MantidAPI/WorkspaceFactory.h
+++ b/Framework/API/inc/MantidAPI/WorkspaceFactory.h
@@ -94,7 +94,7 @@ private:
/// Private assignment operator - NO ASSIGNMENT ALLOWED
WorkspaceFactoryImpl &operator=(const WorkspaceFactoryImpl &);
/// Private Destructor
- virtual ~WorkspaceFactoryImpl();
+ ~WorkspaceFactoryImpl() override;
// Unhide the inherited create method but make it private
using Kernel::DynamicFactory<Workspace>::create;
diff --git a/Framework/API/inc/MantidAPI/WorkspaceGroup.h b/Framework/API/inc/MantidAPI/WorkspaceGroup.h
index 8484a6e4b7d23728f9225ead97706612409102d4..96abf576ddbfd7f9c36e79c45046480ac6a4b24a 100644
--- a/Framework/API/inc/MantidAPI/WorkspaceGroup.h
+++ b/Framework/API/inc/MantidAPI/WorkspaceGroup.h
@@ -54,14 +54,14 @@ public:
/// Default constructor.
WorkspaceGroup();
/// Destructor
- ~WorkspaceGroup();
+ ~WorkspaceGroup() override;
/// Return a string ID of the class
- virtual const std::string id() const { return "WorkspaceGroup"; }
+ const std::string id() const override { return "WorkspaceGroup"; }
/// Returns a formatted string detailing the contents of the group
- virtual const std::string toString() const;
+ const std::string toString() const override;
/// The collection itself is considered to take up no space
- virtual size_t getMemorySize() const { return 0; }
+ size_t getMemorySize() const override { return 0; }
/// Adds a workspace to the group.
void addWorkspace(Workspace_sptr workspace);
/// Return the number of entries within the group
@@ -117,7 +117,7 @@ protected:
const WorkspaceGroup &operator=(const WorkspaceGroup &);
private:
- virtual WorkspaceGroup *doClone() const {
+ WorkspaceGroup *doClone() const override {
throw std::runtime_error("Cloning of WorkspaceGroup is not implemented.");
}
/// ADS removes a member of this group using this method. It doesn't send
diff --git a/Framework/API/inc/MantidAPI/WorkspaceProperty.h b/Framework/API/inc/MantidAPI/WorkspaceProperty.h
index ecc1ce8f858d2eeefbdc06eaeccef0870a218f2d..78a3993565041f05d43c5bcaa6cba1151491bc71 100644
--- a/Framework/API/inc/MantidAPI/WorkspaceProperty.h
+++ b/Framework/API/inc/MantidAPI/WorkspaceProperty.h
@@ -169,8 +169,8 @@ public:
* @param value :: The value to set to
* @return assigned PropertyWithValue
*/
- virtual boost::shared_ptr<TYPE> &
- operator=(const boost::shared_ptr<TYPE> &value) {
+ boost::shared_ptr<TYPE> &
+ operator=(const boost::shared_ptr<TYPE> &value) override {
std::string wsName = value->name();
if (this->direction() == Kernel::Direction::Input && !wsName.empty()) {
m_workspaceName = wsName;
@@ -180,36 +180,36 @@ public:
//--------------------------------------------------------------------------------------
/// Add the value of another property
- virtual WorkspaceProperty &operator+=(Kernel::Property const *) {
+ WorkspaceProperty &operator+=(Kernel::Property const *) override {
throw Kernel::Exception::NotImplementedError(
"+= operator is not implemented for WorkspaceProperty.");
return *this;
}
/// 'Virtual copy constructor'
- WorkspaceProperty<TYPE> *clone() const {
+ WorkspaceProperty<TYPE> *clone() const override {
return new WorkspaceProperty<TYPE>(*this);
}
/// Virtual destructor
- virtual ~WorkspaceProperty() {}
+ ~WorkspaceProperty() override {}
/** Get the name of the workspace
* @return The workspace's name
*/
- virtual std::string value() const { return m_workspaceName; }
+ std::string value() const override { return m_workspaceName; }
/** Get the value the property was initialised with -its default value
* @return The default value
*/
- virtual std::string getDefault() const { return m_initialWSName; }
+ std::string getDefault() const override { return m_initialWSName; }
/** Set the name of the workspace.
* Also tries to retrieve it from the AnalysisDataService.
* @param value :: The new name for the workspace
* @return
*/
- virtual std::string setValue(const std::string &value) {
+ std::string setValue(const std::string &value) override {
m_workspaceName = value;
// Try and get the workspace from the ADS, but don't worry if we can't
try {
@@ -229,8 +229,8 @@ public:
* type it will set validated, if not the property's value will be cleared.
* @return
*/
- virtual std::string
- setDataItem(const boost::shared_ptr<Kernel::DataItem> value) {
+ std::string
+ setDataItem(const boost::shared_ptr<Kernel::DataItem> value) override {
boost::shared_ptr<TYPE> typed = boost::dynamic_pointer_cast<TYPE>(value);
if (typed) {
std::string wsName = typed->name();
@@ -251,7 +251,7 @@ public:
* a workspace of the correct type.
* @returns A user level description of the problem or "" if it is valid.
*/
- std::string isValid() const {
+ std::string isValid() const override {
// start with the no error condition
std::string error = "";
@@ -302,21 +302,23 @@ public:
* @return true if the value is the same as the initial value or false
* otherwise
*/
- bool isDefault() const { return m_initialWSName == m_workspaceName; }
+ bool isDefault() const override { return m_initialWSName == m_workspaceName; }
/** Is the workspace property optional
* @return true if the workspace can be blank */
- bool isOptional() const { return (m_optional == PropertyMode::Optional); }
+ bool isOptional() const override {
+ return (m_optional == PropertyMode::Optional);
+ }
/** Does the workspace need to be locked before starting an algorithm?
* @return true (default) if the workspace will be locked */
- bool isLocking() const { return (m_locking == LockMode::Lock); }
+ bool isLocking() const override { return (m_locking == LockMode::Lock); }
/** Returns the current contents of the AnalysisDataService for input
* workspaces.
* For output workspaces, an empty set is returned
* @return set of objects in AnalysisDataService
*/
- virtual std::vector<std::string> allowedValues() const {
+ std::vector<std::string> allowedValues() const override {
if (this->direction() == Kernel::Direction::Input ||
this->direction() == Kernel::Direction::InOut) {
// If an input workspace, get the list of workspaces currently in the ADS
@@ -347,7 +349,7 @@ public:
/// Create a history record
/// @return A populated PropertyHistory for this class
- virtual const Kernel::PropertyHistory createHistory() const {
+ const Kernel::PropertyHistory createHistory() const override {
std::string wsName = m_workspaceName;
bool isdefault = this->isDefault();
@@ -366,7 +368,7 @@ public:
* @return True if the workspace is an output workspace and has been stored
* @throw std::runtime_error if unable to store the workspace successfully
*/
- virtual bool store() {
+ bool store() override {
bool result = false;
if (!this->operator()() && isOptional())
return result;
@@ -387,7 +389,7 @@ public:
return result;
}
- Workspace_sptr getWorkspace() const { return this->operator()(); }
+ Workspace_sptr getWorkspace() const override { return this->operator()(); }
private:
/** Checks whether the entered workspace group is valid.
@@ -485,7 +487,7 @@ private:
}
/// Reset the pointer to the workspace
- void clear() {
+ void clear() override {
Kernel::PropertyWithValue<boost::shared_ptr<TYPE>>::m_value =
boost::shared_ptr<TYPE>();
}
diff --git a/Framework/API/inc/MantidAPI/WorkspaceUnitValidator.h b/Framework/API/inc/MantidAPI/WorkspaceUnitValidator.h
index f4ddf3a9133d3e3434e7c26c3c4510c4a95968e6..b8c1fd5696694b3aaf17c77c3ababc0a95fe6dca 100644
--- a/Framework/API/inc/MantidAPI/WorkspaceUnitValidator.h
+++ b/Framework/API/inc/MantidAPI/WorkspaceUnitValidator.h
@@ -37,11 +37,11 @@ public:
/// Gets the type of the validator
std::string getType() const { return "workspaceunit"; }
/// Clone the current state
- Kernel::IValidator_sptr clone() const;
+ Kernel::IValidator_sptr clone() const override;
private:
/// Check for validity.
- std::string checkValidity(const MatrixWorkspace_sptr &value) const;
+ std::string checkValidity(const MatrixWorkspace_sptr &value) const override;
/// The name of the required unit
const std::string m_unitID;
diff --git a/Framework/API/src/ExperimentInfo.cpp b/Framework/API/src/ExperimentInfo.cpp
index 6cea5a05fa97a4200e3f155cf67f33a5725471b9..02dba5fb81ec50701dcc53e45165bcc73ac3f190 100644
--- a/Framework/API/src/ExperimentInfo.cpp
+++ b/Framework/API/src/ExperimentInfo.cpp
@@ -686,25 +686,25 @@ public:
// SAX content handler for grapping stuff quickly from IDF
class myContentHandler : public Poco::XML::ContentHandler {
- virtual void startElement(const XMLString &, const XMLString &localName,
- const XMLString &, const Attributes &attrList) {
+ void startElement(const XMLString &, const XMLString &localName,
+ const XMLString &, const Attributes &attrList) override {
if (localName == "instrument") {
throw DummyException(
static_cast<std::string>(attrList.getValue("", "valid-from")),
static_cast<std::string>(attrList.getValue("", "valid-to")));
}
}
- virtual void endElement(const XMLString &, const XMLString &,
- const XMLString &) {}
- virtual void startDocument() {}
- virtual void endDocument() {}
- virtual void characters(const XMLChar[], int, int) {}
- virtual void endPrefixMapping(const XMLString &) {}
- virtual void ignorableWhitespace(const XMLChar[], int, int) {}
- virtual void processingInstruction(const XMLString &, const XMLString &) {}
- virtual void setDocumentLocator(const Locator *) {}
- virtual void skippedEntity(const XMLString &) {}
- virtual void startPrefixMapping(const XMLString &, const XMLString &) {}
+ void endElement(const XMLString &, const XMLString &,
+ const XMLString &) override {}
+ void startDocument() override {}
+ void endDocument() override {}
+ void characters(const XMLChar[], int, int) override {}
+ void endPrefixMapping(const XMLString &) override {}
+ void ignorableWhitespace(const XMLChar[], int, int) override {}
+ void processingInstruction(const XMLString &, const XMLString &) override {}
+ void setDocumentLocator(const Locator *) override {}
+ void skippedEntity(const XMLString &) override {}
+ void startPrefixMapping(const XMLString &, const XMLString &) override {}
};
//---------------------------------------------------------------------------------------
diff --git a/Framework/API/src/IFunction.cpp b/Framework/API/src/IFunction.cpp
index 29d8c309067cc4675c04b9b889745adeb419cdcb..29bb684f74743a5f69251c3bb627af53e2f275ee 100644
--- a/Framework/API/src/IFunction.cpp
+++ b/Framework/API/src/IFunction.cpp
@@ -275,15 +275,17 @@ namespace {
class AttType : public IFunction::ConstAttributeVisitor<std::string> {
protected:
/// Apply if string
- std::string apply(const std::string &) const { return "std::string"; }
+ std::string apply(const std::string &) const override {
+ return "std::string";
+ }
/// Apply if int
- std::string apply(const int &) const { return "int"; }
+ std::string apply(const int &) const override { return "int"; }
/// Apply if double
- std::string apply(const double &) const { return "double"; }
+ std::string apply(const double &) const override { return "double"; }
/// Apply if bool
- std::string apply(const bool &) const { return "bool"; }
+ std::string apply(const bool &) const override { return "bool"; }
/// Apply if vector
- std::string apply(const std::vector<double> &) const {
+ std::string apply(const std::vector<double> &) const override {
return "std::vector<double>";
}
};
@@ -306,21 +308,23 @@ public:
protected:
/// Apply if string
- std::string apply(const std::string &str) const {
+ std::string apply(const std::string &str) const override {
return (m_quoteString) ? std::string("\"" + str + "\"") : str;
}
/// Apply if int
- std::string apply(const int &i) const {
+ std::string apply(const int &i) const override {
return boost::lexical_cast<std::string>(i);
}
/// Apply if double
- std::string apply(const double &d) const {
+ std::string apply(const double &d) const override {
return boost::lexical_cast<std::string>(d);
}
/// Apply if bool
- std::string apply(const bool &b) const { return b ? "true" : "false"; }
+ std::string apply(const bool &b) const override {
+ return b ? "true" : "false";
+ }
/// Apply if vector
- std::string apply(const std::vector<double> &v) const {
+ std::string apply(const std::vector<double> &v) const override {
std::string res = "(";
if (v.size() > 0) {
for (size_t i = 0; i < v.size() - 1; ++i) {
@@ -535,9 +539,9 @@ public:
protected:
/// Apply if string
- void apply(std::string &str) const { str = m_value; }
+ void apply(std::string &str) const override { str = m_value; }
/// Apply if int
- void apply(int &i) const {
+ void apply(int &i) const override {
std::istringstream istr(m_value + " ");
istr >> i;
if (!istr.good())
@@ -546,7 +550,7 @@ protected:
m_value);
}
/// Apply if double
- void apply(double &d) const {
+ void apply(double &d) const override {
std::istringstream istr(m_value + " ");
istr >> d;
if (!istr.good())
@@ -555,11 +559,11 @@ protected:
m_value);
}
/// Apply if bool
- void apply(bool &b) const {
+ void apply(bool &b) const override {
b = (m_value == "true" || m_value == "TRUE" || m_value == "1");
}
/// Apply if vector
- void apply(std::vector<double> &v) const {
+ void apply(std::vector<double> &v) const override {
if (m_value.empty()) {
v.clear();
return;
diff --git a/Framework/API/src/IPeakFunction.cpp b/Framework/API/src/IPeakFunction.cpp
index cf87603fc957f26f3cb7b3284ab12298a413a91f..734730872d8f0bdf7eb21cdfed3396b41405f43a 100644
--- a/Framework/API/src/IPeakFunction.cpp
+++ b/Framework/API/src/IPeakFunction.cpp
@@ -33,7 +33,7 @@ public:
* @param iP :: The parameter index of an individual function.
* @param value :: The derivative value
*/
- void set(size_t iY, size_t iP, double value) {
+ void set(size_t iY, size_t iP, double value) override {
m_J->set(m_iY0 + iY, iP, value);
}
/**
@@ -41,14 +41,16 @@ public:
* @param iY :: The index of the data point
* @param iP :: The parameter index of an individual function.
*/
- double get(size_t iY, size_t iP) { return m_J->get(m_iY0 + iY, iP); }
+ double get(size_t iY, size_t iP) override { return m_J->get(m_iY0 + iY, iP); }
};
class TempJacobian : public Jacobian {
public:
TempJacobian(size_t y, size_t p) : m_y(y), m_p(p), m_J(y * p) {}
- void set(size_t iY, size_t iP, double value) { m_J[iY * m_p + iP] = value; }
- double get(size_t iY, size_t iP) { return m_J[iY * m_p + iP]; }
+ void set(size_t iY, size_t iP, double value) override {
+ m_J[iY * m_p + iP] = value;
+ }
+ double get(size_t iY, size_t iP) override { return m_J[iY * m_p + iP]; }
size_t maxParam(size_t iY) {
double max = -DBL_MAX;
size_t maxIndex = 0;
diff --git a/Framework/API/src/MatrixWorkspace.cpp b/Framework/API/src/MatrixWorkspace.cpp
index d6602db4c0494bfc5e4eef4d1b4c3b21da7ad5ff..e0220ec9730a8ffb9f6c8ff4e54023f3a934fa29 100644
--- a/Framework/API/src/MatrixWorkspace.cpp
+++ b/Framework/API/src/MatrixWorkspace.cpp
@@ -1281,7 +1281,7 @@ public:
m_axis.unit()->label())) {}
/// the name of the dimennlsion as can be displayed along the axis
- virtual std::string getName() const {
+ std::string getName() const override {
const auto &unit = m_axis.unit();
if (unit && unit->unitID() != "Empty")
return unit->caption();
@@ -1290,27 +1290,27 @@ public:
}
/// @return the units of the dimension as a string
- virtual const Kernel::UnitLabel getUnits() const {
+ const Kernel::UnitLabel getUnits() const override {
return m_axis.unit()->label();
}
/// short name which identify the dimension among other dimension. A dimension
/// can be usually find by its ID and various
/// various method exist to manipulate set of dimensions by their names.
- virtual std::string getDimensionId() const { return m_dimensionId; }
+ std::string getDimensionId() const override { return m_dimensionId; }
/// if the dimension is integrated (e.g. have single bin)
- virtual bool getIsIntegrated() const { return m_axis.length() == 1; }
+ bool getIsIntegrated() const override { return m_axis.length() == 1; }
/// @return the minimum extent of this dimension
- virtual coord_t getMinimum() const { return coord_t(m_axis.getMin()); }
+ coord_t getMinimum() const override { return coord_t(m_axis.getMin()); }
/// @return the maximum extent of this dimension
- virtual coord_t getMaximum() const { return coord_t(m_axis.getMax()); }
+ coord_t getMaximum() const override { return coord_t(m_axis.getMax()); }
/// number of bins dimension have (an integrated has one). A axis directed
/// along dimension would have getNBins+1 axis points.
- virtual size_t getNBins() const {
+ size_t getNBins() const override {
if (m_haveEdges)
return m_axis.length() - 1;
else
@@ -1318,32 +1318,34 @@ public:
}
/// Change the extents and number of bins
- virtual void setRange(size_t /*nBins*/, coord_t /*min*/, coord_t /*max*/) {
+ void setRange(size_t /*nBins*/, coord_t /*min*/, coord_t /*max*/) override {
throw std::runtime_error("Not implemented");
}
/// Get coordinate for index;
- virtual coord_t getX(size_t ind) const { return coord_t(m_axis(ind)); }
+ coord_t getX(size_t ind) const override { return coord_t(m_axis(ind)); }
/**
* Return the bin width taking into account if the stored values are actually
* bin centres or not
* @return A single value for the uniform bin width
*/
- virtual coord_t getBinWidth() const {
+ coord_t getBinWidth() const override {
size_t nsteps = (m_haveEdges) ? this->getNBins() : this->getNBins() - 1;
return (getMaximum() - getMinimum()) / static_cast<coord_t>(nsteps);
}
// Dimensions must be xml serializable.
- virtual std::string toXMLString() const {
+ std::string toXMLString() const override {
throw std::runtime_error("Not implemented");
}
- const Kernel::MDUnit &getMDUnits() const { return m_frame->getMDUnit(); }
- const Geometry::MDFrame &getMDFrame() const { return *m_frame; }
+ const Kernel::MDUnit &getMDUnits() const override {
+ return m_frame->getMDUnit();
+ }
+ const Geometry::MDFrame &getMDFrame() const override { return *m_frame; }
- virtual ~MWDimension() {}
+ ~MWDimension() override {}
private:
const Axis &m_axis;
@@ -1365,10 +1367,10 @@ public:
m_X = ws->readX(0);
}
- virtual ~MWXDimension() {}
+ ~MWXDimension() override {}
/// the name of the dimennlsion as can be displayed along the axis
- virtual std::string getName() const {
+ std::string getName() const override {
const auto *axis = m_ws->getAxis(0);
const auto &unit = axis->unit();
if (unit && unit->unitID() != "Empty")
@@ -1378,44 +1380,46 @@ public:
}
/// @return the units of the dimension as a string
- virtual const Kernel::UnitLabel getUnits() const {
+ const Kernel::UnitLabel getUnits() const override {
return m_ws->getAxis(0)->unit()->label();
}
/// short name which identify the dimension among other dimension. A dimension
/// can be usually find by its ID and various
/// various method exist to manipulate set of dimensions by their names.
- virtual std::string getDimensionId() const { return m_dimensionId; }
+ std::string getDimensionId() const override { return m_dimensionId; }
/// if the dimension is integrated (e.g. have single bin)
- virtual bool getIsIntegrated() const { return m_X.size() == 1; }
+ bool getIsIntegrated() const override { return m_X.size() == 1; }
/// coord_t the minimum extent of this dimension
- virtual coord_t getMinimum() const { return coord_t(m_X.front()); }
+ coord_t getMinimum() const override { return coord_t(m_X.front()); }
/// @return the maximum extent of this dimension
- virtual coord_t getMaximum() const { return coord_t(m_X.back()); }
+ coord_t getMaximum() const override { return coord_t(m_X.back()); }
/// number of bins dimension have (an integrated has one). A axis directed
/// along dimension would have getNBins+1 axis points.
- virtual size_t getNBins() const {
+ size_t getNBins() const override {
return (m_ws->isHistogramData()) ? m_X.size() - 1 : m_X.size();
}
/// Change the extents and number of bins
- virtual void setRange(size_t /*nBins*/, coord_t /*min*/, coord_t /*max*/) {
+ void setRange(size_t /*nBins*/, coord_t /*min*/, coord_t /*max*/) override {
throw std::runtime_error("Not implemented");
}
/// Get coordinate for index;
- virtual coord_t getX(size_t ind) const { return coord_t(m_X[ind]); }
+ coord_t getX(size_t ind) const override { return coord_t(m_X[ind]); }
// Dimensions must be xml serializable.
- virtual std::string toXMLString() const {
+ std::string toXMLString() const override {
throw std::runtime_error("Not implemented");
}
- const Kernel::MDUnit &getMDUnits() const { return m_frame->getMDUnit(); }
- const Geometry::MDFrame &getMDFrame() const { return *m_frame; }
+ const Kernel::MDUnit &getMDUnits() const override {
+ return m_frame->getMDUnit();
+ }
+ const Geometry::MDFrame &getMDFrame() const override { return *m_frame; }
private:
/// Workspace we refer to
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h
index 80f690a25b9093653445903bee4abcbfa73ced63..164449ac95e6b309d14354a93916d849ff123532 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h
@@ -72,13 +72,13 @@ public:
/// (Empty) Constructor
AbsorptionCorrection();
/// Virtual destructor
- virtual ~AbsorptionCorrection() {}
+ ~AbsorptionCorrection() override {}
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\AbsorptionCorrections";
}
/// Algorithm's summary
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates an approximation of the attenuation due to absorption "
"and single scattering in a generic sample shape. The sample shape "
"can be defined by the CreateSampleShape algorithm.";
@@ -117,9 +117,9 @@ protected:
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void retrieveBaseProperties();
void constructSample(API::Sample &sample);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AddLogDerivative.h b/Framework/Algorithms/inc/MantidAlgorithms/AddLogDerivative.h
index b8a093260fd85ce14c8e8fe27abcabacf85d808c..9636a3b57c0669b9e032a639558d186fa1be5244 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AddLogDerivative.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AddLogDerivative.h
@@ -38,20 +38,20 @@ namespace Algorithms {
class DLLExport AddLogDerivative : public API::Algorithm {
public:
AddLogDerivative();
- ~AddLogDerivative();
+ ~AddLogDerivative() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "AddLogDerivative"; };
+ const std::string name() const override { return "AddLogDerivative"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Add a sample log that is the first or second derivative of an "
"existing sample log.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "DataHandling\\Logs"; }
+ const std::string category() const override { return "DataHandling\\Logs"; }
static Mantid::Kernel::TimeSeriesProperty<double> *
makeDerivative(API::Progress &progress,
@@ -60,9 +60,9 @@ public:
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AddNote.h b/Framework/Algorithms/inc/MantidAlgorithms/AddNote.h
index 2e2c850088ab4abae64f2035fbe8e364ee344b3d..dbe25aceaffbf49b3fad0b9507cdf948252d1588 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AddNote.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AddNote.h
@@ -38,16 +38,16 @@ class DLLExport AddNote : public API::Algorithm,
public API::DeprecatedAlgorithm {
public:
AddNote();
- virtual ~AddNote();
+ ~AddNote() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Remove an existing log of the given name
void removeExisting(API::MatrixWorkspace_sptr &, const std::string &);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AddPeak.h b/Framework/Algorithms/inc/MantidAlgorithms/AddPeak.h
index b13234a67087fd3a3fabeb75b13f276e790b00ae..25c0861034879a3ec4ac0e3b0408cfc784044762 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AddPeak.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AddPeak.h
@@ -36,24 +36,24 @@ namespace Algorithms {
class DLLExport AddPeak : public API::Algorithm {
public:
AddPeak();
- ~AddPeak();
+ ~AddPeak() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "AddPeak"; };
+ const std::string name() const override { return "AddPeak"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Adds a peak to a PeaksWorkspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Crystal\\Peaks"; }
+ const std::string category() const override { return "Crystal\\Peaks"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Mantid
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AddSampleLog.h b/Framework/Algorithms/inc/MantidAlgorithms/AddSampleLog.h
index 0d58a960e88947e8f16c87d9b8b2347b0a2c6f67..b9d7ab5993383d6d2f07b4353e2add99329fb428 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AddSampleLog.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AddSampleLog.h
@@ -49,24 +49,24 @@ public:
/// (Empty) Constructor
AddSampleLog() : API::Algorithm() {}
/// Virtual destructor
- virtual ~AddSampleLog() {}
+ ~AddSampleLog() override {}
/// Algorithm's name
- virtual const std::string name() const { return "AddSampleLog"; }
+ const std::string name() const override { return "AddSampleLog"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Used to insert a value into the sample logs in a workspace.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "DataHandling\\Logs"; }
+ const std::string category() const override { return "DataHandling\\Logs"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AddTimeSeriesLog.h b/Framework/Algorithms/inc/MantidAlgorithms/AddTimeSeriesLog.h
index 98d9e3538b18364100e4b58fa9fa8fc46cf33fb4..a69170328dc6e2da5ab766655b53f2800ce57ca4 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AddTimeSeriesLog.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AddTimeSeriesLog.h
@@ -30,18 +30,18 @@ namespace Algorithms {
*/
class DLLExport AddTimeSeriesLog : public API::Algorithm {
public:
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates/updates a time-series log";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Remove an existing log of the given name
void removeExisting(API::MatrixWorkspace_sptr &logWS,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AlignDetectors.h b/Framework/Algorithms/inc/MantidAlgorithms/AlignDetectors.h
index 3bda936ed411b46eacaf73a93eede4f143cfe2bc..485f77a80d655f1b0297a24ece91dbdb1444adea 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AlignDetectors.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AlignDetectors.h
@@ -50,24 +50,24 @@ namespace Algorithms {
class DLLExport AlignDetectors : public API::Algorithm {
public:
AlignDetectors();
- virtual ~AlignDetectors();
+ ~AlignDetectors() override;
/// Algorithms name for identification. @see Algorithm::name
- virtual const std::string name() const;
+ const std::string name() const override;
/// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
- virtual const std::string summary() const;
+ const std::string summary() const override;
/// Algorithm's version for identification. @see Algorithm::version
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification. @see Algorithm::category
- virtual const std::string category() const;
+ const std::string category() const override;
/// Cross-check properties with each other @see IAlgorithm::validateInputs
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void execEvent();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AlphaCalc.h b/Framework/Algorithms/inc/MantidAlgorithms/AlphaCalc.h
index 4a2d0c5bbf51c51cf41a9be7e2bec65504acf0bc..7fe9d792eac575f6a42a7db30aa5e0c2fa1446b6 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AlphaCalc.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AlphaCalc.h
@@ -51,24 +51,24 @@ public:
/// Default constructor
AlphaCalc() : API::Algorithm(){};
/// Destructor
- virtual ~AlphaCalc(){};
+ ~AlphaCalc() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "AlphaCalc"; }
+ const std::string name() const override { return "AlphaCalc"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Muon algorithm for calculating the detector efficiency between two "
"groups of detectors.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AnnularRingAbsorption.h b/Framework/Algorithms/inc/MantidAlgorithms/AnnularRingAbsorption.h
index c0f6c734c003c9acc0b0710ae0bc98aff0fc5f15..f8690b02f7eeeb009019196d7f709627cf1f4b86 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AnnularRingAbsorption.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AnnularRingAbsorption.h
@@ -45,16 +45,16 @@ namespace Algorithms {
class DLLExport AnnularRingAbsorption : public API::Algorithm {
public:
AnnularRingAbsorption();
- virtual ~AnnularRingAbsorption();
+ ~AnnularRingAbsorption() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void attachSample(API::MatrixWorkspace_sptr &workspace);
void runCreateSampleShape(API::MatrixWorkspace_sptr &workspace);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AnyShapeAbsorption.h b/Framework/Algorithms/inc/MantidAlgorithms/AnyShapeAbsorption.h
index ed2c23f1bbae1e83444ee9e9ad91f7445361ad86..ac8783b89ebd7dbc1af43080a00ab7c6a077e0b8 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AnyShapeAbsorption.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AnyShapeAbsorption.h
@@ -86,11 +86,11 @@ public:
/// (Empty) Constructor
AnyShapeAbsorption();
/// Virtual destructor
- virtual ~AnyShapeAbsorption() {}
+ ~AnyShapeAbsorption() override {}
/// Algorithm's name
- virtual const std::string name() const { return "AbsorptionCorrection"; }
+ const std::string name() const override { return "AbsorptionCorrection"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates an approximation of the attenuation due to absorption "
"and single scattering in a generic sample shape. The sample shape "
"can be defined by, e.g., the CreateSampleShape algorithm.\nNote "
@@ -100,13 +100,13 @@ public:
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
private:
- void defineProperties();
- void retrieveProperties();
- std::string sampleXML();
- void initialiseCachedDistances();
+ void defineProperties() override;
+ void retrieveProperties() override;
+ std::string sampleXML() override;
+ void initialiseCachedDistances() override;
/// Create the gague volume for the correction
Geometry::Object constructGaugeVolume();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AppendSpectra.h b/Framework/Algorithms/inc/MantidAlgorithms/AppendSpectra.h
index a4dd6c78a2139f88929e7043eaba54e1c12dccfc..5c2e68c09a87d4127ff3a7ffdb120e7d9137e0b2 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AppendSpectra.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AppendSpectra.h
@@ -45,19 +45,19 @@ namespace Algorithms {
class DLLExport AppendSpectra : public WorkspaceJoiners {
public:
AppendSpectra();
- virtual ~AppendSpectra();
+ ~AppendSpectra() override;
- virtual const std::string name() const;
- virtual int version() const;
+ const std::string name() const override;
+ int version() const override;
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
- virtual void fixSpectrumNumbers(API::MatrixWorkspace_const_sptr ws1,
- API::MatrixWorkspace_const_sptr ws2,
- API::MatrixWorkspace_sptr output);
+ void fixSpectrumNumbers(API::MatrixWorkspace_const_sptr ws1,
+ API::MatrixWorkspace_const_sptr ws2,
+ API::MatrixWorkspace_sptr output) override;
void combineLogs(const API::Run &lhs, const API::Run &rhs, API::Run &ans);
};
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ApplyCalibration.h b/Framework/Algorithms/inc/MantidAlgorithms/ApplyCalibration.h
index 82d3e2cba72c62706b32d7f92c926baf472b972e..4a00620198df6d12637fbb80e4ead7d4930a1b6d 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ApplyCalibration.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ApplyCalibration.h
@@ -49,28 +49,28 @@ public:
ApplyCalibration();
/// Destructor
- ~ApplyCalibration() {}
+ ~ApplyCalibration() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "ApplyCalibration"; }
+ const std::string name() const override { return "ApplyCalibration"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Update detector positions from input table workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument";
} // Needs to change
private:
/// Overwrites Algorithm method. Does nothing at present
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// Set the detector position from the calibration table
void setDetectorPosition(const Geometry::Instrument_const_sptr &instrument,
const int detID, Mantid::Kernel::V3D pos,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ApplyDeadTimeCorr.h b/Framework/Algorithms/inc/MantidAlgorithms/ApplyDeadTimeCorr.h
index 10458ee26b74c37c0f86d5fe378dc71cad070d93..934a23e8928f0a2e57581e8b1d89665b59e212ba 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ApplyDeadTimeCorr.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ApplyDeadTimeCorr.h
@@ -39,26 +39,26 @@ public:
/// Default constructor
ApplyDeadTimeCorr() : API::Algorithm(){};
/// Destructor
- virtual ~ApplyDeadTimeCorr(){};
+ ~ApplyDeadTimeCorr() override{};
/// Algorithm's name for identification
- virtual const std::string name() const { return "ApplyDeadTimeCorr"; };
+ const std::string name() const override { return "ApplyDeadTimeCorr"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Apply deadtime correction to each spectra of a workspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Muon;CorrectionFunctions\\EfficiencyCorrections";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ApplyDetailedBalance.h b/Framework/Algorithms/inc/MantidAlgorithms/ApplyDetailedBalance.h
index db48bb9fd4157db54991e2b0a68109e8707d47ce..45960088f2dc108eed2f983b0eb4ff67130c626f 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ApplyDetailedBalance.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ApplyDetailedBalance.h
@@ -37,27 +37,27 @@ namespace Algorithms {
class DLLExport ApplyDetailedBalance : public API::Algorithm {
public:
ApplyDetailedBalance();
- ~ApplyDetailedBalance();
+ ~ApplyDetailedBalance() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "ApplyDetailedBalance"; };
+ const std::string name() const override { return "ApplyDetailedBalance"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Transform scattering intensity to dynamic susceptibility.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Inelastic\\Corrections";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ApplyTransmissionCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/ApplyTransmissionCorrection.h
index c909a81ef281f2e55afd64324657e3e84c93dab6..5d5e1db7e91b6f7924f604541944367bd43547b5 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ApplyTransmissionCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ApplyTransmissionCorrection.h
@@ -47,28 +47,28 @@ public:
/// (Empty) Constructor
ApplyTransmissionCorrection() : API::Algorithm() {}
/// Virtual destructor
- virtual ~ApplyTransmissionCorrection() {}
+ ~ApplyTransmissionCorrection() override {}
/// Algorithm's name
- virtual const std::string name() const {
+ const std::string name() const override {
return "ApplyTransmissionCorrection";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Apply a transmission correction to 2D SANS data.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "SANS;CorrectionFunctions\\TransmissionCorrections";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AsymmetryCalc.h b/Framework/Algorithms/inc/MantidAlgorithms/AsymmetryCalc.h
index 17d811ee4ac5234a22825455da646f00a6b8c7d0..8502440049d9315509dc8be82c95e05a884a4149 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AsymmetryCalc.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AsymmetryCalc.h
@@ -54,25 +54,25 @@ public:
/// Default constructor
AsymmetryCalc() : API::Algorithm(){};
/// Destructor
- virtual ~AsymmetryCalc(){};
+ ~AsymmetryCalc() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "AsymmetryCalc"; }
+ const std::string name() const override { return "AsymmetryCalc"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates the asymmetry between two groups of detectors for a "
"muon workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
- std::map<std::string, std::string> validateInputs();
+ void init() override;
+ void exec() override;
+ std::map<std::string, std::string> validateInputs() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/AverageLogData.h b/Framework/Algorithms/inc/MantidAlgorithms/AverageLogData.h
index 72b8c9583a880f39e1a8e5451132db98e8cb14c2..5532c41027f4a044fec3bed7c28d960aa22bdaab 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/AverageLogData.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/AverageLogData.h
@@ -33,19 +33,19 @@ namespace Algorithms {
class DLLExport AverageLogData : public API::Algorithm {
public:
AverageLogData();
- virtual ~AverageLogData();
+ ~AverageLogData() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
/// Algorithm's summary
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Computes the proton charge averaged value of a given log.";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperateMasks.h b/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperateMasks.h
index 2659be504e516ce9c2a51699e99c94d66e0b1d28..812134927adde97d30329ebe61e199c59ffa041b 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperateMasks.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperateMasks.h
@@ -33,26 +33,26 @@ namespace Algorithms {
class DLLExport BinaryOperateMasks : public API::Algorithm {
public:
BinaryOperateMasks();
- ~BinaryOperateMasks();
+ ~BinaryOperateMasks() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "BinaryOperateMasks"; };
+ const std::string name() const override { return "BinaryOperateMasks"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs binary operation, including and, or and xor, on two mask "
"Workspaces, i.e., SpecialWorkspace2D.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Masking"; }
+ const std::string category() const override { return "Transforms\\Masking"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h b/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h
index 07062fbc96959a224cfd565931ffd9aa4e0b919b..347d6b8841bb88a90008fe401460dfefb2ae94a3 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h
@@ -60,10 +60,10 @@ public:
/// Default constructor
BinaryOperation();
/// Destructor
- virtual ~BinaryOperation();
+ ~BinaryOperation() override;
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Arithmetic"; }
+ const std::string category() const override { return "Arithmetic"; }
/** BinaryOperationTable: a list of ints.
* Index into vector: workspace index in the lhs;
@@ -79,8 +79,8 @@ public:
protected:
// Overridden Algorithm methods
- virtual void exec();
- virtual void init();
+ void exec() override;
+ void init() override;
bool handleSpecialDivideMinus();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CalMuonDeadTime.h b/Framework/Algorithms/inc/MantidAlgorithms/CalMuonDeadTime.h
index c3cbbf8b9c41e96d275d7263245c4c4485c97d5a..8940d618e96e4452f24c1b0dec2615ee6a3cd0d4 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CalMuonDeadTime.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CalMuonDeadTime.h
@@ -39,23 +39,23 @@ public:
/// Default constructor
CalMuonDeadTime() : API::Algorithm(){};
/// Destructor
- virtual ~CalMuonDeadTime(){};
+ ~CalMuonDeadTime() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CalMuonDeadTime"; }
+ const std::string name() const override { return "CalMuonDeadTime"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate Muon deadtime for each spectra in a workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CalMuonDetectorPhases.h b/Framework/Algorithms/inc/MantidAlgorithms/CalMuonDetectorPhases.h
index 1f5b4be466353dbfd450322d0eea0625f7230017..eaeaac96fbdfe4195f0f7de8d1ea3952977d4e7c 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CalMuonDetectorPhases.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CalMuonDetectorPhases.h
@@ -35,27 +35,27 @@ public:
/// Default constructor
CalMuonDetectorPhases() : API::Algorithm(){};
/// Destructor
- virtual ~CalMuonDetectorPhases(){};
+ ~CalMuonDetectorPhases() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CalMuonDetectorPhases"; }
+ const std::string name() const override { return "CalMuonDetectorPhases"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates the asymmetry and phase for each detector in a "
"workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
private:
/// Initialise the algorithm
- void init();
+ void init() override;
/// Execute the algorithm
- void exec();
+ void exec() override;
/// Validate the inputs
- std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
/// Prepare workspace for fit
API::MatrixWorkspace_sptr
prepareWorkspace(const API::MatrixWorkspace_sptr &ws, double startTime,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CalculateDIFC.h b/Framework/Algorithms/inc/MantidAlgorithms/CalculateDIFC.h
index ba6f60f792a4f6f76d9b2442b6f757cbc6f2dd4d..aa636dcc11d5de3b99a27631ff8f748041d34a1a 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CalculateDIFC.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CalculateDIFC.h
@@ -34,16 +34,16 @@ namespace Algorithms {
class DLLExport CalculateDIFC : public API::Algorithm {
public:
CalculateDIFC();
- virtual ~CalculateDIFC();
+ ~CalculateDIFC() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Calculate the DIFC for every pixel
void calculate(API::Progress &progress, API::MatrixWorkspace_sptr &outputWs,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CalculateEfficiency.h b/Framework/Algorithms/inc/MantidAlgorithms/CalculateEfficiency.h
index 6e4830b03d7b0a086c4c4cdf82a22a4c950860a0..05bf0c1bb6086847edbc471fd4d4a75fc9cee33d 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CalculateEfficiency.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CalculateEfficiency.h
@@ -47,25 +47,25 @@ public:
/// Default constructor
CalculateEfficiency() : API::Algorithm(){};
/// Destructor
- virtual ~CalculateEfficiency(){};
+ ~CalculateEfficiency() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CalculateEfficiency"; }
+ const std::string name() const override { return "CalculateEfficiency"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates the detector efficiency for a SANS instrument.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "SANS;CorrectionFunctions\\EfficiencyCorrections";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Sum all detectors, excluding monitors and masked detectors
void sumUnmaskedDetectors(API::MatrixWorkspace_sptr rebinnedWS, double &sum,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CalculateFlatBackground.h b/Framework/Algorithms/inc/MantidAlgorithms/CalculateFlatBackground.h
index d7ba179403040c8c99e5d43219383007696cfdf6..e61aa86f0572dd19ae9f4842814582cf0e32f553 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CalculateFlatBackground.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CalculateFlatBackground.h
@@ -56,31 +56,31 @@ public:
: API::Algorithm(), m_convertedFromRawCounts(false),
m_skipMonitors(false), m_nullifyNegative(true), m_progress(NULL) {}
/// Virtual destructor
- virtual ~CalculateFlatBackground() {
+ ~CalculateFlatBackground() override {
if (m_progress)
delete m_progress;
m_progress = NULL;
}
/// Algorithm's name
- virtual const std::string name() const { return "CalculateFlatBackground"; }
+ const std::string name() const override { return "CalculateFlatBackground"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Finds a constant value fit to an appropriate range of each desired "
"spectrum and subtracts that value from the entire spectrum.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "SANS;CorrectionFunctions\\BackgroundCorrections";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void convertToDistribution(API::MatrixWorkspace_sptr workspace);
void restoreDistributionState(API::MatrixWorkspace_sptr workspace);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CalculateResolution.h b/Framework/Algorithms/inc/MantidAlgorithms/CalculateResolution.h
index bb28786adb55cbc968ce26827656f71cd0a955e4..0d0bec3f8d5f89a3349ea0cb7f4f0eb5da297675 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CalculateResolution.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CalculateResolution.h
@@ -36,16 +36,16 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport CalculateResolution : public API::DataProcessorAlgorithm {
public:
CalculateResolution();
- virtual ~CalculateResolution();
+ ~CalculateResolution() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CalculateSlits.h b/Framework/Algorithms/inc/MantidAlgorithms/CalculateSlits.h
index e92700572a984e120f2517bc5747351e2e51912f..f4654b9b73521c63128283a49bfae837c8a61858 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CalculateSlits.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CalculateSlits.h
@@ -36,16 +36,16 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport CalculateSlits : public API::DataProcessorAlgorithm {
public:
CalculateSlits();
- virtual ~CalculateSlits();
+ ~CalculateSlits() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CalculateTransmission.h b/Framework/Algorithms/inc/MantidAlgorithms/CalculateTransmission.h
index 7befaecf5058cc4aedbf71eb4c2deb815ebaa68f..f8514bd55c77d4879fa936ea52ced6cce56b0dfb 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CalculateTransmission.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CalculateTransmission.h
@@ -71,20 +71,20 @@ public:
/// Constructor
CalculateTransmission();
/// Virtual destructor
- virtual ~CalculateTransmission();
+ ~CalculateTransmission() override;
/// Algorithm's name
- virtual const std::string name() const { return "CalculateTransmission"; }
+ const std::string name() const override { return "CalculateTransmission"; }
/// Summary of algorithms purpose
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates the transmission correction, as a function of "
"wavelength, for a SANS instrument.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "SANS;CorrectionFunctions\\TransmissionCorrections";
}
@@ -94,9 +94,9 @@ private:
mutable double m_done;
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Pull out a single spectrum from a 2D workspace
API::MatrixWorkspace_sptr extractSpectra(API::MatrixWorkspace_sptr ws,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CalculateTransmissionBeamSpreader.h b/Framework/Algorithms/inc/MantidAlgorithms/CalculateTransmissionBeamSpreader.h
index 336e890f28d896929425fad0660db29b125f27b6..450c6e7a942c1e4751a4ce2e893aea48d5877878 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CalculateTransmissionBeamSpreader.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CalculateTransmissionBeamSpreader.h
@@ -76,29 +76,29 @@ public:
/// Constructor
CalculateTransmissionBeamSpreader();
/// Virtual destructor
- virtual ~CalculateTransmissionBeamSpreader();
+ ~CalculateTransmissionBeamSpreader() override;
/// Algorithm's name
- virtual const std::string name() const {
+ const std::string name() const override {
return "CalculateTransmissionBeamSpreader";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates the sample transmission using the beam spreader (aka "
"glass carbon) method.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "SANS;CorrectionFunctions\\TransmissionCorrections";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Pull out a single spectrum from a 2D workspace
API::MatrixWorkspace_sptr extractSpectrum(API::MatrixWorkspace_sptr WS,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CalculateZscore.h b/Framework/Algorithms/inc/MantidAlgorithms/CalculateZscore.h
index 1ad6ae3a20961a7b0d1fb0da32c7574aed188da1..a7faffdabf8acaf43559206555ecfe58527316b0 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CalculateZscore.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CalculateZscore.h
@@ -33,26 +33,26 @@ namespace Algorithms {
class DLLExport CalculateZscore : public API::Algorithm {
public:
CalculateZscore();
- virtual ~CalculateZscore();
+ ~CalculateZscore() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CalculateZscore"; }
+ const std::string name() const override { return "CalculateZscore"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate Z-score for Y and E of MatrixWorkspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Utility\\Calculation"; }
+ const std::string category() const override { return "Utility\\Calculation"; }
private:
/// Implement abstract Algorithm methods
- void init();
+ void init() override;
/// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ChangeBinOffset.h b/Framework/Algorithms/inc/MantidAlgorithms/ChangeBinOffset.h
index b3117b1de40b0dc494a807886b6cd615b29a84ea..490e907a066a6ea12271712e8beac8aebc47ef7e 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ChangeBinOffset.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ChangeBinOffset.h
@@ -48,26 +48,26 @@ public:
/// Default constructor
ChangeBinOffset();
/// Destructor
- virtual ~ChangeBinOffset();
+ ~ChangeBinOffset() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "ChangeBinOffset"; }
+ const std::string name() const override { return "ChangeBinOffset"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Adjusts all the time bin values in a workspace by a specified "
"amount.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Axes"; }
+ const std::string category() const override { return "Transforms\\Axes"; }
/// Algorithm's Alternate Name
- virtual const std::string alias() const { return "OffsetX"; }
+ const std::string alias() const override { return "OffsetX"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Execute algorithm for EventWorkspaces
void execEvent();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ChangeLogTime.h b/Framework/Algorithms/inc/MantidAlgorithms/ChangeLogTime.h
index 881e557f62ae8f49dc83c8f758773560bfab1eeb..4fc6ba82556edd03ba6400359b3561a902dbbe17 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ChangeLogTime.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ChangeLogTime.h
@@ -9,21 +9,21 @@ namespace Algorithms {
class DLLExport ChangeLogTime : public API::Algorithm {
public:
ChangeLogTime();
- ~ChangeLogTime();
+ ~ChangeLogTime() override;
- const std::string name() const;
- int version() const;
- const std::string category() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
/// Algorithm's summary
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Adds a constant to the times for the requested log.";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Mantid
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ChangePulsetime.h b/Framework/Algorithms/inc/MantidAlgorithms/ChangePulsetime.h
index 36b47c2c3fdb347b5bc35c31c56e85efdfa2cfd6..9a1531c320575afd1373957ee295c9c51bbdc3a4 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ChangePulsetime.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ChangePulsetime.h
@@ -15,28 +15,28 @@ namespace Algorithms {
class DLLExport ChangePulsetime : public API::Algorithm {
public:
ChangePulsetime();
- ~ChangePulsetime();
+ ~ChangePulsetime() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "ChangePulsetime"; };
+ const std::string name() const override { return "ChangePulsetime"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Adds a constant time value, in seconds, to the pulse time of "
"events in an EventWorkspace. ";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Events;Transforms\\Axes";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Mantid
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h b/Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h
index 1bd283f85e1abf0cadc65e7e807ca499f85e2d79..b104aee44ec48197f03d0f1be2d4e125c37dadd4 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h
@@ -14,27 +14,27 @@ namespace Algorithms {
class DLLExport ChangeTimeZero : public API::Algorithm {
public:
ChangeTimeZero();
- ~ChangeTimeZero();
+ ~ChangeTimeZero() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "ChangeTimeZero"; };
+ const std::string name() const override { return "ChangeTimeZero"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The algorithm adjusts the zero time of a workspace.";
}
/// Check the inputs
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Workspaces"; }
+ const std::string category() const override { return "Utility\\Workspaces"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Create the output workspace
Mantid::API::MatrixWorkspace_sptr
createOutputWS(Mantid::API::MatrixWorkspace_sptr input, double startProgress,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CheckWorkspacesMatch.h b/Framework/Algorithms/inc/MantidAlgorithms/CheckWorkspacesMatch.h
index 01b8c1e2c528a1950a91f0ac0ec7f2b2b8e9e1dc..cf0c1da460d95a6a635aa55a3db9f3554c9a2f86 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CheckWorkspacesMatch.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CheckWorkspacesMatch.h
@@ -74,36 +74,36 @@ class DLLExport CheckWorkspacesMatch : public API::Algorithm,
public API::DeprecatedAlgorithm {
public:
CheckWorkspacesMatch();
- virtual ~CheckWorkspacesMatch();
+ ~CheckWorkspacesMatch() override;
/// Algorithm's name
- virtual const std::string name() const { return "CheckWorkspacesMatch"; }
+ const std::string name() const override { return "CheckWorkspacesMatch"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Compares two workspaces for equality. This algorithm is mainly "
"intended for use by the Mantid development team as part of the "
"testing process.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Workspaces"; }
+ const std::string category() const override { return "Utility\\Workspaces"; }
/// The string that is returned when comparison is successful.
static std::string successString() { return "Success!"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Called when comparing two individual workspaces
- void exec();
+ void exec() override;
/// Called when comparing workspace groups
- virtual bool processGroups();
+ bool processGroups() override;
/// This algorithm is now deprecated and calls CompareWorkspaces instead
std::string runCompareWorkspaces(bool group_compare = false);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ChopData.h b/Framework/Algorithms/inc/MantidAlgorithms/ChopData.h
index da937b2b0a0a2ce34c5d6b112160802e213d95c4..b0c493080270c2a6dde575fdda30539f914ea00f 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ChopData.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ChopData.h
@@ -38,19 +38,19 @@ namespace Algorithms {
class DLLExport ChopData : public API::Algorithm {
public:
ChopData() : API::Algorithm() {} ///< Empty constructor
- virtual ~ChopData() {} ///< Empty destructor
+ ~ChopData() override {} ///< Empty destructor
- virtual const std::string name() const {
+ const std::string name() const override {
return "ChopData";
} ///< @return the algorithms name
- virtual const std::string category() const {
+ const std::string category() const override {
return "Transforms\\Splitting";
} ///< @return the algorithms category
- virtual int version() const {
+ int version() const override {
return (1);
} ///< @return version number of algorithm
/// Algorithm's summary
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Splits an input workspace into a grouped workspace, where each "
"spectra "
"if 'chopped' at a certain point (given in 'Step' input value) "
@@ -59,8 +59,8 @@ public:
}
private:
- void init(); ///< Initialise the algorithm. Declare properties, etc.
- void exec(); ///< Executes the algorithm.
+ void init() override; ///< Initialise the algorithm. Declare properties, etc.
+ void exec() override; ///< Executes the algorithm.
};
}
}
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ClearInstrumentParameters.h b/Framework/Algorithms/inc/MantidAlgorithms/ClearInstrumentParameters.h
index 81ff45142bb305680210e6277df7b45884eba0d2..212fb4e80e174b00ecbe2cdbce3ca45a771f9b6e 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ClearInstrumentParameters.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ClearInstrumentParameters.h
@@ -37,15 +37,15 @@ namespace Algorithms {
class DLLExport ClearInstrumentParameters : public API::Algorithm {
public:
ClearInstrumentParameters();
- virtual ~ClearInstrumentParameters();
- virtual const std::string name() const;
- virtual const std::string summary() const;
- virtual const std::string category() const;
- virtual int version() const;
+ ~ClearInstrumentParameters() override;
+ const std::string name() const override;
+ const std::string summary() const override;
+ const std::string category() const override;
+ int version() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ClearMaskFlag.h b/Framework/Algorithms/inc/MantidAlgorithms/ClearMaskFlag.h
index c162d13b400113aaa79481c8a2ce3ee55ca0464e..8ce5da88e9cacea149baeedc314852e35922a98d 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ClearMaskFlag.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ClearMaskFlag.h
@@ -33,19 +33,19 @@ namespace Algorithms {
class DLLExport ClearMaskFlag : public API::Algorithm {
public:
ClearMaskFlag();
- virtual ~ClearMaskFlag();
+ ~ClearMaskFlag() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
/// Algorithm's summary
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Delete the mask flag/bit on all spectra in a workspace.";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CloneWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/CloneWorkspace.h
index 84e207c436a8f234d21174961c0edc02ed1d9bfe..d4b03e5892733c293a94b3fd70b761ac126877a3 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CloneWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CloneWorkspace.h
@@ -48,29 +48,29 @@ public:
/// (Empty) Constructor
CloneWorkspace() : API::Algorithm() {}
/// Virtual destructor
- virtual ~CloneWorkspace() {}
+ ~CloneWorkspace() override {}
/// Algorithm's name
- virtual const std::string name() const { return "CloneWorkspace"; }
+ const std::string name() const override { return "CloneWorkspace"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Copies an existing workspace into a new one.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Workspaces"; }
+ const std::string category() const override { return "Utility\\Workspaces"; }
private:
- const std::string workspaceMethodName() const { return "clone"; }
- const std::string workspaceMethodInputProperty() const {
+ const std::string workspaceMethodName() const override { return "clone"; }
+ const std::string workspaceMethodInputProperty() const override {
return "InputWorkspace";
}
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Comment.h b/Framework/Algorithms/inc/MantidAlgorithms/Comment.h
index dfd4f5e81bbb9e8e2610c6adc10185cd7b2efb6c..6f8c599810bb3f8e9d07dbce9e393d7eb1bc2764 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Comment.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Comment.h
@@ -32,16 +32,16 @@ namespace Algorithms {
class DLLExport Comment : public API::Algorithm {
public:
Comment();
- virtual ~Comment();
+ ~Comment() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CommutativeBinaryOperation.h b/Framework/Algorithms/inc/MantidAlgorithms/CommutativeBinaryOperation.h
index 6e3b0ecafa2cdbe51305e76570e274f3c04c21fe..e264cf68424a578603879a0511ce9a2526b1782c 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CommutativeBinaryOperation.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CommutativeBinaryOperation.h
@@ -44,14 +44,14 @@ public:
/// Default constructor
CommutativeBinaryOperation() : BinaryOperation(){};
/// Destructor
- virtual ~CommutativeBinaryOperation(){};
+ ~CommutativeBinaryOperation() override{};
protected:
// Overridden BinaryOperation method
/// Checks the overall size compatability of two workspaces
- virtual std::string
- checkSizeCompatibility(const API::MatrixWorkspace_const_sptr lhs,
- const API::MatrixWorkspace_const_sptr rhs) const;
+ std::string checkSizeCompatibility(
+ const API::MatrixWorkspace_const_sptr lhs,
+ const API::MatrixWorkspace_const_sptr rhs) const override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CompareWorkspaces.h b/Framework/Algorithms/inc/MantidAlgorithms/CompareWorkspaces.h
index 573f8aa0fb3b39a89cacb183725006e57cd51d57..f8d0ef59d708021c98c707ff24cf9b7da9a410be 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CompareWorkspaces.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CompareWorkspaces.h
@@ -72,30 +72,30 @@ namespace Algorithms {
class DLLExport CompareWorkspaces : public API::Algorithm {
public:
CompareWorkspaces();
- virtual ~CompareWorkspaces();
+ ~CompareWorkspaces() override;
/// Algorithm's name
- virtual const std::string name() const;
+ const std::string name() const override;
/// Algorithm's version
- virtual int version() const;
+ int version() const override;
/// Categories this algorithm belongs to
- virtual const std::string category() const;
+ const std::string category() const override;
/// Summary of algorithm's purpose
- virtual const std::string summary() const;
+ const std::string summary() const override;
private:
/// Initialise algorithm
- virtual void init();
+ void init() override;
/// Execute algorithm
- virtual void exec();
+ void exec() override;
/// Process two groups and ensure the Result string is set properly on the
/// final algorithm
- virtual bool processGroups();
+ bool processGroups() override;
/// Process the two groups
void processGroups(boost::shared_ptr<const API::WorkspaceGroup> groupOne,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConjoinWorkspaces.h b/Framework/Algorithms/inc/MantidAlgorithms/ConjoinWorkspaces.h
index ca0541a80a8ba7bb48ee2bea38466dbde39a27c9..81e3dc780c0b71fad6417feb29b95ab2f59452ea 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConjoinWorkspaces.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConjoinWorkspaces.h
@@ -55,24 +55,24 @@ public:
/// Empty constructor
ConjoinWorkspaces();
/// Destructor
- virtual ~ConjoinWorkspaces();
+ ~ConjoinWorkspaces() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "ConjoinWorkspaces"; }
+ const std::string name() const override { return "ConjoinWorkspaces"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void checkForOverlap(API::MatrixWorkspace_const_sptr ws1,
API::MatrixWorkspace_const_sptr ws2,
bool checkSpectra) const;
- virtual void fixSpectrumNumbers(API::MatrixWorkspace_const_sptr ws1,
- API::MatrixWorkspace_const_sptr ws2,
- API::MatrixWorkspace_sptr output);
- bool processGroups();
+ void fixSpectrumNumbers(API::MatrixWorkspace_const_sptr ws1,
+ API::MatrixWorkspace_const_sptr ws2,
+ API::MatrixWorkspace_sptr output) override;
+ bool processGroups() override;
/// True if spectra overlap
bool m_overlapChecked;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertAxesToRealSpace.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertAxesToRealSpace.h
index 4fe3e89e899a9b41ec87984c4391d5eeb649b58d..5963e67a32e106eed1510227cc1a89edd64706f3 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertAxesToRealSpace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertAxesToRealSpace.h
@@ -37,16 +37,16 @@ namespace Algorithms {
class DLLExport ConvertAxesToRealSpace : public API::Algorithm {
public:
ConvertAxesToRealSpace();
- virtual ~ConvertAxesToRealSpace();
+ ~ConvertAxesToRealSpace() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Local cache data about a spectra
struct SpectraData {
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertAxisByFormula.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertAxisByFormula.h
index bc39424b437c2db150ff8c220b247c10a5ef9291..ed381e486aa93c503ad383b4cbd8c2a423d37286 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertAxisByFormula.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertAxisByFormula.h
@@ -33,21 +33,21 @@ namespace Algorithms {
class DLLExport ConvertAxisByFormula : public API::Algorithm {
public:
ConvertAxisByFormula();
- virtual ~ConvertAxisByFormula();
+ ~ConvertAxisByFormula() override;
- const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Converts the X or Y axis of a MatrixWorkspace via a user defined "
"math formula.";
}
- int version() const;
- const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertDiffCal.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertDiffCal.h
index 461b70014c8337a2a7d5cb42dfac34734e352f44..d04ebf02e6a47b4d30599fd265bf68b3eed412ba 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertDiffCal.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertDiffCal.h
@@ -32,16 +32,16 @@ namespace Algorithms {
class DLLExport ConvertDiffCal : public API::Algorithm {
public:
ConvertDiffCal();
- virtual ~ConvertDiffCal();
+ ~ConvertDiffCal() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertEmptyToTof.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertEmptyToTof.h
index db06940c690dc57e62a494d2cb933eea63321a08..7542573a1822d54bb9a3b04b357491d33e3b1a5d 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertEmptyToTof.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertEmptyToTof.h
@@ -41,19 +41,19 @@ namespace Algorithms {
class DLLExport ConvertEmptyToTof : public API::Algorithm {
public:
ConvertEmptyToTof();
- virtual ~ConvertEmptyToTof();
+ ~ConvertEmptyToTof() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Converts the channel number to time of flight.";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void validateSpectraIndices(std::vector<int> &v);
void validateChannelIndices(std::vector<int> &v);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertFromDistribution.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertFromDistribution.h
index 703d5a76d760034766f8d5c807e77cee1db0642b..5085a59fa45e143f56fb38b727645d2f7b7a3539 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertFromDistribution.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertFromDistribution.h
@@ -45,26 +45,26 @@ public:
/// (Empty) Constructor
ConvertFromDistribution() : API::Algorithm() {}
/// Virtual destructor
- virtual ~ConvertFromDistribution() {}
+ ~ConvertFromDistribution() override {}
/// Algorithm's name
- virtual const std::string name() const { return "ConvertFromDistribution"; }
+ const std::string name() const override { return "ConvertFromDistribution"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Converts a histogram workspace from a distribution i.e. multiplies "
"by the bin width.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Transforms\\Distribution";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertSpectrumAxis.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertSpectrumAxis.h
index 4238eefe19f0e562690ca99a68ca19b333fa78a6..c4aa37b1ec8aac8c83b981f3fe32aee85cf1ddc5 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertSpectrumAxis.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertSpectrumAxis.h
@@ -53,11 +53,11 @@ public:
/// (Empty) Constructor
ConvertSpectrumAxis() : API::Algorithm() {}
/// Virtual destructor
- virtual ~ConvertSpectrumAxis() {}
+ ~ConvertSpectrumAxis() override {}
/// Algorithm's name
- virtual const std::string name() const { return "ConvertSpectrumAxis"; }
+ const std::string name() const override { return "ConvertSpectrumAxis"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Converts the axis of a Workspace2D which normally holds spectrum "
"numbers to some other unit, which will normally be some physical "
"value about the instrument such as Q, Q^2 or theta. 'Note': After "
@@ -67,17 +67,17 @@ public:
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Transforms\\Units;Transforms\\Axes";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Getting Efixed
double getEfixed(Geometry::IDetector_const_sptr detector,
API::MatrixWorkspace_const_sptr inputWS, int emode) const;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertSpectrumAxis2.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertSpectrumAxis2.h
index 2ce6307860f58a6c71accfaebcb3d6f04d711d32..d87cace4e88f5e148be65b4929c1a54154aba934 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertSpectrumAxis2.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertSpectrumAxis2.h
@@ -48,11 +48,11 @@ public:
/// (Empty) Constructor
ConvertSpectrumAxis2();
/// Virtual destructor
- virtual ~ConvertSpectrumAxis2() {}
+ ~ConvertSpectrumAxis2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "ConvertSpectrumAxis"; }
+ const std::string name() const override { return "ConvertSpectrumAxis"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Converts the axis of a Workspace2D which normally holds spectrum "
"numbers to one of Q, Q^2 or theta. 'Note': After running this "
"algorithm, some features will be unavailable on the workspace as "
@@ -61,17 +61,17 @@ public:
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Transforms\\Units;Transforms\\Axes";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Converting to theta.
void createThetaMap(API::Progress &progress, const std::string &target,
API::MatrixWorkspace_sptr &inputWS, size_t nHist);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertTableToMatrixWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertTableToMatrixWorkspace.h
index 94a108ff464091ae4a1671b93972baddcddd2982..7588a2bcb35bed91e3a4fad0815c41ccc57b3e09 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertTableToMatrixWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertTableToMatrixWorkspace.h
@@ -50,27 +50,27 @@ public:
/// (Empty) Constructor
ConvertTableToMatrixWorkspace() : API::Algorithm() {}
/// Virtual destructor
- virtual ~ConvertTableToMatrixWorkspace() {}
+ ~ConvertTableToMatrixWorkspace() override {}
/// Algorithm's name
- virtual const std::string name() const {
+ const std::string name() const override {
return "ConvertTableToMatrixWorkspace";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates a single spectrum matrix workspace from some columns of a "
"table workspace.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Workspaces"; }
+ const std::string category() const override { return "Utility\\Workspaces"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToDistribution.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToDistribution.h
index 1ad6fa440f32ddb8bbfba030730df26790ab0176..51ef273e81100c501a3c37fbd5d585fb0d88905f 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToDistribution.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToDistribution.h
@@ -44,28 +44,28 @@ public:
/// (Empty) Constructor
ConvertToDistribution() : API::Algorithm() {}
/// Virtual destructor
- virtual ~ConvertToDistribution() {}
+ ~ConvertToDistribution() override {}
/// Algorithm's name
- virtual const std::string name() const { return "ConvertToDistribution"; }
+ const std::string name() const override { return "ConvertToDistribution"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Makes a histogram workspace a distribution i.e. divides by the bin "
"width.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Transforms\\Distribution";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Validate inputs
- std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToEventWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToEventWorkspace.h
index 008d89b514aaa9b1fe35cc63a09c8da25f7a1006..bcb3778763cffbf25db38533552ae3d79c7ed4a5 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToEventWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToEventWorkspace.h
@@ -37,27 +37,27 @@ namespace Algorithms {
class DLLExport ConvertToEventWorkspace : public API::Algorithm {
public:
ConvertToEventWorkspace();
- ~ConvertToEventWorkspace();
+ ~ConvertToEventWorkspace() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "ConvertToEventWorkspace"; };
+ const std::string name() const override { return "ConvertToEventWorkspace"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Converts a Workspace2D from histograms to events in an "
"EventWorkspace by converting each bin to an equivalent weighted "
"event.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Events"; }
+ const std::string category() const override { return "Events"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToHistogram.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToHistogram.h
index 104ba792774cc8810d95b44dab28571d63f826f7..3b28421a06a7e362081bbb57b9e89d11d72d1abc 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToHistogram.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToHistogram.h
@@ -40,25 +40,29 @@ namespace Algorithms {
class DLLExport ConvertToHistogram : public XDataConverter {
public:
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "ConvertToHistogram"; }
+ const std::string name() const override { return "ConvertToHistogram"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Converts a workspace containing point data into one containing "
"histograms.";
}
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Axes"; }
+ const std::string category() const override { return "Transforms\\Axes"; }
private:
/// Returns true if the algorithm needs to be run.
- bool isProcessingRequired(const API::MatrixWorkspace_sptr inputWS) const;
+ bool
+ isProcessingRequired(const API::MatrixWorkspace_sptr inputWS) const override;
/// Checks the input workspace is consistent, throwing if not
- bool isWorkspaceLogical(const API::MatrixWorkspace_sptr inputWS) const;
+ bool
+ isWorkspaceLogical(const API::MatrixWorkspace_sptr inputWS) const override;
/// Returns the size of the new X vector
- std::size_t getNewXSize(const API::MatrixWorkspace_sptr inputWS) const;
+ std::size_t
+ getNewXSize(const API::MatrixWorkspace_sptr inputWS) const override;
/// Calculate the X point values. Implement in an inheriting class.
- void calculateXPoints(const MantidVec &inputX, MantidVec &outputX) const;
+ void calculateXPoints(const MantidVec &inputX,
+ MantidVec &outputX) const override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToMatrixWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToMatrixWorkspace.h
index ce6db5d6566423ed021f7f70bcfd29e52cbda75b..8d2823328085ee8e357851e72624cf7306ce5be2 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToMatrixWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToMatrixWorkspace.h
@@ -47,26 +47,26 @@ public:
/// (Empty) Constructor
ConvertToMatrixWorkspace() : API::Algorithm() {}
/// Virtual destructor
- virtual ~ConvertToMatrixWorkspace() {}
+ ~ConvertToMatrixWorkspace() override {}
/// Algorithm's name
- virtual const std::string name() const { return "ConvertToMatrixWorkspace"; }
+ const std::string name() const override { return "ConvertToMatrixWorkspace"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Converts an EventWorkspace into a Workspace2D, using the input "
"workspace's current X bin values.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Events"; }
+ const std::string category() const override { return "Events"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToPointData.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToPointData.h
index 52d72c9a4bd44a7744b29a2b285eed7bf7c628df..69635666cae718cd04d4fb6122accd81b64fa8d1 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertToPointData.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertToPointData.h
@@ -40,25 +40,29 @@ namespace Algorithms {
class DLLExport ConvertToPointData : public XDataConverter {
public:
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "ConvertToPointData"; }
+ const std::string name() const override { return "ConvertToPointData"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Converts a workspace containing histogram data into one containing "
"point data.";
}
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Axes"; }
+ const std::string category() const override { return "Transforms\\Axes"; }
private:
/// Returns true if the algorithm needs to be run.
- bool isProcessingRequired(const API::MatrixWorkspace_sptr inputWS) const;
+ bool
+ isProcessingRequired(const API::MatrixWorkspace_sptr inputWS) const override;
/// Checks the input workspace is consistent, throwing if not
- bool isWorkspaceLogical(const API::MatrixWorkspace_sptr inputWS) const;
+ bool
+ isWorkspaceLogical(const API::MatrixWorkspace_sptr inputWS) const override;
/// Returns the size of the new X vector
- std::size_t getNewXSize(const API::MatrixWorkspace_sptr inputWS) const;
+ std::size_t
+ getNewXSize(const API::MatrixWorkspace_sptr inputWS) const override;
/// Calculate the X point values. Implement in an inheriting class.
- void calculateXPoints(const MantidVec &inputX, MantidVec &outputX) const;
+ void calculateXPoints(const MantidVec &inputX,
+ MantidVec &outputX) const override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertUnits.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertUnits.h
index d799252f7778a4720f927054e6ade31abef0bfa6..89af71a55c1672bfb095ebc701cb85e19a1a17d4 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertUnits.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertUnits.h
@@ -71,28 +71,30 @@ public:
/// Default constructor
ConvertUnits();
/// Virtual destructor
- virtual ~ConvertUnits();
+ ~ConvertUnits() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "ConvertUnits"; }
+ const std::string name() const override { return "ConvertUnits"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs a unit change on the X values of a workspace";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Units"; }
+ const std::string category() const override { return "Transforms\\Units"; }
private:
- const std::string workspaceMethodName() const { return "convertUnits"; }
- const std::string workspaceMethodInputProperty() const {
+ const std::string workspaceMethodName() const override {
+ return "convertUnits";
+ }
+ const std::string workspaceMethodInputProperty() const override {
return "InputWorkspace";
}
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void setupMemberVariables(const API::MatrixWorkspace_const_sptr inputWS);
API::MatrixWorkspace_sptr
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ConvertUnitsUsingDetectorTable.h b/Framework/Algorithms/inc/MantidAlgorithms/ConvertUnitsUsingDetectorTable.h
index c61f955f40b647c5afaae5401e9380110232c515..b9f62e0376d5fc48b315ec00a325ea79147269e0 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ConvertUnitsUsingDetectorTable.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ConvertUnitsUsingDetectorTable.h
@@ -34,16 +34,16 @@ namespace Algorithms {
class DLLExport ConvertUnitsUsingDetectorTable : public API::Algorithm {
public:
ConvertUnitsUsingDetectorTable();
- virtual ~ConvertUnitsUsingDetectorTable();
+ ~ConvertUnitsUsingDetectorTable() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void setupMemberVariables(const API::MatrixWorkspace_const_sptr inputWS);
API::MatrixWorkspace_sptr
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CopyDetectorMapping.h b/Framework/Algorithms/inc/MantidAlgorithms/CopyDetectorMapping.h
index ef85ac20e0e805868baa7540f93de34320cad27a..2b7a0dd7601859acfddee482a3651d4560dc2f24 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CopyDetectorMapping.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CopyDetectorMapping.h
@@ -41,28 +41,28 @@ public:
/// (Empty) Constructor
CopyDetectorMapping() : API::Algorithm() {}
/// Virtual destructor
- virtual ~CopyDetectorMapping() {}
+ ~CopyDetectorMapping() override {}
/// Algorithm's name
- virtual const std::string name() const { return "CopyDetectorMapping"; }
+ const std::string name() const override { return "CopyDetectorMapping"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Copies spectra to detector mapping from one Matrix Workspace to "
"another.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Workspaces"; }
+ const std::string category() const override { return "Utility\\Workspaces"; }
/// Input property validation
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CopyInstrumentParameters.h b/Framework/Algorithms/inc/MantidAlgorithms/CopyInstrumentParameters.h
index a5790caf2e070ac7992add809281808228523419..f12ead195c92f1932fb579a5df705197da0ab325 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CopyInstrumentParameters.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CopyInstrumentParameters.h
@@ -58,19 +58,19 @@ namespace Algorithms {
class DLLExport CopyInstrumentParameters : public API::Algorithm {
public:
CopyInstrumentParameters();
- virtual ~CopyInstrumentParameters();
+ ~CopyInstrumentParameters() override;
/// Algorithm's name
- virtual const std::string name() const { return "CopyInstrumentParameters"; }
+ const std::string name() const override { return "CopyInstrumentParameters"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Transfers an instrument from on workspace to another workspace "
"with same base instrument.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument";
} // Needs to change
/// method indicates that base source instrument is the same or different from
@@ -79,9 +79,9 @@ public:
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void checkProperties();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CopyLogs.h b/Framework/Algorithms/inc/MantidAlgorithms/CopyLogs.h
index 2679d490f4b66287d4d851a50b4d96abcba3232b..15b6887c8b95d5be80f3abcbdb76839eb36e8100 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CopyLogs.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CopyLogs.h
@@ -40,20 +40,20 @@ namespace Algorithms {
class DLLExport CopyLogs : public API::Algorithm {
public:
CopyLogs();
- virtual ~CopyLogs();
+ ~CopyLogs() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Copies the sample logs from one workspace to another.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// appends new logs and overwrites existing logs.
void mergeReplaceExisting(const std::vector<Kernel::Property *> &inputLogs,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CopySample.h b/Framework/Algorithms/inc/MantidAlgorithms/CopySample.h
index e84df54cf23e92a7ad299b5729ecf16db3d4bee9..8205b4f3e3b97eacb7e62a503ca4882c62108142 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CopySample.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CopySample.h
@@ -48,29 +48,29 @@ National Laboratory & European Spallation Source
class DLLExport CopySample : public API::Algorithm {
public:
CopySample();
- ~CopySample();
+ ~CopySample() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "CopySample"; };
+ const std::string name() const override { return "CopySample"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Copy some/all the sample information from one workspace to "
"another.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Sample;Utility\\Workspaces";
}
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Function to copy information from one sample to another
void copyParameters(API::Sample &from, API::Sample &to, bool nameFlag,
bool materialFlag, bool environmentFlag, bool shapeFlag,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CorelliCrossCorrelate.h b/Framework/Algorithms/inc/MantidAlgorithms/CorelliCrossCorrelate.h
index 7ab057e4ad3c0090c95108df5bef28bbc70b6ae1..54988e78453d6cd229790d21a022646a8b12bcd4 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CorelliCrossCorrelate.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CorelliCrossCorrelate.h
@@ -34,21 +34,21 @@ namespace Algorithms {
class DLLExport CorelliCrossCorrelate : public API::Algorithm {
public:
CorelliCrossCorrelate();
- virtual ~CorelliCrossCorrelate();
+ ~CorelliCrossCorrelate() override;
- virtual const std::string name() const { return "CorelliCrossCorrelate"; };
- virtual int version() const { return 1; };
- virtual const std::string category() const {
+ const std::string name() const override { return "CorelliCrossCorrelate"; };
+ int version() const override { return 1; };
+ const std::string category() const override {
return "Diffraction\\Calibration;Events";
};
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Cross-correlation calculation for the elastic signal from Corelli.";
};
private:
- std::map<std::string, std::string> validateInputs();
- void init();
- void exec();
+ std::map<std::string, std::string> validateInputs() override;
+ void init() override;
+ void exec() override;
/// Input workspace
DataObjects::EventWorkspace_const_sptr inputWS;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CorrectFlightPaths.h b/Framework/Algorithms/inc/MantidAlgorithms/CorrectFlightPaths.h
index fdf84863bfaceeddb50be8acdb6e056a9727a657..b4db03d18c606d0ea2e8a296656aba1c34ea02ef 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CorrectFlightPaths.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CorrectFlightPaths.h
@@ -48,24 +48,24 @@ public:
/// Default constructor
CorrectFlightPaths();
/// Destructor
- virtual ~CorrectFlightPaths(){};
+ ~CorrectFlightPaths() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CorrectFlightPaths"; }
+ const std::string name() const override { return "CorrectFlightPaths"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Used to correct flight paths in 2D shaped detectors.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Inelastic\\Corrections;CorrectionFunctions\\InstrumentCorrections";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void initWorkspaces();
double getRunProperty(std::string);
double getInstrumentProperty(std::string);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CorrectKiKf.h b/Framework/Algorithms/inc/MantidAlgorithms/CorrectKiKf.h
index 7f34bb2341ea36336506075f76cca12205cc1aba..b58a0909470f47381def124247c103594ba9201d 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CorrectKiKf.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CorrectKiKf.h
@@ -63,27 +63,27 @@ public:
/// Default constructor
CorrectKiKf();
/// Virtual destructor
- virtual ~CorrectKiKf();
+ ~CorrectKiKf() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CorrectKiKf"; }
+ const std::string name() const override { return "CorrectKiKf"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs k_i/k_f multiplication, in order to transform "
"differential scattering cross section into dynamic structure "
"factor.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Inelastic\\Corrections;CorrectionFunctions\\SpecialCorrections";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void execEvent();
/**
* Execute CorrectKiKf for event lists
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CorrectToFile.h b/Framework/Algorithms/inc/MantidAlgorithms/CorrectToFile.h
index f34077cb270f792738080cceb65c3c7f7cd285fc..91f60e85f7f0c25e528940e6c46e0e2740ad0191 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CorrectToFile.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CorrectToFile.h
@@ -47,18 +47,18 @@ public:
/// (Empty) Constructor
CorrectToFile() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~CorrectToFile() {}
+ ~CorrectToFile() override {}
/// Algorithm's name
- virtual const std::string name() const { return "CorrectToFile"; }
+ const std::string name() const override { return "CorrectToFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Correct data using a file in the LOQ RKH format";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "SANS;CorrectionFunctions";
}
@@ -67,9 +67,9 @@ private:
/// that taken up with loading the file
static const double LOAD_TIME;
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Load in the RKH file for that has the correction information
API::MatrixWorkspace_sptr loadInFile(const std::string &corrFile);
/// Multiply or divide the input workspace as specified by the user
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CreateCalFileByNames.h b/Framework/Algorithms/inc/MantidAlgorithms/CreateCalFileByNames.h
index 01a55b6591363b7ae5e3e3c2664990364485883a..6b6e34d8ae6b48abab1ffc4beeb9e69991327173 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CreateCalFileByNames.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CreateCalFileByNames.h
@@ -65,20 +65,20 @@ public:
/// (Empty) Constructor
CreateCalFileByNames();
/// Virtual destructor
- virtual ~CreateCalFileByNames() {}
+ ~CreateCalFileByNames() override {}
/// Algorithm's name
- virtual const std::string name() const { return "CreateCalFileByNames"; }
+ const std::string name() const override { return "CreateCalFileByNames"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Create a calibration file (extension .cal) for diffraction "
"focusing based on the names of the components in the instrument "
"tree.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling\\CalFiles";
}
@@ -86,9 +86,9 @@ private:
/// Calibration entries map
typedef std::map<int, std::pair<int, int>> instrcalmap;
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// The name and path of the input file
std::string m_filename;
/// Determine whether the grouping file already exists.
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CreateDummyCalFile.h b/Framework/Algorithms/inc/MantidAlgorithms/CreateDummyCalFile.h
index 4e7afe46a0afdf4e573108f7f89345011ac4208e..3420a242d6b230a590fb1568cca14dec5a84809e 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CreateDummyCalFile.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CreateDummyCalFile.h
@@ -61,11 +61,11 @@ public:
/// (Empty) Constructor
CreateDummyCalFile();
/// Virtual destructor
- virtual ~CreateDummyCalFile() {}
+ ~CreateDummyCalFile() override {}
/// Algorithm's name
- virtual const std::string name() const { return "CreateDummyCalFile"; }
+ const std::string name() const override { return "CreateDummyCalFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Create a calibration file (extension .cal) from a workspace by "
"harvesting the detector ids from the instrument. All of the "
"offsets will be zero, and the pixels will be all grouped into "
@@ -75,9 +75,9 @@ public:
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling\\CalFiles";
}
@@ -85,9 +85,9 @@ private:
/// Calibration entries map
typedef std::map<int, std::pair<int, int>> instrcalmap;
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// The name and path of the input file
std::string m_filename;
/// Determine whether the grouping file already exists.
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CreateFlatEventWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/CreateFlatEventWorkspace.h
index 3817a507f2f8c4143cbceb7efbb2964cd4aa15ef..797772d4d7ea13be349f433f9971a87792bd2517 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CreateFlatEventWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CreateFlatEventWorkspace.h
@@ -34,21 +34,21 @@ namespace Algorithms {
class DLLExport CreateFlatEventWorkspace : public API::Algorithm {
public:
CreateFlatEventWorkspace();
- virtual ~CreateFlatEventWorkspace();
+ ~CreateFlatEventWorkspace() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates a flat event workspace that can be used for background "
"removal.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CreateGroupingWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/CreateGroupingWorkspace.h
index 5529345569302208e196855675914cc2f8e0554f..ba480fdb79ae169b8eac3e02caf1edc07b5cc3c4 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CreateGroupingWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CreateGroupingWorkspace.h
@@ -17,27 +17,27 @@ namespace Algorithms {
class DLLExport CreateGroupingWorkspace : public API::Algorithm {
public:
CreateGroupingWorkspace();
- ~CreateGroupingWorkspace();
+ ~CreateGroupingWorkspace() override;
/// Algorithm's name for identification
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates a new GroupingWorkspace using an instrument from one of: "
"an input workspace, an instrument name, or an instrument IDF "
"file.\nOptionally uses bank names to create the groups.";
}
/// Algorithm's version for identification
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification
- virtual const std::string category() const;
+ const std::string category() const override;
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Mantid
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CreateLogPropertyTable.h b/Framework/Algorithms/inc/MantidAlgorithms/CreateLogPropertyTable.h
index dfe932d32dcb60842dc597767e99f56dcc0d3eb7..667c8cc8b2f0c1d413279b64fa83886a4e6cd9a8 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CreateLogPropertyTable.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CreateLogPropertyTable.h
@@ -39,17 +39,17 @@ public:
/// (Empty) Constructor
CreateLogPropertyTable() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~CreateLogPropertyTable() {}
+ ~CreateLogPropertyTable() override {}
/// Algorithm's name for identification
- virtual const std::string name() const { return "CreateLogPropertyTable"; };
+ const std::string name() const override { return "CreateLogPropertyTable"; };
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Workspaces"; }
+ const std::string category() const override { return "Utility\\Workspaces"; }
/// Algorithm's summary
- virtual const std::string summary() const {
+ const std::string summary() const override {
return " Takes a list of workspaces and a list of log property names. "
"For each workspace, the Run info is inspected and "
"all log property values are used to populate a resulting output "
@@ -58,9 +58,9 @@ public:
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CreateLogTimeCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/CreateLogTimeCorrection.h
index 706c55bb21ef328c291c0f8f331b05ecfaf948d3..4b1459588a447765f61074194e0f64d7c8576032 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CreateLogTimeCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CreateLogTimeCorrection.h
@@ -43,25 +43,25 @@ namespace Algorithms {
class DLLExport CreateLogTimeCorrection : public API::Algorithm {
public:
CreateLogTimeCorrection();
- virtual ~CreateLogTimeCorrection();
+ ~CreateLogTimeCorrection() override;
- virtual const std::string name() const { return "CreateLogTimeCorrection"; }
+ const std::string name() const override { return "CreateLogTimeCorrection"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Create log time correction table. Correction for each pixel is "
"based on L1 and L2.";
}
- virtual int version() const { return 1; }
- virtual const std::string category() const {
+ int version() const override { return 1; }
+ const std::string category() const override {
return "Events\\EventFiltering";
}
private:
/// Implement abstract Algorithm methods
- void init();
+ void init() override;
/// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
/// Get instrument geometry setup including L2 for each detector and L1
void getInstrumentSetup();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CreatePSDBleedMask.h b/Framework/Algorithms/inc/MantidAlgorithms/CreatePSDBleedMask.h
index 4d2e3344475992ef1b706fc797f4cd26748d320d..05a492c96117909428bebbee9de939962af8a97a 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CreatePSDBleedMask.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CreatePSDBleedMask.h
@@ -51,19 +51,19 @@ public:
/// Default constructor
CreatePSDBleedMask();
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CreatePSDBleedMask"; }
+ const std::string name() const override { return "CreatePSDBleedMask"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Runs a diagnostic test for saturation of PSD tubes and creates a "
"MaskWorkspace marking the failed tube spectra.";
}
- virtual const std::string category() const;
+ const std::string category() const override;
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Process a tube
bool performBleedTest(const std::vector<int> &tubeIndices,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CreatePeaksWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/CreatePeaksWorkspace.h
index c0c282adfc7101da8cf2a77707fb282c9c98f202..37a602b61b964e0acf42783de6b80a15d91bc683 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CreatePeaksWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CreatePeaksWorkspace.h
@@ -15,27 +15,27 @@ namespace Algorithms {
class DLLExport CreatePeaksWorkspace : public API::Algorithm {
public:
CreatePeaksWorkspace();
- ~CreatePeaksWorkspace();
+ ~CreatePeaksWorkspace() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "CreatePeaksWorkspace"; };
+ const std::string name() const override { return "CreatePeaksWorkspace"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Create an empty PeaksWorkspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\Peaks;Utility\\Workspaces";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Mantid
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CreateSampleWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/CreateSampleWorkspace.h
index 969c9ba69a7000d67d6a23422b9f6200766dee37..edb40481c1df50dfd6487cfa7fc02ebb11ccfc65 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CreateSampleWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CreateSampleWorkspace.h
@@ -38,19 +38,19 @@ namespace Algorithms {
class DLLExport CreateSampleWorkspace : public API::Algorithm {
public:
CreateSampleWorkspace();
- virtual ~CreateSampleWorkspace();
+ ~CreateSampleWorkspace() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
/// Algorithm's summary
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates sample workspaces for usage examples and other situations.";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
DataObjects::EventWorkspace_sptr
createEventWorkspace(int numPixels, int numBins, int numEvents, double x0,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CreateSingleValuedWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/CreateSingleValuedWorkspace.h
index 4909b2fc63761e3486190a767e787e65a43e6fed..21daf71175e3a1401e41aa59538237a2edf18246 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CreateSingleValuedWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CreateSingleValuedWorkspace.h
@@ -49,26 +49,26 @@ public:
/// (Empty) Constructor
CreateSingleValuedWorkspace() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~CreateSingleValuedWorkspace() {}
+ ~CreateSingleValuedWorkspace() override {}
/// Algorithm's name
- virtual const std::string name() const {
+ const std::string name() const override {
return "CreateSingleValuedWorkspace";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates a 2D workspace containing a single X, Y & E value.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Workspaces"; }
+ const std::string category() const override { return "Utility\\Workspaces"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CreateTransmissionWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/CreateTransmissionWorkspace.h
index eab48a58032cb6eb0f240d31eb2ef5f2f4ac7fa9..375abfa8744044ac5f186ab77db66f5557b67697 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CreateTransmissionWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CreateTransmissionWorkspace.h
@@ -34,17 +34,17 @@ namespace Algorithms {
class DLLExport CreateTransmissionWorkspace : public ReflectometryWorkflowBase {
public:
CreateTransmissionWorkspace();
- virtual ~CreateTransmissionWorkspace();
+ ~CreateTransmissionWorkspace() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates a transmission run workspace in Wavelength from input TOF "
"workspaces.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
/// Make a transmission correction workspace
@@ -60,8 +60,8 @@ private:
const OptionalDouble &stitchingStartOverlapQ,
const OptionalDouble &stitchingEndOverlapQ, const double &wavelengthStep);
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CreateTransmissionWorkspaceAuto.h b/Framework/Algorithms/inc/MantidAlgorithms/CreateTransmissionWorkspaceAuto.h
index f736d61dbbffc3ce6062d8a767f84c8b5da5715c..b1562b1979ddf219295fce7c295a7cc165992af6 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CreateTransmissionWorkspaceAuto.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CreateTransmissionWorkspaceAuto.h
@@ -37,23 +37,23 @@ class DLLExport CreateTransmissionWorkspaceAuto
: public API::DataProcessorAlgorithm {
public:
CreateTransmissionWorkspaceAuto();
- virtual ~CreateTransmissionWorkspaceAuto();
+ ~CreateTransmissionWorkspaceAuto() override;
//----------------------------------------------------------------------------------------------
/// Algorithm's name for identification. @see Algorithm::name
- virtual const std::string name() const {
+ const std::string name() const override {
return "CreateTransmissionWorkspaceAuto";
}
/// Algorithm's version for identification. @see Algorithm::version
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification. @see Algorithm::category
- virtual const std::string category() const { return "Reflectometry\\ISIS"; }
+ const std::string category() const override { return "Reflectometry\\ISIS"; }
/// Algorithm's summary for documentation
- virtual const std::string summary() const;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
template <typename T> boost::optional<T> isSet(std::string propName) const;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CreateWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/CreateWorkspace.h
index 9637bd67c0ad2abca417befcda4a91e30b1d0ea0..3bec4985ccbdcf6e9abeb55cb0bd716ced377baa 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CreateWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CreateWorkspace.h
@@ -52,31 +52,31 @@ public:
/// Default constructor
CreateWorkspace();
/// Default desctructor
- virtual ~CreateWorkspace();
+ ~CreateWorkspace() override;
- virtual const std::string name() const {
+ const std::string name() const override {
return "CreateWorkspace";
} ///< @return the algorithms name
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm constructs a MatrixWorkspace when passed a vector "
"for each of the X, Y, and E data values.";
}
- virtual const std::string category() const {
+ const std::string category() const override {
return "Utility\\Workspaces";
} ///< @return the algorithms category
- virtual int version() const {
+ int version() const override {
return (1);
} ///< @return version number of algorithm
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
/// Initialise the Algorithm (declare properties)
- void init();
+ void init() override;
/// Execute the Algorithm
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CropWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/CropWorkspace.h
index 52c0bc9aa7ea61116191b989a6b375a5eb3fa6bd..4ec2425e31d069d7668f9c21c7409c2372ed869e 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CropWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CropWorkspace.h
@@ -69,25 +69,27 @@ namespace Algorithms {
class DLLExport CropWorkspace : public API::Algorithm {
public:
CropWorkspace();
- virtual ~CropWorkspace();
+ ~CropWorkspace() override;
/// Algorithm's name
- virtual const std::string name() const { return "CropWorkspace"; }
+ const std::string name() const override { return "CropWorkspace"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Extracts a 'block' from a workspace and places it in a new "
"workspace.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Transforms\\Splitting"; }
+ const std::string category() const override {
+ return "Transforms\\Splitting";
+ }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CrossCorrelate.h b/Framework/Algorithms/inc/MantidAlgorithms/CrossCorrelate.h
index eb60ad91ab59c5774af661ff71589a9fdc14f38f..bd07a06895afbc10c08aa28c36dda6884ff32214 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CrossCorrelate.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CrossCorrelate.h
@@ -61,29 +61,29 @@ public:
/// (Empty) Constructor
CrossCorrelate() : API::Algorithm(), m_progress(NULL) {}
/// Virtual destructor
- virtual ~CrossCorrelate() {
+ ~CrossCorrelate() override {
if (m_progress)
delete m_progress;
m_progress = NULL;
}
/// Algorithm's name
- virtual const std::string name() const { return "CrossCorrelate"; }
+ const std::string name() const override { return "CrossCorrelate"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Cross-correlates a range of spectra against one reference spectra "
"in the same workspace.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Arithmetic"; }
+ const std::string category() const override { return "Arithmetic"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Spectra to index map
spec2index_map index_map;
/// Iterator for the spectra to index map
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CuboidGaugeVolumeAbsorption.h b/Framework/Algorithms/inc/MantidAlgorithms/CuboidGaugeVolumeAbsorption.h
index fc490e944f3e97e4cb256d044f20bba6ad599e1c..328b03994941918177a0b3fefd5cea0981445e5c 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CuboidGaugeVolumeAbsorption.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CuboidGaugeVolumeAbsorption.h
@@ -46,13 +46,13 @@ public:
/// (Empty) Constructor
CuboidGaugeVolumeAbsorption();
/// Virtual destructor
- virtual ~CuboidGaugeVolumeAbsorption() {}
+ ~CuboidGaugeVolumeAbsorption() override {}
/// Algorithm's name
- virtual const std::string name() const {
+ const std::string name() const override {
return "CuboidGaugeVolumeAbsorption";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates bin-by-bin correction factors for attenuation due to "
"absorption and (single) scattering within a cuboid shaped 'gauge "
"volume' of a generic sample. The sample shape can be defined by, "
@@ -60,11 +60,11 @@ public:
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
private:
- std::string sampleXML();
- void initialiseCachedDistances();
+ std::string sampleXML() override;
+ void initialiseCachedDistances() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CylinderAbsorption.h b/Framework/Algorithms/inc/MantidAlgorithms/CylinderAbsorption.h
index fe5fa12759ea501eabd35a018341916b31aa4db2..58729aadddf89ae9c7f7a17667a30a1affedf73f 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CylinderAbsorption.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CylinderAbsorption.h
@@ -91,23 +91,23 @@ public:
/// (Empty) Constructor
CylinderAbsorption();
/// Virtual destructor
- virtual ~CylinderAbsorption() {}
+ ~CylinderAbsorption() override {}
/// Algorithm's name
- virtual const std::string name() const { return "CylinderAbsorption"; }
+ const std::string name() const override { return "CylinderAbsorption"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates bin-by-bin correction factors for attenuation due to "
"absorption and single scattering in a 'cylindrical' sample.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
private:
- void defineProperties();
- void retrieveProperties();
- std::string sampleXML();
- void initialiseCachedDistances();
+ void defineProperties() override;
+ void retrieveProperties() override;
+ std::string sampleXML() override;
+ void initialiseCachedDistances() override;
double m_cylHeight; ///< The height of the cylindrical sample in m
double m_cylRadius; ///< The radius of the cylindrical sample in m
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/DeleteLog.h b/Framework/Algorithms/inc/MantidAlgorithms/DeleteLog.h
index 7a9cf95515fc76bed5f203353bd9a77cf05c3f58..12c5a0dedef05d34d7505a61e6dd4874790659fe 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/DeleteLog.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/DeleteLog.h
@@ -30,18 +30,18 @@ namespace Algorithms {
*/
class DLLExport DeleteLog : public API::Algorithm {
public:
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Removes a named log from a run";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/DeleteWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/DeleteWorkspace.h
index 941aad912d083dffd84c6dce256a0c78f29471b5..91890dbf8d5a8ad29a99e245cbc6ef3074a51815 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/DeleteWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/DeleteWorkspace.h
@@ -40,25 +40,27 @@ namespace Algorithms {
class DLLExport DeleteWorkspace : public API::Algorithm {
public:
/// Algorithm's name
- virtual const std::string name() const { return "DeleteWorkspace"; }
+ const std::string name() const override { return "DeleteWorkspace"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Removes a workspace from memory.";
}
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Workspaces"; }
+ const std::string category() const override { return "Utility\\Workspaces"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
private:
/// Overridden init
- void init();
+ void init() override;
/// Overridden exec
- void exec();
+ void exec() override;
- const std::string workspaceMethodName() const { return "delete"; }
- const std::string workspaceMethodInputProperty() const { return "Workspace"; }
+ const std::string workspaceMethodName() const override { return "delete"; }
+ const std::string workspaceMethodInputProperty() const override {
+ return "Workspace";
+ }
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/DetectorDiagnostic.h b/Framework/Algorithms/inc/MantidAlgorithms/DetectorDiagnostic.h
index dfeb58b2c398f1dbb47426ecf16e6df8f57af427..b8403006b44186cd0230bdbcb61a6677c3f1d561 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/DetectorDiagnostic.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/DetectorDiagnostic.h
@@ -47,26 +47,26 @@ public:
/// Default constructor
DetectorDiagnostic();
/// Virtual destructor
- virtual ~DetectorDiagnostic(){};
+ ~DetectorDiagnostic() override{};
/// Algorithm's category for identification
- virtual const std::string category() const;
+ const std::string category() const override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Identifies histograms and their detectors that have total numbers "
"of counts over a user defined maximum or less than the user define "
"minimum.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const;
+ int version() const override;
private:
// Overridden Algorithm methods
- virtual void init();
- virtual void exec();
+ void init() override;
+ void exec() override;
/// Apply a given mask
void applyMask(API::MatrixWorkspace_sptr inputWS,
API::MatrixWorkspace_sptr maskWS);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyCor.h b/Framework/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyCor.h
index b704249198ea1298b07fb579b0990c132186b59e..c5a0e71bf60b5655f1e66e51a8b98e8130179b14 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyCor.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyCor.h
@@ -86,9 +86,9 @@ class DLLExport DetectorEfficiencyCor : public API::Algorithm {
public:
DetectorEfficiencyCor();
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "DetectorEfficiencyCor"; }
+ const std::string name() const override { return "DetectorEfficiencyCor"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm adjusts the binned data in a workspace for detector "
"efficiency, calculated from the neutrons' kinetic energy, the gas "
"filled detector's geometry and gas pressure. The data are then "
@@ -96,9 +96,9 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\EfficiencyCorrections;Inelastic\\Corrections";
}
@@ -146,8 +146,8 @@ private:
std::list<int64_t> m_spectraSkipped;
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyCorUser.h b/Framework/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyCorUser.h
index ee52e8d2b300c74723b09e6487c4c64f832d8b97..93d3a800c6e18157d3f9339f017fdf5642e6d454 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyCorUser.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyCorUser.h
@@ -40,21 +40,21 @@ namespace Algorithms {
class DLLExport DetectorEfficiencyCorUser : public API::Algorithm {
public:
DetectorEfficiencyCorUser();
- virtual ~DetectorEfficiencyCorUser();
+ ~DetectorEfficiencyCorUser() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm calculates the detector efficiency according the "
"formula set in the instrument definition file/parameters.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void retrieveProperties();
double calculateFormulaValue(const std::string &, double);
MantidVec calculateEfficiency(double, const std::string &, const MantidVec &);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyVariation.h b/Framework/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyVariation.h
index ea8d2f72fd75867ac9af1781a5e2b41b1ade6e30..b8346b57e50648cdd743331a46d4b30e48ebef5d 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyVariation.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyVariation.h
@@ -62,26 +62,26 @@ public:
/// Default constructor
DetectorEfficiencyVariation();
/// Destructor
- virtual ~DetectorEfficiencyVariation(){};
+ ~DetectorEfficiencyVariation() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const {
+ const std::string name() const override {
return "DetectorEfficiencyVariation";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Compares two white beam vanadium workspaces from the same "
"instrument to find detectors whose efficiencies have changed "
"beyond a threshold.";
}
- virtual const std::string category() const;
+ const std::string category() const override;
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
protected:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Loads and checks the values passed to the algorithm
void retrieveProperties(API::MatrixWorkspace_sptr &whiteBeam1,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/DiffractionEventCalibrateDetectors.h b/Framework/Algorithms/inc/MantidAlgorithms/DiffractionEventCalibrateDetectors.h
index 1006e23e28146a7486835a84c08eccf964c8b1e7..0d84227f9049aa98d7d0f67e7cb0e760a7860571 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/DiffractionEventCalibrateDetectors.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/DiffractionEventCalibrateDetectors.h
@@ -43,22 +43,22 @@ public:
/// Default constructor
DiffractionEventCalibrateDetectors();
/// Destructor
- virtual ~DiffractionEventCalibrateDetectors();
+ ~DiffractionEventCalibrateDetectors() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const {
+ const std::string name() const override {
return "DiffractionEventCalibrateDetectors";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm optimizes the position and angles of all of the "
"detector panels. The target instruments for this feature are SNAP "
"and TOPAZ.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\Calibration;"
"CorrectionFunctions\\InstrumentCorrections";
}
@@ -73,8 +73,8 @@ public:
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
// Event workspace pointer
// API::EventWorkspace_sptr inputW;
};
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing.h b/Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing.h
index 91bcfabd0154c9b7f85dd7bfe0854bdf5d80a5e2..7131df28119a5e748b94c8fcfa95a5dc8f5af465 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing.h
@@ -68,26 +68,26 @@ public:
/// Constructor
DiffractionFocussing();
/// Destructor
- virtual ~DiffractionFocussing(){};
+ ~DiffractionFocussing() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "DiffractionFocussing"; }
+ const std::string name() const override { return "DiffractionFocussing"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Algorithm to focus powder diffraction data into a number of "
"histograms according to a grouping scheme defined in a CalFile.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\Focussing";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
API::MatrixWorkspace_sptr
convertUnitsToDSpacing(const API::MatrixWorkspace_sptr &workspace);
void RebinWorkspace(API::MatrixWorkspace_sptr &workspace);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing2.h b/Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing2.h
index 724f8b22bde59291d32211994e0ba04864f6f6c8..5bc73365e28871e0d6b1fd0e6f7fbc0076292549 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing2.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/DiffractionFocussing2.h
@@ -85,26 +85,26 @@ public:
/// Default constructor
DiffractionFocussing2();
/// Destructor
- virtual ~DiffractionFocussing2();
+ ~DiffractionFocussing2() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "DiffractionFocussing"; }
+ const std::string name() const override { return "DiffractionFocussing"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Algorithm to focus powder diffraction data into a number of "
"histograms according to a grouping scheme defined in a CalFile.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 2; }
+ int version() const override { return 2; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\Focussing";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void cleanup();
std::size_t setupGroupToWSIndices();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Divide.h b/Framework/Algorithms/inc/MantidAlgorithms/Divide.h
index 787f4d55f7d2ae371fbc33e98a49efeaaf3fdefd..00d3779054ab45fdaf25598a9d03bf829e65c28f 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Divide.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Divide.h
@@ -49,51 +49,50 @@ public:
/// Default constructor
Divide() : BinaryOperation(), m_warnOnZeroDivide(true){};
/// Destructor
- virtual ~Divide(){};
+ ~Divide() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Divide"; }
+ const std::string name() const override { return "Divide"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The Divide algorithm will divide the data values and calculate the "
"corresponding error values of two compatible workspaces.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
private:
- virtual void init();
- virtual void exec();
+ void init() override;
+ void exec() override;
// Overridden BinaryOperation methods
void performBinaryOperation(const MantidVec &lhsX, const MantidVec &lhsY,
const MantidVec &lhsE, const MantidVec &rhsY,
const MantidVec &rhsE, MantidVec &YOut,
- MantidVec &EOut);
+ MantidVec &EOut) override;
void performBinaryOperation(const MantidVec &lhsX, const MantidVec &lhsY,
const MantidVec &lhsE, const double rhsY,
const double rhsE, MantidVec &YOut,
- MantidVec &EOut);
+ MantidVec &EOut) override;
void setOutputUnits(const API::MatrixWorkspace_const_sptr lhs,
const API::MatrixWorkspace_const_sptr rhs,
- API::MatrixWorkspace_sptr out);
+ API::MatrixWorkspace_sptr out) override;
- virtual void performEventBinaryOperation(DataObjects::EventList &lhs,
- const DataObjects::EventList &rhs);
+ void performEventBinaryOperation(DataObjects::EventList &lhs,
+ const DataObjects::EventList &rhs) override;
- virtual void performEventBinaryOperation(DataObjects::EventList &lhs,
- const MantidVec &rhsX,
- const MantidVec &rhsY,
- const MantidVec &rhsE);
+ void performEventBinaryOperation(DataObjects::EventList &lhs,
+ const MantidVec &rhsX, const MantidVec &rhsY,
+ const MantidVec &rhsE) override;
- virtual void performEventBinaryOperation(DataObjects::EventList &lhs,
- const double &rhsY,
- const double &rhsE);
+ void performEventBinaryOperation(DataObjects::EventList &lhs,
+ const double &rhsY,
+ const double &rhsE) override;
- void checkRequirements();
+ void checkRequirements() override;
- std::string
- checkSizeCompatibility(const API::MatrixWorkspace_const_sptr lhs,
- const API::MatrixWorkspace_const_sptr rhs) const;
+ std::string checkSizeCompatibility(
+ const API::MatrixWorkspace_const_sptr lhs,
+ const API::MatrixWorkspace_const_sptr rhs) const override;
// usually you want to warn user if division by 0 occurs. set it to false to
// generate these warnings on debug level only
bool m_warnOnZeroDivide;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/EQSANSResolution.h b/Framework/Algorithms/inc/MantidAlgorithms/EQSANSResolution.h
index 0751bb3bed32205cdd0de4360b8bfea87b9f503d..ba063744345d86549250dcd0e2a321c07ba28012 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/EQSANSResolution.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/EQSANSResolution.h
@@ -38,18 +38,18 @@ public:
/// (Empty) Constructor
EQSANSResolution() : Algorithms::TOFSANSResolution() {}
/// Virtual destructor
- virtual ~EQSANSResolution() {}
+ ~EQSANSResolution() override {}
/// Algorithm's name
- virtual const std::string name() const { return "EQSANSResolution"; }
+ const std::string name() const override { return "EQSANSResolution"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate the Q resolution for EQSANS data.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "SANS"; }
+ const std::string category() const override { return "SANS"; }
private:
/// Initialisation code
@@ -57,7 +57,7 @@ private:
/// Execution code
// void exec();
/// Return the TOF resolution for a particular wavelength
- virtual double getTOFResolution(double wl);
+ double getTOFResolution(double wl) override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/EQSANSTofStructure.h b/Framework/Algorithms/inc/MantidAlgorithms/EQSANSTofStructure.h
index 66b32545de7f260e94a2aa0e1b7e93ed0d1e824d..a55a3bce185e2fb6d820dbc7c57c21368ab77cd2 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/EQSANSTofStructure.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/EQSANSTofStructure.h
@@ -36,25 +36,25 @@ public:
/// Default constructor
EQSANSTofStructure();
/// Virtual destructor
- virtual ~EQSANSTofStructure() {}
+ ~EQSANSTofStructure() override {}
/// Algorithm's name
- virtual const std::string name() const { return "EQSANSTofStructure"; }
+ const std::string name() const override { return "EQSANSTofStructure"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Corrects the TOF of raw EQSANS data. This algorithm needs to be "
"run once on every data set.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "SANS"; }
+ const std::string category() const override { return "SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
// void execEvent(Mantid::DataObjects::EventWorkspace_sptr inputWS, bool
// frame_skipping);
void execEvent(Mantid::DataObjects::EventWorkspace_sptr inputWS,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/EditInstrumentGeometry.h b/Framework/Algorithms/inc/MantidAlgorithms/EditInstrumentGeometry.h
index 17974ee796cf3544660f62d08cbc468eb9472f8d..7504d6f5fd42e94ecdca129f1056c37fb6a657d6 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/EditInstrumentGeometry.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/EditInstrumentGeometry.h
@@ -36,26 +36,26 @@ namespace Algorithms {
class DLLExport EditInstrumentGeometry : public API::Algorithm {
public:
EditInstrumentGeometry();
- ~EditInstrumentGeometry();
- virtual const std::string name() const;
+ ~EditInstrumentGeometry() override;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The edit or added information will be attached to a Workspace. "
"Currently it is in an overwrite mode only.";
}
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const;
+ const std::string category() const override;
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const;
+ int version() const override;
/// Validate the inputs that must be parallel
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ElasticWindow.h b/Framework/Algorithms/inc/MantidAlgorithms/ElasticWindow.h
index fbe8726b3c96f77128c4537a196429d0cc7366cc..9ef3ec543f33aca1a7fb15c71632ff96371de510 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ElasticWindow.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ElasticWindow.h
@@ -41,11 +41,11 @@ public:
/// (Empty) Constructor
ElasticWindow() : API::Algorithm() {}
/// Virtual destructor
- virtual ~ElasticWindow() {}
+ ~ElasticWindow() override {}
/// Algorithm's name
- virtual const std::string name() const { return "ElasticWindow"; }
+ const std::string name() const override { return "ElasticWindow"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm performs an integration over an energy range, with "
"the option to subtract a background over a second range, then "
"transposes the result into a single-spectrum workspace with units "
@@ -53,15 +53,15 @@ public:
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Inelastic\\Indirect"; }
+ const std::string category() const override { return "Inelastic\\Indirect"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/EstimateResolutionDiffraction.h b/Framework/Algorithms/inc/MantidAlgorithms/EstimateResolutionDiffraction.h
index 4c3dead2741e510eb0400e7b103be9a2d1014c34..f707e129b2175a5b1b332684622ebf5f7fc44c17 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/EstimateResolutionDiffraction.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/EstimateResolutionDiffraction.h
@@ -34,28 +34,28 @@ namespace Algorithms {
class DLLExport EstimateResolutionDiffraction : public API::Algorithm {
public:
EstimateResolutionDiffraction();
- virtual ~EstimateResolutionDiffraction();
+ ~EstimateResolutionDiffraction() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const;
+ const std::string name() const override;
/// function to return any aliases to the algorithm
- virtual const std::string alias() const;
+ const std::string alias() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const;
+ const std::string summary() const override;
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const;
+ const std::string category() const override;
private:
/// Implement abstract Algorithm methods
- void init();
+ void init() override;
/// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
/// Returns the wavelength from either the property or the input workspace
double getWavelength();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Exponential.h b/Framework/Algorithms/inc/MantidAlgorithms/Exponential.h
index 64d80da597fe772b59741869d0bb72e575b066a7..39b1a1c130276853b0cabc8d36b48b20e07addd3 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Exponential.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Exponential.h
@@ -49,22 +49,23 @@ public:
/// Default constructor
Exponential();
/// Destructor
- virtual ~Exponential(){};
+ ~Exponential() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Exponential"; }
+ const std::string name() const override { return "Exponential"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The Exponential algorithm will transform the signal values 'y' "
"into e^y.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
private:
// Overridden UnaryOperation methods
void performUnaryOperation(const double XIn, const double YIn,
- const double EIn, double &YOut, double &EOut);
+ const double EIn, double &YOut,
+ double &EOut) override;
/*
void performBinaryOperation(const MantidVec& lhsX, const MantidVec& lhsY,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ExponentialCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/ExponentialCorrection.h
index 64594b52efd5faec550a73f4b69fec80dc2ac276..00ef1c9e9466cb2be11d019f23a383ac6c57a510 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ExponentialCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ExponentialCorrection.h
@@ -56,26 +56,27 @@ public:
/// Default constructor
ExponentialCorrection();
/// Destructor
- virtual ~ExponentialCorrection(){};
+ ~ExponentialCorrection() override{};
/// Algorithm's name for identification
- virtual const std::string name() const { return "ExponentialCorrection"; }
+ const std::string name() const override { return "ExponentialCorrection"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Corrects the data in a workspace by the value of an "
"exponential function which is evaluated at the X value of each "
"data point.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "CorrectionFunctions"; }
+ const std::string category() const override { return "CorrectionFunctions"; }
private:
// Overridden UnaryOperation methods
- void defineProperties();
- void retrieveProperties();
+ void defineProperties() override;
+ void retrieveProperties() override;
void performUnaryOperation(const double XIn, const double YIn,
- const double EIn, double &YOut, double &EOut);
+ const double EIn, double &YOut,
+ double &EOut) override;
double m_c0, ///< The constant by which to multiply the exponential
m_c1; ///< The constant term in the exponent
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ExportTimeSeriesLog.h b/Framework/Algorithms/inc/MantidAlgorithms/ExportTimeSeriesLog.h
index f388fbd453faac5ba6fb1b37f8d1484ab3ee4eb4..d49cf4aaebe968e718860919324cde7c79c0fdaa 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ExportTimeSeriesLog.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ExportTimeSeriesLog.h
@@ -39,18 +39,18 @@ namespace Algorithms {
class DLLExport ExportTimeSeriesLog : public API::Algorithm {
public:
ExportTimeSeriesLog();
- virtual ~ExportTimeSeriesLog();
+ ~ExportTimeSeriesLog() override;
- virtual const std::string name() const { return "ExportTimeSeriesLog"; };
+ const std::string name() const override { return "ExportTimeSeriesLog"; };
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling;Events\\EventFiltering";
};
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Read a TimeSeries log and return information";
}
@@ -65,9 +65,9 @@ private:
Kernel::DateAndTime mFilterT0;
Kernel::DateAndTime mFilterTf;
- void init();
+ void init() override;
- void exec();
+ void exec() override;
bool
calculateTimeSeriesRangeByTime(std::vector<Kernel::DateAndTime> &vec_times,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ExtractFFTSpectrum.h b/Framework/Algorithms/inc/MantidAlgorithms/ExtractFFTSpectrum.h
index 93b90e55bc28a3072ef691fc034223f07e734704..5376d39e404a7fc3eaf4ec844f71e4f0c2f431c3 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ExtractFFTSpectrum.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ExtractFFTSpectrum.h
@@ -46,11 +46,11 @@ public:
/// (Empty) Constructor
ExtractFFTSpectrum() : API::Algorithm() {}
/// Virtual destructor
- virtual ~ExtractFFTSpectrum() {}
+ ~ExtractFFTSpectrum() override {}
/// Algorithm's name
- virtual const std::string name() const { return "ExtractFFTSpectrum"; }
+ const std::string name() const override { return "ExtractFFTSpectrum"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm performs a Fast Fourier Transform on each spectrum "
"in a workspace, and from the result takes the indicated spectrum "
"and places it into the OutputWorkspace, so that you end up with "
@@ -58,15 +58,15 @@ public:
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Arithmetic\\FFT"; }
+ const std::string category() const override { return "Arithmetic\\FFT"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ExtractMask.h b/Framework/Algorithms/inc/MantidAlgorithms/ExtractMask.h
index 5d367927057acdfbf29ba4d7b4041d40b077c05f..ccdcca33a006da7b9bfaf906c6d8988e205c6900 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ExtractMask.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ExtractMask.h
@@ -52,25 +52,25 @@ public:
/// Constructor
ExtractMask() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~ExtractMask() {}
+ ~ExtractMask() override {}
/// Algorithm's name
- virtual const std::string name() const { return "ExtractMask"; }
+ const std::string name() const override { return "ExtractMask"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Extracts the masking from a given workspace and places it in a new "
"workspace.";
}
/// Algorithm's version
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Transforms\\Masking"; }
+ const std::string category() const override { return "Transforms\\Masking"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ExtractMaskToTable.h b/Framework/Algorithms/inc/MantidAlgorithms/ExtractMaskToTable.h
index 5ea14e605d7d7bd8b8b150d9ff1d8d09d5dcc501..602a0fa233ff87d1c8d5174bfde0e783914d935f 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ExtractMaskToTable.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ExtractMaskToTable.h
@@ -36,20 +36,20 @@ namespace Algorithms {
class DLLExport ExtractMaskToTable : public API::Algorithm {
public:
ExtractMaskToTable();
- virtual ~ExtractMaskToTable();
+ ~ExtractMaskToTable() override;
/// Algorithm's name
- virtual const std::string name() const { return "ExtractMaskToTable"; }
+ const std::string name() const override { return "ExtractMaskToTable"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The output TableWorkspace should be compatible to "
"MaskBinsFromTable.";
}
/// Algorithm's version
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Transforms\\Masking"; }
+ const std::string category() const override { return "Transforms\\Masking"; }
/// Remove the items appeared in a vector from another
std::vector<detid_t> subtractVector(std::vector<detid_t> minuend,
@@ -57,9 +57,9 @@ public:
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Input matrix workspace
API::MatrixWorkspace_const_sptr m_dataWS;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ExtractSingleSpectrum.h b/Framework/Algorithms/inc/MantidAlgorithms/ExtractSingleSpectrum.h
index 09d3002a1cdf879792778d0677440607272846c6..ad4c38f9695f166a4c435a53932fd6d8ac3166e9 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ExtractSingleSpectrum.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ExtractSingleSpectrum.h
@@ -48,25 +48,27 @@ public:
/// (Empty) Constructor
ExtractSingleSpectrum() : API::Algorithm() {}
/// Virtual destructor
- virtual ~ExtractSingleSpectrum() {}
+ ~ExtractSingleSpectrum() override {}
/// Algorithm's name
- virtual const std::string name() const { return "ExtractSingleSpectrum"; }
+ const std::string name() const override { return "ExtractSingleSpectrum"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Extracts the specified spectrum from a workspace and places it in "
"a new single-spectrum workspace.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Transforms\\Splitting"; }
+ const std::string category() const override {
+ return "Transforms\\Splitting";
+ }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ExtractSpectra.h b/Framework/Algorithms/inc/MantidAlgorithms/ExtractSpectra.h
index 83fe80ecc04ba1a21aeba82e7a1df6b9222d2a53..551980c8e0c92a690a3cc9af0462efc36c32ab7c 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ExtractSpectra.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ExtractSpectra.h
@@ -36,16 +36,16 @@ namespace Algorithms {
class DLLExport ExtractSpectra : public API::Algorithm {
public:
ExtractSpectra();
- virtual ~ExtractSpectra();
+ ~ExtractSpectra() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void execHistogram();
void execEvent();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ExtractUnmaskedSpectra.h b/Framework/Algorithms/inc/MantidAlgorithms/ExtractUnmaskedSpectra.h
index c4ec407bce3e475b09e9133898fa1583fdf8efa9..85b494cd6f1a69f4d1f079bc2d1099cfdc2d75eb 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ExtractUnmaskedSpectra.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ExtractUnmaskedSpectra.h
@@ -33,16 +33,16 @@ namespace Algorithms {
class MANTID_ALGORITHMS_DLL ExtractUnmaskedSpectra : public API::Algorithm {
public:
ExtractUnmaskedSpectra();
- virtual ~ExtractUnmaskedSpectra();
+ ~ExtractUnmaskedSpectra() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FFT.h b/Framework/Algorithms/inc/MantidAlgorithms/FFT.h
index c455993d6fb38b5cf09c56f83c4b679438ec61e3..153a617ab9f13e6bdd1393f88eafc8d40a0e0c4e 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FFT.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FFT.h
@@ -41,23 +41,23 @@ public:
/// Default constructor
FFT() : API::Algorithm(){};
/// Destructor
- virtual ~FFT(){};
+ ~FFT() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FFT"; }
+ const std::string name() const override { return "FFT"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs complex Fast Fourier Transform";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Arithmetic\\FFT"; }
+ const std::string category() const override { return "Arithmetic\\FFT"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FFTDerivative.h b/Framework/Algorithms/inc/MantidAlgorithms/FFTDerivative.h
index f2c83852b7d504e3e7e164c1deeea1a6bc8c6c02..33322ebcbad26a37576c36ef80738889aca20590 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FFTDerivative.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FFTDerivative.h
@@ -38,25 +38,25 @@ public:
/// (Empty) Constructor
FFTDerivative() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~FFTDerivative() {}
+ ~FFTDerivative() override {}
/// Algorithm's name
- virtual const std::string name() const { return "FFTDerivative"; }
+ const std::string name() const override { return "FFTDerivative"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculated derivatives of a spectra in the MatrixWorkspace using "
"Fast Fourier Transform (FFT).";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Arithmetic\\FFT"; }
+ const std::string category() const override { return "Arithmetic\\FFT"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void execRealFFT();
void execComplexFFT();
};
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FFTSmooth.h b/Framework/Algorithms/inc/MantidAlgorithms/FFTSmooth.h
index 350b9e7e89cd7f2827dfcdeb5a0845191a744e9d..0e322e80bc83563d7ad92893674a22b3076f56e5 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FFTSmooth.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FFTSmooth.h
@@ -40,25 +40,25 @@ public:
/// Default constructor
FFTSmooth() : API::Algorithm(){};
/// Destructor
- virtual ~FFTSmooth(){};
+ ~FFTSmooth() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FFTSmooth"; }
+ const std::string name() const override { return "FFTSmooth"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs smoothing of a spectrum using various filters.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Arithmetic\\FFT;Transforms\\Smoothing";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
// Smoothing by truncation.
void truncate(int n);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FFTSmooth2.h b/Framework/Algorithms/inc/MantidAlgorithms/FFTSmooth2.h
index 70b9cdf811bafc341e2719b777ee1904267bb699..110226be0f2962129fd3a72231f8d8bccf81bd48 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FFTSmooth2.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FFTSmooth2.h
@@ -40,25 +40,25 @@ public:
/// Default constructor
FFTSmooth2() : API::Algorithm(){};
/// Destructor
- virtual ~FFTSmooth2(){};
+ ~FFTSmooth2() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FFTSmooth"; }
+ const std::string name() const override { return "FFTSmooth"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs smoothing of a spectrum using various filters.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 2; }
+ int version() const override { return 2; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Arithmetic\\FFT;Transforms\\Smoothing";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
// Smoothing by zeroing.
void zero(int n, API::MatrixWorkspace_sptr &unfilteredWS,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FilterBadPulses.h b/Framework/Algorithms/inc/MantidAlgorithms/FilterBadPulses.h
index db95246dd36851e38b32e435985437ccfbcc2367..fcbd31bd53e0a834996374158d6a05fcad216ed3 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FilterBadPulses.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FilterBadPulses.h
@@ -52,23 +52,23 @@ namespace Algorithms {
class DLLExport FilterBadPulses : public API::Algorithm {
public:
FilterBadPulses();
- virtual ~FilterBadPulses();
+ ~FilterBadPulses() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Filters out events associated with pulses that happen when proton "
"charge is lower than a given percentage of the average.";
}
- virtual int version() const;
+ int version() const override;
- virtual const std::string category() const;
+ const std::string category() const override;
private:
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FilterByLogValue.h b/Framework/Algorithms/inc/MantidAlgorithms/FilterByLogValue.h
index 32120d00ac0af1a037c9cd6a144cf006c066583b..5099e6a3a89b2e47d666163d3b5c06c09ea2f4cd 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FilterByLogValue.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FilterByLogValue.h
@@ -36,29 +36,29 @@ namespace Algorithms {
class DLLExport FilterByLogValue : public API::Algorithm {
public:
FilterByLogValue();
- virtual ~FilterByLogValue();
+ ~FilterByLogValue() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FilterByLogValue"; };
+ const std::string name() const override { return "FilterByLogValue"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Filter out events from an EventWorkspace based on a sample log "
"value satisfying filter criteria.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Events\\EventFiltering";
}
- std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FilterByTime.h b/Framework/Algorithms/inc/MantidAlgorithms/FilterByTime.h
index 572cd84905aba428337f180fec653cba0858ed92..a26aeb7c90ce2df996e623766a806bfcff881bf4 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FilterByTime.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FilterByTime.h
@@ -43,27 +43,27 @@ namespace Algorithms {
class DLLExport FilterByTime : public API::Algorithm {
public:
FilterByTime();
- virtual ~FilterByTime();
+ ~FilterByTime() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FilterByTime"; };
+ const std::string name() const override { return "FilterByTime"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm filters out events from an EventWorkspace that are "
"not between given start and stop times.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Events\\EventFiltering";
}
private:
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Pointer for an event workspace
DataObjects::EventWorkspace_const_sptr eventW;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FilterByTime2.h b/Framework/Algorithms/inc/MantidAlgorithms/FilterByTime2.h
index ee772d187a2adf5865301f1846eb94a77d95cf53..2ef128fdcce7ee48065e1f28374982fb05907a93 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FilterByTime2.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FilterByTime2.h
@@ -36,18 +36,18 @@ namespace Algorithms {
class DLLExport FilterByTime2 : public API::Algorithm {
public:
FilterByTime2();
- virtual ~FilterByTime2();
+ ~FilterByTime2() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FilterByTime"; };
+ const std::string name() const override { return "FilterByTime"; };
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 2; };
+ int version() const override { return 2; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Events\\EventFiltering";
}
/// Algorithm's summary for identification overriding a virtual method
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Filter event data by time.";
}
@@ -55,8 +55,8 @@ private:
/// Sets documentation strings for this algorithm
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FilterByXValue.h b/Framework/Algorithms/inc/MantidAlgorithms/FilterByXValue.h
index d348d4773a976aee8c5a96be8b4d2b5e3f283af6..b60bcc3f201a293cc705eae3e2e9aa8cd35dbb88 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FilterByXValue.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FilterByXValue.h
@@ -37,22 +37,22 @@ namespace Algorithms {
class DLLExport FilterByXValue : public API::Algorithm {
public:
FilterByXValue();
- virtual ~FilterByXValue();
+ ~FilterByXValue() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Filters events according to a min and/or max value of X.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
- std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h b/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h
index 68bea3b6da58e9e81761de3da593197e713b7ce8..162021480dbd842496d9d1603e3fddceef0bc8b8 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FilterEvents.h
@@ -56,29 +56,29 @@ class DLLExport FilterEvents : public API::Algorithm {
public:
FilterEvents();
- virtual ~FilterEvents();
+ ~FilterEvents() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FilterEvents"; }
+ const std::string name() const override { return "FilterEvents"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Filter events from an EventWorkspace to one or multiple "
"EventWorkspaces according to a series of splitters.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Events\\EventFiltering";
}
private:
// Implement abstract Algorithm methods
- void init();
+ void init() override;
// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
/// Process user input properties
void processAlgorithmProperties();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FindCenterOfMassPosition.h b/Framework/Algorithms/inc/MantidAlgorithms/FindCenterOfMassPosition.h
index 7e57dfb55ee19c3c95e7fad475b5f924fd1fd9df..690f182c0949960023cfe23def2d5c16f9db5480 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FindCenterOfMassPosition.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FindCenterOfMassPosition.h
@@ -44,24 +44,24 @@ public:
/// (Empty) Constructor
FindCenterOfMassPosition() : API::Algorithm() {}
/// Virtual destructor
- virtual ~FindCenterOfMassPosition() {}
+ ~FindCenterOfMassPosition() override {}
/// Algorithm's name
- virtual const std::string name() const { return "FindCenterOfMassPosition"; }
+ const std::string name() const override { return "FindCenterOfMassPosition"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Finds the beam center in a 2D SANS data set.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "SANS"; }
+ const std::string category() const override { return "SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FindCenterOfMassPosition2.h b/Framework/Algorithms/inc/MantidAlgorithms/FindCenterOfMassPosition2.h
index 9189e6b29c2f216f2d793abe41c2998cbf211649..d9e5830833fea917ad63c30cc1720972e6c94410 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FindCenterOfMassPosition2.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FindCenterOfMassPosition2.h
@@ -44,24 +44,24 @@ public:
/// (Empty) Constructor
FindCenterOfMassPosition2() : API::Algorithm() {}
/// Virtual destructor
- virtual ~FindCenterOfMassPosition2() {}
+ ~FindCenterOfMassPosition2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "FindCenterOfMassPosition"; }
+ const std::string name() const override { return "FindCenterOfMassPosition"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Finds the beam center in a 2D SANS data set.";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "SANS"; }
+ const std::string category() const override { return "SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FindDeadDetectors.h b/Framework/Algorithms/inc/MantidAlgorithms/FindDeadDetectors.h
index a909b3cdeeae356f08ed6be3042e39964f45c509..5866187b32d99566e145815efb71e44794f13b36 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FindDeadDetectors.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FindDeadDetectors.h
@@ -69,23 +69,23 @@ public:
/// Default constructor
FindDeadDetectors() : API::Algorithm(){};
/// Destructor
- virtual ~FindDeadDetectors(){};
+ ~FindDeadDetectors() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FindDeadDetectors"; }
+ const std::string name() const override { return "FindDeadDetectors"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Identifies and flags empty spectra caused by 'dead' detectors.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Diagnostics"; }
+ const std::string category() const override { return "Diagnostics"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
API::MatrixWorkspace_sptr integrateWorkspace();
};
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FindDetectorsOutsideLimits.h b/Framework/Algorithms/inc/MantidAlgorithms/FindDetectorsOutsideLimits.h
index eddda8fad920f122863b6fe07b3680ce5f758a4d..388050d4642a0d5842d507d07d65726e345f3cc1 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FindDetectorsOutsideLimits.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FindDetectorsOutsideLimits.h
@@ -69,27 +69,27 @@ public:
FindDetectorsOutsideLimits() : DetectorDiagnostic() {}
/// Destructor
- virtual ~FindDetectorsOutsideLimits() {}
+ ~FindDetectorsOutsideLimits() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const {
+ const std::string name() const override {
return "FindDetectorsOutsideLimits";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Identifies histograms and their detectors that have total numbers "
"of counts over a user defined maximum or less than the user define "
"minimum.";
}
- virtual const std::string category() const;
+ const std::string category() const override;
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
private:
/// Overridden init
- void init();
+ void init() override;
/// Overridden exec
- void exec();
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FindPeakBackground.h b/Framework/Algorithms/inc/MantidAlgorithms/FindPeakBackground.h
index e29dd69b107b333c88b0071039a2cbfd195ebd25..4144ff2705b10b3cbfc1e6a51918dbc4e2d71e08 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FindPeakBackground.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FindPeakBackground.h
@@ -33,28 +33,28 @@ namespace Algorithms {
class DLLExport FindPeakBackground : public API::Algorithm {
public:
FindPeakBackground();
- virtual ~FindPeakBackground();
+ ~FindPeakBackground() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FindPeakBackground"; }
+ const std::string name() const override { return "FindPeakBackground"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Separates background from signal for spectra of a workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Utility\\Calculation"; }
+ const std::string category() const override { return "Utility\\Calculation"; }
private:
std::string m_backgroundType; //< The type of background to fit
/// Implement abstract Algorithm methods
- void init();
+ void init() override;
/// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
double moment4(MantidVec &X, size_t n, double mean);
void estimateBackground(const MantidVec &X, const MantidVec &Y,
const size_t i_min, const size_t i_max,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FindPeaks.h b/Framework/Algorithms/inc/MantidAlgorithms/FindPeaks.h
index 5ae71ab4c771fc0f09bd49647df2cb3bbc7496f3..020383eba0ef80d90b17941dd1a2835901b4e9ed 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FindPeaks.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FindPeaks.h
@@ -63,30 +63,30 @@ public:
/// Constructor
FindPeaks();
/// Virtual destructor
- virtual ~FindPeaks() {
+ ~FindPeaks() override {
if (m_progress)
delete m_progress;
m_progress = NULL;
}
/// Algorithm's name
- virtual const std::string name() const { return "FindPeaks"; }
+ const std::string name() const override { return "FindPeaks"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Searches for peaks in a dataset.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Optimization\\PeakFinding";
}
/// needed by FindPeaksBackground
int getVectorIndex(const MantidVec &vecX, double x);
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Process algorithm's properties
void processAlgorithmProperties();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FitPeak.h b/Framework/Algorithms/inc/MantidAlgorithms/FitPeak.h
index 8dadd2b9d86471521af700b945cf0fdb50c183c9..dbb5c5727523a555211d9d4462255acd8732d022 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FitPeak.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FitPeak.h
@@ -22,10 +22,10 @@ public:
FitOneSinglePeak();
/// Desctructor
- virtual ~FitOneSinglePeak();
+ ~FitOneSinglePeak() override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Fit a single peak with checking mechanism. ";
}
@@ -81,14 +81,14 @@ public:
private:
/// Name
- virtual const std::string name() const { return "FitOneSinglePeak"; }
+ const std::string name() const override { return "FitOneSinglePeak"; }
/// Version
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Init
- void init();
+ void init() override;
/// Exec
- void exec();
+ void exec() override;
/// Check whether it is ready to fit
bool hasSetupToFitPeak(std::string &errmsg);
@@ -254,22 +254,22 @@ private:
class DLLExport FitPeak : public API::Algorithm {
public:
FitPeak();
- virtual ~FitPeak();
+ ~FitPeak() override;
/// Algorithm's name
- virtual const std::string name() const { return "FitPeak"; }
+ const std::string name() const override { return "FitPeak"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Fit a single peak with checking mechanism. ";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Optimization"; }
+ const std::string category() const override { return "Optimization"; }
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Process input propeties
void processProperties();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FixGSASInstrumentFile.h b/Framework/Algorithms/inc/MantidAlgorithms/FixGSASInstrumentFile.h
index 6c32a3897278e47721e92d7f4a1365f08a0667ee..9a3f7e4bcbac2dbb8e223ece48a9b087734311b2 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FixGSASInstrumentFile.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FixGSASInstrumentFile.h
@@ -33,28 +33,28 @@ namespace Algorithms {
class DLLExport FixGSASInstrumentFile : public API::Algorithm {
public:
FixGSASInstrumentFile();
- virtual ~FixGSASInstrumentFile();
+ ~FixGSASInstrumentFile() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FixGSASInstrumentFile"; }
+ const std::string name() const override { return "FixGSASInstrumentFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Fix format error in an GSAS instrument file.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling";
}
private:
/// Implement abstract Algorithm methods
- void init();
+ void init() override;
/// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/FlatPlateAbsorption.h b/Framework/Algorithms/inc/MantidAlgorithms/FlatPlateAbsorption.h
index 453f23cadb316a544e2e2e7f4c385e9cf42c0ad0..2e934898ffa46bf0200822648991337e886b1fc4 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/FlatPlateAbsorption.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/FlatPlateAbsorption.h
@@ -79,25 +79,25 @@ public:
/// (Empty) Constructor
FlatPlateAbsorption();
/// Virtual destructor
- virtual ~FlatPlateAbsorption() {}
+ ~FlatPlateAbsorption() override {}
/// Algorithm's name
- virtual const std::string name() const { return "FlatPlateAbsorption"; }
+ const std::string name() const override { return "FlatPlateAbsorption"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates bin-by-bin correction factors for attenuation due to "
"absorption and scattering in a sample of 'flat plate' geometry.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
protected:
- void initialiseCachedDistances();
+ void initialiseCachedDistances() override;
private:
- void defineProperties();
- void retrieveProperties();
- std::string sampleXML();
+ void defineProperties() override;
+ void retrieveProperties() override;
+ std::string sampleXML() override;
double m_slabHeight; ///< The height of the sample in m
double m_slabWidth; ///< The width of the sample in m
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GeneralisedSecondDifference.h b/Framework/Algorithms/inc/MantidAlgorithms/GeneralisedSecondDifference.h
index 7ef5c362f4a281d6f73c868672de8d119f1a6362..879861fea9a58dc747dd7701bb7340fffb045852 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GeneralisedSecondDifference.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GeneralisedSecondDifference.h
@@ -58,27 +58,27 @@ public:
/// (Empty) Constructor
GeneralisedSecondDifference();
/// Virtual destructor
- virtual ~GeneralisedSecondDifference();
+ ~GeneralisedSecondDifference() override;
/// Algorithm's name
- virtual const std::string name() const {
+ const std::string name() const override {
return "GeneralisedSecondDifference";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Computes the generalised second difference of a spectrum or "
"several spectra.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Arithmetic"; }
+ const std::string category() const override { return "Arithmetic"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
///
void computePrefactors();
/// Vector that contains the prefactor coefficients Cij in the range
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GenerateEventsFilter.h b/Framework/Algorithms/inc/MantidAlgorithms/GenerateEventsFilter.h
index cebed9f58a483e0afce13ab054b2d9ba92b5c7b7..3df084122e64014c719724d646945c984894741a 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GenerateEventsFilter.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GenerateEventsFilter.h
@@ -62,28 +62,28 @@ namespace Algorithms {
class DLLExport GenerateEventsFilter : public API::Algorithm {
public:
explicit GenerateEventsFilter();
- virtual ~GenerateEventsFilter();
+ ~GenerateEventsFilter() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "GenerateEventsFilter"; }
+ const std::string name() const override { return "GenerateEventsFilter"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Generate one or a set of event filters according to time or "
"specified log's value.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Events\\EventFiltering";
}
private:
/// Implement abstract Algorithm methods
- void init();
+ void init() override;
/// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
/// Process properties
void processInOutWorkspaces();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GenerateIPythonNotebook.h b/Framework/Algorithms/inc/MantidAlgorithms/GenerateIPythonNotebook.h
index fa720c8015368b3505a3b9b8b563bb68820821e7..a9ba8b13fbffe7945bf24738b1e280ea3b69fb28 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GenerateIPythonNotebook.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GenerateIPythonNotebook.h
@@ -42,26 +42,26 @@ namespace Algorithms {
class DLLExport GenerateIPythonNotebook : public API::Algorithm {
public:
GenerateIPythonNotebook() : Mantid::API::Algorithm() {}
- virtual ~GenerateIPythonNotebook() {}
+ ~GenerateIPythonNotebook() override {}
/// Algorithm's name for identification
- virtual const std::string name() const { return "GenerateIPythonNotebook"; };
+ const std::string name() const override { return "GenerateIPythonNotebook"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "An Algorithm to generate an IPython notebook file to record the "
"history of a workspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Python"; }
+ const std::string category() const override { return "Utility\\Python"; }
protected:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GeneratePeaks.h b/Framework/Algorithms/inc/MantidAlgorithms/GeneratePeaks.h
index 72d42a456a3de349c61312dcb9f1f083eee972d7..6cdf3474982ad783e76b5b4d1da952c4d171b745 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GeneratePeaks.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GeneratePeaks.h
@@ -42,26 +42,26 @@ namespace Algorithms {
class DLLExport GeneratePeaks : public API::Algorithm {
public:
GeneratePeaks();
- virtual ~GeneratePeaks();
+ ~GeneratePeaks() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "GeneratePeaks"; }
+ const std::string name() const override { return "GeneratePeaks"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Generate peaks in an output workspace according to a "
"TableWorkspace containing a list of peak's parameters.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Crystal\\Peaks"; }
+ const std::string category() const override { return "Crystal\\Peaks"; }
private:
- void init();
+ void init() override;
/// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
/// Process algorithm properties
void processAlgProperties(std::string &peakfunctype,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GeneratePythonScript.h b/Framework/Algorithms/inc/MantidAlgorithms/GeneratePythonScript.h
index 923a9874432cac4c2192d4a2911ed6cc93e4ad04..d44d60dcef89e0b31d39b9880ebaa5aeafeb0179 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GeneratePythonScript.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GeneratePythonScript.h
@@ -45,26 +45,26 @@ namespace Algorithms {
class DLLExport GeneratePythonScript : public API::Algorithm {
public:
GeneratePythonScript() : Mantid::API::Algorithm() {}
- virtual ~GeneratePythonScript() {}
+ ~GeneratePythonScript() override {}
/// Algorithm's name for identification
- virtual const std::string name() const { return "GeneratePythonScript"; };
+ const std::string name() const override { return "GeneratePythonScript"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "An Algorithm to generate a Python script file to reproduce the "
"history of a workspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Python"; }
+ const std::string category() const override { return "Utility\\Python"; }
protected:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GetAllEi.h b/Framework/Algorithms/inc/MantidAlgorithms/GetAllEi.h
index 3d40bc4a7fd75294d266fc8ae070113269c06697..c44ec944615af7ff319a6d2c81e5be35dc236232 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GetAllEi.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GetAllEi.h
@@ -37,27 +37,27 @@ namespace Algorithms {
class DLLExport GetAllEi : public API::Algorithm {
public:
GetAllEi();
- virtual ~GetAllEi(){};
+ ~GetAllEi() override{};
/// Algorithms name for identification. @see Algorithm::name
- virtual const std::string name() const { return "GetAllEi"; };
+ const std::string name() const override { return "GetAllEi"; };
/// Algorithm's summary for use in the GUI and help. @see Algorithm::summary
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Analyze the chopper logs and the signal registered by the monitors "
"to identify energies used as incident energies in an inelastic "
"experiment.";
}
/// Algorithm's version for identification. @see Algorithm::version
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification. @see Algorithm::category
- virtual const std::string category() const { return "Inelastic\\Ei"; };
+ const std::string category() const override { return "Inelastic\\Ei"; };
/// Cross-check properties with each other @see IAlgorithm::validateInputs
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
Kernel::Property *getPLogForProperty(const API::MatrixWorkspace_sptr &inputWS,
const std::string &name);
void setFilterLog(const API::MatrixWorkspace_sptr &inputWS);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GetDetOffsetsMultiPeaks.h b/Framework/Algorithms/inc/MantidAlgorithms/GetDetOffsetsMultiPeaks.h
index 999606ea9024decd205e1a183f5972d5d80c7ccf..971d0f06693e2fc3b94d7d8a1de8661a02528964 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GetDetOffsetsMultiPeaks.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GetDetOffsetsMultiPeaks.h
@@ -71,25 +71,25 @@ public:
/// Default constructorMatrix
GetDetOffsetsMultiPeaks();
/// Destructor
- virtual ~GetDetOffsetsMultiPeaks();
+ ~GetDetOffsetsMultiPeaks() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "GetDetOffsetsMultiPeaks"; }
+ const std::string name() const override { return "GetDetOffsetsMultiPeaks"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\Calibration";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates an OffsetsWorkspace containing offsets for each detector. "
"You can then save these to a .cal file using SaveCalFile.";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void processProperties();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GetDetectorOffsets.h b/Framework/Algorithms/inc/MantidAlgorithms/GetDetectorOffsets.h
index 56acc0c580db75893e48d928004d7bb5d7bae2a0..4653cdc07af7dcbbb012b9de0c2c551bc6d7e6ed 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GetDetectorOffsets.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GetDetectorOffsets.h
@@ -40,26 +40,26 @@ public:
/// Default constructorMatrix
GetDetectorOffsets();
/// Destructor
- virtual ~GetDetectorOffsets();
+ ~GetDetectorOffsets() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "GetDetectorOffsets"; }
+ const std::string name() const override { return "GetDetectorOffsets"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates an OffsetsWorkspace containing offsets for each detector. "
"You can then save these to a .cal file using SaveCalFile.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\Calibration";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Call Gaussian as a Child Algorithm to fit the peak in a spectrum
double fitSpectra(const int64_t s, bool isAbsolbute);
/// Create a function string from the given parameters and the algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GetEi.h b/Framework/Algorithms/inc/MantidAlgorithms/GetEi.h
index d725b1c49d5f398bd0de6f649d73750a4c8e3d6e..aa2d65c8f07335250c655451ef5ab2cab4af1ea5 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GetEi.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GetEi.h
@@ -53,17 +53,17 @@ public:
GetEi();
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "GetEi"; }
+ const std::string name() const override { return "GetEi"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates the kinetic energy of neutrons leaving the source based "
"on the time it takes for them to travel between two monitors.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Inelastic\\Ei"; }
+ const std::string category() const override { return "Inelastic\\Ei"; }
private:
/// name of the tempory workspace that we create and use
@@ -79,8 +79,8 @@ private:
};
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void getGeometry(API::MatrixWorkspace_const_sptr WS, specid_t mon0Spec,
specid_t mon1Spec, double &monitor0Dist,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GetEi2.h b/Framework/Algorithms/inc/MantidAlgorithms/GetEi2.h
index a10e88a84a8710d1f6b8766f8ef961921ffb5353..8824c95bc29ba82e92412ca30f5f158e4d0831f6 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GetEi2.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GetEi2.h
@@ -54,22 +54,22 @@ public:
/// Default constructor
GetEi2();
/// Initialize the algorithm
- void init();
+ void init() override;
/// Execute the algorithm
- void exec();
+ void exec() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "GetEi"; }
+ const std::string name() const override { return "GetEi"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates the kinetic energy of neutrons leaving the source based "
"on the time it takes for them to travel between two monitors.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 2; }
+ int version() const override { return 2; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Inelastic\\Ei"; }
+ const std::string category() const override { return "Inelastic\\Ei"; }
private:
/// Calculate Ei from the initial guess given
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GetTimeSeriesLogInformation.h b/Framework/Algorithms/inc/MantidAlgorithms/GetTimeSeriesLogInformation.h
index c4eb9c613434a8a8d4dfa695285c0b736b6115ce..619ddfb8b660701c3b4329136dd392a3ed9cb2d4 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GetTimeSeriesLogInformation.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GetTimeSeriesLogInformation.h
@@ -40,18 +40,18 @@ namespace Algorithms {
class DLLExport GetTimeSeriesLogInformation : public API::Algorithm {
public:
GetTimeSeriesLogInformation();
- virtual ~GetTimeSeriesLogInformation();
+ ~GetTimeSeriesLogInformation() override;
- virtual const std::string name() const {
+ const std::string name() const override {
return "GetTimeSeriesLogInformation";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Get information from a TimeSeriesProperty log.";
}
- virtual int version() const { return 1; }
- virtual const std::string category() const {
+ int version() const override { return 1; }
+ const std::string category() const override {
return "Diffraction\\Utility;Events\\EventFiltering";
}
@@ -74,9 +74,9 @@ private:
bool m_ignoreNegativeTime;
- void init();
+ void init() override;
- void exec();
+ void exec() override;
void examLog(std::string logname, std::string outputdir);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GroupWorkspaces.h b/Framework/Algorithms/inc/MantidAlgorithms/GroupWorkspaces.h
index c1d0a0bc14f0f4324452a55064442e92bce5bb72..56333e6393178e8f3342f248ef66aa78b24bf150 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GroupWorkspaces.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GroupWorkspaces.h
@@ -46,24 +46,24 @@ public:
/// Default constructor
GroupWorkspaces();
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "GroupWorkspaces"; }
+ const std::string name() const override { return "GroupWorkspaces"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Takes workspaces as input and groups similar workspaces together.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Transforms\\Grouping;Utility\\Workspaces";
}
private:
/// Overridden Init method
- void init();
+ void init() override;
/// overridden execute method
- void exec();
+ void exec() override;
/// Add a list of names to the new group
void addToGroup(const std::vector<std::string> &names);
/// Add a workspace to the new group, checking for a WorkspaceGroup and
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/HRPDSlabCanAbsorption.h b/Framework/Algorithms/inc/MantidAlgorithms/HRPDSlabCanAbsorption.h
index d5a7a77d6b9dd743384a46367893c298e8eeb547..3d135c528925f2d6ba434be2abc8f6efd24cb32c 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/HRPDSlabCanAbsorption.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/HRPDSlabCanAbsorption.h
@@ -72,27 +72,27 @@ public:
/// (Empty) Constructor
HRPDSlabCanAbsorption() : API::Algorithm() {}
/// Virtual destructor
- virtual ~HRPDSlabCanAbsorption() {}
+ ~HRPDSlabCanAbsorption() override {}
/// Algorithm's name
- virtual const std::string name() const { return "HRPDSlabCanAbsorption"; }
+ const std::string name() const override { return "HRPDSlabCanAbsorption"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates attenuation due to absorption and scattering in an HRPD "
"'slab' can.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\AbsorptionCorrections";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// runs the flat plate absorption
API::MatrixWorkspace_sptr runFlatPlateAbsorption();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/He3TubeEfficiency.h b/Framework/Algorithms/inc/MantidAlgorithms/He3TubeEfficiency.h
index 57e74c8521a63cbddca30428adcce257d2e8869e..93ea4bc24df10c352f098b1062e196b2ff6b6932 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/He3TubeEfficiency.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/He3TubeEfficiency.h
@@ -55,25 +55,25 @@ public:
/// Default constructor
He3TubeEfficiency();
/// Virtual destructor
- virtual ~He3TubeEfficiency();
+ ~He3TubeEfficiency() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "He3TubeEfficiency"; }
+ const std::string name() const override { return "He3TubeEfficiency"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "He3 tube efficiency correction.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\EfficiencyCorrections";
}
private:
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void execEvent();
/// Correct the given spectra index for efficiency
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/IQTransform.h b/Framework/Algorithms/inc/MantidAlgorithms/IQTransform.h
index 84be4a8297b7d1ea8b175bb734e15ed1a1a49c12..f4488e9e0439ca025b6f59ddb863881911b5ed55 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/IQTransform.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/IQTransform.h
@@ -59,21 +59,21 @@ namespace Algorithms {
class DLLExport IQTransform : public API::Algorithm {
public:
IQTransform();
- virtual ~IQTransform();
- virtual const std::string name() const { return "IQTransform"; }
+ ~IQTransform() override;
+ const std::string name() const override { return "IQTransform"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm provides various functions that are sometimes used "
"to linearise the output of a 'SANS' data reduction prior to "
"fitting it.";
}
- virtual int version() const { return (1); }
- virtual const std::string category() const { return "SANS"; }
+ int version() const override { return (1); }
+ const std::string category() const override { return "SANS"; }
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
inline void subtractBackgroundValue(MantidVec &Y, const double value);
inline API::MatrixWorkspace_sptr
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/IdentifyNoisyDetectors.h b/Framework/Algorithms/inc/MantidAlgorithms/IdentifyNoisyDetectors.h
index 7d1afbfb7648be213bcbf4338993d13b11bd7aeb..272083ba7ec81ef2699077d32f6550931e67e727 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/IdentifyNoisyDetectors.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/IdentifyNoisyDetectors.h
@@ -38,29 +38,29 @@ namespace Algorithms {
class DLLExport IdentifyNoisyDetectors : public API::Algorithm {
public:
IdentifyNoisyDetectors() : API::Algorithm() {} ///< Empty constructor
- virtual ~IdentifyNoisyDetectors() {} ///< Empty destructor
+ ~IdentifyNoisyDetectors() override {} ///< Empty destructor
- virtual const std::string name() const {
+ const std::string name() const override {
return "IdentifyNoisyDetectors";
} ///< @return the algorithms name
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm creates a single-column workspace where the Y "
"values are populated withs 1s and 0s, 0 signifying that the "
"detector is to be considered 'bad' based on the method described "
"below.";
}
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diagnostics";
} ///< @return the algorithms category
- virtual int version() const {
+ int version() const override {
return (1);
} ///< @return version number of algorithm
private:
- void init(); ///< Initialise the algorithm. Declare properties, etc.
- void exec(); ///< Executes the algorithm.
+ void init() override; ///< Initialise the algorithm. Declare properties, etc.
+ void exec() override; ///< Executes the algorithm.
void getStdDev(API::Progress &progress,
Mantid::API::MatrixWorkspace_sptr valid,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/IntegrateByComponent.h b/Framework/Algorithms/inc/MantidAlgorithms/IntegrateByComponent.h
index 3d0413b2ba61e5d500c1a00b2153ac0f6bb82ea2..21e31120c25cb89c639ccfeb0a2fe8010dfbd4c1 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/IntegrateByComponent.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/IntegrateByComponent.h
@@ -34,20 +34,20 @@ namespace Algorithms {
class DLLExport IntegrateByComponent : public API::Algorithm {
public:
IntegrateByComponent();
- virtual ~IntegrateByComponent();
+ ~IntegrateByComponent() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Averages up the instrument hierarchy.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// method to check which spectra should be averaged
std::vector<std::vector<size_t>> makeMap(API::MatrixWorkspace_sptr countsWS,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Integration.h b/Framework/Algorithms/inc/MantidAlgorithms/Integration.h
index d443a123d26a6571f06711a3cef7dc3602624e1d..964660a2ffe635ce9de914b821db58ac2c26106f 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Integration.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Integration.h
@@ -60,27 +60,27 @@ public:
/// Default constructor
Integration() : API::Algorithm(){};
/// Destructor
- virtual ~Integration(){};
+ ~Integration() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Integration"; }
+ const std::string name() const override { return "Integration"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Integration takes a 2D workspace or an EventWorkspace as input and "
"sums the data values. Optionally, the range summed can be "
"restricted in either dimension.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Arithmetic;Transforms\\Rebin";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Get the input workspace
API::MatrixWorkspace_const_sptr getInputWorkspace();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/InterpolatingRebin.h b/Framework/Algorithms/inc/MantidAlgorithms/InterpolatingRebin.h
index 894b0a56208c355ceaf8713ec9d940ca62c936f9..4c8320c78ddca42cc61ab51ca2e28a67cc736e49 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/InterpolatingRebin.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/InterpolatingRebin.h
@@ -68,27 +68,27 @@ public:
/// Default constructor
InterpolatingRebin() : Rebin() {}
/// Destructor
- virtual ~InterpolatingRebin() {}
+ ~InterpolatingRebin() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "InterpolatingRebin"; }
+ const std::string name() const override { return "InterpolatingRebin"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates a workspace with different x-value bin boundaries where "
"the new y-values are estimated using cubic splines.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Rebin"; }
+ const std::string category() const override { return "Transforms\\Rebin"; }
/// Alias for the algorithm. Must override so it doesn't get parent class's
- virtual const std::string alias() const { return ""; }
+ const std::string alias() const override { return ""; }
protected:
- const std::string workspaceMethodName() const { return ""; }
+ const std::string workspaceMethodName() const override { return ""; }
// Overridden Algorithm methods
- void init();
- virtual void exec();
+ void init() override;
+ void exec() override;
void outputYandEValues(API::MatrixWorkspace_const_sptr inputW,
const MantidVecPtr &XValues_new,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/InvertMask.h b/Framework/Algorithms/inc/MantidAlgorithms/InvertMask.h
index aa5cd40b25772b8f59ea98389fbea599b0846df0..e43957709d8a2169dfd5da9c3dde30e11c719914 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/InvertMask.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/InvertMask.h
@@ -35,25 +35,25 @@ namespace Algorithms {
class DLLExport InvertMask : public API::Algorithm {
public:
InvertMask();
- virtual ~InvertMask();
+ ~InvertMask() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "InvertMask"; };
+ const std::string name() const override { return "InvertMask"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm inverts every mask bit in a MaskWorkspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Masking"; }
+ const std::string category() const override { return "Transforms\\Masking"; }
private:
// Implement abstract Algorithm methods
- void init();
+ void init() override;
// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Logarithm.h b/Framework/Algorithms/inc/MantidAlgorithms/Logarithm.h
index d1cfe841f3b2760f56e89ff94e0d042416849077..2b53602229d65a3ee9d7f738e9083ac9cacee65c 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Logarithm.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Logarithm.h
@@ -51,20 +51,20 @@ namespace Algorithms {
class DLLExport Logarithm : public UnaryOperation {
public:
Logarithm();
- virtual ~Logarithm(void){};
+ ~Logarithm(void) override{};
/// Algorithm's name for identification
- virtual const std::string name() const { return "Logarithm"; }
+ const std::string name() const override { return "Logarithm"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Logarithm function calculates the logarithm of the data, held in a "
"workspace. A user can choose between natural (default) or base 10 "
"logarithm";
}
/// Algorithm's version for identification
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Arithmetic"; }
+ const std::string category() const override { return "Arithmetic"; }
private:
/// The value to replace ln(0)
@@ -73,14 +73,14 @@ private:
bool is_natural;
/// Declare additional properties for this algorithm
- virtual void defineProperties();
+ void defineProperties() override;
/// get properties from GUI
- virtual void retrieveProperties();
+ void retrieveProperties() override;
/// Actually the function, which is run on values when the operation is
/// performed
- virtual void performUnaryOperation(const double XIn, const double YIn,
- const double EIn, double &YOut,
- double &EOut);
+ void performUnaryOperation(const double XIn, const double YIn,
+ const double EIn, double &YOut,
+ double &EOut) override;
};
} // End namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/LorentzCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/LorentzCorrection.h
index 0dab0af900704f5c1872dbc113a6a2239b8f1121..3c0922cdb19354ab5e9f8dcd5979de476ae74209 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/LorentzCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/LorentzCorrection.h
@@ -34,16 +34,16 @@ namespace Algorithms {
class DLLExport LorentzCorrection : public API::Algorithm {
public:
LorentzCorrection();
- virtual ~LorentzCorrection();
+ ~LorentzCorrection() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MaskBins.h b/Framework/Algorithms/inc/MantidAlgorithms/MaskBins.h
index f61bde48e5872378db60486fec79de3c5fceea95..bd77e9aa633944a8cff232ad69a5b2e2a7a00a33 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MaskBins.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MaskBins.h
@@ -56,24 +56,24 @@ public:
/// Constructor
MaskBins();
/// Virtual destructor
- virtual ~MaskBins() {}
+ ~MaskBins() override {}
/// Algorithm's name
- virtual const std::string name() const { return "MaskBins"; }
+ const std::string name() const override { return "MaskBins"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Marks bins in a workspace as being masked.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Transforms\\Masking"; }
+ const std::string category() const override { return "Transforms\\Masking"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void execEvent();
void findIndices(const MantidVec &X, MantidVec::difference_type &startBin,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MaskBinsFromTable.h b/Framework/Algorithms/inc/MantidAlgorithms/MaskBinsFromTable.h
index bfe0cad49140042a5e63d4dda25b900a5af6b725..72d2d05f0562f89dafa122a56b935886099326fa 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MaskBinsFromTable.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MaskBinsFromTable.h
@@ -36,25 +36,25 @@ namespace Algorithms {
class DLLExport MaskBinsFromTable : public API::Algorithm {
public:
MaskBinsFromTable();
- virtual ~MaskBinsFromTable();
+ ~MaskBinsFromTable() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "MaskBinsFromTable"; };
+ const std::string name() const override { return "MaskBinsFromTable"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Mask bins from a table workspace. ";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Masking"; }
+ const std::string category() const override { return "Transforms\\Masking"; }
private:
// Implement abstract Algorithm methods
- void init();
+ void init() override;
// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
/// Process input Mask bin TableWorkspace.
void processMaskBinWorkspace(DataObjects::TableWorkspace_sptr masktblws,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MaskDetectorsIf.h b/Framework/Algorithms/inc/MantidAlgorithms/MaskDetectorsIf.h
index 04e873386600621a50d0183269e8790bcfd6153c..164b0e3d6f4c171320b5d5092e9c223ee6354d35 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MaskDetectorsIf.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MaskDetectorsIf.h
@@ -49,19 +49,19 @@ public:
/// Default constructor
MaskDetectorsIf();
/// Destructor
- virtual ~MaskDetectorsIf();
+ ~MaskDetectorsIf() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "MaskDetectorsIf"; }
+ const std::string name() const override { return "MaskDetectorsIf"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Adjusts the selected field for a CalFile depending on the values "
"in the input workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\Masking;Transforms\\Masking";
}
@@ -85,9 +85,9 @@ private:
/// Whether select is on or off
bool select_on;
/// Overidden init
- void init();
+ void init() override;
/// Overidden exec
- void exec();
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Max.h b/Framework/Algorithms/inc/MantidAlgorithms/Max.h
index 6c8318ea9efc8e72af52c68ae0700d374d1d848d..a4606255ebdd4a5594b299c105be0554073a91ab 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Max.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Max.h
@@ -57,23 +57,23 @@ public:
/// Default constructor
Max() : API::Algorithm(){};
/// Destructor
- virtual ~Max(){};
+ ~Max() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Max"; }
+ const std::string name() const override { return "Max"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Arithmetic"; }
+ const std::string category() const override { return "Arithmetic"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Takes a 2D workspace as input and find the maximum in each 1D "
"spectrum.";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MaxEnt.h b/Framework/Algorithms/inc/MantidAlgorithms/MaxEnt.h
index 5791a7049429e5d9340aa1ffb74bdef9653381ec..efc45e4c062ff646bdc99aabeb33c3361be117ff 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MaxEnt.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MaxEnt.h
@@ -64,24 +64,24 @@ public:
/// Constructor
MaxEnt();
/// Destructor
- virtual ~MaxEnt();
+ ~MaxEnt() override;
/// Algorithm's name
- virtual const std::string name() const;
+ const std::string name() const override;
/// Algorithm's version
- virtual int version() const;
+ int version() const override;
/// Algorithm's category
- virtual const std::string category() const;
+ const std::string category() const override;
/// Algorithm's summary
- virtual const std::string summary() const;
+ const std::string summary() const override;
private:
/// Initialise the algorithm's properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Validate the input properties
- std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
/// Transforms from image space to data space
std::vector<double> transformImageToData(const std::vector<double> &input);
/// Transforms from data space to image space
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MaxMin.h b/Framework/Algorithms/inc/MantidAlgorithms/MaxMin.h
index 3561aae67eee358dd0defd038d07badb06e06ea4..0c23ef244311f6ab3b4117a1620b6e101ec6fbc9 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MaxMin.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MaxMin.h
@@ -59,23 +59,23 @@ public:
/// Default constructor
MaxMin() : API::Algorithm(){};
/// Destructor
- virtual ~MaxMin(){};
+ ~MaxMin() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "MaxMin"; }
+ const std::string name() const override { return "MaxMin"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Takes a 2D workspace as input and find the maximum (minimum) in "
"each 1D spectrum.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Arithmetic"; }
+ const std::string category() const override { return "Arithmetic"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MedianDetectorTest.h b/Framework/Algorithms/inc/MantidAlgorithms/MedianDetectorTest.h
index 0b6469794892f1b5214fdfc95232f31ee73986ef..1eae85511e988b4df485146ef0b8cb18028fe26a 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MedianDetectorTest.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MedianDetectorTest.h
@@ -73,17 +73,17 @@ public:
/// constructor
MedianDetectorTest();
/// Destructor
- virtual ~MedianDetectorTest(){};
+ ~MedianDetectorTest() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "MedianDetectorTest"; }
- virtual const std::string category() const;
+ const std::string name() const override { return "MedianDetectorTest"; }
+ const std::string category() const override;
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
// The different steps of the calculation, all called by exec()
/// Loads and checks the values passed to the algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MergeRuns.h b/Framework/Algorithms/inc/MantidAlgorithms/MergeRuns.h
index 1e621a4d88bb9b7fa885dff18e73b7af319b572d..d537ca680ef7ce90c794c852ff3eccd2367ed727 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MergeRuns.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MergeRuns.h
@@ -64,35 +64,35 @@ namespace Algorithms {
class DLLExport MergeRuns : public API::MultiPeriodGroupAlgorithm {
public:
MergeRuns();
- virtual ~MergeRuns();
+ ~MergeRuns() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "MergeRuns"; }
+ const std::string name() const override { return "MergeRuns"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Combines the data contained in an arbitrary number of input "
"workspaces.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Merging"; }
+ const std::string category() const override { return "Transforms\\Merging"; }
// Overriden MultiPeriodGroupAlgorithm method.
- bool useCustomInputPropertyName() const;
+ bool useCustomInputPropertyName() const override;
protected:
/// Overriden fillHistory method to correctly store history from merged
/// workspaces
- virtual void fillHistory();
+ void fillHistory() override;
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void execEvent();
void buildAdditionTables();
// Overriden MultiPeriodGroupAlgorithm method.
- std::string fetchInputPropertyName() const;
+ std::string fetchInputPropertyName() const override;
/// test the compatibility of the given workspace with others
void testCompatibility(API::MatrixWorkspace_const_sptr ws,
const std::string &xUnitID, const std::string &YUnit,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Min.h b/Framework/Algorithms/inc/MantidAlgorithms/Min.h
index 209d566ba4beda991313fb177eeb9bbe9ce16c8e..d978b1302faa57aeecbe6ad893a1a42eea78a9ca 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Min.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Min.h
@@ -57,15 +57,15 @@ public:
/// Default constructor
Min() : API::Algorithm(){};
/// Destructor
- virtual ~Min(){};
+ ~Min() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Min"; }
+ const std::string name() const override { return "Min"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Arithmetic"; }
+ const std::string category() const override { return "Arithmetic"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Takes a 2D workspace as input and find the minimum in each 1D "
"spectrum. "
"The algorithm creates a new 1D workspace containing all minima as "
@@ -76,8 +76,8 @@ public:
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Minus.h b/Framework/Algorithms/inc/MantidAlgorithms/Minus.h
index dc84b5dbd18a83996c889c4f69edb550e1a03d08..7df1a69070c691ea7e5d3f74ed989418536165bd 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Minus.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Minus.h
@@ -49,46 +49,48 @@ public:
/// Default constructor
Minus() : BinaryOperation(){};
/// Destructor
- virtual ~Minus(){};
+ ~Minus() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Minus"; }
+ const std::string name() const override { return "Minus"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The Minus algorithm will subtract the data values and calculate "
"the corresponding error values for two compatible workspaces.";
}
/// Algorithm's alias for identification overriding a virtual method
- virtual const std::string alias() const;
+ const std::string alias() const override;
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
private:
// Overridden BinaryOperation methods
void performBinaryOperation(const MantidVec &lhsX, const MantidVec &lhsY,
const MantidVec &lhsE, const MantidVec &rhsY,
const MantidVec &rhsE, MantidVec &YOut,
- MantidVec &EOut);
+ MantidVec &EOut) override;
void performBinaryOperation(const MantidVec &lhsX, const MantidVec &lhsY,
const MantidVec &lhsE, const double rhsY,
const double rhsE, MantidVec &YOut,
- MantidVec &EOut);
+ MantidVec &EOut) override;
void performEventBinaryOperation(DataObjects::EventList &lhs,
- const DataObjects::EventList &rhs);
+ const DataObjects::EventList &rhs) override;
void performEventBinaryOperation(DataObjects::EventList &lhs,
const MantidVec &rhsX, const MantidVec &rhsY,
- const MantidVec &rhsE);
+ const MantidVec &rhsE) override;
void performEventBinaryOperation(DataObjects::EventList &lhs,
- const double &rhsY, const double &rhsE);
+ const double &rhsY,
+ const double &rhsE) override;
- void checkRequirements();
- std::string
- checkSizeCompatibility(const API::MatrixWorkspace_const_sptr lhs,
- const API::MatrixWorkspace_const_sptr rhs) const;
+ void checkRequirements() override;
+ std::string checkSizeCompatibility(
+ const API::MatrixWorkspace_const_sptr lhs,
+ const API::MatrixWorkspace_const_sptr rhs) const override;
bool checkUnitCompatibility(const API::MatrixWorkspace_const_sptr lhs,
const API::MatrixWorkspace_const_sptr rhs) const;
- bool checkCompatibility(const API::MatrixWorkspace_const_sptr lhs,
- const API::MatrixWorkspace_const_sptr rhs) const;
+ bool
+ checkCompatibility(const API::MatrixWorkspace_const_sptr lhs,
+ const API::MatrixWorkspace_const_sptr rhs) const override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ModeratorTzero.h b/Framework/Algorithms/inc/MantidAlgorithms/ModeratorTzero.h
index 61b9ec3017da3ad179f542999d91a6480ceb72da..be0e2cd1f44e9a85dbe4efb265f2a7ad3046c1a2 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ModeratorTzero.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ModeratorTzero.h
@@ -75,20 +75,20 @@ public:
/// Default constructor
ModeratorTzero();
/// Virtual destructor
- virtual ~ModeratorTzero() {}
+ ~ModeratorTzero() override {}
/// Algorithm's name
- virtual const std::string name() const { return "ModeratorTzero"; }
+ const std::string name() const override { return "ModeratorTzero"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Corrects the time of flight of an indirect geometry instrument by "
"a time offset that is dependent on the energy of the neutron after "
"passing through the moderator.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\InstrumentCorrections";
}
/// set attribute m_formula
@@ -100,9 +100,9 @@ private:
Mantid::Geometry::Instrument_const_sptr m_instrument;
// Initialisation code
- void init();
+ void init() override;
/// Execution code for histogram workspace
- void exec();
+ void exec() override;
/// Execution code for event workspace
void execEvent(const std::string &emode);
/// Calculate emission time from the moderator for a given
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ModeratorTzeroLinear.h b/Framework/Algorithms/inc/MantidAlgorithms/ModeratorTzeroLinear.h
index 7b5a6ce6259c3d1f5371124b100cbab83b2704f4..7e9c7105474934c40f9f8767148bc2278cfdcc31 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ModeratorTzeroLinear.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ModeratorTzeroLinear.h
@@ -82,15 +82,15 @@ public:
/// Default constructor
ModeratorTzeroLinear();
/// Virtual destructor
- virtual ~ModeratorTzeroLinear() {}
+ ~ModeratorTzeroLinear() override {}
/// Algorithm's name
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const;
+ const std::string summary() const override;
/// Algorithm's version
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification
- virtual const std::string category() const;
+ const std::string category() const override;
private:
// conversion constants applicable to histogram and event workspaces
@@ -99,9 +99,9 @@ private:
Geometry::Instrument_const_sptr m_instrument;
// Initialisation code
- void init();
+ void init() override;
// Execution code for histogram workspace
- void exec();
+ void exec() override;
// Execution code for event workspace
void execEvent();
// Calculate time from sample to detector and initial flight path
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MonitorEfficiencyCorUser.h b/Framework/Algorithms/inc/MantidAlgorithms/MonitorEfficiencyCorUser.h
index 3c029217c235070a58bd76cd039e4033b7404fec..659636111cd95509e3223e2cce8b471203e21033 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MonitorEfficiencyCorUser.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MonitorEfficiencyCorUser.h
@@ -12,28 +12,28 @@ public:
/// (Empty) Constructor
MonitorEfficiencyCorUser(); // : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~MonitorEfficiencyCorUser();
+ ~MonitorEfficiencyCorUser() override;
/// Algorithm's name
- virtual const std::string name() const { return "MonitorEfficiencyCorUser"; }
+ const std::string name() const override { return "MonitorEfficiencyCorUser"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm normalises the counts by the monitor counts with "
"additional efficiency correction according to the formula set in "
"the instrument parameters file.";
}
/// Algorithm's version
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\NormalisationCorrections";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
double calculateFormulaValue(const std::string &, double);
std::string getValFromInstrumentDef(const std::string &);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MonteCarloAbsorption.h b/Framework/Algorithms/inc/MantidAlgorithms/MonteCarloAbsorption.h
index f571dcf823a42723b73271d84ab5f7128477137a..54198731c541346295aefc547d96b84528fc9055 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MonteCarloAbsorption.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MonteCarloAbsorption.h
@@ -50,27 +50,27 @@ public:
/// Constructor
MonteCarloAbsorption();
/// Destructor
- ~MonteCarloAbsorption();
+ ~MonteCarloAbsorption() override;
/// Algorithm's name
- virtual const std::string name() const { return "MonteCarloAbsorption"; }
+ const std::string name() const override { return "MonteCarloAbsorption"; }
/// Algorithm's version
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\AbsorptionCorrections";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates attenuation due to absorption and scattering in a "
"sample & its environment using a weighted Monte Carlo.";
}
private:
/// Initialize the algorithm
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Do the simulation for the given detector and wavelength
void doSimulation(const Geometry::IDetector *const detector,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MultipleScatteringCylinderAbsorption.h b/Framework/Algorithms/inc/MantidAlgorithms/MultipleScatteringCylinderAbsorption.h
index 3b09d875f884fa5972d58132d3fc064f5c5d144f..674bfd9066a5410eccc8912cb239d5ebbc8683d7 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MultipleScatteringCylinderAbsorption.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MultipleScatteringCylinderAbsorption.h
@@ -45,27 +45,27 @@ public:
MultipleScatteringCylinderAbsorption();
/// Destructor
- virtual ~MultipleScatteringCylinderAbsorption();
+ ~MultipleScatteringCylinderAbsorption() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const;
+ const std::string name() const override;
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Multiple scattering absorption correction, originally used to "
"correct vanadium spectrum at IPNS.";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// MultipleScatteringCylinderAbsorption correction calculation.
void apply_msa_correction(const double angle_deg, const double radius,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Multiply.h b/Framework/Algorithms/inc/MantidAlgorithms/Multiply.h
index f0e488dc370f60111b9483bc8a1f7e8dd4a10a48..cb8f63760b0ddc27bb3721d04c6bc1ae2dc448a1 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Multiply.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Multiply.h
@@ -49,49 +49,48 @@ public:
/// Default constructor
Multiply() : CommutativeBinaryOperation(){};
/// Destructor
- virtual ~Multiply(){};
+ ~Multiply() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Multiply"; }
+ const std::string name() const override { return "Multiply"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The Multiply algorithm will multiply the data values and calculate "
"the corresponding error values of two compatible workspaces. ";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
private:
// Overridden BinaryOperation methods
void performBinaryOperation(const MantidVec &lhsX, const MantidVec &lhsY,
const MantidVec &lhsE, const MantidVec &rhsY,
const MantidVec &rhsE, MantidVec &YOut,
- MantidVec &EOut);
+ MantidVec &EOut) override;
void performBinaryOperation(const MantidVec &lhsX, const MantidVec &lhsY,
const MantidVec &lhsE, const double rhsY,
const double rhsE, MantidVec &YOut,
- MantidVec &EOut);
+ MantidVec &EOut) override;
- virtual void setOutputUnits(const API::MatrixWorkspace_const_sptr lhs,
- const API::MatrixWorkspace_const_sptr rhs,
- API::MatrixWorkspace_sptr out);
+ void setOutputUnits(const API::MatrixWorkspace_const_sptr lhs,
+ const API::MatrixWorkspace_const_sptr rhs,
+ API::MatrixWorkspace_sptr out) override;
- virtual void performEventBinaryOperation(DataObjects::EventList &lhs,
- const DataObjects::EventList &rhs);
+ void performEventBinaryOperation(DataObjects::EventList &lhs,
+ const DataObjects::EventList &rhs) override;
- virtual void performEventBinaryOperation(DataObjects::EventList &lhs,
- const MantidVec &rhsX,
- const MantidVec &rhsY,
- const MantidVec &rhsE);
+ void performEventBinaryOperation(DataObjects::EventList &lhs,
+ const MantidVec &rhsX, const MantidVec &rhsY,
+ const MantidVec &rhsE) override;
- virtual void performEventBinaryOperation(DataObjects::EventList &lhs,
- const double &rhsY,
- const double &rhsE);
+ void performEventBinaryOperation(DataObjects::EventList &lhs,
+ const double &rhsY,
+ const double &rhsE) override;
- void checkRequirements();
- virtual std::string
- checkSizeCompatibility(const API::MatrixWorkspace_const_sptr lhs,
- const API::MatrixWorkspace_const_sptr rhs) const;
+ void checkRequirements() override;
+ std::string checkSizeCompatibility(
+ const API::MatrixWorkspace_const_sptr lhs,
+ const API::MatrixWorkspace_const_sptr rhs) const override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MultiplyRange.h b/Framework/Algorithms/inc/MantidAlgorithms/MultiplyRange.h
index de043e5a875b132e16c75960c56338c3ff051b79..f244e993745fef703c46d3b4acf3d6c3324f1118 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MultiplyRange.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MultiplyRange.h
@@ -49,25 +49,25 @@ public:
/// no arg constructor
MultiplyRange() : API::Algorithm() {}
/// virtual destructor
- virtual ~MultiplyRange() {}
+ ~MultiplyRange() override {}
- virtual const std::string name() const { return "MultiplyRange"; }
+ const std::string name() const override { return "MultiplyRange"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "An algorithm to multiply a range of bins in a workspace by the "
"factor given.";
}
- virtual int version() const { return (1); }
- virtual const std::string category() const {
+ int version() const override { return (1); }
+ const std::string category() const override {
return "Arithmetic;CorrectionFunctions";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/MuonGroupDetectors.h b/Framework/Algorithms/inc/MantidAlgorithms/MuonGroupDetectors.h
index 70ef027fef2bf0c5e3492de7c6f9f4fa32512bf4..a10d42bade3409cae3824511e449e930b812e2f7 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/MuonGroupDetectors.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/MuonGroupDetectors.h
@@ -34,20 +34,20 @@ namespace Algorithms {
class DLLExport MuonGroupDetectors : public API::Algorithm {
public:
MuonGroupDetectors();
- virtual ~MuonGroupDetectors();
+ ~MuonGroupDetectors() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Applies detector grouping to a workspace. (Muon version).";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/NormaliseByCurrent.h b/Framework/Algorithms/inc/MantidAlgorithms/NormaliseByCurrent.h
index 458d6dd2f17266af75c8d4e84d97205723060086..853d7dda9233a70decb1a567451a32eb1c95d25d 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/NormaliseByCurrent.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/NormaliseByCurrent.h
@@ -53,25 +53,25 @@ namespace Algorithms {
class DLLExport NormaliseByCurrent : public API::Algorithm {
public:
NormaliseByCurrent();
- virtual ~NormaliseByCurrent();
+ ~NormaliseByCurrent() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "NormaliseByCurrent"; }
+ const std::string name() const override { return "NormaliseByCurrent"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Normalises a workspace by the proton charge.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\NormalisationCorrections";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
// Extract the charge value from the logs.
double
extractCharge(boost::shared_ptr<Mantid::API::MatrixWorkspace> inputWs) const;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/NormaliseByDetector.h b/Framework/Algorithms/inc/MantidAlgorithms/NormaliseByDetector.h
index fc08d0e507ed0e3a6f38e750ed23ec1fa5e25bdc..55a025167d4c9765bbc2dc32f851a25050fcc624 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/NormaliseByDetector.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/NormaliseByDetector.h
@@ -47,16 +47,16 @@ namespace Algorithms {
class DLLExport NormaliseByDetector : public API::Algorithm {
public:
NormaliseByDetector(bool parallelExecution = true);
- virtual ~NormaliseByDetector();
+ ~NormaliseByDetector() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Normalise the input workspace by the detector efficiency.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
/// Flag to indicate that the histograms should be processed in parallel.
@@ -76,8 +76,8 @@ private:
boost::shared_ptr<const Mantid::API::MatrixWorkspace> inWS,
Mantid::API::Progress &prog);
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/NormaliseToMonitor.h b/Framework/Algorithms/inc/MantidAlgorithms/NormaliseToMonitor.h
index b7b042c5fbd93f01a2408464d22e42e230b2ff89..2fb6cc053749a37e7d4801c67df6e1b9ea0954b5 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/NormaliseToMonitor.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/NormaliseToMonitor.h
@@ -71,27 +71,27 @@ namespace Algorithms {
class DLLExport NormaliseToMonitor : public API::Algorithm {
public:
NormaliseToMonitor();
- virtual ~NormaliseToMonitor();
+ ~NormaliseToMonitor() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "NormaliseToMonitor"; }
+ const std::string name() const override { return "NormaliseToMonitor"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Normalizes a 2D workspace by a specified spectrum, spectrum, "
"described by a monitor ID or spectrun provided in a separate "
"worskspace. ";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\NormalisationCorrections";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
protected: // for testing
void checkProperties(const API::MatrixWorkspace_sptr &inputWorkspace);
@@ -139,16 +139,17 @@ public:
: hostWSname(WSProperty), SpectraNum(SpectrToNormByProperty),
MonitorWorkspaceProp(MonitorWorkspace), is_enabled(true) {}
// if input to this property is enabled
- bool isEnabled(const Mantid::Kernel::IPropertyManager *algo) const;
- bool isConditionChanged(const Mantid::Kernel::IPropertyManager *algo) const;
+ bool isEnabled(const Mantid::Kernel::IPropertyManager *algo) const override;
+ bool isConditionChanged(
+ const Mantid::Kernel::IPropertyManager *algo) const override;
void applyChanges(const Mantid::Kernel::IPropertyManager *algo,
- Kernel::Property *const pProp);
+ Kernel::Property *const pProp) override;
// interface needs it but if indeed proper clone used -- do not know.
- virtual IPropertySettings *clone() {
+ IPropertySettings *clone() override {
return new MonIDPropChanger(hostWSname, SpectraNum, MonitorWorkspaceProp);
}
- virtual ~MonIDPropChanger(){};
+ ~MonIDPropChanger() override{};
private:
// the name of the property, which specifies the workspace which has to be
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/NormaliseToUnity.h b/Framework/Algorithms/inc/MantidAlgorithms/NormaliseToUnity.h
index f4b4e26d5eb6c067381208466868a1971c2b94f2..7e11bbcb724fcefbdf60d3e910497158b23a19fd 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/NormaliseToUnity.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/NormaliseToUnity.h
@@ -59,27 +59,27 @@ public:
/// Default constructor
NormaliseToUnity() : API::Algorithm(){};
/// Destructor
- virtual ~NormaliseToUnity(){};
+ ~NormaliseToUnity() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "NormaliseToUnity"; }
+ const std::string name() const override { return "NormaliseToUnity"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "NormaliseToUnity takes a 2D workspace or an EventWorkspace as "
"input and normalises it to 1. Optionally, the range summed can be "
"restricted in either dimension.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\NormalisationCorrections";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/OneMinusExponentialCor.h b/Framework/Algorithms/inc/MantidAlgorithms/OneMinusExponentialCor.h
index 0763f17c56e778fca0e7e83c36b7de3296267e72..24979c7e0232f73dd6277c9fdc427c91ee7195b6 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/OneMinusExponentialCor.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/OneMinusExponentialCor.h
@@ -56,26 +56,27 @@ public:
/// Default constructor
OneMinusExponentialCor();
/// Destructor
- virtual ~OneMinusExponentialCor(){};
+ ~OneMinusExponentialCor() override{};
/// Algorithm's name for identification
- virtual const std::string name() const { return "OneMinusExponentialCor"; }
+ const std::string name() const override { return "OneMinusExponentialCor"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Corrects the data in a workspace by one minus the value of an "
"exponential function.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "CorrectionFunctions"; }
+ const std::string category() const override { return "CorrectionFunctions"; }
private:
// Overridden UnaryOperation methods
- void defineProperties();
- void retrieveProperties();
+ void defineProperties() override;
+ void retrieveProperties() override;
void performUnaryOperation(const double XIn, const double YIn,
- const double EIn, double &YOut, double &EOut);
+ const double EIn, double &YOut,
+ double &EOut) override;
double m_c; ///< The constant term in the exponent
double m_c1; ///< The multiplier
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PDDetermineCharacterizations.h b/Framework/Algorithms/inc/MantidAlgorithms/PDDetermineCharacterizations.h
index 76b6145a1267334102d6e03b8ce0af0aeb1544a5..3e70995b80667bc5b1b3a3762ce4b3d80356f7b2 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/PDDetermineCharacterizations.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/PDDetermineCharacterizations.h
@@ -42,13 +42,13 @@ namespace Algorithms {
class DLLExport PDDetermineCharacterizations : public API::Algorithm {
public:
PDDetermineCharacterizations();
- virtual ~PDDetermineCharacterizations();
+ ~PDDetermineCharacterizations() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
- virtual std::map<std::string, std::string> validateInputs();
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
+ std::map<std::string, std::string> validateInputs() override;
private:
double getLogValue(API::Run &run, const std::string &propName);
@@ -56,8 +56,8 @@ private:
void setDefaultsInPropManager();
void overrideRunNumProperty(const std::string &inputName,
const std::string &propName);
- void init();
- void exec();
+ void init() override;
+ void exec() override;
Kernel::PropertyManager_sptr m_propertyManager;
API::ITableWorkspace_sptr m_characterizations;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PDFFourierTransform.h b/Framework/Algorithms/inc/MantidAlgorithms/PDFFourierTransform.h
index af8174281d90bd5d94c93f2f1a82c1d049e22ab5..a6a526963c32c964dc0e90c372c0aa9975a82c2a 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/PDFFourierTransform.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/PDFFourierTransform.h
@@ -12,28 +12,28 @@ namespace Algorithms {
class DLLExport PDFFourierTransform : public API::Algorithm {
public:
PDFFourierTransform();
- ~PDFFourierTransform();
+ ~PDFFourierTransform() override;
/// Algorithm's name for identification
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Fourier transform from S(Q) to G(r), which is paired distribution "
"function (PDF). G(r) will be stored in another named workspace.";
}
/// Algorithm's version for identification
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification
- virtual const std::string category() const;
+ const std::string category() const override;
/// @copydoc Algorithm::validateInputs()
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
/// Initialize the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Mantid
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Pause.h b/Framework/Algorithms/inc/MantidAlgorithms/Pause.h
index a4a60a8a7e2fa7318c5f6516dcb7bfbf0bb1b357..a35cc55c6daafd110bea262fe0b1429e3c24ea6b 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Pause.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Pause.h
@@ -35,20 +35,20 @@ namespace Algorithms {
class DLLExport Pause : public API::Algorithm {
public:
Pause();
- virtual ~Pause();
+ ~Pause() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Pause a script for a given duration.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PerformIndexOperations.h b/Framework/Algorithms/inc/MantidAlgorithms/PerformIndexOperations.h
index bc72962b449d6bb56023cbbe65b61d0a7c72dba4..1ff4583a87c7fe97688a599c272ddcf6d5251ecc 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/PerformIndexOperations.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/PerformIndexOperations.h
@@ -34,20 +34,20 @@ namespace Algorithms {
class DLLExport PerformIndexOperations : public API::DataProcessorAlgorithm {
public:
PerformIndexOperations();
- virtual ~PerformIndexOperations();
+ ~PerformIndexOperations() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Process the workspace according to the Index operations provided.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PhaseQuadMuon.h b/Framework/Algorithms/inc/MantidAlgorithms/PhaseQuadMuon.h
index 3d08342a63ddc80378b2d21bb32c8e0d10a83274..cec6e4637d7c211bdb7ee05567a4e3704513e7a5 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/PhaseQuadMuon.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/PhaseQuadMuon.h
@@ -39,26 +39,26 @@ public:
/// Default constructor
PhaseQuadMuon(){};
/// Destructor
- virtual ~PhaseQuadMuon(){};
+ ~PhaseQuadMuon() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "PhaseQuad"; }
+ const std::string name() const override { return "PhaseQuad"; }
/// Summary of algorithm's purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Generates a quadrature phase signal.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Validate inputs
- std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
/// Calculate the normalization constants
std::vector<double> getExponentialDecay(const API::MatrixWorkspace_sptr &ws);
/// Create squashograms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PlotAsymmetryByLogValue.h b/Framework/Algorithms/inc/MantidAlgorithms/PlotAsymmetryByLogValue.h
index fd569df92d35241eebcde34c5ae8776257f91c2f..de692f259244e7c83b3084753493f309b2f0ca6a 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/PlotAsymmetryByLogValue.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/PlotAsymmetryByLogValue.h
@@ -62,22 +62,22 @@ public:
/// Default constructor
PlotAsymmetryByLogValue();
/// Destructor
- virtual ~PlotAsymmetryByLogValue(){};
+ ~PlotAsymmetryByLogValue() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "PlotAsymmetryByLogValue"; }
+ const std::string name() const override { return "PlotAsymmetryByLogValue"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates asymmetry for a series of log values";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
// Load run, apply dead time corrections and detector grouping
API::Workspace_sptr doLoad(size_t runNumber);
// Analyse loaded run
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Plus.h b/Framework/Algorithms/inc/MantidAlgorithms/Plus.h
index dedd42286776b29af4033d3a041c5be9e678ec5a..3d56f03febf8e49172920deddebca2268f33d8f8 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Plus.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Plus.h
@@ -51,44 +51,46 @@ public:
/// Default constructor
Plus() : CommutativeBinaryOperation(){};
/// Destructor
- virtual ~Plus(){};
+ ~Plus() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Plus"; }
+ const std::string name() const override { return "Plus"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The Plus algorithm will add the data values and calculate the "
"corresponding error values in two compatible workspaces. ";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
private:
// Overridden BinaryOperation methods
void performBinaryOperation(const MantidVec &lhsX, const MantidVec &lhsY,
const MantidVec &lhsE, const MantidVec &rhsY,
const MantidVec &rhsE, MantidVec &YOut,
- MantidVec &EOut);
+ MantidVec &EOut) override;
void performBinaryOperation(const MantidVec &lhsX, const MantidVec &lhsY,
const MantidVec &lhsE, const double rhsY,
const double rhsE, MantidVec &YOut,
- MantidVec &EOut);
+ MantidVec &EOut) override;
void performEventBinaryOperation(DataObjects::EventList &lhs,
- const DataObjects::EventList &rhs);
+ const DataObjects::EventList &rhs) override;
void performEventBinaryOperation(DataObjects::EventList &lhs,
const MantidVec &rhsX, const MantidVec &rhsY,
- const MantidVec &rhsE);
+ const MantidVec &rhsE) override;
void performEventBinaryOperation(DataObjects::EventList &lhs,
- const double &rhsY, const double &rhsE);
-
- void checkRequirements();
- std::string
- checkSizeCompatibility(const API::MatrixWorkspace_const_sptr lhs,
- const API::MatrixWorkspace_const_sptr rhs) const;
- bool checkCompatibility(const API::MatrixWorkspace_const_sptr lhs,
- const API::MatrixWorkspace_const_sptr rhs) const;
+ const double &rhsY,
+ const double &rhsE) override;
+
+ void checkRequirements() override;
+ std::string checkSizeCompatibility(
+ const API::MatrixWorkspace_const_sptr lhs,
+ const API::MatrixWorkspace_const_sptr rhs) const override;
+ bool
+ checkCompatibility(const API::MatrixWorkspace_const_sptr lhs,
+ const API::MatrixWorkspace_const_sptr rhs) const override;
void operateOnRun(const API::Run &lhs, const API::Run &rhs,
- API::Run &ans) const;
+ API::Run &ans) const override;
// Overridden event-specific operation
bool checkUnitCompatibility(const API::MatrixWorkspace_const_sptr lhs,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PointByPointVCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/PointByPointVCorrection.h
index 36fb658bc7609695498a9a355fd97fca5a1ae33b..5ba8af8a2f2b32f1d755a1de76413d20ccd0a1e0 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/PointByPointVCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/PointByPointVCorrection.h
@@ -38,26 +38,26 @@ namespace Algorithms {
class DLLExport PointByPointVCorrection : public API::Algorithm {
public:
PointByPointVCorrection();
- virtual ~PointByPointVCorrection();
+ ~PointByPointVCorrection() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "PointByPointVCorrection"; }
+ const std::string name() const override { return "PointByPointVCorrection"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Spectrum by spectrum division for vanadium normalisation "
"correction.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\Corrections;CorrectionFunctions\\SpecialCorrections";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void check_validity(API::MatrixWorkspace_const_sptr &w1,
API::MatrixWorkspace_const_sptr &w2,
API::MatrixWorkspace_sptr &out);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PoissonErrors.h b/Framework/Algorithms/inc/MantidAlgorithms/PoissonErrors.h
index 0466626430b6175e6db8afc715e8d59e5ab8b833..dd1cf5aa44524a7124bbdaa94598df0432f57ea1 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/PoissonErrors.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/PoissonErrors.h
@@ -53,19 +53,19 @@ public:
/// Default constructor
PoissonErrors() : BinaryOperation(){};
/// Destructor
- virtual ~PoissonErrors(){};
+ ~PoissonErrors() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "PoissonErrors"; }
+ const std::string name() const override { return "PoissonErrors"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates the gaussian approxiamtion of Poisson error based on a "
"matching workspace containing the original counts.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "SANS;Arithmetic\\Errors";
}
@@ -74,21 +74,21 @@ private:
void performBinaryOperation(const MantidVec &lhsX, const MantidVec &lhsY,
const MantidVec &lhsE, const MantidVec &rhsY,
const MantidVec &rhsE, MantidVec &YOut,
- MantidVec &EOut);
+ MantidVec &EOut) override;
void performBinaryOperation(const MantidVec &lhsX, const MantidVec &lhsY,
const MantidVec &lhsE, const double rhsY,
const double rhsE, MantidVec &YOut,
- MantidVec &EOut);
- virtual std::string
- checkSizeCompatibility(const API::MatrixWorkspace_const_sptr lhs,
- const API::MatrixWorkspace_const_sptr rhs) const;
+ MantidVec &EOut) override;
+ std::string checkSizeCompatibility(
+ const API::MatrixWorkspace_const_sptr lhs,
+ const API::MatrixWorkspace_const_sptr rhs) const override;
/// The name of the first input workspace property for BinaryOperation
- virtual std::string inputPropName1() const { return "InputWorkspace"; }
+ std::string inputPropName1() const override { return "InputWorkspace"; }
/// The name of the second input workspace property for BinaryOperation
- virtual std::string inputPropName2() const { return "CountsWorkspace"; }
+ std::string inputPropName2() const override { return "CountsWorkspace"; }
/// The name of the output workspace property for BinaryOperation
- virtual std::string outputPropName() const { return "OutputWorkspace"; }
+ std::string outputPropName() const override { return "OutputWorkspace"; }
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PolarizationCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/PolarizationCorrection.h
index 3a48099f131064d49cb25131c14cd948dc5a2691..5a1575ed135716cd0707c7bc66d773093afcb0b2 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/PolarizationCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/PolarizationCorrection.h
@@ -40,15 +40,15 @@ namespace Algorithms {
class DLLExport PolarizationCorrection : public API::Algorithm {
public:
PolarizationCorrection();
- virtual ~PolarizationCorrection();
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- const std::string summary() const;
+ ~PolarizationCorrection() override;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
boost::shared_ptr<Mantid::API::MatrixWorkspace> execPolynomialCorrection(
boost::shared_ptr<Mantid::API::MatrixWorkspace> &input,
const std::vector<double> &coefficients);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PolynomialCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/PolynomialCorrection.h
index 2521c42ef1a04c641ea78c51e99d68ec5c8f8e88..dedfc8e8832d8afc1893498293ab82cfbe00423c 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/PolynomialCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/PolynomialCorrection.h
@@ -54,26 +54,27 @@ public:
/// Default constructor
PolynomialCorrection();
/// Destructor
- virtual ~PolynomialCorrection(){};
+ ~PolynomialCorrection() override{};
/// Algorithm's name for identification
- virtual const std::string name() const { return "PolynomialCorrection"; }
+ const std::string name() const override { return "PolynomialCorrection"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Corrects the data in a workspace by the value of a polynomial "
"function which is evaluated at the X value of each data point.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "CorrectionFunctions"; }
+ const std::string category() const override { return "CorrectionFunctions"; }
private:
// Overridden UnaryOperation methods
- void defineProperties();
- void retrieveProperties();
+ void defineProperties() override;
+ void retrieveProperties() override;
void performUnaryOperation(const double XIn, const double YIn,
- const double EIn, double &YOut, double &EOut);
+ const double EIn, double &YOut,
+ double &EOut) override;
std::vector<double> m_coeffs; ///< Holds the coefficients for the polynomial
/// correction function
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Power.h b/Framework/Algorithms/inc/MantidAlgorithms/Power.h
index 822f455dc7d704342acb522ad35c45eb0b331a6b..2d2f014152271eecba2778fd65abef0a63ef5cd7 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Power.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Power.h
@@ -50,26 +50,27 @@ public:
/// Default constructor
Power();
/// Destructor
- virtual ~Power(){};
+ ~Power() override{};
/// Algorithm's name for identification
- virtual const std::string name() const { return "Power"; }
+ const std::string name() const override { return "Power"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The Power algorithm will raise the base workspace to a particular "
"power. Corresponding error values will be created.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Arithmetic"; }
+ const std::string category() const override { return "Arithmetic"; }
private:
// Overridden UnaryOperation methods
- void defineProperties();
- void retrieveProperties();
+ void defineProperties() override;
+ void retrieveProperties() override;
void performUnaryOperation(const double XIn, const double YIn,
- const double EIn, double &YOut, double &EOut);
+ const double EIn, double &YOut,
+ double &EOut) override;
/// calculate the power
inline double calculatePower(const double base, const double exponent);
/// Exponent to raise the base workspace to
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/PowerLawCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/PowerLawCorrection.h
index e8f29db2718c52ba19730462ee3a5ae00331cef2..0cac881994b011363e652fee66823f1d5dce89cc 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/PowerLawCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/PowerLawCorrection.h
@@ -52,11 +52,11 @@ public:
/// Default constructor
PowerLawCorrection();
/// Destructor
- virtual ~PowerLawCorrection(){};
+ ~PowerLawCorrection() override{};
/// Algorithm's name for identification
- virtual const std::string name() const { return "PowerLawCorrection"; }
+ const std::string name() const override { return "PowerLawCorrection"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Corrects the data and error values on a workspace by the value of "
"an exponential function which is evaluated at the X value of each "
"data point: c0*x^C1. The data and error values are multiplied by "
@@ -64,16 +64,17 @@ public:
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "CorrectionFunctions"; }
+ const std::string category() const override { return "CorrectionFunctions"; }
private:
// Overridden UnaryOperation methods
- void defineProperties();
- void retrieveProperties();
+ void defineProperties() override;
+ void retrieveProperties() override;
void performUnaryOperation(const double XIn, const double YIn,
- const double EIn, double &YOut, double &EOut);
+ const double EIn, double &YOut,
+ double &EOut) override;
double m_c0; ///< The constant by which to multiply
double m_c1; ///< The power to raise by.
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Q1D2.h b/Framework/Algorithms/inc/MantidAlgorithms/Q1D2.h
index e9948ce5714ba75e75487dba6227ee9423e00882..763ba5c1a5e7337d294de611f7003fa63f8093f4 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Q1D2.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Q1D2.h
@@ -42,19 +42,19 @@ public:
/// Default constructor
Q1D2();
/// Virtual destructor
- virtual ~Q1D2() {}
+ ~Q1D2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "Q1D"; }
+ const std::string name() const override { return "Q1D"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "SANS 1D reduction. Converts a workspace in wavelength into a "
"workspace of momentum transfer, assuming elastic scattering";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "SANS"; }
+ const std::string category() const override { return "SANS"; }
private:
/// the experimental workspace with counts across the detector
@@ -62,9 +62,9 @@ private:
bool m_doSolidAngle;
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
API::MatrixWorkspace_sptr
setUpOutputWorkspace(const std::vector<double> &binParams) const;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Q1DWeighted.h b/Framework/Algorithms/inc/MantidAlgorithms/Q1DWeighted.h
index 955f48930e34b0ff152ffc537804a365be09a140..a796a9aa01353d9434de47ef5261e4d9c3765e62 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Q1DWeighted.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Q1DWeighted.h
@@ -50,24 +50,24 @@ public:
/// (Empty) Constructor
Q1DWeighted() : API::Algorithm() {}
/// Virtual destructor
- virtual ~Q1DWeighted() {}
+ ~Q1DWeighted() override {}
/// Algorithm's name
- virtual const std::string name() const { return "Q1DWeighted"; }
+ const std::string name() const override { return "Q1DWeighted"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs azimuthal averaging on a 2D SANS data to produce I(Q).";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "SANS"; }
+ const std::string category() const override { return "SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Qxy.h b/Framework/Algorithms/inc/MantidAlgorithms/Qxy.h
index 8f84da380eb067151533274b4018e741fe6f4bae..050208773e5a07c2e273c0c4c604dcf80f8e6949 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Qxy.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Qxy.h
@@ -55,25 +55,25 @@ public:
/// (Empty) Constructor
Qxy() : API::Algorithm() {}
/// Virtual destructor
- virtual ~Qxy() {}
+ ~Qxy() override {}
/// Algorithm's name
- virtual const std::string name() const { return "Qxy"; }
+ const std::string name() const override { return "Qxy"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs the final part of a SANS (LOQ/SANS2D) two dimensional (in "
"Q) data reduction.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "SANS"; }
+ const std::string category() const override { return "SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
API::MatrixWorkspace_sptr
setUpOutputWorkspace(API::MatrixWorkspace_const_sptr inputWorkspace);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RRFMuon.h b/Framework/Algorithms/inc/MantidAlgorithms/RRFMuon.h
index 1f821006b21f9f56ee07e62a2d98ac158f7139ae..60f3a32b6affaa460767f62f526aac0cc4271a8a 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RRFMuon.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RRFMuon.h
@@ -39,24 +39,24 @@ public:
/// Default constructor
RRFMuon(){};
/// Destructor
- virtual ~RRFMuon(){};
+ ~RRFMuon() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "RRFMuon"; }
+ const std::string name() const override { return "RRFMuon"; }
/// Summary of algorithm's purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate Muon asymmetry in the rotating reference frame (RRF).";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Get conversion factor from frequency units to input workspace units
double unitConversionFactor(std::string uin, std::string uuser);
};
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RadiusSum.h b/Framework/Algorithms/inc/MantidAlgorithms/RadiusSum.h
index b9b7c8184e64bc9475b75e9c93d9d90cb33177d9..ee7b4a8628ef7b81afe981a17092f4bad79510aa 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RadiusSum.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RadiusSum.h
@@ -39,17 +39,17 @@ namespace Algorithms {
class DLLExport RadiusSum : public API::Algorithm {
public:
RadiusSum();
- virtual ~RadiusSum();
+ ~RadiusSum() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Sum of all the counts inside a ring against the scattering angle "
"for each Radius.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
static bool inputWorkspaceHasInstrumentAssociated(API::MatrixWorkspace_sptr);
@@ -63,8 +63,8 @@ public:
const std::vector<double> &boundaries);
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
std::vector<double> processInstrumentRadiusSum();
std::vector<double> processNumericImageRadiusSum();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RayTracerTester.h b/Framework/Algorithms/inc/MantidAlgorithms/RayTracerTester.h
index 8caeaa3979a8f22a9000e2d9229e7af8d453befe..98540e13bf2978707072479f1334f1445b1ae9a6 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RayTracerTester.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RayTracerTester.h
@@ -36,27 +36,27 @@ namespace Algorithms {
class DLLExport RayTracerTester : public API::Algorithm {
public:
RayTracerTester();
- ~RayTracerTester();
+ ~RayTracerTester() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "RayTracerTester"; };
+ const std::string name() const override { return "RayTracerTester"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Algorithm to test ray tracer by spraying evenly spaced rays "
"around.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Development"; }
+ const std::string category() const override { return "Utility\\Development"; }
/// Run the algorithm
- void exec();
+ void exec() override;
private:
/// Initialise the properties
- void init();
+ void init() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h b/Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h
index 6bca1d9920db406ccf6844bcb9d97e1ff9b05780..e8b4e6c2b39fd8cb49eeb4c19e0568141ae9b208 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ReadGroupsFromFile.h
@@ -76,11 +76,11 @@ public:
/// (Empty) Constructor
ReadGroupsFromFile();
/// Virtual destructor
- virtual ~ReadGroupsFromFile() {}
+ ~ReadGroupsFromFile() override {}
/// Algorithm's name
- virtual const std::string name() const { return "ReadGroupsFromFile"; }
+ const std::string name() const override { return "ReadGroupsFromFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Read a diffraction calibration file (*.cal) or an XML grouping "
"file (*.xml) and an instrument name, and output a 2D workspace "
"containing on the Y-axis the values of the Group each detector "
@@ -91,9 +91,9 @@ public:
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling\\CalFiles";
}
@@ -102,9 +102,9 @@ private:
/// the udet number, the value of is a pair of <group,selected>.
typedef std::unordered_map<int, std::pair<int, int>> calmap;
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Read a grouping file and construct the calibration map
void readGroupingFile(const std::string &filename);
/// Read an XML Grouping File
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RealFFT.h b/Framework/Algorithms/inc/MantidAlgorithms/RealFFT.h
index dd19f3811e95eaf51fce33e7b053ebee75afb477..a5bcc87d53ef7893b0f6e56299e7cc4e49963656 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RealFFT.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RealFFT.h
@@ -41,23 +41,23 @@ public:
/// Default constructor
RealFFT() : API::Algorithm(){};
/// Destructor
- virtual ~RealFFT(){};
+ ~RealFFT() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "RealFFT"; }
+ const std::string name() const override { return "RealFFT"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs real Fast Fourier Transform";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Arithmetic\\FFT"; }
+ const std::string category() const override { return "Arithmetic\\FFT"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Rebin.h b/Framework/Algorithms/inc/MantidAlgorithms/Rebin.h
index f44b43d63d1a91055eeea056c865f022b0187d20..26a05207b9e1e5b8fcf3e10d16ebf185e459ac48 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Rebin.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Rebin.h
@@ -57,22 +57,22 @@ public:
/// Default constructor
Rebin() : API::Algorithm(){};
/// Destructor
- virtual ~Rebin(){};
+ ~Rebin() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Rebin"; }
+ const std::string name() const override { return "Rebin"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Rebins data with new X bin boundaries. For EventWorkspaces, you "
"can very quickly rebin in-place by keeping the same output name "
"and PreserveEvents=true.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Rebin"; }
+ const std::string category() const override { return "Transforms\\Rebin"; }
/// Algorithm's aliases
- virtual const std::string alias() const { return "rebin"; }
+ const std::string alias() const override { return "rebin"; }
static std::vector<double>
rebinParamsFromInput(const std::vector<double> &inParams,
@@ -80,15 +80,17 @@ public:
Kernel::Logger &logger);
protected:
- const std::string workspaceMethodName() const { return "rebin"; }
- const std::string workspaceMethodOnTypes() const { return "MatrixWorkspace"; }
- const std::string workspaceMethodInputProperty() const {
+ const std::string workspaceMethodName() const override { return "rebin"; }
+ const std::string workspaceMethodOnTypes() const override {
+ return "MatrixWorkspace";
+ }
+ const std::string workspaceMethodInputProperty() const override {
return "InputWorkspace";
}
// Overridden Algorithm methods
- void init();
- virtual void exec();
+ void init() override;
+ void exec() override;
void propagateMasks(API::MatrixWorkspace_const_sptr inputW,
API::MatrixWorkspace_sptr outputW, int hist);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Rebin2D.h b/Framework/Algorithms/inc/MantidAlgorithms/Rebin2D.h
index a852a349c234c1abdb214f57fce76387001bf745..6175df922664b516a1d8630acc74a09929f8ed42 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Rebin2D.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Rebin2D.h
@@ -48,16 +48,16 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport Rebin2D : public API::Algorithm {
public:
/// Algorithm's name for identification
- virtual const std::string name() const { return "Rebin2D"; }
+ const std::string name() const override { return "Rebin2D"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Rebins both axes of a 2D workspace using the given parameters";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Transforms\\Rebin"; }
+ const std::string category() const override { return "Transforms\\Rebin"; }
protected:
/// Progress reporter
@@ -65,9 +65,9 @@ protected:
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Setup the output workspace
API::MatrixWorkspace_sptr
createOutputWorkspace(API::MatrixWorkspace_const_sptr parent,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RebinByPulseTimes.h b/Framework/Algorithms/inc/MantidAlgorithms/RebinByPulseTimes.h
index 608c3889094c6ad607a661a25c4a201ce5d77420..fdd0e265d48cc51323eca3264561d671d500a533 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RebinByPulseTimes.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RebinByPulseTimes.h
@@ -34,17 +34,17 @@ namespace Algorithms {
class DLLExport RebinByPulseTimes : public RebinByTimeBase {
public:
RebinByPulseTimes();
- virtual ~RebinByPulseTimes();
+ ~RebinByPulseTimes() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Bins events according to pulse time. Binning parameters are "
"specified relative to the start of the run.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
/// Do the algorithm specific histogramming.
@@ -52,12 +52,12 @@ private:
Mantid::API::MatrixWorkspace_sptr outputWS,
Mantid::MantidVecPtr &XValues_new,
Mantid::MantidVec &OutXValues_scaled,
- Mantid::API::Progress &prog);
+ Mantid::API::Progress &prog) override;
/// Get the minimum x across all spectra in workspace
- virtual uint64_t getMaxX(Mantid::API::IEventWorkspace_sptr) const;
+ uint64_t getMaxX(Mantid::API::IEventWorkspace_sptr) const override;
/// Get the maximum x across all spectra in workspace
- virtual uint64_t getMinX(Mantid::API::IEventWorkspace_sptr) const;
+ uint64_t getMinX(Mantid::API::IEventWorkspace_sptr) const override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RebinByTimeAtSample.h b/Framework/Algorithms/inc/MantidAlgorithms/RebinByTimeAtSample.h
index 741c404f326df10b26383adb54ebaa07aa631001..836aec9ab6715d4f31238b6d3b08983400f7b96a 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RebinByTimeAtSample.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RebinByTimeAtSample.h
@@ -35,24 +35,24 @@ namespace Algorithms {
class DLLExport RebinByTimeAtSample : public RebinByTimeBase {
public:
RebinByTimeAtSample();
- virtual ~RebinByTimeAtSample();
+ ~RebinByTimeAtSample() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
void doHistogramming(Mantid::API::IEventWorkspace_sptr inWS,
Mantid::API::MatrixWorkspace_sptr outputWS,
Mantid::MantidVecPtr &XValues_new,
Mantid::MantidVec &OutXValues_scaled,
- Mantid::API::Progress &prog);
+ Mantid::API::Progress &prog) override;
/// Get the minimum x across all spectra in workspace
- virtual uint64_t getMaxX(Mantid::API::IEventWorkspace_sptr ws) const;
+ uint64_t getMaxX(Mantid::API::IEventWorkspace_sptr ws) const override;
/// Get the maximum x across all spectra in workspace
- virtual uint64_t getMinX(Mantid::API::IEventWorkspace_sptr ws) const;
+ uint64_t getMinX(Mantid::API::IEventWorkspace_sptr ws) const override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RebinByTimeBase.h b/Framework/Algorithms/inc/MantidAlgorithms/RebinByTimeBase.h
index 7560baec50117a76c80ec0f6dbfab43da0ce1cb2..12487f0d29c4cf688bfb010369384337995f3d08 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RebinByTimeBase.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RebinByTimeBase.h
@@ -40,13 +40,13 @@ public:
/// Constructor
RebinByTimeBase();
/// Virtual destructor
- virtual ~RebinByTimeBase() = 0;
+ ~RebinByTimeBase() override = 0;
private:
/// Initialization method
- void init();
+ void init() override;
/// execute.
- void exec();
+ void exec() override;
/// Do the algorithm specific histogramming.
virtual void doHistogramming(Mantid::API::IEventWorkspace_sptr inWS,
Mantid::API::MatrixWorkspace_sptr outputWS,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RebinToWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/RebinToWorkspace.h
index 1bd1d61f29e7376302978ba508a14f656c04ec22..b9ee5461e27d71f11780737e717ee906598cc211 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RebinToWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RebinToWorkspace.h
@@ -50,25 +50,25 @@ public:
/// Constructor
RebinToWorkspace() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~RebinToWorkspace() {}
+ ~RebinToWorkspace() override {}
/// Algorithm's name
- virtual const std::string name() const { return "RebinToWorkspace"; }
+ const std::string name() const override { return "RebinToWorkspace"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Rebin a selected workspace to the same binning as a different "
"workspace";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Transforms\\Rebin"; }
+ const std::string category() const override { return "Transforms\\Rebin"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Create the rebin paraeters
void createRebinParameters(Mantid::API::MatrixWorkspace_sptr toMatch,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Rebunch.h b/Framework/Algorithms/inc/MantidAlgorithms/Rebunch.h
index 059ccb67fc5243ce4fff6f51f54ab034c0b24065..3b41bd8537cc0d572ac0eacbc860ea022a513c7c 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Rebunch.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Rebunch.h
@@ -56,23 +56,23 @@ public:
/// Default constructor
Rebunch() : API::Algorithm(){};
/// Destructor
- virtual ~Rebunch(){};
+ ~Rebunch() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Rebunch"; }
+ const std::string name() const override { return "Rebunch"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Rebins data by adding together 'n_bunch' successive bins.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Rebin"; }
+ const std::string category() const override { return "Transforms\\Rebin"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void rebunch_hist(const std::vector<double> &xold,
const std::vector<double> &yold,
const std::vector<double> &eold, std::vector<double> &xnew,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RecordPythonScript.h b/Framework/Algorithms/inc/MantidAlgorithms/RecordPythonScript.h
index aacb41687518b6e172d1bd3648392724427b6a38..7634e0c47ca51d907325d205f9fa068b215f6413 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RecordPythonScript.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RecordPythonScript.h
@@ -44,31 +44,31 @@ class DLLExport RecordPythonScript : public Algorithms::GeneratePythonScript,
public API::AlgorithmObserver {
public:
RecordPythonScript();
- virtual ~RecordPythonScript() {}
+ ~RecordPythonScript() override {}
/// Algorithm's name for identification
- virtual const std::string name() const { return "RecordPythonScript"; };
+ const std::string name() const override { return "RecordPythonScript"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "An Algorithm to generate a Python script file to reproduce the "
"history of a workspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Python"; }
+ const std::string category() const override { return "Utility\\Python"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/** Handler of the start notifications. Must be overriden in inherited
classes.
@param alg :: Shared Pointer to the algorithm sending the notification.
*/
- void startingHandle(API::IAlgorithm_sptr alg);
+ void startingHandle(API::IAlgorithm_sptr alg) override;
/// buffer for the script
std::string m_generatedScript;
};
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOne.h b/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOne.h
index bf81711a25809fdbcba7d796386843968672ab02..cc9642c762256b2761cee3a97df820fcb24c232c 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOne.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOne.h
@@ -41,17 +41,17 @@ public:
/// Constructor
ReflectometryReductionOne();
/// Destructor
- virtual ~ReflectometryReductionOne();
+ ~ReflectometryReductionOne() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Reduces a single TOF/Lambda reflectometry run into a mod Q vs I/I0 "
"workspace. Performs transmission corrections.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
/// Convert to an IvsQ workspace. Performs detector positional corrections
/// based on the component name and the theta value.
@@ -63,9 +63,9 @@ public:
private:
/** Overridden Algorithm methods **/
- void init();
+ void init() override;
- void exec();
+ void exec() override;
/// Get the surface sample component
Mantid::Geometry::IComponent_const_sptr
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOneAuto.h b/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOneAuto.h
index fe3f3f358057373cb5ea318d3cb499f69deebeec..85cca2a1a352e8ed6f2c70afc559c39d5a3e0c72 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOneAuto.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOneAuto.h
@@ -36,20 +36,20 @@ class DLLExport ReflectometryReductionOneAuto
: public API::DataProcessorAlgorithm {
public:
ReflectometryReductionOneAuto();
- virtual ~ReflectometryReductionOneAuto();
+ ~ReflectometryReductionOneAuto() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
// For (multiperiod) workspace groups
- virtual bool checkGroups();
- virtual bool processGroups();
+ bool checkGroups() override;
+ bool processGroups() override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
template <typename T> boost::optional<T> isSet(std::string propName) const;
double checkForDefault(std::string propName,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryWorkflowBase.h b/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryWorkflowBase.h
index 00e33430a9348cd8f466b69976089a8ac8f8f650..1f5613df1946c2b21dee15eeb50eca06b385d038 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryWorkflowBase.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryWorkflowBase.h
@@ -50,7 +50,7 @@ public:
DetectorMonitorWorkspacePair;
ReflectometryWorkflowBase();
- virtual ~ReflectometryWorkflowBase();
+ ~ReflectometryWorkflowBase() override;
/// Convert the input workspace to wavelength, splitting according to the
/// properties provided.
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Regroup.h b/Framework/Algorithms/inc/MantidAlgorithms/Regroup.h
index 69b8970c7782b575b29e1a3b9f6f9dc238cd51dd..2e7eeef23cf448e9077a1874a21777d4448c7805 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Regroup.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Regroup.h
@@ -49,18 +49,18 @@ public:
/// Default constructor
Regroup() : API::Algorithm(){};
/// Destructor
- virtual ~Regroup(){};
+ ~Regroup() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Regroup"; }
+ const std::string name() const override { return "Regroup"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Regroups data with new bin boundaries.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Rebin"; }
+ const std::string category() const override { return "Transforms\\Rebin"; }
int newAxis(const std::vector<double> ¶ms,
const std::vector<double> &xold, std::vector<double> &xnew,
@@ -68,8 +68,8 @@ public:
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void rebin(const std::vector<double> &, const std::vector<double> &,
const std::vector<double> &, const std::vector<int> &,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RemoveBackground.h b/Framework/Algorithms/inc/MantidAlgorithms/RemoveBackground.h
index aafd5eb23dadfc39317a18133e6e9203821e2fc1..d81da16c821522419f49e02d3c1f9b93544d0a59 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RemoveBackground.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RemoveBackground.h
@@ -97,26 +97,26 @@ public:
/// Default constructor
RemoveBackground() : API::Algorithm(), m_BackgroundHelper(){};
/// Destructor
- virtual ~RemoveBackground(){};
+ ~RemoveBackground() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "RemoveBackground"; }
+ const std::string name() const override { return "RemoveBackground"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Removes background (constant for now) calculated in TOF units "
"from a matrix workspace, expressed in units, different from TOF";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\BackgroundCorrections";
}
protected:
// Overridden Algorithm methods
- void init();
- virtual void exec();
+ void init() override;
+ void exec() override;
private:
// class responsible for background removal
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RemoveBins.h b/Framework/Algorithms/inc/MantidAlgorithms/RemoveBins.h
index c8dc0bd26581f9bd639d8cafdaaa1a405e77bcda..61e57d52dbdcd402b0834878f230f413efd78558 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RemoveBins.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RemoveBins.h
@@ -57,23 +57,25 @@ public:
/// Default constructor
RemoveBins();
/// Destructor
- virtual ~RemoveBins(){};
+ ~RemoveBins() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "RemoveBins"; }
+ const std::string name() const override { return "RemoveBins"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Used to remove data from a range of bins in a workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Splitting"; }
+ const std::string category() const override {
+ return "Transforms\\Splitting";
+ }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void checkProperties();
void crop(const double &start, const double &end);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RemoveExpDecay.h b/Framework/Algorithms/inc/MantidAlgorithms/RemoveExpDecay.h
index 440d0f526d70dbff530e2a04eb5cd54341ddd71b..4e9ceba18702b1b8d9bc651c900ef8acfb383be7 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RemoveExpDecay.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RemoveExpDecay.h
@@ -51,24 +51,24 @@ public:
/// Default constructor
MuonRemoveExpDecay() : API::Algorithm(){};
/// Destructor
- virtual ~MuonRemoveExpDecay(){};
+ ~MuonRemoveExpDecay() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "RemoveExpDecay"; }
+ const std::string name() const override { return "RemoveExpDecay"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm removes the exponential decay from a muon "
"workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void removeDecayError(const MantidVec &inX, const MantidVec &inY,
MantidVec &outY);
void removeDecayData(const MantidVec &inX, const MantidVec &inY,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RemoveLowResTOF.h b/Framework/Algorithms/inc/MantidAlgorithms/RemoveLowResTOF.h
index d40d8885e2251a11f50c5cbbc3d46d51e383b5e0..9670cbec32e1936c87c370f4d99cfd4c093a01fc 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RemoveLowResTOF.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RemoveLowResTOF.h
@@ -10,18 +10,18 @@ namespace Algorithms {
class DLLExport RemoveLowResTOF : public API::Algorithm {
public:
RemoveLowResTOF();
- virtual ~RemoveLowResTOF();
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
+ ~RemoveLowResTOF() override;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Removes low resolution Time of Flight data.";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void execEvent();
API::MatrixWorkspace_const_sptr m_inputWS; ///< Pointer to the input workspace
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RemoveMaskedSpectra.h b/Framework/Algorithms/inc/MantidAlgorithms/RemoveMaskedSpectra.h
index 278be3d8abe422031e99de941ae10948d154b849..7a0ae0b6afbd06976194517fb49b6bb59a2e1079 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RemoveMaskedSpectra.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RemoveMaskedSpectra.h
@@ -33,16 +33,16 @@ namespace Algorithms {
class DLLExport RemoveMaskedSpectra : public API::Algorithm {
public:
RemoveMaskedSpectra();
- virtual ~RemoveMaskedSpectra();
+ ~RemoveMaskedSpectra() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void makeIndexList(std::vector<size_t> &indices,
const API::MatrixWorkspace *maskedWorkspace);
};
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RemovePromptPulse.h b/Framework/Algorithms/inc/MantidAlgorithms/RemovePromptPulse.h
index 2b9461d02559b98f0bac2bb5d63c5922124a7971..106100495de32f7395506be6842081c5fb2ce07a 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RemovePromptPulse.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RemovePromptPulse.h
@@ -37,19 +37,19 @@ namespace Algorithms {
class DLLExport RemovePromptPulse : public API::Algorithm {
public:
RemovePromptPulse();
- ~RemovePromptPulse();
+ ~RemovePromptPulse() override;
/// Algorithm's name for identification
- virtual const std::string name() const;
+ const std::string name() const override;
/// Algorithm's version for identification
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification
- virtual const std::string category() const;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Remove the prompt pulse for a time of flight measurement.";
}
@@ -57,9 +57,9 @@ private:
/// Sets documentation strings for this algorithm
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Try to get the frequency from a given name.
double getFrequency(const API::Run &run);
std::vector<double> calculatePulseTimes(const double tmin, const double tmax,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RemoveWorkspaceHistory.h b/Framework/Algorithms/inc/MantidAlgorithms/RemoveWorkspaceHistory.h
index 994a692a615b54b71532b03c53077cc5ed23e69c..5b87f92fce3ba36e5771d14a9d0ab7c1cfbfc517 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RemoveWorkspaceHistory.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RemoveWorkspaceHistory.h
@@ -36,16 +36,16 @@ namespace Algorithms {
class DLLExport RemoveWorkspaceHistory : public API::Algorithm {
public:
RemoveWorkspaceHistory();
- virtual ~RemoveWorkspaceHistory();
+ ~RemoveWorkspaceHistory() override;
- virtual const std::string name() const;
- virtual const std::string summary() const;
- virtual int version() const;
- virtual const std::string category() const;
+ const std::string name() const override;
+ const std::string summary() const override;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RenameWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/RenameWorkspace.h
index fd4d64b3edda4050e36b0a0ab4727e472a20ef6e..b273abdd91dfa703f33c08c67dfbf9dbaa138745 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RenameWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RenameWorkspace.h
@@ -46,28 +46,28 @@ public:
/// Default constructor
RenameWorkspace() : API::Algorithm(){};
/// Destructor
- virtual ~RenameWorkspace(){};
+ ~RenameWorkspace() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "RenameWorkspace"; }
+ const std::string name() const override { return "RenameWorkspace"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const { return "Rename the Workspace."; }
+ const std::string summary() const override { return "Rename the Workspace."; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Utility\\Workspaces"; }
+ const std::string category() const override { return "Utility\\Workspaces"; }
private:
- const std::string workspaceMethodName() const { return "rename"; }
- const std::string workspaceMethodInputProperty() const {
+ const std::string workspaceMethodName() const override { return "rename"; }
+ const std::string workspaceMethodInputProperty() const override {
return "InputWorkspace";
}
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
- bool processGroups();
+ bool processGroups() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RenameWorkspaces.h b/Framework/Algorithms/inc/MantidAlgorithms/RenameWorkspaces.h
index 8682e129f54ca439700fd302eaec910a3e82e0c8..a4a1d952ffa08854e253252fa15888b788859115 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RenameWorkspaces.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RenameWorkspaces.h
@@ -49,25 +49,25 @@ public:
/// Default constructor
RenameWorkspaces() : API::Algorithm(){};
/// Destructor
- virtual ~RenameWorkspaces(){};
+ ~RenameWorkspaces() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "RenameWorkspaces"; }
+ const std::string name() const override { return "RenameWorkspaces"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Rename the Workspace. Please provide either a comma-separated list "
"of new workspace names in WorkspaceNames or Prefix and/or Suffix "
"to add to existing names";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Utility\\Workspaces"; }
+ const std::string category() const override { return "Utility\\Workspaces"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ReplaceSpecialValues.h b/Framework/Algorithms/inc/MantidAlgorithms/ReplaceSpecialValues.h
index 230b841e913cda17d60449f0c30293553798c405..e055491cf3beb2e99917de1ea4569aa691ac6984 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ReplaceSpecialValues.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ReplaceSpecialValues.h
@@ -56,11 +56,11 @@ public:
/// Default constructor
ReplaceSpecialValues();
/// Destructor
- virtual ~ReplaceSpecialValues() {}
+ ~ReplaceSpecialValues() override {}
/// Algorithm's name for identification
- virtual const std::string name() const { return "ReplaceSpecialValues"; }
+ const std::string name() const override { return "ReplaceSpecialValues"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Replaces instances of NaN and infinity in the workspace with user "
"defined numbers. If a replacement value is not provided the check "
"will not occur. This algorithm can also be used to replace numbers "
@@ -68,18 +68,19 @@ public:
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\SpecialCorrections";
}
private:
// Overridden UnaryOperation methods
- void defineProperties();
- void retrieveProperties();
+ void defineProperties() override;
+ void retrieveProperties() override;
void performUnaryOperation(const double XIn, const double YIn,
- const double EIn, double &YOut, double &EOut);
+ const double EIn, double &YOut,
+ double &EOut) override;
/// returns true if the value is NaN
bool checkIfNan(const double &value) const;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ResampleX.h b/Framework/Algorithms/inc/MantidAlgorithms/ResampleX.h
index a31ffee9b69b6843c17d296d6cd0b7e9aa1b1f36..e4b7c777c5fa235f9e9617bbcd6dd1d63a23a7b4 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ResampleX.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ResampleX.h
@@ -35,15 +35,15 @@ namespace Algorithms {
class DLLExport ResampleX : public Algorithms::Rebin {
public:
ResampleX();
- virtual ~ResampleX();
+ ~ResampleX() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string alias() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string alias() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Resample the x-axis of the data with the requested number of "
"points.";
}
@@ -55,14 +55,14 @@ public:
void setOptions(const int numBins, const bool useLogBins, const bool isDist);
private:
- const std::string workspaceMethodName() const {
+ const std::string workspaceMethodName() const override {
return "";
} // Override the one from Rebin to ignore us
- void init();
- void exec();
+ void init() override;
+ void exec() override;
- std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
bool m_useLogBinning;
bool m_preserveEvents;
int m_numBins;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ResetNegatives.h b/Framework/Algorithms/inc/MantidAlgorithms/ResetNegatives.h
index b79a35c1e8df45e37dfc1fca12b1a2c4e30decdc..f03aece73857d70c71947016b034fd5f5a10584c 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ResetNegatives.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ResetNegatives.h
@@ -35,20 +35,20 @@ namespace Algorithms {
class DLLExport ResetNegatives : public API::Algorithm {
public:
ResetNegatives();
- virtual ~ResetNegatives();
+ ~ResetNegatives() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Reset negative values to something else.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void pushMinimum(API::MatrixWorkspace_const_sptr minWS,
API::MatrixWorkspace_sptr wksp, API::Progress &prog);
void changeNegatives(API::MatrixWorkspace_const_sptr minWS,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ResizeRectangularDetector.h b/Framework/Algorithms/inc/MantidAlgorithms/ResizeRectangularDetector.h
index 6c7f2af873a8c66b49ed4baec9ee44c5f4b1c73e..ec130ec2a8973432564782ccb93ab37a313b93ef 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ResizeRectangularDetector.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ResizeRectangularDetector.h
@@ -35,20 +35,20 @@ namespace Algorithms {
class DLLExport ResizeRectangularDetector : public API::Algorithm {
public:
ResizeRectangularDetector();
- virtual ~ResizeRectangularDetector();
+ ~ResizeRectangularDetector() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Resize a RectangularDetector in X and/or Y.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/RingProfile.h b/Framework/Algorithms/inc/MantidAlgorithms/RingProfile.h
index 20d4260fbfc2c8ad861eeebf363242157703a248..bf4f3c4e2577c1e3b1aa80f4f3e1ee3d70966f68 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/RingProfile.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/RingProfile.h
@@ -39,23 +39,25 @@ namespace Algorithms {
class DLLExport RingProfile : public API::Algorithm {
public:
RingProfile();
- virtual ~RingProfile();
+ ~RingProfile() override;
- virtual const std::string name() const { return "RingProfile"; };
+ const std::string name() const override { return "RingProfile"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates the sum of the counts against a circular ring.";
}
- virtual int version() const { return 1; };
- virtual const std::string category() const { return "Transforms\\Grouping"; };
+ int version() const override { return 1; };
+ const std::string category() const override {
+ return "Transforms\\Grouping";
+ };
protected:
boost::shared_ptr<API::Progress> m_progress;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// get the bin position for the given angle
int fromAngleToBin(double angle, bool degree = true);
/// validate the inputs of the algorithm for instrument based workspace
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SANSDirectBeamScaling.h b/Framework/Algorithms/inc/MantidAlgorithms/SANSDirectBeamScaling.h
index 1ec55c905a392aaa917cf09bce729770a00f23bf..be1d8941d80be244524d6ab836a3f99c9fd5247e 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SANSDirectBeamScaling.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SANSDirectBeamScaling.h
@@ -42,25 +42,25 @@ public:
/// (Empty) Constructor
SANSDirectBeamScaling() : API::Algorithm() { deprecatedDate("2014-06-12"); }
/// Virtual destructor
- virtual ~SANSDirectBeamScaling() {}
+ ~SANSDirectBeamScaling() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SANSDirectBeamScaling"; }
+ const std::string name() const override { return "SANSDirectBeamScaling"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Computes the scaling factor to get reduced SANS data on an "
"absolute scale.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "SANS"; }
+ const std::string category() const override { return "SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SampleCorrections/MayersSampleCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/SampleCorrections/MayersSampleCorrection.h
index 341ddb6e32a892d376a65d4fc72e26bb078ab01a..9d336dc788650a1714a71adfae24b5d4f18b746a 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SampleCorrections/MayersSampleCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SampleCorrections/MayersSampleCorrection.h
@@ -35,14 +35,14 @@ class DLLExport MayersSampleCorrection : public API::Algorithm {
public:
MayersSampleCorrection();
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
Kernel::IValidator_sptr createInputWSValidator() const;
};
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SassenaFFT.h b/Framework/Algorithms/inc/MantidAlgorithms/SassenaFFT.h
index 60be738dec768010ddff16b598a3df7547e47021..5ff709c5712aed02aeac9907aa4af9320cfe6157 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SassenaFFT.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SassenaFFT.h
@@ -43,29 +43,29 @@ public:
m_T2ueV(1000.0 / Mantid::PhysicalConstants::meVtoKelvin),
m_ps2meV(4.136) {}
/// Destructor
- virtual ~SassenaFFT() {}
+ ~SassenaFFT() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SassenaFFT"; }
+ const std::string name() const override { return "SassenaFFT"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs complex Fast Fourier Transform of intermediate scattering "
"function";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Arithmetic\\FFT"; }
+ const std::string category() const override { return "Arithmetic\\FFT"; }
protected:
// Overridden Algorithm methods
- bool processGroups();
+ bool processGroups() override;
private:
// Overridden Algorithm methods
- void init();
- void exec();
- bool checkGroups();
+ void init() override;
+ void exec() override;
+ bool checkGroups() override;
const double m_T2ueV; // conversion factor from Kelvin to ueV
const double m_ps2meV; // conversion factor from picosecond to mili-eV
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Scale.h b/Framework/Algorithms/inc/MantidAlgorithms/Scale.h
index 58b6883b6c32452848839947127f4a7b22e6cdd3..857469b42b4907b375c8abe8cb19b0a468df86f7 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Scale.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Scale.h
@@ -51,27 +51,27 @@ public:
/// (Empty) Constructor
Scale() : API::Algorithm() {}
/// Virtual destructor
- virtual ~Scale() {}
+ ~Scale() override {}
/// Algorithm's name
- virtual const std::string name() const { return "Scale"; }
+ const std::string name() const override { return "Scale"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Scales an input workspace by the given factor, which can be either "
"multiplicative or additive.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Arithmetic;CorrectionFunctions";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ScaleX.h b/Framework/Algorithms/inc/MantidAlgorithms/ScaleX.h
index 62e8ba567a7589c4f161424ec625b0358a05b515..f1ea4fa1da59fd253e59bb028009aac2c0e413e9 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ScaleX.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ScaleX.h
@@ -51,26 +51,26 @@ public:
/// Default constructor
ScaleX();
/// Destructor
- virtual ~ScaleX();
+ ~ScaleX() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "ScaleX"; }
+ const std::string name() const override { return "ScaleX"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Scales the X-axis of an input workspace by the given factor, which "
"can be either multiplicative or additive.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Arithmetic;CorrectionFunctions";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Execute algorithm for EventWorkspaces
void execEvent();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Segfault.h b/Framework/Algorithms/inc/MantidAlgorithms/Segfault.h
index be814651d865f9746ecc751d5bd89be867102d79..360eaf2b9b0e6cc67620a9968612ea97dd6c0171 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Segfault.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Segfault.h
@@ -33,16 +33,16 @@ namespace Algorithms {
class DLLExport Segfault : public API::Algorithm {
public:
Segfault();
- virtual ~Segfault();
+ ~Segfault() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SetInstrumentParameter.h b/Framework/Algorithms/inc/MantidAlgorithms/SetInstrumentParameter.h
index fba7f4f0baa54c282cbba647515080561ca0f3bb..25c3f79fbf19c5055346f642e0b79d3cf8ce4b79 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SetInstrumentParameter.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SetInstrumentParameter.h
@@ -40,20 +40,20 @@ namespace Algorithms {
class DLLExport SetInstrumentParameter : public API::Algorithm {
public:
SetInstrumentParameter();
- virtual ~SetInstrumentParameter();
+ ~SetInstrumentParameter() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Add or replace an parameter attached to an instrument component.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void addParameter(Mantid::Geometry::ParameterMap &pmap,
const Mantid::Geometry::IComponent *cmptId,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SetUncertainties.h b/Framework/Algorithms/inc/MantidAlgorithms/SetUncertainties.h
index 55bdbe8339028732a6fb3f9190a01baffed65a73..45d25546c3d1209bcb430c6419b89f002dd9d76c 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SetUncertainties.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SetUncertainties.h
@@ -45,28 +45,28 @@ public:
SetUncertainties();
/// Virtual destructor
- virtual ~SetUncertainties();
+ ~SetUncertainties() override;
/// Algorithm's name
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm creates a workspace which is the duplicate of the "
"input, but where the error value for every bin has been set to "
"zero.";
}
/// Algorithm's version
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Arithmetic\\Errors"; }
+ const std::string category() const override { return "Arithmetic\\Errors"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ShiftLogTime.h b/Framework/Algorithms/inc/MantidAlgorithms/ShiftLogTime.h
index ec78f3c531c70980fe7712cf821d8148ec447e93..4e81860522e0f041d2f6764d72696787331034d9 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ShiftLogTime.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ShiftLogTime.h
@@ -35,14 +35,14 @@ namespace Algorithms {
class DLLExport ShiftLogTime : public API::Algorithm {
public:
ShiftLogTime();
- ~ShiftLogTime();
+ ~ShiftLogTime() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Shifts the indexes of the specified log. This will make the log "
"shorter by the specified shift.";
}
@@ -51,9 +51,9 @@ private:
/// Sets documentation strings for this algorithm
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SignalOverError.h b/Framework/Algorithms/inc/MantidAlgorithms/SignalOverError.h
index c086698df9eab966cf5cdfc79a831abb700051d0..0e798a8c46dd52fa412e18e4019845ddb6528eee 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SignalOverError.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SignalOverError.h
@@ -36,21 +36,22 @@ namespace Algorithms {
class DLLExport SignalOverError : public UnaryOperation {
public:
SignalOverError();
- virtual ~SignalOverError();
+ ~SignalOverError() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Replace Y by Y/E for a MatrixWorkspace";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
// Overridden UnaryOperation methods
void performUnaryOperation(const double XIn, const double YIn,
- const double EIn, double &YOut, double &EOut);
+ const double EIn, double &YOut,
+ double &EOut) override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SmoothData.h b/Framework/Algorithms/inc/MantidAlgorithms/SmoothData.h
index 2156c73ef10af81d62664545cf1fa1b1a8c380db..e2ff55dddb9a47c9c57cb6322ab6dae1e6ba066e 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SmoothData.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SmoothData.h
@@ -56,24 +56,26 @@ public:
/// (Empty) Constructor
SmoothData() : API::Algorithm() {}
/// Virtual destructor
- virtual ~SmoothData() {}
+ ~SmoothData() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SmoothData"; }
+ const std::string name() const override { return "SmoothData"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Smooths out statistical fluctuations in a workspace's data.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Transforms\\Smoothing"; }
+ const std::string category() const override {
+ return "Transforms\\Smoothing";
+ }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
int validateSpectrumInGroup(size_t wi);
// This map does not need to be ordered, just a lookup for udet
/// typedef for the storage of the UDET-group mapping
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SmoothNeighbours.h b/Framework/Algorithms/inc/MantidAlgorithms/SmoothNeighbours.h
index 9aa20c7069d319cf00d2a924ebecdb2b4a500e9b..4ffadfa4952b57cbc1b17db78ad64391614745f8 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SmoothNeighbours.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SmoothNeighbours.h
@@ -83,24 +83,26 @@ public:
/// Default constructor
SmoothNeighbours();
/// Destructor
- virtual ~SmoothNeighbours(){};
+ ~SmoothNeighbours() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SmoothNeighbours"; }
+ const std::string name() const override { return "SmoothNeighbours"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Perform a moving-average smoothing by summing spectra of nearest "
"neighbours over the face of detectors.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Smoothing"; }
+ const std::string category() const override {
+ return "Transforms\\Smoothing";
+ }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void execWorkspace2D();
void execEvent(Mantid::DataObjects::EventWorkspace_sptr ws);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SofQW.h b/Framework/Algorithms/inc/MantidAlgorithms/SofQW.h
index fedd8db995e038b4f5d1e5f754847344c62fab7d..d348364d5e8827b588c56d10245f15a87911a272 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SofQW.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SofQW.h
@@ -51,14 +51,14 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport SofQW : public API::DataProcessorAlgorithm {
public:
/// Algorithm's name
- virtual const std::string name() const { return "SofQW"; }
+ const std::string name() const override { return "SofQW"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const;
+ const std::string summary() const override;
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Inelastic\\SofQW"; }
+ const std::string category() const override { return "Inelastic\\SofQW"; }
/// Create the output workspace
static API::MatrixWorkspace_sptr
setUpOutputWorkspace(API::MatrixWorkspace_const_sptr inputWorkspace,
@@ -71,9 +71,9 @@ public:
private:
/// Initialization code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
SofQCommon m_EmodeProperties;
};
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SofQWCentre.h b/Framework/Algorithms/inc/MantidAlgorithms/SofQWCentre.h
index 2c58ba1eea516ba62260e78d0d83452cac27fef6..d71eec8e0e667cd1ce33bc5b847641f1106c2786 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SofQWCentre.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SofQWCentre.h
@@ -53,11 +53,11 @@ public:
/// (Empty) Constructor
SofQWCentre() : API::Algorithm() {}
/// Virtual destructor
- virtual ~SofQWCentre() {}
+ ~SofQWCentre() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SofQWCentre"; }
+ const std::string name() const override { return "SofQWCentre"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Converts a 2D workspace that has axes in *units* of **DeltaE** "
"(energy transfer) against spectrum number to one "
"that gives intensity as a function of **DeltaE** against "
@@ -65,9 +65,9 @@ public:
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Inelastic\\SofQW"; }
+ const std::string category() const override { return "Inelastic\\SofQW"; }
/// Create the output workspace
static API::MatrixWorkspace_sptr
setUpOutputWorkspace(API::MatrixWorkspace_const_sptr inputWorkspace,
@@ -83,9 +83,9 @@ public:
private:
/// Initialization code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
SofQCommon m_EmodeProperties;
};
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SofQWNormalisedPolygon.h b/Framework/Algorithms/inc/MantidAlgorithms/SofQWNormalisedPolygon.h
index a058a40a2610e544c686675bb4be1f53c0ce79d0..d9ed6965778b776a571b5e3176d5914328164df5 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SofQWNormalisedPolygon.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SofQWNormalisedPolygon.h
@@ -61,24 +61,24 @@ public:
/// Default constructor
SofQWNormalisedPolygon();
/// Algorithm's name for identification
- virtual const std::string name() const;
- virtual const std::string alias() const { return "SofQW3"; }
+ const std::string name() const override;
+ const std::string alias() const override { return "SofQW3"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate the intensity as a function of momentum transfer and "
"energy.";
}
/// Algorithm's version for identification
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification
- virtual const std::string category() const;
+ const std::string category() const override;
private:
/// Initialize the algorithm
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Calculate the Q value for given conditions.
double calculateQ(const double efixed, const int emode, const double deltaE,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SofQWPolygon.h b/Framework/Algorithms/inc/MantidAlgorithms/SofQWPolygon.h
index 7a2e5a6096cec12f6d9a2f783cb75b581c37816f..08f27723b981bcba99f8b3a26a87f79d93a0e283 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SofQWPolygon.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SofQWPolygon.h
@@ -61,24 +61,24 @@ public:
/// Default constructor
SofQWPolygon();
/// Algorithm's name for identification
- virtual const std::string name() const { return "SofQWPolygon"; }
- virtual const std::string alias() const { return "SofQW2"; }
+ const std::string name() const override { return "SofQWPolygon"; }
+ const std::string alias() const override { return "SofQW2"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate the intensity as a function of momentum transfer and "
"energy.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Inelastic\\SofQW"; }
+ const std::string category() const override { return "Inelastic\\SofQW"; }
private:
/// Initialize the algorithm
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Calculate the Q value for a direct instrument
double calculateDirectQ(const double efixed, const double deltaE,
const double twoTheta, const double psi) const;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SolidAngle.h b/Framework/Algorithms/inc/MantidAlgorithms/SolidAngle.h
index 8237d8e3aab7773f7380e271f2b8e6c88b298fac..82e3e0b45241233185e2eb8f9cfda9925422c434 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SolidAngle.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SolidAngle.h
@@ -48,11 +48,11 @@ public:
/// Default constructor
SolidAngle();
/// Virtual destructor
- virtual ~SolidAngle();
+ ~SolidAngle() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SolidAngle"; }
+ const std::string name() const override { return "SolidAngle"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The SolidAngle algorithm calculates the solid angle in steradians "
"for each of the detectors in an instrument and outputs the data in "
"a workspace. This can then be used to normalize a data workspace "
@@ -60,16 +60,16 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\InstrumentCorrections";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SortEvents.h b/Framework/Algorithms/inc/MantidAlgorithms/SortEvents.h
index 0e73a668ea47d74a08523bd9214c4f20eefc6335..6f122a251129a40d2032e262dfe70014fc3e0f88 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SortEvents.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SortEvents.h
@@ -47,25 +47,25 @@ public:
/// Default constructor
SortEvents() : API::Algorithm(){};
/// Destructor
- virtual ~SortEvents(){};
+ ~SortEvents() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SortEvents"; }
+ const std::string name() const override { return "SortEvents"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Sort the events in an EventWorkspace, for faster rebinning.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Events;Utility\\Sorting";
}
protected:
// Overridden Algorithm methods
- void init();
- virtual void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SpatialGrouping.h b/Framework/Algorithms/inc/MantidAlgorithms/SpatialGrouping.h
index db8d17ed21733edf1d5926fd065593e9a4656abd..8c144d6a28f46d1e2870dc1b4244c8c81488f40b 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SpatialGrouping.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SpatialGrouping.h
@@ -53,11 +53,11 @@ public:
/// (Empty) Constructor
SpatialGrouping() : API::Algorithm() {}
/// Virtual destructor
- virtual ~SpatialGrouping() {}
+ ~SpatialGrouping() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SpatialGrouping"; }
+ const std::string name() const override { return "SpatialGrouping"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm creates an XML grouping file, which can be used in "
"GroupDetectors or ReadGroupsFromFile, which groups the detectors "
"of an instrument based on the distance between the detectors. It "
@@ -66,15 +66,15 @@ public:
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Transforms\\Grouping"; }
+ const std::string category() const override { return "Transforms\\Grouping"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// expand our search out to the next neighbours along
bool expandNet(std::map<specid_t, Mantid::Kernel::V3D> &nearest,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SpecularReflectionAlgorithm.h b/Framework/Algorithms/inc/MantidAlgorithms/SpecularReflectionAlgorithm.h
index 51e02e07ae35da565b820b7a176bac593732c9bf..fadfb00cdfc89ac3a4d604ed180b96cfa6ee29a5 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SpecularReflectionAlgorithm.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SpecularReflectionAlgorithm.h
@@ -57,7 +57,7 @@ protected:
public:
/// Destructor
- virtual ~SpecularReflectionAlgorithm() = 0;
+ ~SpecularReflectionAlgorithm() override = 0;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SpecularReflectionCalculateTheta.h b/Framework/Algorithms/inc/MantidAlgorithms/SpecularReflectionCalculateTheta.h
index 196f430827cead0943985f8fe80aa1bc8737403e..d5b3c47ae121dffb5e1fa172d6f91b6a5fd37413 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SpecularReflectionCalculateTheta.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SpecularReflectionCalculateTheta.h
@@ -36,21 +36,21 @@ class DLLExport SpecularReflectionCalculateTheta
: public SpecularReflectionAlgorithm {
public:
SpecularReflectionCalculateTheta();
- virtual ~SpecularReflectionCalculateTheta();
+ ~SpecularReflectionCalculateTheta() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate the specular reflection two theta scattering angle "
"(degrees) from the detector and sample locations .";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SpecularReflectionPositionCorrect.h b/Framework/Algorithms/inc/MantidAlgorithms/SpecularReflectionPositionCorrect.h
index 1320760ce62116ff71ea112353812bab0e6d4ac5..2dfbbb990aa2a5b646784f5a49a2b29491020f23 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SpecularReflectionPositionCorrect.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SpecularReflectionPositionCorrect.h
@@ -36,21 +36,21 @@ class DLLExport SpecularReflectionPositionCorrect
: public SpecularReflectionAlgorithm {
public:
SpecularReflectionPositionCorrect();
- virtual ~SpecularReflectionPositionCorrect();
+ ~SpecularReflectionPositionCorrect() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Correct detector positions vertically based on the specular "
"reflection condition.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Correct detector positions.
void correctPosition(API::MatrixWorkspace_sptr toCorrect,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SphericalAbsorption.h b/Framework/Algorithms/inc/MantidAlgorithms/SphericalAbsorption.h
index 4d0b13b9e4293f60ae7624320540cbb604af4d51..8b0e1a5a177edb82129e9514bae7fdd99244ccd6 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SphericalAbsorption.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SphericalAbsorption.h
@@ -68,21 +68,21 @@ public:
/// (Empty) Constructor
SphericalAbsorption();
/// Virtual destructor
- virtual ~SphericalAbsorption() {}
+ ~SphericalAbsorption() override {}
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\AbsorptionCorrections";
}
/// Algorithm's name
- virtual const std::string name() const { return "SphericalAbsorption"; }
+ const std::string name() const override { return "SphericalAbsorption"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates bin-by-bin or event correction factors for attenuation "
"due to absorption and scattering in a 'spherical' sample.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
protected:
API::MatrixWorkspace_sptr m_inputWS; ///< A pointer to the input workspace
@@ -96,9 +96,9 @@ protected:
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void retrieveBaseProperties();
void constructSample(API::Sample &sample);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h b/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h
index 8de73c49ccc076ae5eed4f90c6694198f60d66aa..a2c2a35653c10d357921a333298670258bdb88cd 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Stitch1D.h
@@ -36,15 +36,15 @@ public:
/// Default constructor
Stitch1D(){};
/// Destructor
- virtual ~Stitch1D(){};
+ ~Stitch1D() override{};
/// Algorithm's name for identification. @see Algorithm::name
- virtual const std::string name() const { return "Stitch1D"; }
+ const std::string name() const override { return "Stitch1D"; }
/// Algorithm's version for identification. @see Algorithm::version
- virtual int version() const { return 3; }
+ int version() const override { return 3; }
/// Algorithm's category for identification. @see Algorithm::category
- virtual const std::string category() const { return "Reflectometry"; }
+ const std::string category() const override { return "Reflectometry"; }
/// Summary of algorithm's purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Stitches single histogram matrix workspaces together";
}
/// Does the x-axis have non-zero errors
@@ -55,9 +55,9 @@ private:
/// workspace.
typedef std::vector<std::vector<size_t>> SpecialTypeIndexes;
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method.
- void exec();
+ void exec() override;
/// Get the start overlap
double getStartOverlap(const double &intesectionMin,
const double &intesectionMax) const;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Stitch1DMany.h b/Framework/Algorithms/inc/MantidAlgorithms/Stitch1DMany.h
index 2e52b9897336bd7120528d9b61247c2afa0b2a15..17b35dd447e53af84106434a48802ba016ed928a 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Stitch1DMany.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Stitch1DMany.h
@@ -38,25 +38,25 @@ public:
: m_numWorkspaces(0), m_manualScaleFactor(1.0), m_scaleRHSWorkspace(true),
m_useManualScaleFactor(false){};
/// Destructor
- virtual ~Stitch1DMany(){};
+ ~Stitch1DMany() override{};
/// Algorithm's name for identification. @see Algorithm::name
- virtual const std::string name() const { return "Stitch1DMany"; }
+ const std::string name() const override { return "Stitch1DMany"; }
/// Algorithm's version for identification. @see Algorithm::version
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification. @see Algorithm::category
- virtual const std::string category() const { return "Reflectometry"; }
+ const std::string category() const override { return "Reflectometry"; }
/// Summary of algorithm's purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Stitches histogram matrix workspaces together";
}
/// Validates algorithm inputs
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method.
- void exec();
+ void exec() override;
// Data
std::vector<Mantid::API::Workspace_sptr> m_inputWorkspaces;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/StripPeaks.h b/Framework/Algorithms/inc/MantidAlgorithms/StripPeaks.h
index c66778824b46b898a0cc0433d1bcc9adc3f1beb8..b85b85ea174786b0accc156802e858425c2545e2 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/StripPeaks.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/StripPeaks.h
@@ -58,28 +58,28 @@ public:
/// (Empty) Constructor
StripPeaks();
/// Virtual destructor
- virtual ~StripPeaks() {}
+ ~StripPeaks() override {}
/// Algorithm's name
- virtual const std::string name() const { return "StripPeaks"; }
+ const std::string name() const override { return "StripPeaks"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm attempts to find all the peaks in all spectra of a "
"workspace and subtract them from the data, leaving just the "
"'background'.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\PeakCorrections;Optimization\\PeakFinding";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
API::ITableWorkspace_sptr findPeaks(API::MatrixWorkspace_sptr WS);
API::MatrixWorkspace_sptr removePeaks(API::MatrixWorkspace_const_sptr input,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/StripVanadiumPeaks.h b/Framework/Algorithms/inc/MantidAlgorithms/StripVanadiumPeaks.h
index 30726dcf11eb4858bf05ad25a7c5113141a97675..ccf9442a64cbcb319ea44112df6a5e20112bf6a2 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/StripVanadiumPeaks.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/StripVanadiumPeaks.h
@@ -61,29 +61,29 @@ public:
/// (Empty) Constructor
StripVanadiumPeaks();
/// Virtual destructor
- virtual ~StripVanadiumPeaks() {}
+ ~StripVanadiumPeaks() override {}
/// Algorithm's name
- virtual const std::string name() const { return "StripVanadiumPeaks"; }
+ const std::string name() const override { return "StripVanadiumPeaks"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm removes peaks (at vanadium d-spacing positions by "
"default) out of a background by linearly interpolating over the "
"expected peak positions.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\PeakCorrections;Optimization\\PeakFinding;"
"Diffraction\\Corrections";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/StripVanadiumPeaks2.h b/Framework/Algorithms/inc/MantidAlgorithms/StripVanadiumPeaks2.h
index 70d4b8d7e016bb53d304e1de99e1f4f75237b3a2..d8192dfd8f5650d7ef16db57ab51e6592e81b607 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/StripVanadiumPeaks2.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/StripVanadiumPeaks2.h
@@ -36,19 +36,19 @@ namespace Algorithms {
class DLLExport StripVanadiumPeaks2 : public API::Algorithm {
public:
StripVanadiumPeaks2();
- ~StripVanadiumPeaks2();
+ ~StripVanadiumPeaks2() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "StripVanadiumPeaks"; }
+ const std::string name() const override { return "StripVanadiumPeaks"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 2; }
+ int version() const override { return 2; }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\PeakCorrections;Optimization\\PeakFinding;"
"Diffraction\\Corrections";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm removes peaks (at vanadium d-spacing positions by "
"default)"
" out of a background by linearly/quadratically interpolating over "
@@ -56,8 +56,8 @@ public:
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SumEventsByLogValue.h b/Framework/Algorithms/inc/MantidAlgorithms/SumEventsByLogValue.h
index 4af2579b1338209b9ca29c5aaed686e49f733284..d81d63044adf7249ac1c8759a5918028ea573bf6 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SumEventsByLogValue.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SumEventsByLogValue.h
@@ -40,26 +40,26 @@ namespace Algorithms {
class DLLExport SumEventsByLogValue : public API::Algorithm {
public:
SumEventsByLogValue();
- virtual ~SumEventsByLogValue();
+ ~SumEventsByLogValue() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SumEventsByLogValue"; }
+ const std::string name() const override { return "SumEventsByLogValue"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Events"; }
+ const std::string category() const override { return "Events"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Produces a single spectrum workspace containing the "
"total summed events in the workspace as a function of a specified "
"log.";
}
- std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void createTableOutput(const Kernel::TimeSeriesProperty<int> *log);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SumNeighbours.h b/Framework/Algorithms/inc/MantidAlgorithms/SumNeighbours.h
index cfe7200bac3369e708deef13ea7283d26d89b9b0..75501cc94b9773eddaf9e1f4f686d4f2bbec5885 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SumNeighbours.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SumNeighbours.h
@@ -45,11 +45,11 @@ public:
/// Default constructor
SumNeighbours() : API::Algorithm(){};
/// Destructor
- virtual ~SumNeighbours(){};
+ ~SumNeighbours() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SumNeighbours"; }
+ const std::string name() const override { return "SumNeighbours"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Sum event lists from neighboring pixels in rectangular area "
"detectors - e.g. to reduce the signal-to-noise of individual "
"spectra. Each spectrum in the output workspace is a sum of a block "
@@ -58,14 +58,14 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Grouping"; }
+ const std::string category() const override { return "Transforms\\Grouping"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SumRowColumn.h b/Framework/Algorithms/inc/MantidAlgorithms/SumRowColumn.h
index 6e8ebf2553d57e1478f5c05b59b4c6436ac592a2..f29ed82567fb1fd3a33911a2d0f17d680a27cbe2 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SumRowColumn.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SumRowColumn.h
@@ -66,28 +66,28 @@ public:
/// (Empty) Constructor
SumRowColumn() : API::Algorithm() {}
/// Virtual destructor
- virtual ~SumRowColumn() {}
+ ~SumRowColumn() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SumRowColumn"; }
+ const std::string name() const override { return "SumRowColumn"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "SANS-specific algorithm which gives a single spectrum containing "
"the total counts in either each row or each column of pixels in a "
"square LOQ or SANS2D detector bank.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "SANS;Transforms\\Grouping";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
API::MatrixWorkspace_sptr integrateWorkspace();
};
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/SumSpectra.h b/Framework/Algorithms/inc/MantidAlgorithms/SumSpectra.h
index f7530823cc3a337693526d15d65ba92a3e7fdee8..ac917d38e2aa18be1d2a63c497194109ec8a3d15 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/SumSpectra.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/SumSpectra.h
@@ -60,11 +60,11 @@ public:
/// Default constructor
SumSpectra();
/// Destructor
- virtual ~SumSpectra(){};
+ ~SumSpectra() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SumSpectra"; }
+ const std::string name() const override { return "SumSpectra"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The SumSpectra algorithm adds the data values in each time bin "
"across a range of spectra; the output workspace has a single "
"spectrum. If the input is an EventWorkspace, the output is also an "
@@ -72,9 +72,9 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Grouping"; }
+ const std::string category() const override { return "Transforms\\Grouping"; }
private:
/// Handle logic for RebinnedOutput workspaces
@@ -87,8 +87,8 @@ private:
size_t &numSpectra, size_t &numMasked, size_t &numZeros);
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void execEvent(DataObjects::EventWorkspace_const_sptr localworkspace,
std::set<int> &indices);
specid_t getOutputSpecId(API::MatrixWorkspace_const_sptr localworkspace);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/TOFSANSResolution.h b/Framework/Algorithms/inc/MantidAlgorithms/TOFSANSResolution.h
index f8e7b3352ee0e48b2a79da4d6cf93aa130cf05dd..958438079520f370a615c460e7fe547e9d749e7b 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/TOFSANSResolution.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/TOFSANSResolution.h
@@ -38,24 +38,24 @@ public:
/// Defatult constructor
TOFSANSResolution();
/// Virtual destructor
- virtual ~TOFSANSResolution() {}
+ ~TOFSANSResolution() override {}
/// Algorithm's name
- virtual const std::string name() const { return "TOFSANSResolution"; }
+ const std::string name() const override { return "TOFSANSResolution"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate the Q resolution for TOF SANS data.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "SANS"; }
+ const std::string category() const override { return "SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Return the TOF resolution for a particular wavelength
virtual double getTOFResolution(double wl);
/// Wavelength resolution (constant for all wavelengths)
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/TOFSANSResolutionByPixel.h b/Framework/Algorithms/inc/MantidAlgorithms/TOFSANSResolutionByPixel.h
index 68bc89e2097479d9b2b04bb35eef80b2e9ae68fa..e8eb8aa693b27da7a35b847029b423532e2fac92 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/TOFSANSResolutionByPixel.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/TOFSANSResolutionByPixel.h
@@ -22,24 +22,24 @@ public:
/// Default constructor
TOFSANSResolutionByPixel();
/// Virtual destructor
- virtual ~TOFSANSResolutionByPixel() {}
+ ~TOFSANSResolutionByPixel() override {}
/// Algorithm's name
- virtual const std::string name() const { return "TOFSANSResolutionByPixel"; }
+ const std::string name() const override { return "TOFSANSResolutionByPixel"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate the Q resolution for TOF SANS data for each pixel.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "SANS"; }
+ const std::string category() const override { return "SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Return the TOF resolution for a particular wavelength
virtual double getTOFResolution(double wl);
/// Get the collimation length when we evaluate it using 5 Guards
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategyDirect.h b/Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategyDirect.h
index f4b8251c58618a80e9b0ff85487bf8594db22a5f..4437ba3cb4216faa30431f33e0b3f313984194bc 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategyDirect.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategyDirect.h
@@ -40,8 +40,8 @@ class DLLExport TimeAtSampleStrategyDirect : public TimeAtSampleStrategy {
public:
TimeAtSampleStrategyDirect(
boost::shared_ptr<const Mantid::API::MatrixWorkspace> ws, double ei);
- virtual ~TimeAtSampleStrategyDirect();
- Correction calculate(const size_t &workspace_index) const;
+ ~TimeAtSampleStrategyDirect() override;
+ Correction calculate(const size_t &workspace_index) const override;
private:
/// Cached L1, Ei dependent const shift
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategyElastic.h b/Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategyElastic.h
index 8cf3b80773e80dda6471c2409d031443e433a470..07add25be73629e3cc8e5057f17ebfe783fa5699 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategyElastic.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategyElastic.h
@@ -40,8 +40,8 @@ class DLLExport TimeAtSampleStrategyElastic
public:
TimeAtSampleStrategyElastic(
boost::shared_ptr<const Mantid::API::MatrixWorkspace> ws);
- virtual ~TimeAtSampleStrategyElastic();
- virtual Correction calculate(const size_t &workspace_index) const;
+ ~TimeAtSampleStrategyElastic() override;
+ Correction calculate(const size_t &workspace_index) const override;
private:
boost::shared_ptr<const Mantid::API::MatrixWorkspace> m_ws;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategyIndirect.h b/Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategyIndirect.h
index 14470d70fe7b565f3bbbf0253afd9ac38aa29715..cd44997f6594dbb98b022d32efc4d099e7346a14 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategyIndirect.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/TimeAtSampleStrategyIndirect.h
@@ -41,8 +41,8 @@ class DLLExport TimeAtSampleStrategyIndirect : public TimeAtSampleStrategy {
public:
TimeAtSampleStrategyIndirect(
boost::shared_ptr<const Mantid::API::MatrixWorkspace> ws);
- virtual ~TimeAtSampleStrategyIndirect();
- virtual Correction calculate(const size_t &workspace_index) const;
+ ~TimeAtSampleStrategyIndirect() override;
+ Correction calculate(const size_t &workspace_index) const override;
private:
/// Workspace to operate on
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/Transpose.h b/Framework/Algorithms/inc/MantidAlgorithms/Transpose.h
index a7f4603dc999fb2cba771fcb242cd78263720e1a..9065f1cea2871a5ff0cee8f05c564abfdd9370a9 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/Transpose.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/Transpose.h
@@ -44,25 +44,25 @@ public:
/// (Empty) Constructor
Transpose() : API::Algorithm() {}
/// Virtual destructor
- virtual ~Transpose() {}
+ ~Transpose() override {}
/// Algorithm's name
- virtual const std::string name() const { return "Transpose"; }
+ const std::string name() const override { return "Transpose"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Transposes a workspace, so that an N1 x N2 workspace becomes N2 x "
"N1.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Transforms\\Axes"; }
+ const std::string category() const override { return "Transforms\\Axes"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Create the output workspace
API::MatrixWorkspace_sptr
createOutputWorkspace(API::MatrixWorkspace_const_sptr workspace);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/UnGroupWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/UnGroupWorkspace.h
index 97978c8abf3053cf511e1fa2b1056a2c314b2f05..75457e37bf06ed13058d3de139e216633f4a520b 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/UnGroupWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/UnGroupWorkspace.h
@@ -44,26 +44,26 @@ public:
/// Default constructor
UnGroupWorkspace() : API::Algorithm(){};
/// Destructor
- virtual ~UnGroupWorkspace(){};
+ ~UnGroupWorkspace() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "UnGroupWorkspace"; }
+ const std::string name() const override { return "UnGroupWorkspace"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Takes a group workspace as input and ungroups the workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Transforms\\Grouping;Utility\\Workspaces";
}
private:
/// Overridden Init method
- void init();
+ void init() override;
/// overridden execute method
- void exec();
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/UnaryOperation.h b/Framework/Algorithms/inc/MantidAlgorithms/UnaryOperation.h
index 1730ba5754368b5459e17441add3d79b76a6523a..048922bc94ff597cff7f7179281a83209db11487 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/UnaryOperation.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/UnaryOperation.h
@@ -52,19 +52,19 @@ public:
/// Default constructor
UnaryOperation();
/// Destructor
- virtual ~UnaryOperation();
+ ~UnaryOperation() override;
/// Algorithm's category for identification
- virtual const std::string category() const { return "Arithmetic"; }
+ const std::string category() const override { return "Arithmetic"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Supports the implementation of a Unary operation on an input "
"workspace.";
}
protected:
// Overridden Algorithm methods
- virtual void init();
- virtual void exec();
+ void init() override;
+ void exec() override;
virtual void execEvent();
template <class T> void unaryOperationEventHelper(std::vector<T> &wevector);
/// The name of the input workspace property
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/UnwrapMonitor.h b/Framework/Algorithms/inc/MantidAlgorithms/UnwrapMonitor.h
index 52b58d95d1630cab788b9235fe7160db5237d1c8..1419cbf901ddcb0a013f8461e891458ffd580e8f 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/UnwrapMonitor.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/UnwrapMonitor.h
@@ -48,11 +48,11 @@ namespace Algorithms {
class DLLExport UnwrapMonitor : public API::Algorithm {
public:
UnwrapMonitor();
- virtual ~UnwrapMonitor();
+ ~UnwrapMonitor() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "UnwrapMonitor"; }
+ const std::string name() const override { return "UnwrapMonitor"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Takes an input workspace that contains 'raw' data, unwraps the "
"data "
"according to the reference flightpath provided and converts the "
@@ -61,15 +61,15 @@ public:
"theoretical wavelength range.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\InstrumentCorrections";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
double getPrimaryFlightpath() const;
double calculateFlightpath(const int &spectrum, const double &L1,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/UnwrapSNS.h b/Framework/Algorithms/inc/MantidAlgorithms/UnwrapSNS.h
index 8a8301e176a6c50843011890636552a58646b1fb..8362fd607a7c443ea091cd092e1dece34d8986b7 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/UnwrapSNS.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/UnwrapSNS.h
@@ -49,22 +49,22 @@ namespace Algorithms {
class DLLExport UnwrapSNS : public API::Algorithm {
public:
UnwrapSNS();
- virtual ~UnwrapSNS();
- virtual const std::string name() const;
+ ~UnwrapSNS() override;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Takes an input workspace that contains 'raw' data, unwraps the "
"data according to the reference flightpath provided and converts "
"the units to wavelength. The output workspace will have common "
"bins in the maximum theoretical wavelength range.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void execEvent();
void runMaskDetectors();
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/UpdateScriptRepository.h b/Framework/Algorithms/inc/MantidAlgorithms/UpdateScriptRepository.h
index 83061cf90394e9250278d89b714aab9bec8491d4..5e0474cee323d7c453c1305d17f3bc389a236d93 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/UpdateScriptRepository.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/UpdateScriptRepository.h
@@ -37,20 +37,20 @@ namespace Algorithms {
class DLLExport UpdateScriptRepository : public API::Algorithm {
public:
UpdateScriptRepository();
- virtual ~UpdateScriptRepository();
+ ~UpdateScriptRepository() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Update the local instance of ScriptRepository.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/VesuvioL1ThetaResolution.h b/Framework/Algorithms/inc/MantidAlgorithms/VesuvioL1ThetaResolution.h
index ee9d17940189ac43090d70632a799ea9da55536c..73346c6859a5318125c0cb8188da4cc50f8a52fb 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/VesuvioL1ThetaResolution.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/VesuvioL1ThetaResolution.h
@@ -37,16 +37,16 @@ namespace Algorithms {
class DLLExport VesuvioL1ThetaResolution : public API::Algorithm {
public:
VesuvioL1ThetaResolution();
- virtual ~VesuvioL1ThetaResolution();
+ ~VesuvioL1ThetaResolution() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void loadInstrument();
void calculateDetector(Mantid::Geometry::IDetector_const_sptr detector,
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/WeightedMean.h b/Framework/Algorithms/inc/MantidAlgorithms/WeightedMean.h
index be77c9b612df697855d544df4d57ab3ac4a0e807..c4b8e6fe386c9b16b5f0affe9313d804b160a880 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/WeightedMean.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/WeightedMean.h
@@ -47,39 +47,39 @@ public:
/// Empty Constructor
WeightedMean() : BinaryOperation() {}
/// Empty Destructor
- virtual ~WeightedMean() {}
+ ~WeightedMean() override {}
- virtual const std::string name() const { return "WeightedMean"; }
+ const std::string name() const override { return "WeightedMean"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "An algorithm to calculate the weighted mean of two workspaces.";
}
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Arithmetic"; }
+ const std::string category() const override { return "Arithmetic"; }
private:
// Overridden BinaryOperation methods
void performBinaryOperation(const MantidVec &lhsX, const MantidVec &lhsY,
const MantidVec &lhsE, const MantidVec &rhsY,
const MantidVec &rhsE, MantidVec &YOut,
- MantidVec &EOut);
+ MantidVec &EOut) override;
void performBinaryOperation(const MantidVec &lhsX, const MantidVec &lhsY,
const MantidVec &lhsE, const double rhsY,
const double rhsE, MantidVec &YOut,
- MantidVec &EOut);
- virtual bool
+ MantidVec &EOut) override;
+ bool
checkCompatibility(const API::MatrixWorkspace_const_sptr lhs,
- const API::MatrixWorkspace_const_sptr rhs) const;
- virtual std::string
- checkSizeCompatibility(const API::MatrixWorkspace_const_sptr lhs,
- const API::MatrixWorkspace_const_sptr rhs) const;
+ const API::MatrixWorkspace_const_sptr rhs) const override;
+ std::string checkSizeCompatibility(
+ const API::MatrixWorkspace_const_sptr lhs,
+ const API::MatrixWorkspace_const_sptr rhs) const override;
/// The name of the first input workspace property for BinaryOperation
- virtual std::string inputPropName1() const { return "InputWorkspace1"; }
+ std::string inputPropName1() const override { return "InputWorkspace1"; }
/// The name of the second input workspace property for BinaryOperation
- virtual std::string inputPropName2() const { return "InputWorkspace2"; }
+ std::string inputPropName2() const override { return "InputWorkspace2"; }
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/WeightedMeanOfWorkspace.h b/Framework/Algorithms/inc/MantidAlgorithms/WeightedMeanOfWorkspace.h
index a3e64917b9601d401b8257fdcfeea5ddd9ca8477..4b57f8d8fbc3d4bdd51cbb1fde98eb58c85d2bae 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/WeightedMeanOfWorkspace.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/WeightedMeanOfWorkspace.h
@@ -35,21 +35,21 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport WeightedMeanOfWorkspace : public API::Algorithm {
public:
WeightedMeanOfWorkspace();
- virtual ~WeightedMeanOfWorkspace();
+ ~WeightedMeanOfWorkspace() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm calculates the weighted mean for an entire "
"workspace.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/WeightingStrategy.h b/Framework/Algorithms/inc/MantidAlgorithms/WeightingStrategy.h
index 7c9d00aa53504e107255173b2f6bf5c112a6b18f..f8bba77c1163a37f236b1a1378d9005ab302c235 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/WeightingStrategy.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/WeightingStrategy.h
@@ -73,10 +73,10 @@ Flat (no weighting) strategy. Concrete WeightingStrategy
class DLLExport FlatWeighting : public WeightingStrategy {
public:
FlatWeighting();
- virtual ~FlatWeighting();
- virtual double weightAt(const double &, const double &, const double &,
- const double &);
- double weightAt(const Mantid::Kernel::V3D &);
+ ~FlatWeighting() override;
+ double weightAt(const double &, const double &, const double &,
+ const double &) override;
+ double weightAt(const Mantid::Kernel::V3D &) override;
};
/*
@@ -85,10 +85,10 @@ Linear weighting strategy.
class DLLExport LinearWeighting : public WeightingStrategy {
public:
LinearWeighting(const double cutOff);
- virtual ~LinearWeighting();
- double weightAt(const Mantid::Kernel::V3D &);
- virtual double weightAt(const double &adjX, const double &ix,
- const double &adjY, const double &iy);
+ ~LinearWeighting() override;
+ double weightAt(const Mantid::Kernel::V3D &) override;
+ double weightAt(const double &adjX, const double &ix, const double &adjY,
+ const double &iy) override;
};
/*
@@ -97,10 +97,10 @@ Parabolic weighting strategy.
class DLLExport ParabolicWeighting : public WeightingStrategy {
public:
ParabolicWeighting(const double cutOff);
- virtual ~ParabolicWeighting();
- double weightAt(const Mantid::Kernel::V3D &);
- virtual double weightAt(const double &adjX, const double &ix,
- const double &adjY, const double &iy);
+ ~ParabolicWeighting() override;
+ double weightAt(const Mantid::Kernel::V3D &) override;
+ double weightAt(const double &adjX, const double &ix, const double &adjY,
+ const double &iy) override;
};
/*
@@ -109,10 +109,10 @@ Null weighting strategy.
class DLLExport NullWeighting : public WeightingStrategy {
public:
NullWeighting();
- virtual ~NullWeighting();
- double weightAt(const Mantid::Kernel::V3D &);
- virtual double weightAt(const double &, const double &, const double &,
- const double &);
+ ~NullWeighting() override;
+ double weightAt(const Mantid::Kernel::V3D &) override;
+ double weightAt(const double &, const double &, const double &,
+ const double &) override;
};
/*
@@ -123,10 +123,10 @@ y = exp(-0.5*((r./p(1)).^2) where p = sqtr(2)*sigma
class DLLExport GaussianWeightingnD : public WeightingStrategy {
public:
GaussianWeightingnD(double cutOff, double sigma);
- virtual ~GaussianWeightingnD();
- virtual double weightAt(const Mantid::Kernel::V3D &);
- virtual double weightAt(const double &, const double &, const double &,
- const double &);
+ ~GaussianWeightingnD() override;
+ double weightAt(const Mantid::Kernel::V3D &) override;
+ double weightAt(const double &, const double &, const double &,
+ const double &) override;
private:
double calculateGaussian(const double normalisedDistanceSq);
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/WienerSmooth.h b/Framework/Algorithms/inc/MantidAlgorithms/WienerSmooth.h
index 0a433dc3c6871c391cabc4f40fafc52bbf44baed..a8b82a10dc373ec2d3a48ef027a75dafe2744199 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/WienerSmooth.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/WienerSmooth.h
@@ -35,16 +35,16 @@ namespace Algorithms {
class DLLExport WienerSmooth : public API::Algorithm {
public:
WienerSmooth();
- virtual ~WienerSmooth();
+ ~WienerSmooth() override;
- virtual const std::string name() const { return "WienerSmooth"; }
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override { return "WienerSmooth"; }
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
std::pair<double, double> getStartEnd(const MantidVec &X,
bool isHistogram) const;
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h b/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h
index 02bd1dd938f7a6e6b78ed43eef5be8f349f548ca..f8f655e1c711332fa5bd5dd08ab24da46066f053 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/WorkspaceJoiners.h
@@ -40,12 +40,12 @@ namespace Algorithms {
class DLLExport WorkspaceJoiners : public API::Algorithm {
public:
WorkspaceJoiners();
- virtual ~WorkspaceJoiners();
+ ~WorkspaceJoiners() override;
- virtual const std::string category() const;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Join two workspaces together by appending their spectra.";
}
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/XDataConverter.h b/Framework/Algorithms/inc/MantidAlgorithms/XDataConverter.h
index 224e1e6138a45a12aeb583aacbda3d4207b56ee7..a325179e52b93d1f1eca81fadf800016ffcd3e02 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/XDataConverter.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/XDataConverter.h
@@ -44,9 +44,9 @@ public:
/// Default constructor
XDataConverter();
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "General"; }
+ const std::string category() const override { return "General"; }
protected:
/// Returns true if the algorithm needs to be run.
@@ -64,9 +64,9 @@ protected:
private:
/// Override init
- virtual void init();
+ void init() override;
/// Override exec
- virtual void exec();
+ void exec() override;
/// Set the X data on given spectra
void setXData(API::MatrixWorkspace_sptr outputWS,
diff --git a/Framework/Algorithms/src/PerformIndexOperations.cpp b/Framework/Algorithms/src/PerformIndexOperations.cpp
index 7a5eb3cdea68826820f0e48bb4347e9440a9969f..bff1d4a137a1fe98512bb9c2ceb3490136b883e2 100644
--- a/Framework/Algorithms/src/PerformIndexOperations.cpp
+++ b/Framework/Algorithms/src/PerformIndexOperations.cpp
@@ -51,12 +51,12 @@ typedef std::vector<boost::shared_ptr<Command>> VecCommands;
* Command yielding no result.
*/
class NullCommand : public Command {
- virtual bool isValid() const { return false; }
- virtual MatrixWorkspace_sptr execute(MatrixWorkspace_sptr) const {
+ bool isValid() const override { return false; }
+ MatrixWorkspace_sptr execute(MatrixWorkspace_sptr) const override {
throw std::runtime_error(
"Should not be attempting ::execute on a NullCommand");
}
- virtual ~NullCommand() {}
+ ~NullCommand() override {}
};
/**
@@ -70,7 +70,7 @@ public:
explicit AdditionCommand(const std::vector<int> &indexes)
: m_indexes(indexes) {}
- virtual MatrixWorkspace_sptr execute(MatrixWorkspace_sptr inputWS) const {
+ MatrixWorkspace_sptr execute(MatrixWorkspace_sptr inputWS) const override {
MatrixWorkspace_sptr outWS;
if (m_indexes.size() > 0) {
Mantid::API::AlgorithmManagerImpl &factory =
@@ -87,7 +87,7 @@ public:
return outWS;
}
- virtual ~AdditionCommand() {}
+ ~AdditionCommand() override {}
};
/**
@@ -100,7 +100,7 @@ private:
public:
explicit CropCommand(const std::vector<int> &indexes) : m_indexes(indexes) {}
- MatrixWorkspace_sptr execute(MatrixWorkspace_sptr inputWS) const {
+ MatrixWorkspace_sptr execute(MatrixWorkspace_sptr inputWS) const override {
MatrixWorkspace_sptr outWS;
for (size_t i = 0; i < m_indexes.size(); ++i) {
@@ -130,7 +130,7 @@ public:
}
return outWS;
}
- virtual ~CropCommand() {}
+ ~CropCommand() override {}
};
/**
@@ -151,7 +151,7 @@ typedef std::vector<boost::shared_ptr<CommandParser>> VecCommandParsers;
*/
template <typename ProductType> class CommandParserBase : public CommandParser {
public:
- virtual Command *interpret(const std::string &instruction) const {
+ Command *interpret(const std::string &instruction) const override {
Command *command = nullptr;
boost::regex ex = getRegex();
if (boost::regex_match(instruction, ex)) {
@@ -163,7 +163,7 @@ public:
}
return command;
}
- virtual ~CommandParserBase() {}
+ ~CommandParserBase() override {}
private:
virtual std::string getSeparator() const = 0;
@@ -175,13 +175,13 @@ private:
*/
class AdditionParserRange : public CommandParserBase<AdditionCommand> {
public:
- virtual ~AdditionParserRange() {}
+ ~AdditionParserRange() override {}
private:
- boost::regex getRegex() const {
+ boost::regex getRegex() const override {
return boost::regex("^\\s*[0-9]+\\s*\\-\\s*[0-9]+\\s*$");
}
- std::string getSeparator() const { return "-"; }
+ std::string getSeparator() const override { return "-"; }
};
/**
@@ -189,9 +189,9 @@ private:
*/
class AdditionParser : public CommandParser {
public:
- virtual ~AdditionParser() {}
+ ~AdditionParser() override {}
- virtual Command *interpret(const std::string &instruction) const {
+ Command *interpret(const std::string &instruction) const override {
Command *command = nullptr;
boost::regex ex("^\\s*[0-9]+\\s*\\+\\s*[0-9]+\\s*$");
if (boost::regex_match(instruction, ex)) {
@@ -217,13 +217,13 @@ public:
*/
class CropParserRange : public CommandParserBase<CropCommand> {
public:
- virtual ~CropParserRange() {}
+ ~CropParserRange() override {}
private:
- boost::regex getRegex() const {
+ boost::regex getRegex() const override {
return boost::regex("^\\s*[0-9]+\\s*:\\s*[0-9]+\\s*$");
}
- std::string getSeparator() const { return ":"; }
+ std::string getSeparator() const override { return ":"; }
};
/**
@@ -231,9 +231,9 @@ private:
*/
class CropParserIndex : public CommandParser {
public:
- virtual ~CropParserIndex() {}
+ ~CropParserIndex() override {}
- virtual Command *interpret(const std::string &instruction) const {
+ Command *interpret(const std::string &instruction) const override {
Command *command = nullptr;
boost::regex ex("^\\s*[0-9]+\\s*$");
if (boost::regex_match(instruction, ex)) {
diff --git a/Framework/Crystal/inc/MantidCrystal/AddPeakHKL.h b/Framework/Crystal/inc/MantidCrystal/AddPeakHKL.h
index e8ab8f07d5bcf39766302a3aa91746f72798261a..dac48206f742eca22e3bd6e6b3b82c09323ea05f 100644
--- a/Framework/Crystal/inc/MantidCrystal/AddPeakHKL.h
+++ b/Framework/Crystal/inc/MantidCrystal/AddPeakHKL.h
@@ -33,16 +33,16 @@ namespace Crystal {
class DLLExport AddPeakHKL : public API::Algorithm {
public:
AddPeakHKL();
- virtual ~AddPeakHKL();
+ ~AddPeakHKL() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/AnvredCorrection.h b/Framework/Crystal/inc/MantidCrystal/AnvredCorrection.h
index 5dc83b6a6246be690dac624e6f9f143435f775e6..cc8fbc7f409484ebd5439e7078046068c0cb2000 100644
--- a/Framework/Crystal/inc/MantidCrystal/AnvredCorrection.h
+++ b/Framework/Crystal/inc/MantidCrystal/AnvredCorrection.h
@@ -78,19 +78,19 @@ public:
/// (Empty) Constructor
AnvredCorrection();
/// Virtual destructor
- virtual ~AnvredCorrection() {}
+ ~AnvredCorrection() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "AnvredCorrection"; }
+ const std::string name() const override { return "AnvredCorrection"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates anvred correction factors for attenuation due to "
"absorption and scattering in a spherical sample";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\Corrections;CorrectionFunctions\\AbsorptionCorrections";
}
@@ -112,9 +112,9 @@ protected:
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Event execution code
void execEvent();
/// Algorithm cleanup
diff --git a/Framework/Crystal/inc/MantidCrystal/CalculatePeaksHKL.h b/Framework/Crystal/inc/MantidCrystal/CalculatePeaksHKL.h
index b43f54a57b83286892ce30c9e6431ea2a5aa63b9..93bd80be543e7612a8b56fcd6ecaff418987ad9d 100644
--- a/Framework/Crystal/inc/MantidCrystal/CalculatePeaksHKL.h
+++ b/Framework/Crystal/inc/MantidCrystal/CalculatePeaksHKL.h
@@ -35,21 +35,21 @@ namespace Crystal {
class DLLExport CalculatePeaksHKL : public API::Algorithm {
public:
CalculatePeaksHKL();
- virtual ~CalculatePeaksHKL();
+ ~CalculatePeaksHKL() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates Miller indices for each peak. No rounding or UB "
"optimization.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/CalculateUMatrix.h b/Framework/Crystal/inc/MantidCrystal/CalculateUMatrix.h
index d751904acbe466ed6669898ea43d038d40f3728c..4a1b3a5f3044cd31c30efe9b45b004bea8766519 100644
--- a/Framework/Crystal/inc/MantidCrystal/CalculateUMatrix.h
+++ b/Framework/Crystal/inc/MantidCrystal/CalculateUMatrix.h
@@ -37,26 +37,26 @@ namespace Crystal {
class DLLExport CalculateUMatrix : public API::Algorithm {
public:
CalculateUMatrix();
- ~CalculateUMatrix();
+ ~CalculateUMatrix() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "CalculateUMatrix"; };
+ const std::string name() const override { return "CalculateUMatrix"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate the U matrix from a peaks workspace, given lattice "
"parameters.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Crystal\\UBMatrix"; }
+ const std::string category() const override { return "Crystal\\UBMatrix"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/CentroidPeaks.h b/Framework/Crystal/inc/MantidCrystal/CentroidPeaks.h
index 9c50fb9f1da82952ddf743563a473e7b25cf085d..df8eb01e801b091736bdec3e459d964b7e6ad65d 100644
--- a/Framework/Crystal/inc/MantidCrystal/CentroidPeaks.h
+++ b/Framework/Crystal/inc/MantidCrystal/CentroidPeaks.h
@@ -18,26 +18,26 @@ namespace Crystal {
class DLLExport CentroidPeaks : public API::Algorithm {
public:
CentroidPeaks();
- ~CentroidPeaks();
+ ~CentroidPeaks() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "CentroidPeaks"; };
+ const std::string name() const override { return "CentroidPeaks"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Find the centroid of single-crystal peaks in a 2D Workspace, in "
"order to refine their positions.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Crystal\\Peaks"; }
+ const std::string category() const override { return "Crystal\\Peaks"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
void integrate();
void integrateEvent();
int findPixelID(std::string bankName, int col, int row);
diff --git a/Framework/Crystal/inc/MantidCrystal/ClearUB.h b/Framework/Crystal/inc/MantidCrystal/ClearUB.h
index 739830baa03b99181232128449b6a14e8f417e68..cbb69dfaabe43fc3bc379117015e58f73aa6cc6e 100644
--- a/Framework/Crystal/inc/MantidCrystal/ClearUB.h
+++ b/Framework/Crystal/inc/MantidCrystal/ClearUB.h
@@ -34,16 +34,16 @@ namespace Crystal {
class DLLExport ClearUB : public API::Algorithm {
public:
ClearUB();
- virtual ~ClearUB();
+ ~ClearUB() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Clears the UB by removing the oriented lattice from the sample.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
protected:
bool doExecute(Mantid::API::Workspace *const ws, bool dryRun);
@@ -52,8 +52,8 @@ private:
bool
clearSingleExperimentInfo(Mantid::API::ExperimentInfo *const experimentInfo,
const bool dryRun) const;
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/Cluster.h b/Framework/Crystal/inc/MantidCrystal/Cluster.h
index 9b0e8a6ad1e3d81c27cb2668db81f037c7a7e12e..c492116b2333ccb692299a80fc79090ff2f818e1 100644
--- a/Framework/Crystal/inc/MantidCrystal/Cluster.h
+++ b/Framework/Crystal/inc/MantidCrystal/Cluster.h
@@ -41,41 +41,43 @@ public:
Cluster(const size_t &label);
/// Destructor
- virtual ~Cluster();
+ ~Cluster() override;
/// integrate the cluster
ClusterIntegratedValues
- integrate(boost::shared_ptr<const Mantid::API::IMDHistoWorkspace> ws) const;
+ integrate(boost::shared_ptr<const Mantid::API::IMDHistoWorkspace> ws)
+ const override;
/// Apply labels to the workspace
- void writeTo(boost::shared_ptr<Mantid::API::IMDHistoWorkspace> ws) const;
+ void
+ writeTo(boost::shared_ptr<Mantid::API::IMDHistoWorkspace> ws) const override;
/// Get the cluster label
- size_t getLabel() const;
+ size_t getLabel() const override;
/// Get the original label
- size_t getOriginalLabel() const;
+ size_t getOriginalLabel() const override;
/// Number of indexes tracked
- size_t size() const;
+ size_t size() const override;
/// Track a linear IMDHistoWorkspace index that belongs to the cluster.
- void addIndex(const size_t &index);
+ void addIndex(const size_t &index) override;
/// Resolve the proper label for this cluster.
- void toUniformMinimum(std::vector<DisjointElement> &disjointSet);
+ void toUniformMinimum(std::vector<DisjointElement> &disjointSet) override;
/// Overloaded equals.
bool operator==(const Cluster &other) const;
/// Set the root cluster
- void setRootCluster(ICluster const *root);
+ void setRootCluster(ICluster const *root) override;
/// Get a representative index of the cluster
- virtual size_t getRepresentitiveIndex() const;
+ size_t getRepresentitiveIndex() const override;
/// Does the cluster contain the label.
- virtual bool containsLabel(const size_t &label) const;
+ bool containsLabel(const size_t &label) const override;
private:
/// Disabled copy construction
diff --git a/Framework/Crystal/inc/MantidCrystal/CombinePeaksWorkspaces.h b/Framework/Crystal/inc/MantidCrystal/CombinePeaksWorkspaces.h
index 3e61434481c37f6c51aa8095ed0c3aeb57e8b34b..c114990c41622c482cd36e328b69f3363337051c 100644
--- a/Framework/Crystal/inc/MantidCrystal/CombinePeaksWorkspaces.h
+++ b/Framework/Crystal/inc/MantidCrystal/CombinePeaksWorkspaces.h
@@ -36,21 +36,21 @@ namespace Crystal {
class DLLExport CombinePeaksWorkspaces : public API::Algorithm {
public:
CombinePeaksWorkspaces();
- virtual ~CombinePeaksWorkspaces();
+ ~CombinePeaksWorkspaces() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Combines the sets of peaks in two peaks workspaces, optionally "
"omitting duplicates.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/CompositeCluster.h b/Framework/Crystal/inc/MantidCrystal/CompositeCluster.h
index e0bc98756ecfac71b627f69f3a889092df8d73b1..2b672738ce5b6cc974fe5555ab207ea7c4ac9804 100644
--- a/Framework/Crystal/inc/MantidCrystal/CompositeCluster.h
+++ b/Framework/Crystal/inc/MantidCrystal/CompositeCluster.h
@@ -35,41 +35,43 @@ namespace Crystal {
class DLLExport CompositeCluster : public ICluster {
public:
CompositeCluster();
- virtual ~CompositeCluster();
+ ~CompositeCluster() override;
/// integrate the cluster
ICluster::ClusterIntegratedValues
- integrate(boost::shared_ptr<const Mantid::API::IMDHistoWorkspace> ws) const;
+ integrate(boost::shared_ptr<const Mantid::API::IMDHistoWorkspace> ws)
+ const override;
/// Apply labels to the workspace
- void writeTo(boost::shared_ptr<Mantid::API::IMDHistoWorkspace> ws) const;
+ void
+ writeTo(boost::shared_ptr<Mantid::API::IMDHistoWorkspace> ws) const override;
/// Original label
- size_t getOriginalLabel() const;
+ size_t getOriginalLabel() const override;
/// Get the cluster label
- size_t getLabel() const;
+ size_t getLabel() const override;
/// Number of indexes tracked
- size_t size() const;
+ size_t size() const override;
/// Track a linear IMDHistoWorkspace index that belongs to the cluster.
- void addIndex(const size_t &index);
+ void addIndex(const size_t &index) override;
/// Resolve the proper label for this cluster.
- void toUniformMinimum(std::vector<DisjointElement> &disjointSet);
+ void toUniformMinimum(std::vector<DisjointElement> &disjointSet) override;
/// Own.
void add(boost::shared_ptr<ICluster> &toOwn);
/// Set the root cluster
- void setRootCluster(ICluster const *root);
+ void setRootCluster(ICluster const *root) override;
/// Get a representative index of the cluster
- size_t getRepresentitiveIndex() const;
+ size_t getRepresentitiveIndex() const override;
/// Is a given label part of this cluster
- bool containsLabel(const size_t &label) const;
+ bool containsLabel(const size_t &label) const override;
private:
/// Helper method to find the minimum label.
diff --git a/Framework/Crystal/inc/MantidCrystal/DiffPeaksWorkspaces.h b/Framework/Crystal/inc/MantidCrystal/DiffPeaksWorkspaces.h
index 7f42665e72a83990afe97a4a2f440fe5b1b7a128..94f2361d58a35b2cfcbdddd9a50a3960144ed40c 100644
--- a/Framework/Crystal/inc/MantidCrystal/DiffPeaksWorkspaces.h
+++ b/Framework/Crystal/inc/MantidCrystal/DiffPeaksWorkspaces.h
@@ -34,21 +34,21 @@ namespace Crystal {
class DLLExport DiffPeaksWorkspaces : public API::Algorithm {
public:
DiffPeaksWorkspaces();
- virtual ~DiffPeaksWorkspaces();
+ ~DiffPeaksWorkspaces() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Removes from a workspace any peaks that match a peak in a second "
"workspace.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/FilterPeaks.h b/Framework/Crystal/inc/MantidCrystal/FilterPeaks.h
index 1fead9b8fb1d70b60809a28c6dda764a2ae42f9b..e54e19099144c27a2600a455f28561f00a28e164 100644
--- a/Framework/Crystal/inc/MantidCrystal/FilterPeaks.h
+++ b/Framework/Crystal/inc/MantidCrystal/FilterPeaks.h
@@ -34,21 +34,21 @@ namespace Crystal {
class DLLExport FilterPeaks : public API::Algorithm {
public:
FilterPeaks();
- virtual ~FilterPeaks();
+ ~FilterPeaks() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Filters the peaks in a peaks workspace based upon the valur of a "
"chosen variable.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/FindClusterFaces.h b/Framework/Crystal/inc/MantidCrystal/FindClusterFaces.h
index a472c0405f4366f657df4575ac774f4aeabc69ff..bdceac716fbc37181789afbaf12851439fe789d9 100644
--- a/Framework/Crystal/inc/MantidCrystal/FindClusterFaces.h
+++ b/Framework/Crystal/inc/MantidCrystal/FindClusterFaces.h
@@ -34,20 +34,20 @@ namespace Crystal {
class DLLExport FindClusterFaces : public API::Algorithm {
public:
FindClusterFaces();
- virtual ~FindClusterFaces();
+ ~FindClusterFaces() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Find faces for clusters in a cluster image.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/FindSXPeaks.h b/Framework/Crystal/inc/MantidCrystal/FindSXPeaks.h
index 6597e066ae790822207ad47136b6d2cf02cebbcb..9369716ccad532dd7749da018f5b3f747cdcb073 100644
--- a/Framework/Crystal/inc/MantidCrystal/FindSXPeaks.h
+++ b/Framework/Crystal/inc/MantidCrystal/FindSXPeaks.h
@@ -194,28 +194,28 @@ public:
/// Default constructor
FindSXPeaks();
/// Destructor
- virtual ~FindSXPeaks(){};
+ ~FindSXPeaks() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FindSXPeaks"; }
+ const std::string name() const override { return "FindSXPeaks"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Takes a 2D workspace as input and find the FindSXPeaksimum in each "
"1D spectrum. This is used in particular for single crystal as a "
"quick way to find strong peaks.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\Peaks;Optimization\\PeakFinding";
}
private:
// Overridden Algorithm methods
- void init();
+ void init() override;
//
- void exec();
+ void exec() override;
//
void reducePeakList(const peakvector &);
/// The value in X to start the search from
diff --git a/Framework/Crystal/inc/MantidCrystal/FindUBUsingFFT.h b/Framework/Crystal/inc/MantidCrystal/FindUBUsingFFT.h
index 874798627003be1241b04513b0b0b1783dcfbcc3..f0e2cc2644d77578264739abf124af1c1145e38d 100644
--- a/Framework/Crystal/inc/MantidCrystal/FindUBUsingFFT.h
+++ b/Framework/Crystal/inc/MantidCrystal/FindUBUsingFFT.h
@@ -36,29 +36,29 @@ namespace Crystal {
class DLLExport FindUBUsingFFT : public API::Algorithm {
public:
FindUBUsingFFT();
- ~FindUBUsingFFT();
+ ~FindUBUsingFFT() override;
/// Algorithm's name for identification
- virtual const std::string name() const;
+ const std::string name() const override;
/// Algorithm's version for identification
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification
- virtual const std::string category() const;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate the UB matrix from a peaks workspace, given min(a,b,c) "
"and max(a,b,c).";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/FindUBUsingIndexedPeaks.h b/Framework/Crystal/inc/MantidCrystal/FindUBUsingIndexedPeaks.h
index d7f6c41dd7f51f663919e283dab96ddb561acbe3..dd869b5df7aedc122f82ba2457fc820559826337 100644
--- a/Framework/Crystal/inc/MantidCrystal/FindUBUsingIndexedPeaks.h
+++ b/Framework/Crystal/inc/MantidCrystal/FindUBUsingIndexedPeaks.h
@@ -37,29 +37,29 @@ namespace Crystal {
class DLLExport FindUBUsingIndexedPeaks : public API::Algorithm {
public:
FindUBUsingIndexedPeaks();
- ~FindUBUsingIndexedPeaks();
+ ~FindUBUsingIndexedPeaks() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "FindUBUsingIndexedPeaks"; };
+ const std::string name() const override { return "FindUBUsingIndexedPeaks"; };
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Crystal\\UBMatrix"; }
+ const std::string category() const override { return "Crystal\\UBMatrix"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate the UB matrix from a peaks workspace, containing indexed "
"peaks.";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/FindUBUsingLatticeParameters.h b/Framework/Crystal/inc/MantidCrystal/FindUBUsingLatticeParameters.h
index b1663d84cdeb39d9154f1d48421a215b36332fab..7efcc71438fa5d00e8cda01ef590e17d4a486652 100644
--- a/Framework/Crystal/inc/MantidCrystal/FindUBUsingLatticeParameters.h
+++ b/Framework/Crystal/inc/MantidCrystal/FindUBUsingLatticeParameters.h
@@ -37,31 +37,31 @@ namespace Crystal {
class DLLExport FindUBUsingLatticeParameters : public API::Algorithm {
public:
FindUBUsingLatticeParameters();
- ~FindUBUsingLatticeParameters();
+ ~FindUBUsingLatticeParameters() override;
/// Algorithm's name for identification
- virtual const std::string name() const {
+ const std::string name() const override {
return "FindUBUsingLatticeParameters";
};
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Crystal\\UBMatrix"; }
+ const std::string category() const override { return "Crystal\\UBMatrix"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate the UB matrix from a peaks workspace, given lattice "
"parameters.";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/FindUBUsingMinMaxD.h b/Framework/Crystal/inc/MantidCrystal/FindUBUsingMinMaxD.h
index 628add7ab569489562435f9605bca502260c71b8..4ed213c10868e61fbfed0baa7291565b4e8ed923 100644
--- a/Framework/Crystal/inc/MantidCrystal/FindUBUsingMinMaxD.h
+++ b/Framework/Crystal/inc/MantidCrystal/FindUBUsingMinMaxD.h
@@ -39,29 +39,29 @@ class DLLExport FindUBUsingMinMaxD : public API::Algorithm,
public API::DeprecatedAlgorithm {
public:
FindUBUsingMinMaxD();
- ~FindUBUsingMinMaxD();
+ ~FindUBUsingMinMaxD() override;
/// Algorithm's name for identification
- virtual const std::string name() const;
+ const std::string name() const override;
/// Algorithm's version for identification
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification
- virtual const std::string category() const;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate the UB matrix from a peaks workspace, given min(a,b,c) "
"and max(a,b,c).";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/GoniometerAnglesFromPhiRotation.h b/Framework/Crystal/inc/MantidCrystal/GoniometerAnglesFromPhiRotation.h
index a146bed77921b4126dd88d318b8dc9ddba03185a..f03b53552c51d76b834d72a9c4c43d0ec9bca20c 100644
--- a/Framework/Crystal/inc/MantidCrystal/GoniometerAnglesFromPhiRotation.h
+++ b/Framework/Crystal/inc/MantidCrystal/GoniometerAnglesFromPhiRotation.h
@@ -44,26 +44,28 @@ namespace Crystal {
class DLLExport GoniometerAnglesFromPhiRotation : public API::Algorithm {
public:
GoniometerAnglesFromPhiRotation();
- ~GoniometerAnglesFromPhiRotation();
+ ~GoniometerAnglesFromPhiRotation() override;
/// Algorithm's name for identification
- const std::string name() const { return "GoniometerAnglesFromPhiRotation"; }
+ const std::string name() const override {
+ return "GoniometerAnglesFromPhiRotation";
+ }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The 2nd PeaksWorkspace is set up with the correct sample "
"orientations and UB matrices";
}
/// Algorithm's version for identification
- int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- const std::string category() const { return "Crystal\\Goniometer"; }
+ const std::string category() const override { return "Crystal\\Goniometer"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
Kernel::Matrix<double>
getUBRaw(const Kernel::Matrix<double> &UB,
const Kernel::Matrix<double> &GoniometerMatrix) const;
@@ -77,7 +79,7 @@ private:
double tolerance) const;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/HardThresholdBackground.h b/Framework/Crystal/inc/MantidCrystal/HardThresholdBackground.h
index b778e543366bd77bca906ba9f608b969ac832f0c..195fb578e4c6fc425d53123cec9eafd2b270b4bd 100644
--- a/Framework/Crystal/inc/MantidCrystal/HardThresholdBackground.h
+++ b/Framework/Crystal/inc/MantidCrystal/HardThresholdBackground.h
@@ -45,16 +45,17 @@ public:
HardThresholdBackground &operator=(const HardThresholdBackground &other);
/// Overriden isBackground
- virtual bool isBackground(Mantid::API::IMDIterator *iterator) const;
+ bool isBackground(Mantid::API::IMDIterator *iterator) const override;
/// Overriden configureIterator.
- void configureIterator(Mantid::API::IMDIterator *const iterator) const;
+ void
+ configureIterator(Mantid::API::IMDIterator *const iterator) const override;
/// Virtual constructor
- virtual HardThresholdBackground *clone() const;
+ HardThresholdBackground *clone() const override;
/// Destructor
- virtual ~HardThresholdBackground();
+ ~HardThresholdBackground() override;
private:
/// Cutoff
diff --git a/Framework/Crystal/inc/MantidCrystal/HasUB.h b/Framework/Crystal/inc/MantidCrystal/HasUB.h
index 31202a8212fcd8060418a7b356c657121bcdfa33..235a75eb2b9a9f178dc8ab4f428278a40b0280d1 100644
--- a/Framework/Crystal/inc/MantidCrystal/HasUB.h
+++ b/Framework/Crystal/inc/MantidCrystal/HasUB.h
@@ -36,20 +36,20 @@ namespace Crystal {
class DLLExport HasUB : public ClearUB {
public:
HasUB();
- virtual ~HasUB();
+ ~HasUB() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Determines whether the workspace has one or more UB Matrix";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/IndexPeaks.h b/Framework/Crystal/inc/MantidCrystal/IndexPeaks.h
index 7d0d4f7c3fbee28e83421b4d7a1b42fbfaabacf7..892a3a1979038f4cc832bc6f75c155e96df2c64a 100644
--- a/Framework/Crystal/inc/MantidCrystal/IndexPeaks.h
+++ b/Framework/Crystal/inc/MantidCrystal/IndexPeaks.h
@@ -37,27 +37,27 @@ namespace Crystal {
class DLLExport IndexPeaks : public API::Algorithm {
public:
IndexPeaks();
- ~IndexPeaks();
+ ~IndexPeaks() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "IndexPeaks"; };
+ const std::string name() const override { return "IndexPeaks"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Index the peaks using the UB from the sample.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Crystal\\Peaks"; }
+ const std::string category() const override { return "Crystal\\Peaks"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/IndexSXPeaks.h b/Framework/Crystal/inc/MantidCrystal/IndexSXPeaks.h
index 1da33074a3a1d2a41c059c46d2c34a6870962218..0f6715c513169cfcbe9765dd909a69e5bbf4e7d7 100644
--- a/Framework/Crystal/inc/MantidCrystal/IndexSXPeaks.h
+++ b/Framework/Crystal/inc/MantidCrystal/IndexSXPeaks.h
@@ -157,20 +157,20 @@ public:
/// Default constructor
IndexSXPeaks() : API::Algorithm(){};
/// Destructor
- virtual ~IndexSXPeaks(){};
+ ~IndexSXPeaks() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "IndexSXPeaks"; }
+ const std::string name() const override { return "IndexSXPeaks"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Takes a PeaksWorkspace and a B-Matrix and determines the HKL "
"values corresponding to each Single Crystal peak. Sets indexes on "
"the input/output workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Crystal\\Peaks"; }
+ const std::string category() const override { return "Crystal\\Peaks"; }
private:
// Helper method to cull potential hkls off each peak.
@@ -179,9 +179,9 @@ private:
// Helper method used to check that not all peaks are colinear.
void validateNotColinear(std::vector<PeakCandidate> &peakCandidates) const;
// Overridden Algorithm methods
- void init();
+ void init() override;
//
- void exec();
+ void exec() override;
//
};
diff --git a/Framework/Crystal/inc/MantidCrystal/IntegratePeakTimeSlices.h b/Framework/Crystal/inc/MantidCrystal/IntegratePeakTimeSlices.h
index 58e51a51514fb18c5fb8fc9868c7bc141c4156e8..71d3529a9de5987b84a2ac14b03dac4cbd9d1131 100644
--- a/Framework/Crystal/inc/MantidCrystal/IntegratePeakTimeSlices.h
+++ b/Framework/Crystal/inc/MantidCrystal/IntegratePeakTimeSlices.h
@@ -229,26 +229,26 @@ public:
IntegratePeakTimeSlices();
/// Destructor
- virtual ~IntegratePeakTimeSlices();
+ ~IntegratePeakTimeSlices() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "IntegratePeakTimeSlices"; }
+ const std::string name() const override { return "IntegratePeakTimeSlices"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The algorithm uses CurveFitting::BivariateNormal for fitting a "
"time slice";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Crystal\\Integration"; }
+ const std::string category() const override { return "Crystal\\Integration"; }
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
bool m_EdgePeak;
diff --git a/Framework/Crystal/inc/MantidCrystal/IntegratePeaksHybrid.h b/Framework/Crystal/inc/MantidCrystal/IntegratePeaksHybrid.h
index 4f0dba9ea55639daf6ff0bfcbfea86f710a37aeb..cd67e4aba979eb17546dc11d4ef599e5d2ecaec5 100644
--- a/Framework/Crystal/inc/MantidCrystal/IntegratePeaksHybrid.h
+++ b/Framework/Crystal/inc/MantidCrystal/IntegratePeaksHybrid.h
@@ -33,16 +33,16 @@ namespace Crystal {
class DLLExport IntegratePeaksHybrid : public API::Algorithm {
public:
IntegratePeaksHybrid();
- virtual ~IntegratePeaksHybrid();
+ ~IntegratePeaksHybrid() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
private:
- virtual const std::string summary() const;
- void init();
- void exec();
+ const std::string summary() const override;
+ void init() override;
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/IntegratePeaksUsingClusters.h b/Framework/Crystal/inc/MantidCrystal/IntegratePeaksUsingClusters.h
index 524907d66d7421627ea5dcfaa9bf1f7c739cad8a..c7546f455f31fa1ceb6e1dd3dc1810081ab1764a 100644
--- a/Framework/Crystal/inc/MantidCrystal/IntegratePeaksUsingClusters.h
+++ b/Framework/Crystal/inc/MantidCrystal/IntegratePeaksUsingClusters.h
@@ -34,21 +34,21 @@ namespace Crystal {
class DLLExport IntegratePeaksUsingClusters : public API::Algorithm {
public:
IntegratePeaksUsingClusters();
- virtual ~IntegratePeaksUsingClusters();
+ ~IntegratePeaksUsingClusters() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Integrate single crystal peaks using connected component analysis";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
Mantid::API::MDNormalization getNormalization();
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/LoadHKL.h b/Framework/Crystal/inc/MantidCrystal/LoadHKL.h
index 0e14642c8711e91c9f6d7719caabd0755fddd6e1..fd7a4745621b5e62e50795e4fb13b82621a0965e 100644
--- a/Framework/Crystal/inc/MantidCrystal/LoadHKL.h
+++ b/Framework/Crystal/inc/MantidCrystal/LoadHKL.h
@@ -19,27 +19,27 @@ namespace Crystal {
class DLLExport LoadHKL : public API::Algorithm {
public:
LoadHKL();
- ~LoadHKL();
+ ~LoadHKL() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "LoadHKL"; };
+ const std::string name() const override { return "LoadHKL"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads an ASCII .hkl file to a PeaksWorkspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\DataHandling;DataHandling\\Text";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Mantid
diff --git a/Framework/Crystal/inc/MantidCrystal/LoadIsawPeaks.h b/Framework/Crystal/inc/MantidCrystal/LoadIsawPeaks.h
index 4ea4de97af84216aba5933991197e191cddabec1..2e9d9b9ebe606c8a2cd2c445e0421bf9e1fb99a9 100644
--- a/Framework/Crystal/inc/MantidCrystal/LoadIsawPeaks.h
+++ b/Framework/Crystal/inc/MantidCrystal/LoadIsawPeaks.h
@@ -19,33 +19,33 @@ class DLLExport LoadIsawPeaks
: public API::IFileLoader<Kernel::FileDescriptor> {
public:
LoadIsawPeaks();
- virtual ~LoadIsawPeaks();
+ ~LoadIsawPeaks() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "LoadIsawPeaks"; }
+ const std::string name() const override { return "LoadIsawPeaks"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load an ISAW-style .peaks file into a PeaksWorkspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\DataHandling;DataHandling\\Isaw";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Reads calibration/detector section and returns first word of next line
std::string ApplyCalibInfo(std::ifstream &in, std::string startChar,
diff --git a/Framework/Crystal/inc/MantidCrystal/LoadIsawSpectrum.h b/Framework/Crystal/inc/MantidCrystal/LoadIsawSpectrum.h
index d47e54ad963637cd03cc259332103cc3d90f5c78..20c178711e4cba88a71c263325ee4a152b7fe48d 100644
--- a/Framework/Crystal/inc/MantidCrystal/LoadIsawSpectrum.h
+++ b/Framework/Crystal/inc/MantidCrystal/LoadIsawSpectrum.h
@@ -35,27 +35,27 @@ National Laboratory & European Spallation Source
class DLLExport LoadIsawSpectrum : public API::Algorithm {
public:
LoadIsawSpectrum();
- ~LoadIsawSpectrum();
+ ~LoadIsawSpectrum() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "LoadIsawSpectrum"; };
+ const std::string name() const override { return "LoadIsawSpectrum"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load incident spectrum and detector efficiency correction file.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\DataHandling;DataHandling\\Text";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
double spectrumCalc(double TOF, int iSpec,
std::vector<std::vector<double>> time,
diff --git a/Framework/Crystal/inc/MantidCrystal/LoadIsawUB.h b/Framework/Crystal/inc/MantidCrystal/LoadIsawUB.h
index c8d3bbd95f1ad47c53f175db5b089b022eaf029f..b0c8ee51d8d04bf18ba191761eace347a6bb967b 100644
--- a/Framework/Crystal/inc/MantidCrystal/LoadIsawUB.h
+++ b/Framework/Crystal/inc/MantidCrystal/LoadIsawUB.h
@@ -17,28 +17,28 @@ namespace Crystal {
class DLLExport LoadIsawUB : public API::Algorithm {
public:
LoadIsawUB();
- ~LoadIsawUB();
+ ~LoadIsawUB() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "LoadIsawUB"; };
+ const std::string name() const override { return "LoadIsawUB"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load an ISAW-style ASCII UB matrix and lattice parameters file, "
"and place its information into a workspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\DataHandling;DataHandling\\Isaw";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Mantid
diff --git a/Framework/Crystal/inc/MantidCrystal/MaskPeaksWorkspace.h b/Framework/Crystal/inc/MantidCrystal/MaskPeaksWorkspace.h
index ba171d73bd6d866f6a46ffefb63c6c9687742182..1b1e1bc233c98be466ef62f921a758cecce7816e 100644
--- a/Framework/Crystal/inc/MantidCrystal/MaskPeaksWorkspace.h
+++ b/Framework/Crystal/inc/MantidCrystal/MaskPeaksWorkspace.h
@@ -42,16 +42,16 @@ public:
/// Default constructor
MaskPeaksWorkspace();
/// Destructor
- virtual ~MaskPeaksWorkspace();
+ ~MaskPeaksWorkspace() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "MaskPeaksWorkspace"; }
+ const std::string name() const override { return "MaskPeaksWorkspace"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Crystal\\Peaks"; }
+ const std::string category() const override { return "Crystal\\Peaks"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Masks a peaks workspace.";
}
@@ -59,8 +59,8 @@ private:
API::MatrixWorkspace_sptr m_inputW; ///< A pointer to the input workspace
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
std::size_t getWkspIndex(const detid2index_map &pixel_to_wi,
Geometry::IComponent_const_sptr comp, const int x,
const int y);
diff --git a/Framework/Crystal/inc/MantidCrystal/NormaliseVanadium.h b/Framework/Crystal/inc/MantidCrystal/NormaliseVanadium.h
index 80381cf1984b38b35408ffbe2e2dbb9a276e05ad..f173fffb2edd1debcbeb07e54919b51e361f557e 100644
--- a/Framework/Crystal/inc/MantidCrystal/NormaliseVanadium.h
+++ b/Framework/Crystal/inc/MantidCrystal/NormaliseVanadium.h
@@ -50,18 +50,18 @@ public:
/// (Empty) Constructor
NormaliseVanadium();
/// Virtual destructor
- virtual ~NormaliseVanadium() {}
+ ~NormaliseVanadium() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "NormaliseVanadium"; }
+ const std::string name() const override { return "NormaliseVanadium"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Normalises all spectra to a specified wavelength.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\Corrections;CorrectionFunctions\\NormalisationCorrections";
}
@@ -75,9 +75,9 @@ protected:
protected:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/OptimizeCrystalPlacement.h b/Framework/Crystal/inc/MantidCrystal/OptimizeCrystalPlacement.h
index 3fe3a68dd1f25bf62ae180437b11807fd8503c10..deeb332aff6e25ad231eeca27ef100ae0ea85c19 100644
--- a/Framework/Crystal/inc/MantidCrystal/OptimizeCrystalPlacement.h
+++ b/Framework/Crystal/inc/MantidCrystal/OptimizeCrystalPlacement.h
@@ -49,23 +49,27 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport OptimizeCrystalPlacement : public API::Algorithm {
public:
OptimizeCrystalPlacement();
- virtual ~OptimizeCrystalPlacement();
+ ~OptimizeCrystalPlacement() override;
- virtual const std::string name() const { return "OptimizeCrystalPlacement"; };
+ const std::string name() const override {
+ return "OptimizeCrystalPlacement";
+ };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm optimizes goniometer settings and sample "
"orientation to better index the peaks.";
}
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
- const std::string category() const { return "Crystal\\Corrections"; };
+ const std::string category() const override {
+ return "Crystal\\Corrections";
+ };
private:
- void init();
+ void init() override;
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/Crystal/inc/MantidCrystal/OptimizeExtinctionParameters.h b/Framework/Crystal/inc/MantidCrystal/OptimizeExtinctionParameters.h
index c03704c4590d91f3804d8af0f46771473d1a1a86..9223eb9f7e62349ff412023237fe1d45e215663b 100644
--- a/Framework/Crystal/inc/MantidCrystal/OptimizeExtinctionParameters.h
+++ b/Framework/Crystal/inc/MantidCrystal/OptimizeExtinctionParameters.h
@@ -44,20 +44,20 @@ public:
/// Default constructorMatrix
OptimizeExtinctionParameters();
/// Destructor
- virtual ~OptimizeExtinctionParameters();
+ ~OptimizeExtinctionParameters() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const {
+ const std::string name() const override {
return "OptimizeExtinctionParameters";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Finds optimal mosaic and r_crystallite parameters for extinction "
"correction.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Crystal\\Corrections"; }
+ const std::string category() const override { return "Crystal\\Corrections"; }
/// Call TOFExtinction as a Child Algorithm to get statistics of the peaks
double fitMosaic(double mosaic, double rcrystallite, std::string inname,
std::string corrOption, std::string pointOption,
@@ -67,8 +67,8 @@ private:
/// Point Groups possible
std::vector<Mantid::Geometry::PointGroup_sptr> m_pointGroups;
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/Crystal/inc/MantidCrystal/OptimizeLatticeForCellType.h b/Framework/Crystal/inc/MantidCrystal/OptimizeLatticeForCellType.h
index bd6df7fe2ec061c9e74795d6005111aa789ea20c..746a511d0db233f6136615e05f32c6de241d0a67 100644
--- a/Framework/Crystal/inc/MantidCrystal/OptimizeLatticeForCellType.h
+++ b/Framework/Crystal/inc/MantidCrystal/OptimizeLatticeForCellType.h
@@ -47,20 +47,20 @@ public:
/// Default constructorMatrix
OptimizeLatticeForCellType();
/// Destructor
- virtual ~OptimizeLatticeForCellType();
+ ~OptimizeLatticeForCellType() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const {
+ const std::string name() const override {
return "OptimizeLatticeForCellType";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Optimize lattice parameters for cell type.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Crystal\\Cell"; }
+ const std::string category() const override { return "Crystal\\Cell"; }
API::ILatticeFunction_sptr
getLatticeFunction(const std::string &cellType,
@@ -68,8 +68,8 @@ public:
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Function to find peaks near detector edge
bool edgePixel(DataObjects::PeaksWorkspace_sptr ws, std::string bankName,
int col, int row, int Edge);
diff --git a/Framework/Crystal/inc/MantidCrystal/PeakBackground.h b/Framework/Crystal/inc/MantidCrystal/PeakBackground.h
index c7b1643e1e3f0310fa8e9584502fe781dbc3d2d6..cf588c14b4a96d9f1428deeda2259a317ca58852 100644
--- a/Framework/Crystal/inc/MantidCrystal/PeakBackground.h
+++ b/Framework/Crystal/inc/MantidCrystal/PeakBackground.h
@@ -68,17 +68,17 @@ public:
PeakBackground &operator=(const PeakBackground &other);
/// Overriden is background function
- virtual bool isBackground(Mantid::API::IMDIterator *iterator) const;
+ bool isBackground(Mantid::API::IMDIterator *iterator) const override;
/// Overriden configure iterator function.
- virtual void
- configureIterator(Mantid::API::IMDIterator *const iterator) const;
+ void
+ configureIterator(Mantid::API::IMDIterator *const iterator) const override;
/// Virutal constructor
- virtual PeakBackground *clone() const;
+ PeakBackground *clone() const override;
/// Destructor
- virtual ~PeakBackground();
+ ~PeakBackground() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/PeakHKLErrors.h b/Framework/Crystal/inc/MantidCrystal/PeakHKLErrors.h
index 31b60b492b26876e919b0897f76ae54524c45560..b288fa792ffa6803b78b89f14b3be0c9b561c001 100644
--- a/Framework/Crystal/inc/MantidCrystal/PeakHKLErrors.h
+++ b/Framework/Crystal/inc/MantidCrystal/PeakHKLErrors.h
@@ -50,20 +50,21 @@ class DLLExport PeakHKLErrors : public API::ParamFunction,
public API::IFunction1D {
public:
PeakHKLErrors();
- virtual ~PeakHKLErrors();
+ ~PeakHKLErrors() override;
- std::string name() const { return std::string("PeakHKLErrors"); };
+ std::string name() const override { return std::string("PeakHKLErrors"); };
virtual int version() const { return 1; };
- const std::string category() const { return "Calibration"; };
+ const std::string category() const override { return "Calibration"; };
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
void functionDeriv1D(Mantid::API::Jacobian *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
- void init();
+ void init() override;
static void cLone(boost::shared_ptr<Geometry::ParameterMap> &pmap,
boost::shared_ptr<const Geometry::IComponent> component,
@@ -72,7 +73,7 @@ public:
void getRun2MatMap(DataObjects::PeaksWorkspace_sptr &Peaks,
const std::string &OptRuns,
std::map<int, Mantid::Kernel::Matrix<double>> &Res) const;
- size_t nAttributes() const { return (size_t)2; }
+ size_t nAttributes() const override { return (size_t)2; }
static Kernel::Matrix<double> DerivRotationMatrixAboutRegAxis(double theta,
char axis);
@@ -83,11 +84,11 @@ public:
boost::shared_ptr<Geometry::Instrument>
getNewInstrument(DataObjects::PeaksWorkspace_sptr Peaks) const;
- std::vector<std::string> getAttributeNames() const {
+ std::vector<std::string> getAttributeNames() const override {
return {"OptRuns", "PeakWorkspaceName"};
}
- IFunction::Attribute getAttribute(const std::string &attName) const {
+ IFunction::Attribute getAttribute(const std::string &attName) const override {
if (attName == "OptRuns")
return IFunction::Attribute(OptRuns);
@@ -98,7 +99,7 @@ public:
}
void setAttribute(const std::string &attName,
- const IFunction::Attribute &value) {
+ const IFunction::Attribute &value) override {
if (attName == "OptRuns") {
OptRuns = value.asString();
@@ -128,7 +129,7 @@ public:
throw std::invalid_argument("Not a valid attribute name");
}
- bool hasAttribute(const std::string &attName) const {
+ bool hasAttribute(const std::string &attName) const override {
if (attName == "OptRuns")
return true;
diff --git a/Framework/Crystal/inc/MantidCrystal/PeakIntegration.h b/Framework/Crystal/inc/MantidCrystal/PeakIntegration.h
index 9613a020b3b14d65ec0be05e7d5a00423130ae58..171d7459706a3766d4e7db649afb54d196869a6d 100644
--- a/Framework/Crystal/inc/MantidCrystal/PeakIntegration.h
+++ b/Framework/Crystal/inc/MantidCrystal/PeakIntegration.h
@@ -42,15 +42,15 @@ public:
/// Default constructor
PeakIntegration();
/// Destructor
- virtual ~PeakIntegration();
+ ~PeakIntegration() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "PeakIntegration"; }
+ const std::string name() const override { return "PeakIntegration"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Crystal\\Integration"; }
+ const std::string category() const override { return "Crystal\\Integration"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Integrate single crystal peaks using IkedaCarpenter fit TOF";
}
@@ -58,8 +58,8 @@ private:
API::MatrixWorkspace_sptr inputW; ///< A pointer to the input workspace
API::MatrixWorkspace_sptr outputW; ///< A pointer to the output workspace
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Call Gaussian as a Child Algorithm to fit the peak in a spectrum
void fitSpectra(const int s, double TOFPeakd, double &I, double &sigI);
/// Read in all the input parameters
diff --git a/Framework/Crystal/inc/MantidCrystal/PeakIntensityVsRadius.h b/Framework/Crystal/inc/MantidCrystal/PeakIntensityVsRadius.h
index 1cd68da14cc88ff8e3d7176fb2288e89cb527162..4fc2480aeaa66170c8efae8065b5209a435d0301 100644
--- a/Framework/Crystal/inc/MantidCrystal/PeakIntensityVsRadius.h
+++ b/Framework/Crystal/inc/MantidCrystal/PeakIntensityVsRadius.h
@@ -35,21 +35,21 @@ namespace Crystal {
class DLLExport PeakIntensityVsRadius : public API::Algorithm {
public:
PeakIntensityVsRadius();
- virtual ~PeakIntensityVsRadius();
+ ~PeakIntensityVsRadius() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate the integrated intensity of peaks vs integration radius.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
- std::map<std::string, std::string> validateInputs();
+ void init() override;
+ void exec() override;
+ std::map<std::string, std::string> validateInputs() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/PeaksInRegion.h b/Framework/Crystal/inc/MantidCrystal/PeaksInRegion.h
index 7cf4039f3f6363e1381903cb3f25dc55cdab1ff7..9869ac9afd3150768d617df91ba47862adeeaee1 100644
--- a/Framework/Crystal/inc/MantidCrystal/PeaksInRegion.h
+++ b/Framework/Crystal/inc/MantidCrystal/PeaksInRegion.h
@@ -33,33 +33,33 @@ namespace Crystal {
class DLLExport PeaksInRegion : public PeaksIntersection {
public:
PeaksInRegion();
- virtual ~PeaksInRegion();
+ ~PeaksInRegion() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Find peaks intersecting a box region.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
// Overriden base class methods.
- virtual void validateExtentsInput() const;
- virtual int numberOfFaces() const;
- virtual VecVecV3D createFaces() const;
- virtual bool
- pointOutsideAnyExtents(const Mantid::Kernel::V3D &testPoint) const;
- virtual bool
+ void validateExtentsInput() const override;
+ int numberOfFaces() const override;
+ VecVecV3D createFaces() const override;
+ bool
+ pointOutsideAnyExtents(const Mantid::Kernel::V3D &testPoint) const override;
+ bool
pointInsideAllExtents(const Mantid::Kernel::V3D &testPoints,
- const Mantid::Kernel::V3D &peakCenter) const;
- virtual void checkTouchPoint(const Mantid::Kernel::V3D &touchPoint,
- const Mantid::Kernel::V3D &normal,
- const Mantid::Kernel::V3D &faceVertex) const;
+ const Mantid::Kernel::V3D &peakCenter) const override;
+ void checkTouchPoint(const Mantid::Kernel::V3D &touchPoint,
+ const Mantid::Kernel::V3D &normal,
+ const Mantid::Kernel::V3D &faceVertex) const override;
/// Extents.
std::vector<double> m_extents;
diff --git a/Framework/Crystal/inc/MantidCrystal/PeaksIntersection.h b/Framework/Crystal/inc/MantidCrystal/PeaksIntersection.h
index 9ed9bd5be029137508725ab052b3c949d74e601f..1769387bdd928c738e32b42389a9e39490a6466a 100644
--- a/Framework/Crystal/inc/MantidCrystal/PeaksIntersection.h
+++ b/Framework/Crystal/inc/MantidCrystal/PeaksIntersection.h
@@ -39,7 +39,7 @@ typedef std::vector<VecV3D> VecVecV3D;
class DLLExport PeaksIntersection : public API::Algorithm {
public:
PeaksIntersection();
- virtual ~PeaksIntersection();
+ ~PeaksIntersection() override;
static std::string detectorSpaceFrame();
static std::string qLabFrame();
diff --git a/Framework/Crystal/inc/MantidCrystal/PeaksOnSurface.h b/Framework/Crystal/inc/MantidCrystal/PeaksOnSurface.h
index 00160af4e4c6e0e391eb808ab5fa899cf37d6f69..b145ba4a080fc5413b9f0244820d937a982f88c2 100644
--- a/Framework/Crystal/inc/MantidCrystal/PeaksOnSurface.h
+++ b/Framework/Crystal/inc/MantidCrystal/PeaksOnSurface.h
@@ -33,33 +33,33 @@ namespace Crystal {
class DLLExport PeaksOnSurface : public PeaksIntersection {
public:
PeaksOnSurface();
- virtual ~PeaksOnSurface();
+ ~PeaksOnSurface() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Find peaks intersecting a single surface region.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
// Overriden base class methods.
- virtual void validateExtentsInput() const;
- virtual int numberOfFaces() const;
- virtual VecVecV3D createFaces() const;
- virtual bool
- pointOutsideAnyExtents(const Mantid::Kernel::V3D &testPoint) const;
- virtual bool
+ void validateExtentsInput() const override;
+ int numberOfFaces() const override;
+ VecVecV3D createFaces() const override;
+ bool
+ pointOutsideAnyExtents(const Mantid::Kernel::V3D &testPoint) const override;
+ bool
pointInsideAllExtents(const Mantid::Kernel::V3D &testPoints,
- const Mantid::Kernel::V3D &peakCenter) const;
- virtual void checkTouchPoint(const Mantid::Kernel::V3D &touchPoint,
- const Mantid::Kernel::V3D &normal,
- const Mantid::Kernel::V3D &faceVertex) const;
+ const Mantid::Kernel::V3D &peakCenter) const override;
+ void checkTouchPoint(const Mantid::Kernel::V3D &touchPoint,
+ const Mantid::Kernel::V3D &normal,
+ const Mantid::Kernel::V3D &faceVertex) const override;
/// Extents.
std::vector<double> m_extents;
diff --git a/Framework/Crystal/inc/MantidCrystal/PredictFractionalPeaks.h b/Framework/Crystal/inc/MantidCrystal/PredictFractionalPeaks.h
index 4237b5526679524ec8ed44e9ba94f895f93ff1a4..39583156722537507fab1e0f1ec740aba0adea3b 100644
--- a/Framework/Crystal/inc/MantidCrystal/PredictFractionalPeaks.h
+++ b/Framework/Crystal/inc/MantidCrystal/PredictFractionalPeaks.h
@@ -38,28 +38,28 @@ namespace Crystal {
class DLLExport PredictFractionalPeaks : public API::Algorithm {
public:
PredictFractionalPeaks();
- virtual ~PredictFractionalPeaks();
+ ~PredictFractionalPeaks() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "PredictFractionalPeaks"; };
+ const std::string name() const override { return "PredictFractionalPeaks"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The offsets can be from hkl values in a range of hkl values or "
"from peaks in the input PeaksWorkspace";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Crystal\\Peaks"; }
+ const std::string category() const override { return "Crystal\\Peaks"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/PredictPeaks.h b/Framework/Crystal/inc/MantidCrystal/PredictPeaks.h
index b3fcb7eeae95b907be9ce0bbb70cba994c7004f6..0fe5e371e0e4fb7d8f5a42765e1131457216f69a 100644
--- a/Framework/Crystal/inc/MantidCrystal/PredictPeaks.h
+++ b/Framework/Crystal/inc/MantidCrystal/PredictPeaks.h
@@ -23,27 +23,27 @@ namespace Crystal {
class DLLExport PredictPeaks : public API::Algorithm {
public:
PredictPeaks();
- ~PredictPeaks();
+ ~PredictPeaks() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "PredictPeaks"; };
+ const std::string name() const override { return "PredictPeaks"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Using a known crystal lattice and UB matrix, predict where single "
"crystal peaks should be found in detector/TOF space. Creates a "
"PeaksWorkspace containing the peaks at the expected positions.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Crystal\\Peaks"; }
+ const std::string category() const override { return "Crystal\\Peaks"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
void checkBeamDirection() const;
void setInstrumentFromInputWorkspace(const API::ExperimentInfo_sptr &inWS);
diff --git a/Framework/Crystal/inc/MantidCrystal/SCDCalibratePanels.h b/Framework/Crystal/inc/MantidCrystal/SCDCalibratePanels.h
index 3ded3ef522b69ff12fe89ea95e056d0f6aad2750..a5f20997b39007f83498a47b546614bf7056e4f9 100644
--- a/Framework/Crystal/inc/MantidCrystal/SCDCalibratePanels.h
+++ b/Framework/Crystal/inc/MantidCrystal/SCDCalibratePanels.h
@@ -47,21 +47,21 @@ class SCDCalibratePanels : public Mantid::API::Algorithm {
public:
SCDCalibratePanels();
- virtual ~SCDCalibratePanels();
+ ~SCDCalibratePanels() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Panel parameters, sample position,L0 and T0 are optimized to "
"minimize errors between theoretical and actual q values for the "
"peaks";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const;
+ const std::string category() const override;
/**
* Refactors a rotation Q as a Rotation in x dir by Rotx * a Rotation in the
@@ -251,9 +251,9 @@ private:
const std::vector<double> ¶ms,
const std::vector<double> &errs);
- void exec();
+ void exec() override;
- void init();
+ void init() override;
API::ITableWorkspace_sptr Result;
diff --git a/Framework/Crystal/inc/MantidCrystal/SCDPanelErrors.h b/Framework/Crystal/inc/MantidCrystal/SCDPanelErrors.h
index b5c4809fe714e2f27646923dec13ccd94efde5be..7dba4ef5af7c416c4006b725cc7278ab659e87ee 100644
--- a/Framework/Crystal/inc/MantidCrystal/SCDPanelErrors.h
+++ b/Framework/Crystal/inc/MantidCrystal/SCDPanelErrors.h
@@ -68,16 +68,17 @@ public:
double a, double b, double c, double alpha, double beta,
double gamma, double tolerance);
- virtual ~SCDPanelErrors();
+ ~SCDPanelErrors() override;
- std::string name() const { return "SCDPanelErrors"; }
+ std::string name() const override { return "SCDPanelErrors"; }
- virtual const std::string category() const { return "Calibrate"; }
+ const std::string category() const override { return "Calibrate"; }
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
Kernel::Matrix<double>
CalcDiffDerivFromdQ(Kernel::Matrix<double> const &DerivQ,
@@ -86,15 +87,16 @@ public:
Kernel::Matrix<double> const &InvhklThkl,
Kernel::Matrix<double> const &UB) const;
- size_t nAttributes() const;
+ size_t nAttributes() const override;
- std::vector<std::string> getAttributeNames() const;
+ std::vector<std::string> getAttributeNames() const override;
- Attribute getAttribute(const std::string &attName) const;
+ Attribute getAttribute(const std::string &attName) const override;
- void setAttribute(const std::string &attName, const Attribute &value);
+ void setAttribute(const std::string &attName,
+ const Attribute &value) override;
- bool hasAttribute(const std::string &attName) const;
+ bool hasAttribute(const std::string &attName) const override;
/**
* A utility method that will set up the Workspace needed by this function.
@@ -139,7 +141,7 @@ public:
double T0, double L0);
protected:
- void init();
+ void init() override;
/**
* Checks for out of bounds values , peaksWorkspace status
diff --git a/Framework/Crystal/inc/MantidCrystal/SaveHKL.h b/Framework/Crystal/inc/MantidCrystal/SaveHKL.h
index bf11a810394ef7a33868beb498d3502875bae8ab..0cc490e2b33314ea36b1005dd306487f18c07a68 100644
--- a/Framework/Crystal/inc/MantidCrystal/SaveHKL.h
+++ b/Framework/Crystal/inc/MantidCrystal/SaveHKL.h
@@ -17,27 +17,27 @@ namespace Crystal {
class DLLExport SaveHKL : public API::Algorithm {
public:
SaveHKL();
- ~SaveHKL();
+ ~SaveHKL() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SaveHKL"; };
+ const std::string name() const override { return "SaveHKL"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save a PeaksWorkspace to a ASCII .hkl file.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\DataHandling;DataHandling\\Text";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
double absor_sphere(double &twoth, double &wl, double &tbar);
double m_smu; // in 1/cm
diff --git a/Framework/Crystal/inc/MantidCrystal/SaveIsawPeaks.h b/Framework/Crystal/inc/MantidCrystal/SaveIsawPeaks.h
index f58ef01c10342fa24185b1da4ee253c14763c9fc..021f75920d44244d66e62b1c5539034b1a52e1ea 100644
--- a/Framework/Crystal/inc/MantidCrystal/SaveIsawPeaks.h
+++ b/Framework/Crystal/inc/MantidCrystal/SaveIsawPeaks.h
@@ -15,27 +15,27 @@ namespace Crystal {
class DLLExport SaveIsawPeaks : public API::Algorithm {
public:
SaveIsawPeaks();
- ~SaveIsawPeaks();
+ ~SaveIsawPeaks() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SaveIsawPeaks"; };
+ const std::string name() const override { return "SaveIsawPeaks"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save a PeaksWorkspace to a ISAW-style ASCII .peaks file.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\DataHandling;DataHandling\\Isaw";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// find position for rectangular and non-rectangular
Kernel::V3D findPixelPos(std::string bankName, int col, int row);
void sizeBanks(std::string bankName, int &NCOLS, int &NROWS, double &xsize,
diff --git a/Framework/Crystal/inc/MantidCrystal/SaveIsawUB.h b/Framework/Crystal/inc/MantidCrystal/SaveIsawUB.h
index 8d03536ed96a890b43bc99fa284313fbbdcfa545..c12b4ea7d31e3f2e3e913c3d0138e9835f44a565 100644
--- a/Framework/Crystal/inc/MantidCrystal/SaveIsawUB.h
+++ b/Framework/Crystal/inc/MantidCrystal/SaveIsawUB.h
@@ -40,28 +40,28 @@ namespace Crystal {
class DLLExport SaveIsawUB : public API::Algorithm {
public:
SaveIsawUB();
- ~SaveIsawUB();
+ ~SaveIsawUB() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SaveIsawUB"; };
+ const std::string name() const override { return "SaveIsawUB"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save a UB matrix and lattice parameters from a workspace to an "
"ISAW-style ASCII file.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\DataHandling;DataHandling\\Isaw";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
// Calculates the error in the volume
double getErrorVolume(const Geometry::OrientedLattice &lattice);
diff --git a/Framework/Crystal/inc/MantidCrystal/SaveLauenorm.h b/Framework/Crystal/inc/MantidCrystal/SaveLauenorm.h
index 3bcdc23c05355c19b1876e268292df41ad49246d..89a333dd0af95356a09583b70670454cbf46537a 100644
--- a/Framework/Crystal/inc/MantidCrystal/SaveLauenorm.h
+++ b/Framework/Crystal/inc/MantidCrystal/SaveLauenorm.h
@@ -18,27 +18,27 @@ namespace Crystal {
class DLLExport SaveLauenorm : public API::Algorithm {
public:
SaveLauenorm();
- ~SaveLauenorm();
+ ~SaveLauenorm() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SaveLauenorm"; };
+ const std::string name() const override { return "SaveLauenorm"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save a PeaksWorkspace to a ASCII file for each detector.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\DataHandling;DataHandling\\Text";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
DataObjects::PeaksWorkspace_sptr ws;
void sizeBanks(std::string bankName, int &nCols, int &nRows);
diff --git a/Framework/Crystal/inc/MantidCrystal/SavePeaksFile.h b/Framework/Crystal/inc/MantidCrystal/SavePeaksFile.h
index 69caeede88dae78d53806c2f0c956e68671ebac2..891949603abedac21341c3dd2c553f8df25b812e 100644
--- a/Framework/Crystal/inc/MantidCrystal/SavePeaksFile.h
+++ b/Framework/Crystal/inc/MantidCrystal/SavePeaksFile.h
@@ -15,25 +15,25 @@ namespace Crystal {
class DLLExport SavePeaksFile : public API::Algorithm {
public:
SavePeaksFile();
- ~SavePeaksFile();
+ ~SavePeaksFile() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SavePeaksFile"; };
+ const std::string name() const override { return "SavePeaksFile"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save a PeaksWorkspace to a .peaks text-format file.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Crystal"; }
+ const std::string category() const override { return "Crystal"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Mantid
diff --git a/Framework/Crystal/inc/MantidCrystal/SelectCellOfType.h b/Framework/Crystal/inc/MantidCrystal/SelectCellOfType.h
index afe1bc0d206ad73fff995ef60b2f79db1548e31d..0a18d76f404d540f03d9cb4735cad13fb705bcfd 100644
--- a/Framework/Crystal/inc/MantidCrystal/SelectCellOfType.h
+++ b/Framework/Crystal/inc/MantidCrystal/SelectCellOfType.h
@@ -39,19 +39,19 @@ namespace Crystal {
class DLLExport SelectCellOfType : public API::Algorithm {
public:
SelectCellOfType();
- ~SelectCellOfType();
+ ~SelectCellOfType() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SelectCellOfType"; };
+ const std::string name() const override { return "SelectCellOfType"; };
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Crystal\\Cell"; }
+ const std::string category() const override { return "Crystal\\Cell"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Select a conventional cell with a specific lattice type and "
"centering, corresponding to the UB stored with the sample for this "
"peaks works space.";
@@ -59,10 +59,10 @@ public:
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/SelectCellWithForm.h b/Framework/Crystal/inc/MantidCrystal/SelectCellWithForm.h
index 68d2fd5778e367b07672521ce60462ade420f70e..3245384faf964fd211e7404fa1c9e0d839d35704 100644
--- a/Framework/Crystal/inc/MantidCrystal/SelectCellWithForm.h
+++ b/Framework/Crystal/inc/MantidCrystal/SelectCellWithForm.h
@@ -40,19 +40,19 @@ namespace Crystal {
class DLLExport SelectCellWithForm : public API::Algorithm {
public:
SelectCellWithForm();
- ~SelectCellWithForm();
+ ~SelectCellWithForm() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SelectCellWithForm"; };
+ const std::string name() const override { return "SelectCellWithForm"; };
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Crystal\\Cell"; }
+ const std::string category() const override { return "Crystal\\Cell"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Select a conventional cell with a specific form number, "
"corresponding to the UB stored with the sample for this peaks "
"works space.";
@@ -64,10 +64,10 @@ public:
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/SetGoniometer.h b/Framework/Crystal/inc/MantidCrystal/SetGoniometer.h
index e5f085e1920edcc0651ee169efaa9453c2bf07f7..5f903decd12d80338dc33f30d49bf681f32dfa55 100644
--- a/Framework/Crystal/inc/MantidCrystal/SetGoniometer.h
+++ b/Framework/Crystal/inc/MantidCrystal/SetGoniometer.h
@@ -16,26 +16,26 @@ namespace Crystal {
class DLLExport SetGoniometer : public API::Algorithm {
public:
SetGoniometer();
- ~SetGoniometer();
+ ~SetGoniometer() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SetGoniometer"; };
+ const std::string name() const override { return "SetGoniometer"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Define the goniometer motors used in an experiment by giving the "
"axes and directions of rotations.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Crystal\\Goniometer"; }
+ const std::string category() const override { return "Crystal\\Goniometer"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Mantid
diff --git a/Framework/Crystal/inc/MantidCrystal/SetSpecialCoordinates.h b/Framework/Crystal/inc/MantidCrystal/SetSpecialCoordinates.h
index 0755e6e343a86ce049e70a3921ea200874bd7163..154db46856d4c495aa98fe06108c9816ea3a10eb 100644
--- a/Framework/Crystal/inc/MantidCrystal/SetSpecialCoordinates.h
+++ b/Framework/Crystal/inc/MantidCrystal/SetSpecialCoordinates.h
@@ -40,20 +40,20 @@ namespace Crystal {
class DLLExport SetSpecialCoordinates : public API::Algorithm {
public:
SetSpecialCoordinates();
- virtual ~SetSpecialCoordinates();
+ ~SetSpecialCoordinates() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Set or overwrite any Q3D special coordinates.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
std::vector<std::string> m_specialCoordinatesNames;
typedef std::map<std::string, Mantid::Kernel::SpecialCoordinateSystem>
SpecialCoordinatesNameMap;
diff --git a/Framework/Crystal/inc/MantidCrystal/SetUB.h b/Framework/Crystal/inc/MantidCrystal/SetUB.h
index fb8eb6b311c2bee17fd0c8823ed6f94113302112..cd429e05e35425438199fc1c88670770467061c2 100644
--- a/Framework/Crystal/inc/MantidCrystal/SetUB.h
+++ b/Framework/Crystal/inc/MantidCrystal/SetUB.h
@@ -39,21 +39,21 @@ namespace Crystal {
class DLLExport SetUB : public API::Algorithm {
public:
SetUB();
- ~SetUB();
+ ~SetUB() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Set the UB matrix, given either lattice parametersand orientation "
"vectors or the UB matrix elements";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/ShowPeakHKLOffsets.h b/Framework/Crystal/inc/MantidCrystal/ShowPeakHKLOffsets.h
index a45d12e500a22c6597d614e24b0139b89d0bab7d..53d46eca37a1b673bd6aef024b7b7bf5e7c0f7d4 100644
--- a/Framework/Crystal/inc/MantidCrystal/ShowPeakHKLOffsets.h
+++ b/Framework/Crystal/inc/MantidCrystal/ShowPeakHKLOffsets.h
@@ -45,24 +45,24 @@ namespace Crystal {
class DLLExport ShowPeakHKLOffsets : public API::Algorithm {
public:
ShowPeakHKLOffsets();
- virtual ~ShowPeakHKLOffsets();
+ ~ShowPeakHKLOffsets() override;
- virtual const std::string name() const { return "ShowPeakHKLOffsets"; };
+ const std::string name() const override { return "ShowPeakHKLOffsets"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return " Histograms, scatter plots, etc. of this data could be useful to "
"detect calibration problems";
}
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
- const std::string category() const { return "Crystal\\Peaks"; };
+ const std::string category() const override { return "Crystal\\Peaks"; };
private:
- void init();
+ void init() override;
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/Crystal/inc/MantidCrystal/ShowPossibleCells.h b/Framework/Crystal/inc/MantidCrystal/ShowPossibleCells.h
index 8922394c8925ff447f32e6ea3568db0a92f98744..c7b91ea2415eef7372c668bb9eb1b49a6f132d9c 100644
--- a/Framework/Crystal/inc/MantidCrystal/ShowPossibleCells.h
+++ b/Framework/Crystal/inc/MantidCrystal/ShowPossibleCells.h
@@ -39,29 +39,29 @@ namespace Crystal {
class DLLExport ShowPossibleCells : public API::Algorithm {
public:
ShowPossibleCells();
- ~ShowPossibleCells();
+ ~ShowPossibleCells() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "ShowPossibleCells"; };
+ const std::string name() const override { return "ShowPossibleCells"; };
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Crystal\\Cell"; }
+ const std::string category() const override { return "Crystal\\Cell"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Show conventional cells corresponding to the UB stored with the "
"sample for this peaks works space.";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/inc/MantidCrystal/SortHKL.h b/Framework/Crystal/inc/MantidCrystal/SortHKL.h
index 76a383812c459754a59453198120a4d11ad9a905..6e2aee3e402436a47af497a25b7e887d3afee8fb 100644
--- a/Framework/Crystal/inc/MantidCrystal/SortHKL.h
+++ b/Framework/Crystal/inc/MantidCrystal/SortHKL.h
@@ -109,26 +109,26 @@ private:
class DLLExport SortHKL : public API::Algorithm {
public:
SortHKL();
- ~SortHKL();
+ ~SortHKL() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SortHKL"; };
+ const std::string name() const override { return "SortHKL"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Sorts a PeaksWorkspace by HKL. Averages intensities using point "
"group.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\Peaks;DataHandling\\Text;Utility\\Sorting";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
std::vector<DataObjects::Peak>
getNonZeroPeaks(const std::vector<DataObjects::Peak> &inputPeaks) const;
diff --git a/Framework/Crystal/inc/MantidCrystal/SortPeaksWorkspace.h b/Framework/Crystal/inc/MantidCrystal/SortPeaksWorkspace.h
index 0979bb7b1df45b1590567b5fbc3d40fdbf6c4d85..0eb677f0c1bf899f42eddd1098c05f95b6e4b896 100644
--- a/Framework/Crystal/inc/MantidCrystal/SortPeaksWorkspace.h
+++ b/Framework/Crystal/inc/MantidCrystal/SortPeaksWorkspace.h
@@ -35,20 +35,20 @@ namespace Crystal {
class DLLExport SortPeaksWorkspace : public API::Algorithm {
public:
SortPeaksWorkspace();
- virtual ~SortPeaksWorkspace();
+ ~SortPeaksWorkspace() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Sort a peaks workspace by a column of the workspace";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
Mantid::DataObjects::PeaksWorkspace_sptr tryFetchOutputWorkspace() const;
Mantid::DataObjects::PeaksWorkspace_sptr tryFetchInputWorkspace() const;
};
diff --git a/Framework/Crystal/inc/MantidCrystal/StatisticsOfPeaksWorkspace.h b/Framework/Crystal/inc/MantidCrystal/StatisticsOfPeaksWorkspace.h
index c7eb6d6d271a051e796e0a25d98622e7670c9096..605408cf02827aa6ed9b77276aef7a470eb81d30 100644
--- a/Framework/Crystal/inc/MantidCrystal/StatisticsOfPeaksWorkspace.h
+++ b/Framework/Crystal/inc/MantidCrystal/StatisticsOfPeaksWorkspace.h
@@ -17,21 +17,21 @@ namespace Crystal {
class DLLExport StatisticsOfPeaksWorkspace : public API::Algorithm {
public:
StatisticsOfPeaksWorkspace();
- ~StatisticsOfPeaksWorkspace();
+ ~StatisticsOfPeaksWorkspace() override;
/// Algorithm's name for identification
- virtual const std::string name() const {
+ const std::string name() const override {
return "StatisticsOfPeaksWorkspace";
};
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Statistics of a PeaksWorkspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal\\Peaks;DataHandling\\Text";
}
@@ -39,9 +39,9 @@ private:
/// Point Groups possible
std::vector<Mantid::Geometry::PointGroup_sptr> m_pointGroups;
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Runs SortHKL on workspace
void doSortHKL(Mantid::API::Workspace_sptr ws, std::string runName);
diff --git a/Framework/Crystal/inc/MantidCrystal/TOFExtinction.h b/Framework/Crystal/inc/MantidCrystal/TOFExtinction.h
index 847af280f514bd00c0724b14e94f4dc24f6cf3bf..2e56c118bb6fac96c38ca4932a862689af9d18ac 100644
--- a/Framework/Crystal/inc/MantidCrystal/TOFExtinction.h
+++ b/Framework/Crystal/inc/MantidCrystal/TOFExtinction.h
@@ -38,27 +38,27 @@ const double radtodeg_half = 180.0 / M_PI / 2.;
class DLLExport TOFExtinction : public API::Algorithm {
public:
TOFExtinction();
- ~TOFExtinction();
+ ~TOFExtinction() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "TOFExtinction"; };
+ const std::string name() const override { return "TOFExtinction"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Extinction correction for single crystal peaks.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Crystal;DataHandling\\Text";
}
private:
/// Initialise the properties;
- void init();
+ void init() override;
/// Run the algorithm;
- void exec();
+ void exec() override;
double getEg(double mosaic);
double getEgLaue(double Eb, double twoth, double wl, double divBeam,
double betaBeam);
diff --git a/Framework/Crystal/inc/MantidCrystal/TransformHKL.h b/Framework/Crystal/inc/MantidCrystal/TransformHKL.h
index de5b3f57cbd824a423a4c8692bca2d4f74ef8adc..429f38b32ca11598223555ff3120645a2d95086c 100644
--- a/Framework/Crystal/inc/MantidCrystal/TransformHKL.h
+++ b/Framework/Crystal/inc/MantidCrystal/TransformHKL.h
@@ -37,19 +37,19 @@ namespace Crystal {
class DLLExport TransformHKL : public API::Algorithm {
public:
TransformHKL();
- ~TransformHKL();
+ ~TransformHKL() override;
/// Algorithm's name for identification
- virtual const std::string name() const;
+ const std::string name() const override;
/// Algorithm's version for identification
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification
- virtual const std::string category() const;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Specify a 3x3 matrix to apply to (HKL) vectors as a list of 9 "
"comma separated numbers. Both the UB and HKL values will be "
"updated";
@@ -57,10 +57,10 @@ public:
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Crystal
diff --git a/Framework/Crystal/src/OptimizeCrystalPlacement.cpp b/Framework/Crystal/src/OptimizeCrystalPlacement.cpp
index 08d85f1084d90d57ccadc45dda5a20ac9f4970bc..830e04af5910cbb3f266d12099ee471511011e9a 100644
--- a/Framework/Crystal/src/OptimizeCrystalPlacement.cpp
+++ b/Framework/Crystal/src/OptimizeCrystalPlacement.cpp
@@ -44,19 +44,19 @@ public:
Prop1 = new Kernel::EnabledWhenProperty(propName1, Criteria1, value1);
Prop2 = new Kernel::EnabledWhenProperty(propName2, Criteria2, value2);
}
- ~OrEnabledWhenProperties() // responsible for deleting all supplied
- // EnabledWhenProperites
+ ~OrEnabledWhenProperties() override // responsible for deleting all supplied
+ // EnabledWhenProperites
{
delete Prop1;
delete Prop2;
}
- IPropertySettings *clone() {
+ IPropertySettings *clone() override {
return new OrEnabledWhenProperties(propName1, Criteria1, value1, propName2,
Criteria2, value2);
}
- bool isEnabled(const IPropertyManager *algo) const {
+ bool isEnabled(const IPropertyManager *algo) const override {
return Prop1->isEnabled(algo) && Prop2->isEnabled(algo);
}
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateChiSquared.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateChiSquared.h
index 867ec832b324d9ad2353e516c3235fc791d48ed4..3a4279938f528d0401123112fefbafe1681eaa97 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateChiSquared.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateChiSquared.h
@@ -37,13 +37,13 @@ namespace Algorithms {
*/
class DLLExport CalculateChiSquared : public IFittingAlgorithm {
public:
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string summary() const override;
private:
- void initConcrete();
- void execConcrete();
+ void initConcrete() override;
+ void execConcrete() override;
void estimateErrors();
void unfixParameters();
void refixParameters();
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h
index 11a870adec6328f4dbb98b3bed5fa14c0f64a5d0..6b667f71ea5c930a4c56d00a23e74b8047a6102b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateGammaBackground.h
@@ -42,21 +42,21 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport CalculateGammaBackground : public API::Algorithm {
public:
CalculateGammaBackground();
- ~CalculateGammaBackground();
+ ~CalculateGammaBackground() override;
- const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates the background due to gamma rays produced when neutrons "
"are absorbed by shielding.";
}
- int version() const;
- const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Hold information about a single foil
struct FoilInfo {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h
index 06b1cbd635b8fa3333653c641f9482566ee5720b..896cda52e2ccc6edf1ef5c7297a201bc3dcde7d1 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/CalculateMSVesuvio.h
@@ -67,25 +67,25 @@ private:
public:
CalculateMSVesuvio();
- ~CalculateMSVesuvio();
+ ~CalculateMSVesuvio() override;
/// @copydoc Algorithm::name
- virtual const std::string name() const { return "CalculateMSVesuvio"; }
+ const std::string name() const override { return "CalculateMSVesuvio"; }
/// @copydoc Algorithm::version
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// @copydoc Algorithm::category
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\SpecialCorrections";
}
/// @copydoc Algorithm::summary
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculates the contributions of multiple scattering "
"on a flat plate sample for VESUVIO";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void cacheInputs();
void calculateMS(const size_t wsIndex, API::ISpectrum &totalsc,
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvertToYSpace.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvertToYSpace.h
index 6ed4648408a367518609fab46670ec8d4c4dbe18..2ad130a893b3ffeed6a3498acbc71aad25c064e4 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvertToYSpace.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvertToYSpace.h
@@ -49,15 +49,15 @@ public:
/// Constructor
ConvertToYSpace();
- const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Converts workspace in units of TOF to Y-space as defined in "
"Compton scattering field";
}
- int version() const;
- const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
/// Creates a POD struct containing the required detector parameters for this
/// spectrum
@@ -76,8 +76,8 @@ public:
const DetectorParams &detpar);
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Perform the conversion to Y-space
bool convert(const size_t i);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvolveWorkspaces.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvolveWorkspaces.h
index 19fa08127b0e1a54c8fdd6a0a6594e1faba251ec..76c74e3c70da988c9a275daf64618bfbc55dd186 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvolveWorkspaces.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/ConvolveWorkspaces.h
@@ -43,24 +43,24 @@ namespace Algorithms {
class DLLExport ConvolveWorkspaces : public API::Algorithm {
public:
ConvolveWorkspaces();
- virtual ~ConvolveWorkspaces();
+ ~ConvolveWorkspaces() override;
/// Algorithm's name
- virtual const std::string name() const { return "ConvolveWorkspaces"; }
+ const std::string name() const override { return "ConvolveWorkspaces"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Convolution of two workspaces.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Utility\\Workspaces"; }
+ const std::string category() const override { return "Utility\\Workspaces"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void convolve(MantidVec &xValues, const MantidVec &Y1, const MantidVec &Y2,
MantidVec &out) const;
API::Progress *prog;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EstimatePeakErrors.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EstimatePeakErrors.h
index c16a6b037959f973eed6c93204d73d11ed92ac45..9337aba270672b8e5d0be8a9fda44a8fbed9d98b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EstimatePeakErrors.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EstimatePeakErrors.h
@@ -34,15 +34,15 @@ class DLLExport EstimatePeakErrors : public API::Algorithm {
public:
EstimatePeakErrors();
- const std::string name() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ const std::string summary() const override;
- int version() const;
- const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EvaluateFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EvaluateFunction.h
index 55be4b63901ced996a404c85b2980f8702f52d29..915b3285faaf16451e5783672913d91faeb03785 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EvaluateFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/EvaluateFunction.h
@@ -36,13 +36,13 @@ namespace Algorithms {
*/
class DLLExport EvaluateFunction : public IFittingAlgorithm {
public:
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string summary() const override;
private:
- void initConcrete();
- void execConcrete();
+ void initConcrete() override;
+ void execConcrete() override;
};
} // namespace Algorithms
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit.h
index 20c76810d8a5affe143d42be189d9fd0b77ca9d6..430d68a1a4505925459feb341ab81840bc6cf57e 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit.h
@@ -100,18 +100,18 @@ public:
/// Default constructor
Fit() : IFittingAlgorithm() {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Fit"; }
+ const std::string name() const override { return "Fit"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Fits a function to data in a Workspace";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
protected:
- void initConcrete();
- void execConcrete();
+ void initConcrete() override;
+ void execConcrete() override;
void copyMinimizerOutput(const API::IFuncMinimizer &minimizer);
};
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit1D.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit1D.h
index 9cfc546a20c3023fc0d609560b8d3eece550cf72..014afffdde5272b80c468b5bddd89644ee0e7a80 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit1D.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/Fit1D.h
@@ -63,13 +63,13 @@ public:
/// Default constructor
Fit1D() : API::Algorithm(){};
/// Destructor
- virtual ~Fit1D(){};
+ ~Fit1D() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Fit1D"; }
+ const std::string name() const override { return "Fit1D"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Optimization"; }
+ const std::string category() const override { return "Optimization"; }
/// Function you want to fit to.
virtual void function(const double *in, double *out, const double *xValues,
@@ -80,8 +80,8 @@ public:
protected:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Option for providing intelligent range starting value based e.g. on the
/// user input parameter values
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
index 1c983df6b4b5e0c65c3e86b832a65ee65c46d3ec..511c9b783c2736231b0133fac29c9c411bf62980 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/FitPowderDiffPeaks.h
@@ -61,26 +61,26 @@ namespace Algorithms {
class DLLExport FitPowderDiffPeaks : public API::Algorithm {
public:
FitPowderDiffPeaks();
- virtual ~FitPowderDiffPeaks();
+ ~FitPowderDiffPeaks() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FitPowderDiffPeaks"; }
+ const std::string name() const override { return "FitPowderDiffPeaks"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Fit peaks in powder diffraction pattern. ";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Diffraction\\Fitting"; }
+ const std::string category() const override { return "Diffraction\\Fitting"; }
private:
/// Implement abstract Algorithm methods
- void init();
+ void init() override;
/// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
/// Process input properties
void processInputProperties();
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFit.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFit.h
index 7a76297e1492b2e4bd941d6dfe318552309ac8af..644d42b470749ce564f5bcb0358d38e2c2bc9ebd 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFit.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/LeBailFit.h
@@ -75,26 +75,26 @@ public:
enum FunctionMode { CALCULATION, FIT, BACKGROUNDPROCESS, MONTECARLO };
LeBailFit();
- virtual ~LeBailFit();
+ ~LeBailFit() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LeBailFit"; }
+ const std::string name() const override { return "LeBailFit"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Do LeBail Fit to a spectrum of powder diffraction data. ";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Diffraction\\Fitting"; }
+ const std::string category() const override { return "Diffraction\\Fitting"; }
private:
// Implement abstract Algorithm methods
- void init();
+ void init() override;
// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
/// Process input properties
void processInputProperties();
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/NormaliseByPeakArea.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/NormaliseByPeakArea.h
index 4cfac079922ccc7d1b7579199dad4aae0f9fc293..a3e17bd7011c69fe1b90b11995255d6ebe3efeda 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/NormaliseByPeakArea.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/NormaliseByPeakArea.h
@@ -35,19 +35,19 @@ class DLLExport NormaliseByPeakArea : public API::Algorithm {
public:
NormaliseByPeakArea();
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Normalises the input data by the area of of peak defined by the "
"input mass value.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Check and store appropriate input data
void retrieveInputs();
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h
index 39ae763992dd249dbf298d0fdff052d8f75370af..2260e01c7414a6776742cd4eb11af8c818ef1bfc 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PawleyFit.h
@@ -67,12 +67,12 @@ protected:
class DLLExport PawleyFit : public API::Algorithm {
public:
PawleyFit();
- virtual ~PawleyFit() {}
+ ~PawleyFit() override {}
- const std::string name() const { return "PawleyFit"; }
- int version() const { return 1; }
- const std::string summary() const;
- const std::string category() const { return "Diffraction\\Fitting"; }
+ const std::string name() const override { return "PawleyFit"; }
+ int version() const override { return 1; }
+ const std::string summary() const override;
+ const std::string category() const override { return "Diffraction\\Fitting"; }
protected:
double getTransformedCenter(double d, const Kernel::Unit_sptr &unit) const;
@@ -90,8 +90,8 @@ protected:
API::IFunction_sptr
getCompositeFunction(const Functions::PawleyFunction_sptr &pawleyFn) const;
- void init();
- void exec();
+ void init() override;
+ void exec() override;
Kernel::Unit_sptr m_dUnit;
};
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PlotPeakByLogValue.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PlotPeakByLogValue.h
index 0c0acc74d34543a09c5202729c92f1c91aebdfaf..45a48ed3acb1618fff23ad867a8c178641d107e2 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PlotPeakByLogValue.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/PlotPeakByLogValue.h
@@ -82,23 +82,23 @@ public:
/// Default constructor
PlotPeakByLogValue() : API::Algorithm(){};
/// Destructor
- virtual ~PlotPeakByLogValue(){};
+ ~PlotPeakByLogValue() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "PlotPeakByLogValue"; }
+ const std::string name() const override { return "PlotPeakByLogValue"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Fits a number of spectra with the same function.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Optimization"; }
+ const std::string category() const override { return "Optimization"; }
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Get a workspace
InputData getWorkspace(const InputData &data);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters.h
index fc90a7c52679b442bc320e4db1ada380c5f76fb7..e1198280c78c8baefd2e771771debf6dff81b354 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters.h
@@ -54,28 +54,28 @@ namespace Algorithms {
class DLLExport RefinePowderInstrumentParameters : public API::Algorithm {
public:
RefinePowderInstrumentParameters();
- virtual ~RefinePowderInstrumentParameters();
+ ~RefinePowderInstrumentParameters() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const {
+ const std::string name() const override {
return "RefinePowderInstrumentParameters";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Parameters include Dtt1, Dtt1t, Dtt2t, Zero, Zerot. ";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 2; }
+ int version() const override { return 2; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Diffraction\\Fitting"; }
+ const std::string category() const override { return "Diffraction\\Fitting"; }
private:
// Implement abstract Algorithm methods
- void init();
+ void init() override;
// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
//---------------- Processing Input ---------------------
/// Import instrument parameter from table (workspace)
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters3.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters3.h
index 764b6e74f1a71d903c7a7dd2239f7b4fe852e3e4..34c0be1a62b98c5b518b5c850201abb814c4629a 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters3.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/RefinePowderInstrumentParameters3.h
@@ -42,29 +42,29 @@ namespace Algorithms {
class DLLExport RefinePowderInstrumentParameters3 : public API::Algorithm {
public:
RefinePowderInstrumentParameters3();
- virtual ~RefinePowderInstrumentParameters3();
+ ~RefinePowderInstrumentParameters3() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const {
+ const std::string name() const override {
return "RefinePowderInstrumentParameters";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Parameters include Dtt1, Dtt1t, Dtt2t, Zero, Zerot. ";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 3; }
+ int version() const override { return 3; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Diffraction\\Fitting"; }
+ const std::string category() const override { return "Diffraction\\Fitting"; }
private:
/// Implement abstract Algorithm methods
- void init();
+ void init() override;
/// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
/// Fit instrument parameters by non Monte Carlo algorithm
double execFitParametersNonMC();
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineBackground.h
index 9aa91c96228c809036a56bac61cf5da9e9e01a36..88452489023b6dcf5612ed9a56e83d83662b34f9 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineBackground.h
@@ -42,24 +42,24 @@ public:
/// Default constructor
SplineBackground() : API::Algorithm(){};
/// Destructor
- virtual ~SplineBackground(){};
+ ~SplineBackground() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SplineBackground"; }
+ const std::string name() const override { return "SplineBackground"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Optimization;CorrectionFunctions\\BackgroundCorrections";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Fit spectra background using b-splines.";
}
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineInterpolation.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineInterpolation.h
index fbb797729d6c07784b7d6fa7efed53a4bfec8d2f..9f96cb954ea7f9fa18a86171ddc656e33a1e3348 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineInterpolation.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineInterpolation.h
@@ -46,21 +46,21 @@ namespace Algorithms {
class DLLExport SplineInterpolation : public API::Algorithm {
public:
SplineInterpolation();
- virtual ~SplineInterpolation();
+ ~SplineInterpolation() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Interpolates a set of spectra onto a spline defined by a second "
"input workspace. Optionally, this algorithm can also calculate "
"derivatives up to order 2 as a side product";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// CubicSpline member used to perform interpolation
boost::shared_ptr<Functions::CubicSpline> m_cspline;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineSmoothing.h b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineSmoothing.h
index 4c35d7f729baca9fd037e16cada539f6911e1873..cc6d96e0aa0ed5874dc2061d34347f225976f159 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineSmoothing.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Algorithms/SplineSmoothing.h
@@ -41,13 +41,13 @@ namespace Algorithms {
class DLLExport SplineSmoothing : public API::Algorithm {
public:
SplineSmoothing();
- virtual ~SplineSmoothing();
+ ~SplineSmoothing() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Smoothes a set of spectra using a cubic spline. Optionally, this "
"algorithm can also calculate derivatives up to order 2 as a side "
"product";
@@ -58,8 +58,8 @@ private:
const int M_START_SMOOTH_POINTS;
// Overriden methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// smooth a single spectrum of the workspace
void smoothSpectrum(int index);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Constraints/BoundaryConstraint.h b/Framework/CurveFitting/inc/MantidCurveFitting/Constraints/BoundaryConstraint.h
index ef798c50e1afbe87ad21d94ee77fdd088c0bfa47..8cd76b1853536b9159f0ed04d85b6a1ca771dac8 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Constraints/BoundaryConstraint.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Constraints/BoundaryConstraint.h
@@ -64,15 +64,15 @@ public:
const double lowerBound, bool isDefault = false);
/// Destructor
- virtual ~BoundaryConstraint() {}
+ ~BoundaryConstraint() override {}
/// Initialize the constraint from an expression
void initialize(API::IFunction *fun, const API::Expression &expr,
- bool isDefault);
+ bool isDefault) override;
/// implement IConstraint virtual functions
- void setPenaltyFactor(const double &c);
- double getPenaltyFactor() const { return m_penaltyFactor; }
+ void setPenaltyFactor(const double &c) override;
+ double getPenaltyFactor() const override { return m_penaltyFactor; }
/// Return if it has a lower bound
bool hasLower() const { return m_hasLowerBound; }
@@ -120,11 +120,11 @@ public:
std::string getParameterName() const { return m_parameterName; }
/// overwrite IConstraint base class methods
- virtual double check();
- virtual double checkDeriv();
- virtual double checkDeriv2();
- virtual void setParamToSatisfyConstraint();
- virtual std::string asString() const;
+ double check() override;
+ double checkDeriv() override;
+ double checkDeriv2() override;
+ void setParamToSatisfyConstraint() override;
+ std::string asString() const override;
private:
/// Penalty factor for the given boundary constraint
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
index 41cc8170906b0b63a589a46c417aa0fb4442a974..f7929e68470950c38c0e9497508c44ec0f92e2dc 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncFitting.h
@@ -46,13 +46,13 @@ public:
/// Get i-th parameter
/// @param i :: Index of a parameter
/// @return :: Value of the parameter
- virtual double getParameter(size_t i) const;
+ double getParameter(size_t i) const override;
/// Set i-th parameter
/// @param i :: Index of a parameter
/// @param value :: New value of the parameter
- virtual void setParameter(size_t i, const double &value);
+ void setParameter(size_t i, const double &value) override;
/// Number of parameters
- virtual size_t nParams() const;
+ size_t nParams() const override;
/// Set fitting function.
virtual void setFittingFunction(API::IFunction_sptr function,
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
index 9478d2ab3be0dd7fc4ee4b47e5d147f139741c96..4d622076f4fc11c0aa3e59eba906472598d33f05 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncLeastSquares.h
@@ -45,25 +45,25 @@ public:
/// Constructor
CostFuncLeastSquares();
/// Virtual destructor
- virtual ~CostFuncLeastSquares() {}
+ ~CostFuncLeastSquares() override {}
/// Get name of minimizer
- virtual std::string name() const { return "Least squares"; }
+ std::string name() const override { return "Least squares"; }
/// Get short name of minimizer - useful for say labels in guis
- virtual std::string shortName() const { return "Chi-sq"; };
+ std::string shortName() const override { return "Chi-sq"; };
/// Calculate value of cost function
- virtual double val() const;
+ double val() const override;
/// Calculate the derivatives of the cost function
/// @param der :: Container to output the derivatives
- virtual void deriv(std::vector<double> &der) const;
+ void deriv(std::vector<double> &der) const override;
/// Calculate the value and the derivatives of the cost function
/// @param der :: Container to output the derivatives
/// @return :: The value of the function
- virtual double valAndDeriv(std::vector<double> &der) const;
+ double valAndDeriv(std::vector<double> &der) const override;
virtual double valDerivHessian(bool evalDeriv = true,
bool evalHessian = true) const;
@@ -77,8 +77,8 @@ public:
void getParameters(GSLVector ¶ms) const;
protected:
- virtual void calActiveCovarianceMatrix(GSLMatrix &covar,
- double epsrel = 1e-8);
+ void calActiveCovarianceMatrix(GSLMatrix &covar,
+ double epsrel = 1e-8) override;
void addVal(API::FunctionDomain_sptr domain,
API::FunctionValues_sptr values) const;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
index 4c5b04e99c27543c1150e0f06421ed9d57d418fb..ef15ee7db90177fea19bf2733c11dda209020bac 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncRwp.h
@@ -49,17 +49,17 @@ public:
/// Constructor
CostFuncRwp();
/// Virtual destructor
- virtual ~CostFuncRwp() {}
+ ~CostFuncRwp() override {}
/// Get name of minimizer
- virtual std::string name() const { return "Rwp"; }
+ std::string name() const override { return "Rwp"; }
/// Get short name of minimizer - useful for say labels in guis
- virtual std::string shortName() const { return "Rwp"; }
+ std::string shortName() const override { return "Rwp"; }
private:
- virtual std::vector<double>
- getFitWeights(API::FunctionValues_sptr values) const;
+ std::vector<double>
+ getFitWeights(API::FunctionValues_sptr values) const override;
/// Get weight (1/sigma)
double getWeight(API::FunctionValues_sptr values, size_t i,
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
index 85f979e8876e3206414b27f2a3173d1c7f0f20bf..87b907f618eab24737c32ed746f41e651b34b89e 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/CostFunctions/CostFuncUnweightedLeastSquares.h
@@ -42,14 +42,15 @@ namespace CostFunctions {
class DLLExport CostFuncUnweightedLeastSquares : public CostFuncLeastSquares {
public:
CostFuncUnweightedLeastSquares();
- virtual ~CostFuncUnweightedLeastSquares() {}
+ ~CostFuncUnweightedLeastSquares() override {}
- std::string name() const { return "Unweighted least squares"; }
- std::string shortName() const { return "Chi-sq-unw."; }
+ std::string name() const override { return "Unweighted least squares"; }
+ std::string shortName() const override { return "Chi-sq-unw."; }
protected:
- void calActiveCovarianceMatrix(GSLMatrix &covar, double epsrel);
- std::vector<double> getFitWeights(API::FunctionValues_sptr values) const;
+ void calActiveCovarianceMatrix(GSLMatrix &covar, double epsrel) override;
+ std::vector<double>
+ getFitWeights(API::FunctionValues_sptr values) const override;
double getResidualVariance() const;
};
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FitMW.h b/Framework/CurveFitting/inc/MantidCurveFitting/FitMW.h
index 25fa2ec07cb2953377dc69f0ed954b690e07c0df..afe34c4a8396790b28f95aaa01f924f22fa4b587 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FitMW.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FitMW.h
@@ -59,22 +59,21 @@ public:
FitMW(DomainType domainType = Simple);
/// declare properties that specify the dataset within the workspace to fit
/// to.
- virtual void declareDatasetProperties(const std::string &suffix = "",
- bool addProp = true);
+ void declareDatasetProperties(const std::string &suffix = "",
+ bool addProp = true) override;
/// Create a domain from the input workspace
- virtual void createDomain(boost::shared_ptr<API::FunctionDomain> &domain,
- boost::shared_ptr<API::FunctionValues> &values,
- size_t i0 = 0);
- boost::shared_ptr<API::Workspace>
- createOutputWorkspace(const std::string &baseName,
- API::IFunction_sptr function,
- boost::shared_ptr<API::FunctionDomain> domain,
- boost::shared_ptr<API::FunctionValues> values,
- const std::string &outputWorkspacePropertyName);
+ void createDomain(boost::shared_ptr<API::FunctionDomain> &domain,
+ boost::shared_ptr<API::FunctionValues> &values,
+ size_t i0 = 0) override;
+ boost::shared_ptr<API::Workspace> createOutputWorkspace(
+ const std::string &baseName, API::IFunction_sptr function,
+ boost::shared_ptr<API::FunctionDomain> domain,
+ boost::shared_ptr<API::FunctionValues> values,
+ const std::string &outputWorkspacePropertyName) override;
/// Return the size of the domain to be created.
- virtual size_t getDomainSize() const;
+ size_t getDomainSize() const override;
/// Initialize the function
- virtual void initFunction(API::IFunction_sptr function);
+ void initFunction(API::IFunction_sptr function) override;
/// Set the workspace
/// @param ws :: workspace to set.
void setWorkspace(boost::shared_ptr<API::MatrixWorkspace> ws) {
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
index 137e3f2f08b1f4fd5f36f13a801eda26cb229bf1..3f1ecb7fefaf6830f09db43708b2717eaf1c7814 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/BFGS_Minimizer.h
@@ -43,11 +43,11 @@ public:
/// Constructor.
BFGS_Minimizer() : DerivMinimizer() {}
/// Name of the minimizer.
- std::string name() const { return "BFGS_Minimizer"; }
+ std::string name() const override { return "BFGS_Minimizer"; }
protected:
/// Return a concrete type to initialize m_gslSolver with
- virtual const gsl_multimin_fdfminimizer_type *getGSLMinimizerType();
+ const gsl_multimin_fdfminimizer_type *getGSLMinimizerType() override;
/// Static reference to the logger class
static Kernel::Logger &g_log;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
index a09325d17a0556d65ff8fe3c8f925ccfd394c18d..69e54e104788355b031d262ec5ac454c86629f82 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DampingMinimizer.h
@@ -46,15 +46,15 @@ public:
/// Constructor
DampingMinimizer(double relTol = 0.0001);
/// Name of the minimizer.
- std::string name() const { return "DampingMinimizer"; }
+ std::string name() const override { return "DampingMinimizer"; }
/// Initialize minimizer, i.e. pass a function to minimize.
- virtual void initialize(API::ICostFunction_sptr function,
- size_t maxIterations = 0);
+ void initialize(API::ICostFunction_sptr function,
+ size_t maxIterations = 0) override;
/// Do one iteration.
- virtual bool iterate(size_t);
+ bool iterate(size_t) override;
/// Return current value of the cost function
- virtual double costFunctionVal();
+ double costFunctionVal() override;
private:
/// Pointer to the cost function. Must be the least squares.
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
index 2da8b40ba41cf1e55c5a3a9fe27ba0822cc7e428..fcab40e4f73ea5ce34bc9b33099acbbadc717a5c 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/DerivMinimizer.h
@@ -46,17 +46,17 @@ public:
DerivMinimizer();
DerivMinimizer(const double stepSize, const double tolerance);
/// Destructor
- ~DerivMinimizer();
+ ~DerivMinimizer() override;
/// Do one iteration.
- bool iterate(size_t);
+ bool iterate(size_t) override;
/// Return current value of the cost function
- double costFunctionVal();
+ double costFunctionVal() override;
/// Calculate the covariance matrix.
void calCovarianceMatrix(gsl_matrix *covar, double epsrel = 0.0001);
/// Initialize minimizer, i.e. pass a function to minimize.
- virtual void initialize(API::ICostFunction_sptr function,
- size_t maxIterations = 0);
+ void initialize(API::ICostFunction_sptr function,
+ size_t maxIterations = 0) override;
/// Set maximum value of the gradient at which iterations can stop
void setStopGradient(const double value);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
index c2c5b5ebfb75a997919a933003aff9b3beee60ea..12ed35d91161d585d5b4ad22976df7d955e10ed6 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FABADAMinimizer.h
@@ -48,18 +48,18 @@ class DLLExport FABADAMinimizer : public API::IFuncMinimizer {
public:
/// Constructor
FABADAMinimizer();
- virtual ~FABADAMinimizer();
+ ~FABADAMinimizer() override;
/// Name of the minimizer.
- std::string name() const { return "FABADA"; }
+ std::string name() const override { return "FABADA"; }
/// Initialize minimizer, i.e. pass a function to minimize.
- virtual void initialize(API::ICostFunction_sptr function,
- size_t maxIterations);
+ void initialize(API::ICostFunction_sptr function,
+ size_t maxIterations) override;
/// Do one iteration.
- virtual bool iterate(size_t iter);
+ bool iterate(size_t iter) override;
/// Return current value of the cost function
- virtual double costFunctionVal();
+ double costFunctionVal() override;
/// Finalize minimization, eg store additional outputs
- virtual void finalize();
+ void finalize() override;
private:
/// Pointer to the cost function. Must be the least squares.
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
index 683b3a8c3b0521ab38b2be2e29d0831b84f844a3..a72724463b878f0eb50b368217da56d22b8afa0e 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/FRConjugateGradientMinimizer.h
@@ -43,13 +43,13 @@ public:
/// Constructor.
FRConjugateGradientMinimizer() : DerivMinimizer() {}
/// Name of the minimizer.
- std::string name() const {
+ std::string name() const override {
return "Conjugate gradient (Fletcher-Reeves imp.)";
}
protected:
/// Return a concrete type to initialize m_gslSolver with
- virtual const gsl_multimin_fdfminimizer_type *getGSLMinimizerType();
+ const gsl_multimin_fdfminimizer_type *getGSLMinimizerType() override;
};
} // namespace FuncMinimisers
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
index 139b82aff0229675b5193519173860073e388008..67372363a8443c413cb6871e8cfe23eef34e7481 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMDMinimizer.h
@@ -47,15 +47,15 @@ public:
/// Constructor
LevenbergMarquardtMDMinimizer();
/// Name of the minimizer.
- std::string name() const { return "Levenberg-MarquardtMD"; }
+ std::string name() const override { return "Levenberg-MarquardtMD"; }
/// Initialize minimizer, i.e. pass a function to minimize.
- virtual void initialize(API::ICostFunction_sptr function,
- size_t maxIterations = 0);
+ void initialize(API::ICostFunction_sptr function,
+ size_t maxIterations = 0) override;
/// Do one iteration.
- virtual bool iterate(size_t iteration);
+ bool iterate(size_t iteration) override;
/// Return current value of the cost function
- virtual double costFunctionVal();
+ double costFunctionVal() override;
private:
/// Pointer to the cost function. Must be the least squares.
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
index e2c786adb32c18a7f1b32bb90f7d2813405df4c3..aca5a491d1b66a6ad3250a60a94f946ec41153ff 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/LevenbergMarquardtMinimizer.h
@@ -42,20 +42,20 @@ namespace FuncMinimisers {
class DLLExport LevenbergMarquardtMinimizer : public API::IFuncMinimizer {
public:
/// constructor and destructor
- ~LevenbergMarquardtMinimizer();
+ ~LevenbergMarquardtMinimizer() override;
LevenbergMarquardtMinimizer();
/// Overloading base class methods
/// Name of the minimizer.
- std::string name() const { return "Levenberg-Marquardt"; }
+ std::string name() const override { return "Levenberg-Marquardt"; }
/// Initialize minimizer, i.e. pass a function to minimize.
- virtual void initialize(API::ICostFunction_sptr function,
- size_t maxIterations = 0);
+ void initialize(API::ICostFunction_sptr function,
+ size_t maxIterations = 0) override;
/// Do one iteration.
- virtual bool iterate(size_t);
+ bool iterate(size_t) override;
/// Return current value of the cost function
- virtual double costFunctionVal();
+ double costFunctionVal() override;
private:
void calCovarianceMatrix(double epsrel, gsl_matrix *covar);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
index 99f37e47c2b7f46d35eb3fb2e36c7b0b9040e846..5bd60dc697bf1b83ca82c4bf4ad8d3689760fb72 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/PRConjugateGradientMinimizer.h
@@ -43,11 +43,13 @@ public:
/// Constructor.
PRConjugateGradientMinimizer() : DerivMinimizer() {}
/// Name of the minimizer.
- std::string name() const { return "Conjugate gradient (Polak-Ribiere imp.)"; }
+ std::string name() const override {
+ return "Conjugate gradient (Polak-Ribiere imp.)";
+ }
protected:
/// Return a concrete type to initialize m_gslSolver with
- virtual const gsl_multimin_fdfminimizer_type *getGSLMinimizerType();
+ const gsl_multimin_fdfminimizer_type *getGSLMinimizerType() override;
};
} // namespace FuncMinimisers
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
index 14e637fd956804ea8580a0ebd7a6cc656b9c1942..f071a3e0a75bf8c2a2a43941a3c2ceee37bf8e3e 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SimplexMinimizer.h
@@ -44,17 +44,17 @@ public:
/// (default=0.01)
SimplexMinimizer(const double epsabs = 1e-2);
/// Destructor
- ~SimplexMinimizer();
+ ~SimplexMinimizer() override;
/// Overloading base class methods
- std::string name() const { return "Simplex"; }
+ std::string name() const override { return "Simplex"; }
/// Do one iteration
- bool iterate(size_t);
+ bool iterate(size_t) override;
/// Return current value of the cost function
- double costFunctionVal();
+ double costFunctionVal() override;
/// Initialize minimizer, i.e. pass a function to minimize.
- virtual void initialize(API::ICostFunction_sptr function,
- size_t maxIterations = 0);
+ void initialize(API::ICostFunction_sptr function,
+ size_t maxIterations = 0) override;
protected:
void resetSize(const double &size);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
index a251a9eae3b7ec077233b9ce66b96812aead1e81..d34da2c498a0e82977dfd22d6badb9cf27d00f4d 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FuncMinimizers/SteepestDescentMinimizer.h
@@ -42,11 +42,11 @@ public:
/// Constructor.
SteepestDescentMinimizer() : DerivMinimizer() {}
/// Name of the minimizer.
- std::string name() const { return "SteepestDescentMinimizer"; }
+ std::string name() const override { return "SteepestDescentMinimizer"; }
protected:
/// Return a concrete type to initialize m_gslSolver with
- virtual const gsl_multimin_fdfminimizer_type *getGSLMinimizerType();
+ const gsl_multimin_fdfminimizer_type *getGSLMinimizerType() override;
/// Static reference to the logger class
static Kernel::Logger &g_log;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/FunctionDomain1DSpectrumCreator.h b/Framework/CurveFitting/inc/MantidCurveFitting/FunctionDomain1DSpectrumCreator.h
index 09cb3d1aafbfe1a7714dbefcddc69f5b9a99edba..8cc771e22154d673040f333b2e1d401d3124dd77 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/FunctionDomain1DSpectrumCreator.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/FunctionDomain1DSpectrumCreator.h
@@ -46,16 +46,16 @@ namespace CurveFitting {
class DLLExport FunctionDomain1DSpectrumCreator : public API::IDomainCreator {
public:
FunctionDomain1DSpectrumCreator();
- virtual ~FunctionDomain1DSpectrumCreator() {}
+ ~FunctionDomain1DSpectrumCreator() override {}
void setMatrixWorkspace(API::MatrixWorkspace_sptr matrixWorkspace);
void setWorkspaceIndex(size_t workspaceIndex);
- virtual void createDomain(boost::shared_ptr<API::FunctionDomain> &domain,
- boost::shared_ptr<API::FunctionValues> &values,
- size_t i0 = 0);
+ void createDomain(boost::shared_ptr<API::FunctionDomain> &domain,
+ boost::shared_ptr<API::FunctionValues> &values,
+ size_t i0 = 0) override;
- virtual size_t getDomainSize() const;
+ size_t getDomainSize() const override;
protected:
void throwIfWorkspaceInvalid() const;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Abragam.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Abragam.h
index b4c715482f70d747a7029080a2675334c82c8bc1..353215fe09e55b5188b1591b1a4303cd9b464219 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Abragam.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Abragam.h
@@ -46,23 +46,23 @@ class DLLExport Abragam : public API::ParamFunction,
public API::IFunction1D {
public:
/// Destructor
- virtual ~Abragam() {}
+ ~Abragam() override {}
/// overwrite IFunction base class methods
- std::string name() const { return "Abragam"; }
+ std::string name() const override { return "Abragam"; }
/// overwrite IFunction base class methods
- virtual const std::string category() const { return "Muon"; }
- virtual void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
+ const std::string category() const override { return "Muon"; }
+ void functionDeriv(const API::FunctionDomain &domain,
+ API::Jacobian &jacobian) override;
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void setActiveParameter(size_t i, double value);
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void setActiveParameter(size_t i, double value) override;
/// overwrite IFunction base class method that declares function parameters
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h
index b45302749aaad9b49e7ca5082d9f4dbe64c7afc5..70ecab1b795b71d299dcfb5d063e3a9ae1213401 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BSpline.h
@@ -46,19 +46,20 @@ public:
/// Constructor
BSpline();
/// Destructor
- ~BSpline();
+ ~BSpline() override;
/// overwrite IFunction base class methods
- std::string name() const { return "BSpline"; }
- virtual const std::string category() const { return "Background"; }
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ std::string name() const override { return "BSpline"; }
+ const std::string category() const override { return "Background"; }
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
void derivative1D(double *out, const double *xValues, size_t nData,
- const size_t order) const;
+ const size_t order) const override;
/// Set a value to attribute attName
- void setAttribute(const std::string &attName, const Attribute &);
+ void setAttribute(const std::string &attName, const Attribute &) override;
/// Returns a list of attribute names
- std::vector<std::string> getAttributeNames() const;
+ std::vector<std::string> getAttributeNames() const override;
private:
/// Initialize the GSL objects.
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackToBackExponential.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackToBackExponential.h
index 83910c281dbe962f7dcfabaad1d381c90f90ffcf..2727bd6fc5e7bce4efbd531d148bfac987d2c600 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackToBackExponential.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackToBackExponential.h
@@ -56,33 +56,33 @@ public:
BackToBackExponential() : API::IPeakFunction() {}
/// overwrite IPeakFunction base class methods
- virtual double centre() const { return getParameter("X0"); }
- virtual void setCentre(const double c) { setParameter("X0", c); }
- virtual double height() const;
- virtual void setHeight(const double h);
- virtual double fwhm() const;
- virtual void setFwhm(const double w);
- virtual double intensity() const { return getParameter("I"); }
- virtual void setIntensity(const double newIntensity) {
+ double centre() const override { return getParameter("X0"); }
+ void setCentre(const double c) override { setParameter("X0", c); }
+ double height() const override;
+ void setHeight(const double h) override;
+ double fwhm() const override;
+ void setFwhm(const double w) override;
+ double intensity() const override { return getParameter("I"); }
+ void setIntensity(const double newIntensity) override {
setParameter("I", newIntensity);
}
/// overwrite IFunction base class methods
- std::string name() const { return "BackToBackExponential"; }
- virtual const std::string category() const { return "Peak"; }
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ std::string name() const override { return "BackToBackExponential"; }
+ const std::string category() const override { return "Peak"; }
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
protected:
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
/// Function evaluation method to be implemented in the inherited classes
- virtual void functionLocal(double *, const double *, const size_t) const {}
+ void functionLocal(double *, const double *, const size_t) const override {}
/// Derivative evaluation method to be implemented in the inherited classes
- virtual void functionDerivLocal(API::Jacobian *, const double *,
- const size_t) {}
+ void functionDerivLocal(API::Jacobian *, const double *,
+ const size_t) override {}
double expWidth() const;
};
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackgroundFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackgroundFunction.h
index fc373fc1331bff0219d8f2d477db154ef6c9c97b..bc496f54e98cf67546a099ec8a0a25f86637de92 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackgroundFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BackgroundFunction.h
@@ -49,28 +49,28 @@ public:
/// the fitting range in the case of a background function or peak shape
/// function this
/// return value reflects the centre of the peak
- double centre() const { return 0.; }
+ double centre() const override { return 0.; }
/// Returns the height of the function. For a background function this may
/// return an average
/// height of the background. For a peak function this return value is the
/// height of the peak
- double height() const { return 0.; }
+ double height() const override { return 0.; }
/// Sets the parameters such that centre == c
- void setCentre(const double c) {
+ void setCentre(const double c) override {
(void)c; // Avoid compiler warning
}
/// Sets the parameters such that height == h
- void setHeight(const double h) {
+ void setHeight(const double h) override {
(void)h; // Avoid compiler warning
}
- void fit(const std::vector<double> &X, const std::vector<double> &Y);
+ void fit(const std::vector<double> &X, const std::vector<double> &Y) override;
/// overwrite IFunction base class methods
- virtual const std::string category() const { return "Background"; }
+ const std::string category() const override { return "Background"; }
};
typedef boost::shared_ptr<BackgroundFunction> BackgroundFunction_sptr;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h
index 5f31e3a1accc182852efc39a4c6c4085fe44f53c..15c873463b62e86a8487d495da699a538a7e3a01 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/BivariateNormal.h
@@ -89,27 +89,28 @@ class DLLExport BivariateNormal : public API::ParamFunction,
public:
BivariateNormal();
/// Destructor
- virtual ~BivariateNormal();
+ ~BivariateNormal() override;
/// overwrite IFunction base class methods
- std::string name() const { return "BivariateNormal"; }
+ std::string name() const override { return "BivariateNormal"; }
- virtual const std::string category() const { return "Peak"; }
+ const std::string category() const override { return "Peak"; }
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
- size_t nAttributes() const { return (size_t)1; }
+ size_t nAttributes() const override { return (size_t)1; }
- std::vector<std::string> getAttributeNames() const {
+ std::vector<std::string> getAttributeNames() const override {
std::vector<std::string> V;
V.emplace_back("CalcVariances");
return V;
}
- Attribute getAttribute(const std::string &attName) const {
+ Attribute getAttribute(const std::string &attName) const override {
if (!hasAttribute(attName))
throw std::invalid_argument("Not a valid attribute name");
@@ -119,7 +120,8 @@ public:
return Attribute(CalcVariances);
}
- void setAttribute(const std::string &attName, const Attribute &value) {
+ void setAttribute(const std::string &attName,
+ const Attribute &value) override {
if (!hasAttribute(attName))
throw std::invalid_argument("Not a valid attribute name");
@@ -137,7 +139,7 @@ public:
}
}
- bool hasAttribute(const std::string &attName) const {
+ bool hasAttribute(const std::string &attName) const override {
if (attName == std::string("CalcVariances"))
return true;
@@ -147,7 +149,7 @@ public:
bool CalcVxx, CalcVyy, CalcVxy;
protected:
- void init();
+ void init() override;
int NCells;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Bk2BkExpConvPV.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Bk2BkExpConvPV.h
index be7ed03f4ad95d00407a788af69241ca74bbe386..a11a1b76ad0d51f94efe737155a739460fea942f 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Bk2BkExpConvPV.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Bk2BkExpConvPV.h
@@ -41,19 +41,19 @@ class DLLExport Bk2BkExpConvPV : virtual public API::IPeakFunction,
virtual public API::IFunctionMW {
public:
Bk2BkExpConvPV();
- virtual ~Bk2BkExpConvPV();
+ ~Bk2BkExpConvPV() override;
/// overwrite IPeakFunction base class methods
- virtual double centre() const;
- virtual double height() const;
- virtual double fwhm() const;
- virtual void setCentre(const double c);
- virtual void setHeight(const double h);
- virtual void setFwhm(const double w);
+ double centre() const override;
+ double height() const override;
+ double fwhm() const override;
+ void setCentre(const double c) override;
+ void setHeight(const double h) override;
+ void setFwhm(const double w) override;
/// overwrite IFunction base class methods
- std::string name() const { return "Bk2BkExpConvPV"; }
- virtual const std::string category() const { return "Peak"; }
+ std::string name() const override { return "Bk2BkExpConvPV"; }
+ const std::string category() const override { return "Peak"; }
/// Set up the range of peak calculation for higher efficiency
// void setCalculationRange(double tof_low, double tof_upper);
@@ -63,15 +63,15 @@ public:
void resetFWHM();
protected:
- virtual void functionLocal(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDerivLocal(API::Jacobian *out, const double *xValues,
- const size_t nData);
- virtual void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
+ void functionLocal(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDerivLocal(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
+ void functionDeriv(const API::FunctionDomain &domain,
+ API::Jacobian &jacobian) override;
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
private:
/// container for storing wavelength values for each data point
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h
index 0b4209636d5883ea7112815e5e7d0e2369da0144..be4e754c9bffac216eabccb12defb6c9db821c34 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Chebyshev.h
@@ -48,17 +48,18 @@ public:
/// Constructor
Chebyshev();
/// Destructor
- ~Chebyshev(){};
+ ~Chebyshev() override{};
/// overwrite IFunction base class methods
- std::string name() const { return "Chebyshev"; }
- virtual const std::string category() const { return "Background"; }
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ std::string name() const override { return "Chebyshev"; }
+ const std::string category() const override { return "Background"; }
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
/// Set a value to attribute attName
- void setAttribute(const std::string &attName, const Attribute &);
+ void setAttribute(const std::string &attName, const Attribute &) override;
private:
/// Polynomial order
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonPeakProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonPeakProfile.h
index 4b263938385ecaedb09cba057c93e270cf8e02b2..080b08cea015f5aa4703aed46d448d32b83c03d7 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonPeakProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonPeakProfile.h
@@ -47,21 +47,22 @@ public:
ComptonPeakProfile();
private:
- std::string name() const;
+ std::string name() const override;
/** @name Function evaluation */
///@{
/// Calculate the function
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// Ensure the object is ready to be fitted
- void setUpForFit();
+ void setUpForFit() override;
/// Cache a copy of the workspace pointer and pull out the parameters
- void setWorkspace(boost::shared_ptr<const API::Workspace> ws);
+ void setWorkspace(boost::shared_ptr<const API::Workspace> ws) override;
///@}
- void declareParameters();
- void declareAttributes();
- void setAttribute(const std::string &name, const Attribute &value);
+ void declareParameters() override;
+ void declareAttributes() override;
+ void setAttribute(const std::string &name, const Attribute &value) override;
/// WorkspaceIndex attribute
size_t m_wsIndex;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
index 4efec1b8920f0a1677b27d2cf5195ae38c155c0a..d4b467e119a9ba454a52c1ca2d0f0644a9ceb47a 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonProfile.h
@@ -51,13 +51,14 @@ public:
/** @name Function evaluation */
///@{
/// Calculate the function
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// Ensure the object is ready to be fitted
- void setUpForFit();
+ void setUpForFit() override;
/// Cache a copy of the workspace pointer and pull out the parameters
void
setMatrixWorkspace(boost::shared_ptr<const API::MatrixWorkspace> workspace,
- size_t wi, double startX, double endX);
+ size_t wi, double startX, double endX) override;
/// Pre-calculate the Y-space values with specified resolution parameters
void cacheYSpaceValues(const std::vector<double> &tseconds,
@@ -86,9 +87,9 @@ public:
protected:
/// Declare parameters that will never participate in the fit
- void declareAttributes();
+ void declareAttributes() override;
/// Set an attribute value (and possibly cache its value)
- void setAttribute(const std::string &name, const Attribute &value);
+ void setAttribute(const std::string &name, const Attribute &value) override;
/// Access y-values cache
inline const std::vector<double> &ySpace() const { return m_yspace; }
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonScatteringCountRate.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonScatteringCountRate.h
index a34ee169656166cbcd099378c4ca6a7214c248cc..13ff47f8be7a9c683cf16795b0a3cd9a4169b6d7 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonScatteringCountRate.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ComptonScatteringCountRate.h
@@ -43,14 +43,14 @@ public:
private:
/// String identifier
- std::string name() const { return "ComptonScatteringCountRate"; }
+ std::string name() const override { return "ComptonScatteringCountRate"; }
/// Set an attribute value (and possibly cache its value)
- void setAttribute(const std::string &name, const Attribute &value);
+ void setAttribute(const std::string &name, const Attribute &value) override;
/// Takes the string & constructs the constraint matrix
void parseIntensityConstraintMatrix(const std::string &value);
/// Called by the framework just before an iteration is starting
- void iterationStarting();
+ void iterationStarting() override;
/// Set the fixed parameters to the given values
void setFixedParameterValues(const std::vector<double> &values);
/// Refresh the values of the C matrix for this evaluation
@@ -59,7 +59,7 @@ private:
/// Cache reference to workspace for use in setupForFit
void
setMatrixWorkspace(boost::shared_ptr<const API::MatrixWorkspace> workspace,
- size_t wi, double startX, double endX);
+ size_t wi, double startX, double endX) override;
/// Cache ptrs to the individual profiles and their parameters
void cacheFunctions();
/// Cache ptr to the individual profile and its parameters
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h
index b1e5791269a82fcdc5fbef17b757ab8b22b24a85..0e3e81c9ffa14c244b0ddf10536d84dbea932488 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Convolution.h
@@ -116,27 +116,27 @@ public:
/// Constructor
Convolution();
/// Destructor
- ~Convolution();
+ ~Convolution() override;
/// overwrite IFunction base class methods
- std::string name() const { return "Convolution"; }
- virtual const std::string category() const { return "General"; }
+ std::string name() const override { return "Convolution"; }
+ const std::string category() const override { return "General"; }
/// Function you want to fit to.
/// @param domain :: The buffer for writing the calculated values. Must be big
/// enough to accept dataSize() values
- virtual void function(const API::FunctionDomain &domain,
- API::FunctionValues &values) const;
+ void function(const API::FunctionDomain &domain,
+ API::FunctionValues &values) const override;
/// Derivatives of function with respect to active parameters
- virtual void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
+ void functionDeriv(const API::FunctionDomain &domain,
+ API::Jacobian &jacobian) override;
/// Set a value to attribute attName
- virtual void setAttribute(const std::string &attName, const Attribute &);
+ void setAttribute(const std::string &attName, const Attribute &) override;
/// Add a function.
- size_t addFunction(API::IFunction_sptr f);
+ size_t addFunction(API::IFunction_sptr f) override;
/// Set up the function for a fit.
- void setUpForFit();
+ void setUpForFit() override;
/// Deletes and zeroes pointer m_resolution forsing function(...) to
/// recalculate the resolution function
@@ -144,7 +144,7 @@ public:
protected:
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
private:
/// To keep the Fourier transform of the resolution function (divided by the
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h
index 3dbaa2c4dc2cbae2236fac99393de0856a271c1d..54b2f346f9dad55811f5fd943c5abf41e6304ab3 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/CubicSpline.h
@@ -50,19 +50,21 @@ public:
/// Constructor
CubicSpline();
/// Destructor
- ~CubicSpline();
+ ~CubicSpline() override;
/// overwrite IFunction base class methods
- std::string name() const { return "CubicSpline"; }
- virtual const std::string category() const { return "Background"; }
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ std::string name() const override { return "CubicSpline"; }
+ const std::string category() const override { return "Background"; }
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
void derivative1D(double *out, const double *xValues, size_t nData,
- const size_t order) const;
- void setParameter(size_t i, const double &value, bool explicitlySet = true);
+ const size_t order) const override;
+ void setParameter(size_t i, const double &value,
+ bool explicitlySet = true) override;
using ParamFunction::setParameter;
/// Set a value to attribute attName
- void setAttribute(const std::string &attName, const Attribute &);
+ void setAttribute(const std::string &attName, const Attribute &) override;
/// Set the value of a data point location to x
void setXAttribute(const size_t index, double x);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DeltaFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DeltaFunction.h
index 9f98b9cafbcffd02ce3fa9281323ae05918054c5..9bbfd8bb0d919914e3f510e44407f51159f9c9eb 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DeltaFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DeltaFunction.h
@@ -44,35 +44,35 @@ public:
/// Constructor
DeltaFunction();
/// Destructor
- virtual ~DeltaFunction(){};
+ ~DeltaFunction() override{};
/// overwrite IPeakFunction base class methods
- virtual double centre() const { return 0; }
- virtual double height() const { return getParameter("Height"); }
- virtual double fwhm() const { return 0; }
- virtual void setCentre(const double c) { UNUSED_ARG(c); }
- virtual void setHeight(const double h) { setParameter("Height", h); }
- virtual void setFwhm(const double w) { UNUSED_ARG(w); }
+ double centre() const override { return 0; }
+ double height() const override { return getParameter("Height"); }
+ double fwhm() const override { return 0; }
+ void setCentre(const double c) override { UNUSED_ARG(c); }
+ void setHeight(const double h) override { setParameter("Height", h); }
+ void setFwhm(const double w) override { UNUSED_ARG(w); }
virtual double HeightPrefactor() const {
return 1.0;
} // modulates the Height of the Delta function
/// overwrite IFunction base class methods
- std::string name() const { return "DeltaFunction"; }
- virtual const std::string category() const { return "Peak"; }
+ std::string name() const override { return "DeltaFunction"; }
+ const std::string category() const override { return "Peak"; }
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
- virtual void functionLocal(double *out, const double *xValues,
- const size_t nData) const {
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
+ void functionLocal(double *out, const double *xValues,
+ const size_t nData) const override {
UNUSED_ARG(out);
UNUSED_ARG(xValues);
UNUSED_ARG(nData);
}
- virtual void functionDerivLocal(API::Jacobian *out, const double *xValues,
- const size_t nData) {
+ void functionDerivLocal(API::Jacobian *out, const double *xValues,
+ const size_t nData) override {
UNUSED_ARG(out);
UNUSED_ARG(xValues);
UNUSED_ARG(nData);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffRotDiscreteCircle.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffRotDiscreteCircle.h
index 0157a963217c46f6cc209ebef4c09d2e9e195b5d..dc96450707ebd39dc4088e6300ad66f726662d63 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffRotDiscreteCircle.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffRotDiscreteCircle.h
@@ -46,18 +46,18 @@ public:
ElasticDiffRotDiscreteCircle();
/// Destructor
- virtual ~ElasticDiffRotDiscreteCircle(){};
+ ~ElasticDiffRotDiscreteCircle() override{};
/// overwrite IFunction base class methods
- virtual std::string name() const { return "ElasticDiffRotDiscreteCircle"; }
+ std::string name() const override { return "ElasticDiffRotDiscreteCircle"; }
- virtual const std::string category() const { return "QuasiElastic"; }
+ const std::string category() const override { return "QuasiElastic"; }
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
/// A rescaling of the peak intensity
- double HeightPrefactor() const;
+ double HeightPrefactor() const override;
};
/* Class representing the inelastic portion of DiffRotDiscreteCircle
@@ -70,21 +70,21 @@ public:
InelasticDiffRotDiscreteCircle();
/// Destructor
- virtual ~InelasticDiffRotDiscreteCircle() {}
+ ~InelasticDiffRotDiscreteCircle() override {}
- virtual std::string name() const { return "InelasticDiffRotDiscreteCircle"; }
+ std::string name() const override { return "InelasticDiffRotDiscreteCircle"; }
- virtual const std::string category() const { return "QuasiElastic"; }
+ const std::string category() const override { return "QuasiElastic"; }
- virtual void init();
+ void init() override;
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
private:
/// Cache Q values from the workspace
- void setWorkspace(boost::shared_ptr<const API::Workspace> ws);
+ void setWorkspace(boost::shared_ptr<const API::Workspace> ws) override;
const double m_hbar; // Plank constant, in meV*THz (or ueV*PHz)
@@ -100,15 +100,15 @@ private:
class DLLExport DiffRotDiscreteCircle : public API::ImmutableCompositeFunction {
public:
/// Destructor
- ~DiffRotDiscreteCircle(){};
+ ~DiffRotDiscreteCircle() override{};
- virtual std::string name() const { return "DiffRotDiscreteCircle"; }
+ std::string name() const override { return "DiffRotDiscreteCircle"; }
- virtual const std::string category() const { return "QuasiElastic"; }
+ const std::string category() const override { return "QuasiElastic"; }
virtual int version() const { return 1; }
- virtual void init();
+ void init() override;
/// Propagate an attribute to member functions
virtual void trickleDownAttribute(const std::string &name);
@@ -118,7 +118,7 @@ public:
const API::IFunction::Attribute &defaultValue);
/// Override parent definition
- virtual void setAttribute(const std::string &attName, const Attribute &att);
+ void setAttribute(const std::string &attName, const Attribute &att) override;
private:
boost::shared_ptr<ElasticDiffRotDiscreteCircle> m_elastic;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffSphere.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffSphere.h
index b7eeb4b57e017333dd7ac416b11752691c7693f2..e7d75e35a6f4a2d22ddfbf1f8643b79fe28af630 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffSphere.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DiffSphere.h
@@ -47,18 +47,18 @@ public:
ElasticDiffSphere();
/// Destructor
- virtual ~ElasticDiffSphere(){};
+ ~ElasticDiffSphere() override{};
/// overwrite IFunction base class methods
- virtual std::string name() const { return "ElasticDiffSphere"; }
+ std::string name() const override { return "ElasticDiffSphere"; }
- virtual const std::string category() const { return "QuasiElastic"; }
+ const std::string category() const override { return "QuasiElastic"; }
/// A rescaling of the peak intensity
- double HeightPrefactor() const;
+ double HeightPrefactor() const override;
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
};
/// structure to hold info on Volino's coefficients
@@ -83,23 +83,23 @@ class DLLExport InelasticDiffSphere : public API::ParamFunction,
public:
InelasticDiffSphere();
- virtual ~InelasticDiffSphere() {}
+ ~InelasticDiffSphere() override {}
/// overwrite IFunction base class methods
- virtual void init();
+ void init() override;
/// overwrite IFunction base class methods
- virtual std::string name() const { return "InelasticDiffSphere"; }
+ std::string name() const override { return "InelasticDiffSphere"; }
/// overwrite IFunction base class methods
- virtual const std::string category() const { return "QuasiElastic"; }
+ const std::string category() const override { return "QuasiElastic"; }
/// Calculate the (2l+1)*A_{n,l} coefficients for each Lorentzian
std::vector<double> LorentzianCoefficients(double a) const;
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
private:
/// initialize the Xnl coefficients
@@ -113,7 +113,7 @@ private:
void initLinJlist();
/// Cache Q values from the workspace
- void setWorkspace(boost::shared_ptr<const API::Workspace> ws);
+ void setWorkspace(boost::shared_ptr<const API::Workspace> ws) override;
/// xnl coefficients
std::vector<xnlc> m_xnl;
@@ -142,13 +142,13 @@ class DLLExport DiffSphere : public API::ImmutableCompositeFunction {
public:
/// Destructor
- ~DiffSphere(){};
+ ~DiffSphere() override{};
/// overwrite IFunction base class methods
- std::string name() const { return "DiffSphere"; }
+ std::string name() const override { return "DiffSphere"; }
/// overwrite IFunction base class methods
- virtual const std::string category() const { return "QuasiElastic"; }
+ const std::string category() const override { return "QuasiElastic"; }
/// overwrite IFunction base class methods
virtual int version() const { return 1; }
@@ -161,10 +161,10 @@ public:
const API::IFunction::Attribute &defaultValue);
/// Override parent definition
- virtual void setAttribute(const std::string &attName, const Attribute &att);
+ void setAttribute(const std::string &attName, const Attribute &att) override;
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
private:
boost::shared_ptr<ElasticDiffSphere>
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DynamicKuboToyabe.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DynamicKuboToyabe.h
index 9865dd6b967b0f8104c7d4c385ac8fe4a9265fb9..c6ffc468085eb65227bac8c4694a1553718a5343 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DynamicKuboToyabe.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/DynamicKuboToyabe.h
@@ -48,36 +48,36 @@ public:
DynamicKuboToyabe();
/// Destructor
- virtual ~DynamicKuboToyabe() {}
+ ~DynamicKuboToyabe() override {}
/// overwrite base class methods
- std::string name() const { return "DynamicKuboToyabe"; }
- virtual const std::string category() const { return "Muon"; }
+ std::string name() const override { return "DynamicKuboToyabe"; }
+ const std::string category() const override { return "Muon"; }
/// Returns the number of attributes associated with the function
- size_t nAttributes() const { return 1; }
+ size_t nAttributes() const override { return 1; }
/// Returns a list of attribute names
- std::vector<std::string> getAttributeNames() const;
+ std::vector<std::string> getAttributeNames() const override;
/// Return a value of attribute attName
- Attribute getAttribute(const std::string &attName) const;
+ Attribute getAttribute(const std::string &attName) const override;
/// Set a value to attribute attName
- void setAttribute(const std::string &attName, const Attribute &);
+ void setAttribute(const std::string &attName, const Attribute &) override;
/// Check if attribute attName exists
- bool hasAttribute(const std::string &attName) const;
+ bool hasAttribute(const std::string &attName) const override;
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
- virtual void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
- virtual void init();
- virtual void setActiveParameter(size_t i, double value);
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
+ void functionDeriv(const API::FunctionDomain &domain,
+ API::Jacobian &jacobian) override;
+ void init() override;
+ void setActiveParameter(size_t i, double value) override;
private:
// Evaluate DKT function for a given t, G, F, v and eps
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/EndErfc.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/EndErfc.h
index 1519739ca40c79dbaa5616264e928a7407fed088..71f5f3a906b2a73d96e7042abb66d7c8497ad1db 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/EndErfc.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/EndErfc.h
@@ -41,21 +41,21 @@ National Laboratory & European Spallation Source
class DLLExport EndErfc : public API::ParamFunction, public API::IFunction1D {
public:
/// Destructor
- virtual ~EndErfc() {}
+ ~EndErfc() override {}
/// overwrite IFunction base class methods
- std::string name() const { return "EndErfc"; }
+ std::string name() const override { return "EndErfc"; }
/// overwrite IFunction base class methods
- virtual void setActiveParameter(size_t i, double value);
- virtual const std::string category() const { return "Calibrate"; }
+ void setActiveParameter(size_t i, double value) override;
+ const std::string category() const override { return "Calibrate"; }
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// overwrite IFunction base class method that declares function parameters
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecay.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecay.h
index 45732a7d1124801438877998d3b7e6b93e8df03a..ad107cb8402d484b0699ec95a6fd0a956b5a73f9 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecay.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecay.h
@@ -42,19 +42,19 @@ public:
/// Constructor
ExpDecay();
/// Destructor
- virtual ~ExpDecay() {}
+ ~ExpDecay() override {}
/// overwrite IFunction base class methods
- std::string name() const { return "ExpDecay"; }
+ std::string name() const override { return "ExpDecay"; }
/// overwrite IFunction base class methods
- virtual const std::string category() const { return "General"; }
+ const std::string category() const override { return "General"; }
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayMuon.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayMuon.h
index 7a42e6a9aaf3058eda3bf8a9ab9877feb10150c4..4a7e3ab5bde2aa83cb960d19187d61d797137ae6 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayMuon.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayMuon.h
@@ -42,22 +42,22 @@ class DLLExport ExpDecayMuon : public API::ParamFunction,
public API::IFunction1D {
public:
/// Destructor
- virtual ~ExpDecayMuon() {}
+ ~ExpDecayMuon() override {}
/// overwrite IFunction base class methods
- std::string name() const { return "ExpDecayMuon"; }
+ std::string name() const override { return "ExpDecayMuon"; }
/// overwrite IFunction base class methods
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
/// overwrite IFunction base class method that declares function parameters
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayOsc.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayOsc.h
index 07d3ad4d03a47a66ed337c142a60e9cf21012683..c1856f54bf8aae109a9c7dadada1f5265de729d2 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayOsc.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ExpDecayOsc.h
@@ -43,23 +43,23 @@ class DLLExport ExpDecayOsc : public API::ParamFunction,
public API::IFunction1D {
public:
/// Destructor
- virtual ~ExpDecayOsc() {}
+ ~ExpDecayOsc() override {}
/// overwrite IFunction base class methods
- std::string name() const { return "ExpDecayOsc"; }
+ std::string name() const override { return "ExpDecayOsc"; }
/// overwrite IFunction base class methods
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
protected:
- virtual void setActiveParameter(size_t i, double value);
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ void setActiveParameter(size_t i, double value) override;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
/// overwrite IFunction base class method that declares function parameters
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FlatBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FlatBackground.h
index cb1add3374562c945fe024946ec3079fdb382742..6c30f83e4744eb42c6168a3eb326eef4f476a5c1 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FlatBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FlatBackground.h
@@ -36,16 +36,16 @@ namespace Functions {
class DLLExport FlatBackground : public BackgroundFunction {
public:
FlatBackground();
- virtual ~FlatBackground();
+ ~FlatBackground() override;
- std::string name() const;
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ std::string name() const override;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
private:
- void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h
index 8a5f52c3953d950f5b62cf7a0b981b4f84c2e7ad..6a2a934c648dba93d0020b5bcaa2c6ecd0a9a7c3 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/FullprofPolynomial.h
@@ -34,37 +34,37 @@ namespace Functions {
class DLLExport FullprofPolynomial : public BackgroundFunction {
public:
FullprofPolynomial();
- virtual ~FullprofPolynomial();
+ ~FullprofPolynomial() override;
/// Overwrite IFunction base class
- std::string name() const { return "FullprofPolynomial"; }
+ std::string name() const override { return "FullprofPolynomial"; }
- virtual const std::string category() const { return "Background"; }
+ const std::string category() const override { return "Background"; }
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
// virtual void functionLocal(std::vector<double> &out, std::vector<double>
// xValues) const;
/// Returns the number of attributes associated with the function (polynomial
/// order n)
- size_t nAttributes() const { return 1; }
+ size_t nAttributes() const override { return 1; }
/// Returns a list of attribute names
- std::vector<std::string> getAttributeNames() const;
+ std::vector<std::string> getAttributeNames() const override;
/// Return a value of attribute attName
- Attribute getAttribute(const std::string &attName) const;
+ Attribute getAttribute(const std::string &attName) const override;
/// Set a value to attribute attName
- void setAttribute(const std::string &attName, const Attribute &);
+ void setAttribute(const std::string &attName, const Attribute &) override;
/// Check if attribute attName exists
- bool hasAttribute(const std::string &attName) const;
+ bool hasAttribute(const std::string &attName) const override;
private:
/// Polynomial order
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausDecay.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausDecay.h
index 053d65163a9f60a0e561be628579b227d1035913..90badfc554b1fbff91d56003e780e35ea348d332 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausDecay.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausDecay.h
@@ -41,23 +41,23 @@ National Laboratory & European Spallation Source
class DLLExport GausDecay : public API::ParamFunction, public API::IFunction1D {
public:
/// Destructor
- virtual ~GausDecay() {}
+ ~GausDecay() override {}
/// overwrite IFunction base class methods
- std::string name() const { return "GausDecay"; }
+ std::string name() const override { return "GausDecay"; }
/// overwrite IFunction base class methods
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
protected:
- virtual void setActiveParameter(size_t i, double value);
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ void setActiveParameter(size_t i, double value) override;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
/// overwrite IFunction base class method that declares function parameters
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausOsc.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausOsc.h
index b54279a77ada4db8cfb55bbf53a1d1fe9b482049..e47ec5c95a3975c856d090a157873ddf84860c37 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausOsc.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GausOsc.h
@@ -41,23 +41,23 @@ National Laboratory & European Spallation Source
class DLLExport GausOsc : public API::ParamFunction, public API::IFunction1D {
public:
/// Destructor
- virtual ~GausOsc() {}
+ ~GausOsc() override {}
/// overwrite IFunction base class methods
- std::string name() const { return "GausOsc"; }
+ std::string name() const override { return "GausOsc"; }
/// overwrite IFunction base class methods
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
- virtual void setActiveParameter(size_t i, double value);
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
+ void setActiveParameter(size_t i, double value) override;
/// overwrite IFunction base class method that declares function parameters
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Gaussian.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Gaussian.h
index c56f8618d54c3feca5e7bbc3937ae6456b771c58..f9b2709279b1a3d3d578e17f2ba03dd24bd12b75 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Gaussian.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Gaussian.h
@@ -51,33 +51,33 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport Gaussian : public API::IPeakFunction {
public:
/// Destructor
- virtual ~Gaussian(){};
+ ~Gaussian() override{};
/// overwrite IPeakFunction base class methods
- virtual double centre() const { return getParameter("PeakCentre"); }
- virtual double height() const { return getParameter("Height"); }
- virtual double fwhm() const {
+ double centre() const override { return getParameter("PeakCentre"); }
+ double height() const override { return getParameter("Height"); }
+ double fwhm() const override {
return 2.0 * sqrt(2.0 * std::log(2.0)) * getParameter("Sigma");
}
- virtual void setCentre(const double c) { setParameter("PeakCentre", c); }
- virtual void setHeight(const double h) { setParameter("Height", h); }
- virtual void setFwhm(const double w) {
+ void setCentre(const double c) override { setParameter("PeakCentre", c); }
+ void setHeight(const double h) override { setParameter("Height", h); }
+ void setFwhm(const double w) override {
setParameter("Sigma", w / (2.0 * sqrt(2.0 * std::log(2.0))));
}
/// overwrite IFunction base class methods
- std::string name() const { return "Gaussian"; }
- virtual const std::string category() const { return "Peak"; }
- virtual void setActiveParameter(size_t i, double value);
- virtual double activeParameter(size_t i) const;
+ std::string name() const override { return "Gaussian"; }
+ const std::string category() const override { return "Peak"; }
+ void setActiveParameter(size_t i, double value) override;
+ double activeParameter(size_t i) const override;
protected:
- virtual void functionLocal(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDerivLocal(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ void functionLocal(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDerivLocal(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GaussianComptonProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GaussianComptonProfile.h
index 60c6ffe5f6266ade00fef84d9785ab66e12588ea..575e568f4ca1ce4adb30648fc8d097fe03e5acae 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GaussianComptonProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GaussianComptonProfile.h
@@ -47,18 +47,18 @@ public:
private:
/// A string identifier for this function
- std::string name() const;
+ std::string name() const override;
/// Declare the function parameters
- void declareParameters();
+ void declareParameters() override;
/// Returns the indices of the intensity parameters
- std::vector<size_t> intensityParameterIndices() const;
+ std::vector<size_t> intensityParameterIndices() const override;
/// Fill in the columns of the matrix for this mass
size_t fillConstraintMatrix(Kernel::DblMatrix &cmatrix, const size_t start,
- const std::vector<double> &errors) const;
+ const std::vector<double> &errors) const override;
/// Compute the function
- void massProfile(double *result, const size_t nData) const;
+ void massProfile(double *result, const size_t nData) const override;
/// Helper to allow the amplitude to be specified separately
void massProfile(double *result, const size_t nData,
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
index 14cbb33b841dfca79fb96e8da8705c1d25da2012..ef677cf96c6aace337e63179d3a9bbd4ef89c76a 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/GramCharlierComptonProfile.h
@@ -42,25 +42,25 @@ public:
private:
/// A string identifier for this function
- std::string name() const;
+ std::string name() const override;
/// Declare the function parameters
- void declareParameters();
+ void declareParameters() override;
/// Declare non-parameter attributes
- void declareAttributes();
+ void declareAttributes() override;
/// Set an attribute value (and possibly cache its value)
- void setAttribute(const std::string &name, const Attribute &value);
+ void setAttribute(const std::string &name, const Attribute &value) override;
/// Parse the active hermite polynomial coefficents
void setHermiteCoefficients(const std::string &coeffs);
/// Declare the Gram-Charlier (Hermite) coefficients
void declareGramCharlierParameters();
/// Returns the indices of the intensity parameters
- std::vector<size_t> intensityParameterIndices() const;
+ std::vector<size_t> intensityParameterIndices() const override;
/// Fill in the columns of the matrix for this mass
size_t fillConstraintMatrix(Kernel::DblMatrix &cmatrix, const size_t index,
- const std::vector<double> &errors) const;
+ const std::vector<double> &errors) const override;
/// Compute the sum for all Hermite polynomial coefficents
- void massProfile(double *result, const size_t nData) const;
+ void massProfile(double *result, const size_t nData) const override;
/// Compute the contribution to mass profile nth Hermite polynomial
/// coefficient
void addMassProfile(double *result, const unsigned int npoly) const;
@@ -73,11 +73,11 @@ private:
/// Called by the framework when a workspace is set
void
setMatrixWorkspace(boost::shared_ptr<const API::MatrixWorkspace> workspace,
- size_t wi, double startX, double endX);
+ size_t wi, double startX, double endX) override;
/// Pre-calculate the Y-space values
void cacheYSpaceValues(const std::vector<double> &tseconds,
const bool isHistogram,
- const Algorithms::DetectorParams &detpar);
+ const Algorithms::DetectorParams &detpar) override;
/// The active hermite coefficents
std::vector<short> m_hermite;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/IkedaCarpenterPV.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/IkedaCarpenterPV.h
index bc8cc43f3e66a697a9e61977a4b8c037736306bb..3eba394827d19ce7947e7bc470f0be2c8c2be53c 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/IkedaCarpenterPV.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/IkedaCarpenterPV.h
@@ -43,22 +43,22 @@ class DLLExport IkedaCarpenterPV : virtual public API::IPeakFunction,
virtual public API::IFunctionMW {
public:
/// Destructor
- virtual ~IkedaCarpenterPV(){};
+ ~IkedaCarpenterPV() override{};
/// contruction used for standard fitting
IkedaCarpenterPV(){};
/// overwrite IPeakFunction base class methods
- virtual double centre() const;
- virtual double height() const;
- virtual double fwhm() const;
- virtual void setCentre(const double c);
- virtual void setHeight(const double h);
- virtual void setFwhm(const double w);
+ double centre() const override;
+ double height() const override;
+ double fwhm() const override;
+ void setCentre(const double c) override;
+ void setHeight(const double h) override;
+ void setFwhm(const double w) override;
/// overwrite IFunction base class methods
- std::string name() const { return "IkedaCarpenterPV"; }
- virtual const std::string category() const { return "Peak"; }
+ std::string name() const override { return "IkedaCarpenterPV"; }
+ const std::string category() const override { return "Peak"; }
// define these instead of functionLocal if you want to custom specify the
// calculation
@@ -69,15 +69,15 @@ public:
// int& nData);
protected:
- virtual void functionLocal(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDerivLocal(API::Jacobian *out, const double *xValues,
- const size_t nData);
- virtual void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
+ void functionLocal(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDerivLocal(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
+ void functionDeriv(const API::FunctionDomain &domain,
+ API::Jacobian &jacobian) override;
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
private:
/// container for storing wavelength values for each data point
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LinearBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LinearBackground.h
index e8ba0edd4443cd9bf9277159cf528a001dd62fb9..4cf5ef049abacbebf8b95b616e1a59b67155022b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LinearBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LinearBackground.h
@@ -46,20 +46,20 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport LinearBackground : public BackgroundFunction {
public:
/// Destructor
- virtual ~LinearBackground(){};
+ ~LinearBackground() override{};
/// overwrite IFunction base class methods
- std::string name() const { return "LinearBackground"; }
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ std::string name() const override { return "LinearBackground"; }
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
- void fit(const std::vector<double> &X, const std::vector<double> &Y);
+ void fit(const std::vector<double> &X, const std::vector<double> &Y) override;
protected:
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LogNormal.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LogNormal.h
index 90273384e73961fbff8ab34e0fea5f01e0bb5adf..e4bae56f6334f4c5af3013c0388d7e12e89cf934 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LogNormal.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/LogNormal.h
@@ -42,17 +42,17 @@ public:
/// Constructor
LogNormal();
/// Destructor
- virtual ~LogNormal() {}
+ ~LogNormal() override {}
/// overwrite IFunction base class methods
- std::string name() const { return "LogNormal"; }
- virtual const std::string category() const { return "Peak"; }
+ std::string name() const override { return "LogNormal"; }
+ const std::string category() const override { return "Peak"; }
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian.h
index 132408dee74bf59f15c532d86ac917d00b2d32da..037857b19906824f98549870cf8a729d69189f32 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian.h
@@ -47,27 +47,27 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport Lorentzian : public API::IPeakFunction {
public:
/// Destructor
- virtual ~Lorentzian(){};
+ ~Lorentzian() override{};
/// overwrite IPeakFunction base class methods
- virtual double centre() const { return getParameter("PeakCentre"); }
- virtual double height() const;
- virtual double fwhm() const { return getParameter("FWHM"); }
- virtual void setCentre(const double c) { setParameter("PeakCentre", c); }
- virtual void setHeight(const double h);
- virtual void setFwhm(const double w) { setParameter("FWHM", w); }
+ double centre() const override { return getParameter("PeakCentre"); }
+ double height() const override;
+ double fwhm() const override { return getParameter("FWHM"); }
+ void setCentre(const double c) override { setParameter("PeakCentre", c); }
+ void setHeight(const double h) override;
+ void setFwhm(const double w) override { setParameter("FWHM", w); }
/// overwrite IFunction base class methods
- std::string name() const { return "Lorentzian"; }
- virtual const std::string category() const { return "Peak"; }
+ std::string name() const override { return "Lorentzian"; }
+ const std::string category() const override { return "Peak"; }
protected:
- virtual void functionLocal(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDerivLocal(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ void functionLocal(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDerivLocal(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h
index 6211f2d053b617abcf03f5084cc31ee7966ec979..00161fef01290338db70370557121238496e2677 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Lorentzian1D.h
@@ -54,11 +54,11 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport Lorentzian1D : public Algorithms::Fit1D {
public:
/// Destructor
- virtual ~Lorentzian1D(){};
+ ~Lorentzian1D() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Lorentzian1D"; }
+ const std::string name() const override { return "Lorentzian1D"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "== Deprecation notice == Instead of using this algorithm to fit a "
"Lorentzian please use the Fit algorithm where the Function "
"parameter of this algorithm is used to specified the fitting "
@@ -66,19 +66,19 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Optimization\\FitAlgorithms";
}
private:
// Overridden Fit1D methods
- void declareParameters();
+ void declareParameters() override;
void function(const double *in, double *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
void functionDeriv(const double *in, API::Jacobian *out,
- const double *xValues, const size_t nData);
+ const double *xValues, const size_t nData) override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/MuonFInteraction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/MuonFInteraction.h
index f474266b5605ce12a87c96a79e392d5410ac75dc..d42747fbfd701b47403378f2f7f8ac209fd72f0b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/MuonFInteraction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/MuonFInteraction.h
@@ -42,20 +42,20 @@ class DLLExport MuonFInteraction : public API::ParamFunction,
public API::IFunction1D {
public:
/// Destructor
- virtual ~MuonFInteraction() {}
+ ~MuonFInteraction() override {}
/// overwrite IFunction base class methods
- std::string name() const { return "MuonFInteraction"; }
+ std::string name() const override { return "MuonFInteraction"; }
/// overwrite IFunction base class methods
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// overwrite IFunction base class method that declares function parameters
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h
index 7ddc907fdabb05231397f386d2bff50dab3e7d54..1f8ac9986eb8ef6cff2f3cffa6291e0c16acd1fb 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/NeutronBk2BkExpConvPVoigt.h
@@ -41,26 +41,27 @@ class DLLExport NeutronBk2BkExpConvPVoigt
public:
NeutronBk2BkExpConvPVoigt();
- virtual ~NeutronBk2BkExpConvPVoigt();
+ ~NeutronBk2BkExpConvPVoigt() override;
/// Overwrite IFunction base class method: name
- std::string name() const { return "NeutronBk2BkExpConvPVoigt"; }
+ std::string name() const override { return "NeutronBk2BkExpConvPVoigt"; }
/// Overwrite IFunction base class method: category
- virtual const std::string category() const { return "General"; }
+ const std::string category() const override { return "General"; }
/// Get peak parameters
- virtual double getPeakParameter(std::string);
+ double getPeakParameter(std::string) override;
/// Calculate peak parameters (alpha, beta, sigma2..)
- virtual void calculateParameters(bool explicitoutput) const;
+ void calculateParameters(bool explicitoutput) const override;
/// Override setting a new value to the i-th parameter
- void setParameter(size_t i, const double &value, bool explicitlySet = true);
+ void setParameter(size_t i, const double &value,
+ bool explicitlySet = true) override;
/// Override setting a new value to a parameter by name
void setParameter(const std::string &name, const double &value,
- bool explicitlySe = true);
+ bool explicitlySe = true) override;
/// Set peak's height
// virtual void setHeight(const double h);
@@ -68,12 +69,12 @@ public:
// virtual double height()const;
using IFunction1D::function;
- virtual void function(std::vector<double> &out,
- const std::vector<double> &xValues) const;
+ void function(std::vector<double> &out,
+ const std::vector<double> &xValues) const override;
/// Function you want to fit to.
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
private:
//----- Overwrite IFunction ------------------------------------------------
@@ -88,7 +89,7 @@ private:
// API::Jacobian& jacobian);
/// Overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
private:
/// Calcualte H and Eta
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PawleyFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PawleyFunction.h
index b2da45f02b56a3c18fd7fbe411d2b88b244863f6..d2c9dde528c5fb989e12067845a5524659a24c0b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PawleyFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PawleyFunction.h
@@ -29,12 +29,13 @@ class DLLExport PawleyParameterFunction : virtual public API::IFunction,
virtual public API::ParamFunction {
public:
PawleyParameterFunction();
- virtual ~PawleyParameterFunction() {}
+ ~PawleyParameterFunction() override {}
/// Returns the function name
- std::string name() const { return "PawleyParameterFunction"; }
+ std::string name() const override { return "PawleyParameterFunction"; }
- void setAttribute(const std::string &attName, const Attribute &attValue);
+ void setAttribute(const std::string &attName,
+ const Attribute &attValue) override;
Geometry::PointGroup::LatticeSystem getLatticeSystem() const;
Geometry::UnitCell getUnitCellFromParameters() const;
@@ -51,12 +52,12 @@ public:
}
void function(const API::FunctionDomain &domain,
- API::FunctionValues &values) const;
+ API::FunctionValues &values) const override;
void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
+ API::Jacobian &jacobian) override;
protected:
- void init();
+ void init() override;
void setProfileFunction(const std::string &profileFunction);
void setLatticeSystem(const std::string &latticeSystem);
@@ -114,36 +115,36 @@ typedef boost::shared_ptr<PawleyParameterFunction> PawleyParameterFunction_sptr;
class DLLExport PawleyFunction : public API::IPawleyFunction {
public:
PawleyFunction();
- virtual ~PawleyFunction() {}
+ ~PawleyFunction() override {}
/// Returns the name of the function.
- std::string name() const { return "PawleyFunction"; }
+ std::string name() const override { return "PawleyFunction"; }
void
setMatrixWorkspace(boost::shared_ptr<const API::MatrixWorkspace> workspace,
- size_t wi, double startX, double endX);
+ size_t wi, double startX, double endX) override;
- void setLatticeSystem(const std::string &latticeSystem);
- void setProfileFunction(const std::string &profileFunction);
- void setUnitCell(const std::string &unitCellString);
+ void setLatticeSystem(const std::string &latticeSystem) override;
+ void setProfileFunction(const std::string &profileFunction) override;
+ void setUnitCell(const std::string &unitCellString) override;
void function(const API::FunctionDomain &domain,
- API::FunctionValues &values) const;
+ API::FunctionValues &values) const override;
/// Derivates are calculated numerically.
void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian) {
+ API::Jacobian &jacobian) override {
calNumericalDeriv(domain, jacobian);
}
void setPeaks(const std::vector<Kernel::V3D> &hkls, double fwhm,
- double height);
- void clearPeaks();
+ double height) override;
+ void clearPeaks() override;
- void addPeak(const Kernel::V3D &hkl, double fwhm, double height);
- size_t getPeakCount() const;
- API::IPeakFunction_sptr getPeakFunction(size_t i) const;
- Kernel::V3D getPeakHKL(size_t i) const;
+ void addPeak(const Kernel::V3D &hkl, double fwhm, double height) override;
+ size_t getPeakCount() const override;
+ API::IPeakFunction_sptr getPeakFunction(size_t i) const override;
+ Kernel::V3D getPeakHKL(size_t i) const override;
PawleyParameterFunction_sptr getPawleyParameterFunction() const;
@@ -157,8 +158,8 @@ protected:
double getTransformedCenter(double d) const;
- void init();
- void beforeDecoratedFunctionSet(const API::IFunction_sptr &fn);
+ void init() override;
+ void beforeDecoratedFunctionSet(const API::IFunction_sptr &fn) override;
API::CompositeFunction_sptr m_compositeFunction;
PawleyParameterFunction_sptr m_pawleyParameterFunction;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PeakParameterFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PeakParameterFunction.h
index e0d34610fbf5f7bd3b948b584c0691614dc68058..20d67021eca842fe3c17043ef6012a322b140ab9 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PeakParameterFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PeakParameterFunction.h
@@ -48,17 +48,18 @@ class MANTID_CURVEFITTING_DLL PeakParameterFunction
virtual public API::FunctionParameterDecorator {
public:
PeakParameterFunction() : FunctionParameterDecorator() {}
- virtual ~PeakParameterFunction() {}
+ ~PeakParameterFunction() override {}
- std::string name() const { return "PeakParameterFunction"; }
+ std::string name() const override { return "PeakParameterFunction"; }
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
+ API::Jacobian &jacobian) override;
protected:
- void beforeDecoratedFunctionSet(const API::IFunction_sptr &fn);
+ void beforeDecoratedFunctionSet(const API::IFunction_sptr &fn) override;
API::IPeakFunction_sptr m_peakFunction;
};
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Polynomial.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Polynomial.h
index fcb944652788d7d91509eb50452853cf582f13ea..9735e7f26360e667bf72585e061d81fa8d00aa3f 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Polynomial.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Polynomial.h
@@ -35,37 +35,37 @@ namespace Functions {
class DLLExport Polynomial : public BackgroundFunction {
public:
Polynomial();
- virtual ~Polynomial();
+ ~Polynomial() override;
/// Overwrite IFunction base class
- std::string name() const { return "Polynomial"; }
+ std::string name() const override { return "Polynomial"; }
- virtual const std::string category() const { return "Background"; }
+ const std::string category() const override { return "Background"; }
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
// virtual void functionLocal(std::vector<double> &out, std::vector<double>
// xValues) const;
/// Returns the number of attributes associated with the function (polynomial
/// order n)
- size_t nAttributes() const { return 1; }
+ size_t nAttributes() const override { return 1; }
/// Returns a list of attribute names
- std::vector<std::string> getAttributeNames() const;
+ std::vector<std::string> getAttributeNames() const override;
/// Return a value of attribute attName
- Attribute getAttribute(const std::string &attName) const;
+ Attribute getAttribute(const std::string &attName) const override;
/// Set a value to attribute attName
- void setAttribute(const std::string &attName, const Attribute &);
+ void setAttribute(const std::string &attName, const Attribute &) override;
/// Check if attribute attName exists
- bool hasAttribute(const std::string &attName) const;
+ bool hasAttribute(const std::string &attName) const override;
private:
/// Polynomial order
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProcessBackground.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProcessBackground.h
index e5b8e1dd27201ed2404d63fb88e4992e592dcea6..de4249ba7b03fd7565ed07649675f012b668ccb0 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProcessBackground.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProcessBackground.h
@@ -67,16 +67,16 @@ private:
class DLLExport ProcessBackground : public API::Algorithm {
public:
ProcessBackground();
- virtual ~ProcessBackground();
+ ~ProcessBackground() override;
- virtual const std::string category() const { return "Diffraction\\Utility"; }
+ const std::string category() const override { return "Diffraction\\Utility"; }
- virtual const std::string name() const { return "ProcessBackground"; }
+ const std::string name() const override { return "ProcessBackground"; }
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "ProcessBackground provides some tools to process powder "
"diffraction pattern's "
"background in order to help Le Bail Fit.";
@@ -84,10 +84,10 @@ public:
private:
/// Define properties
- virtual void init();
+ void init() override;
/// Execution body
- virtual void exec();
+ void exec() override;
/// Set up dummy output optional workspaces
void setupDummyOutputWSes();
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductFunction.h
index cef21a282322ecfe74c8250d2db5ac344b69a72f..24b00f96ae501ea9d35f68addb636fcb13ffb503 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductFunction.h
@@ -44,23 +44,23 @@ public:
/// Constructor
ProductFunction(){};
/// Destructor
- ~ProductFunction(){};
+ ~ProductFunction() override{};
/// overwrite IFunction base class methods
- std::string name() const { return "ProductFunction"; }
+ std::string name() const override { return "ProductFunction"; }
/// Function you want to fit to.
/// @param domain :: The space on which the function acts
/// @param values :: The buffer for writing the calculated values. Must be big
/// enough to accept dataSize() values
- virtual void function(const API::FunctionDomain &domain,
- API::FunctionValues &values) const;
+ void function(const API::FunctionDomain &domain,
+ API::FunctionValues &values) const override;
/// Calculate the derivatives
void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
+ API::Jacobian &jacobian) override;
protected:
/// overwrite IFunction base class method, which declare function parameters
- virtual void init(){};
+ void init() override{};
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductLinearExp.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductLinearExp.h
index 2e54ad0d69c2253c092fe8008ab60508fb24dd51..dd088916529283ec58ff45b36a693bec70d11512 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductLinearExp.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductLinearExp.h
@@ -37,17 +37,17 @@ class DLLExport ProductLinearExp : public API::ParamFunction,
public API::IFunction1D {
public:
ProductLinearExp();
- virtual ~ProductLinearExp();
+ ~ProductLinearExp() override;
- std::string name() const { return "ProductLinearExp"; }
+ std::string name() const override { return "ProductLinearExp"; }
- virtual const std::string category() const { return "Calibrate"; }
+ const std::string category() const override { return "Calibrate"; }
protected:
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductQuadraticExp.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductQuadraticExp.h
index ac047a16d192d738949c4ad1af2bc1485e970f4f..2eab9c68dcc7d80637d07bc409a1644c6cc2a70b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductQuadraticExp.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ProductQuadraticExp.h
@@ -37,17 +37,17 @@ class DLLExport ProductQuadraticExp : public API::ParamFunction,
public API::IFunction1D {
public:
ProductQuadraticExp();
- virtual ~ProductQuadraticExp();
+ ~ProductQuadraticExp() override;
- std::string name() const { return "ProductQuadraticExp"; }
+ std::string name() const override { return "ProductQuadraticExp"; }
- virtual const std::string category() const { return "Calibrate"; }
+ const std::string category() const override { return "Calibrate"; }
protected:
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PseudoVoigt.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PseudoVoigt.h
index 53a3f331d2bd26ced8e7eca0260cb55ed230009f..36ab5cd159968447ef02c77a7c86a76e9310533e 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PseudoVoigt.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/PseudoVoigt.h
@@ -49,27 +49,27 @@ namespace Functions {
*/
class DLLExport PseudoVoigt : public API::IPeakFunction {
public:
- virtual ~PseudoVoigt() {}
+ ~PseudoVoigt() override {}
- double centre() const { return getParameter("PeakCentre"); }
- double height() const { return getParameter("Height"); }
- double fwhm() const { return getParameter("FWHM"); }
+ double centre() const override { return getParameter("PeakCentre"); }
+ double height() const override { return getParameter("Height"); }
+ double fwhm() const override { return getParameter("FWHM"); }
- void setCentre(const double c) { setParameter("PeakCentre", c); }
- void setHeight(const double h) { setParameter("Height", h); }
- void setFwhm(const double w) { setParameter("FWHM", w); }
+ void setCentre(const double c) override { setParameter("PeakCentre", c); }
+ void setHeight(const double h) override { setParameter("Height", h); }
+ void setFwhm(const double w) override { setParameter("FWHM", w); }
- std::string name() const { return "PseudoVoigt"; }
- const std::string category() const { return "Peak"; }
+ std::string name() const override { return "PseudoVoigt"; }
+ const std::string category() const override { return "Peak"; }
protected:
void functionLocal(double *out, const double *xValues,
- const size_t nData) const;
+ const size_t nData) const override;
void functionDerivLocal(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
- void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Quadratic.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Quadratic.h
index 41eb1812f44767733cd18005bc0c6b2a9147a8c1..c9ee0d1603dd428d6eea1b2ec1fd7350d46f1501 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Quadratic.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Quadratic.h
@@ -47,18 +47,18 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport Quadratic : public BackgroundFunction {
public:
/// Destructor
- virtual ~Quadratic(){};
+ ~Quadratic() override{};
/// overwrite IFunction base class methods
- std::string name() const { return "Quadratic"; }
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ std::string name() const override { return "Quadratic"; }
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
protected:
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ReflectivityMulf.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ReflectivityMulf.h
index b1c6fb99b986b55055e602d648be001b8ab03b76..cb80ea23af5280e7477ccd825f1057b66c9a5d13 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ReflectivityMulf.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ReflectivityMulf.h
@@ -40,18 +40,18 @@ class DLLExport ReflectivityMulf : public API::IFunction1D,
public:
ReflectivityMulf();
- virtual void init();
+ void init() override;
/// Overwrite IFunction base class
- std::string name() const { return "ReflectivityMulf"; }
+ std::string name() const override { return "ReflectivityMulf"; }
- virtual const std::string category() const { return "General"; }
+ const std::string category() const override { return "General"; }
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// Set a value to attribute attName
- void setAttribute(const std::string &attName, const Attribute &);
+ void setAttribute(const std::string &attName, const Attribute &) override;
private:
/// ReflectivityMulf layers
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Resolution.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Resolution.h
index bfb2f49bc06f0f68c352223eca731199f136b809..3e45fa50bd8d20d256a618d6e0db7ac7cb4babc5 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Resolution.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Resolution.h
@@ -46,22 +46,23 @@ public:
Resolution();
/// overwrite IFunction base class methods
- std::string name() const { return "Resolution"; }
+ std::string name() const override { return "Resolution"; }
/// Function values
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// function derivatives
void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
/// Returns the number of attributes associated with the function
- size_t nAttributes() const;
+ size_t nAttributes() const override;
/// Returns a list of attribute names
- std::vector<std::string> getAttributeNames() const;
+ std::vector<std::string> getAttributeNames() const override;
/// Return a value of attribute attName
- Attribute getAttribute(const std::string &attName) const;
+ Attribute getAttribute(const std::string &attName) const override;
/// Set a value to attribute attName
- void setAttribute(const std::string &attName, const Attribute &);
+ void setAttribute(const std::string &attName, const Attribute &) override;
/// Check if attribute attName exists
- bool hasAttribute(const std::string &attName) const;
+ bool hasAttribute(const std::string &attName) const override;
private:
/// Function that does the actual job
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabe.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabe.h
index b6beff8a18a795ef96eb64ab6cc427a7f5336910..3c76b7af356d18587a3ddfc28d79c9bb32b33fde 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabe.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabe.h
@@ -42,20 +42,20 @@ class DLLExport StaticKuboToyabe : public API::ParamFunction,
public API::IFunction1D {
public:
/// Destructor
- virtual ~StaticKuboToyabe() {}
+ ~StaticKuboToyabe() override {}
/// overwrite IFunction base class methods
- std::string name() const { return "StaticKuboToyabe"; }
+ std::string name() const override { return "StaticKuboToyabe"; }
/// overwrite IFunction base class methods
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// overwrite IFunction base class method that declares function parameters
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h
index 0ceebf0aa2ecec4259996780b29d09d45a8dc251..44d3dcbd21fad03608466a8b5bd25e548263c2ef 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesExpDecay.h
@@ -41,15 +41,15 @@ namespace Functions {
class DLLExport StaticKuboToyabeTimesExpDecay : public API::ParamFunction,
public API::IFunction1D {
public:
- std::string name() const { return "StaticKuboToyabeTimesExpDecay"; }
+ std::string name() const override { return "StaticKuboToyabeTimesExpDecay"; }
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h
index 6f9370af94cadbeff4d3fa1b48fd050e2d6901d3..4e9f1f2f8c6d3dde4172cb0ecc4d03ea4ee731cd 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesGausDecay.h
@@ -41,15 +41,15 @@ namespace Functions {
class DLLExport StaticKuboToyabeTimesGausDecay : public API::ParamFunction,
public API::IFunction1D {
public:
- std::string name() const { return "StaticKuboToyabeTimesGausDecay"; }
+ std::string name() const override { return "StaticKuboToyabeTimesGausDecay"; }
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesStretchExp.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesStretchExp.h
index 71d122cb501de5c578e44d758b4bef3cc1a8a7a5..b81b6a4951bf1800764d759e3f887456412782f2 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesStretchExp.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StaticKuboToyabeTimesStretchExp.h
@@ -41,15 +41,17 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport StaticKuboToyabeTimesStretchExp : public API::ParamFunction,
public API::IFunction1D {
public:
- std::string name() const { return "StaticKuboToyabeTimesStretchExp"; }
+ std::string name() const override {
+ return "StaticKuboToyabeTimesStretchExp";
+ }
- virtual const std::string category() const { return "Muon"; }
+ const std::string category() const override { return "Muon"; }
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
- virtual void init();
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExp.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExp.h
index 43677513e130aeb2df4d37dcc7753d5f06b417f3..f14f3448d1717dfd22e641895c668f68d157338b 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExp.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExp.h
@@ -43,17 +43,17 @@ public:
/// Constructor
StretchExp();
/// Destructor
- virtual ~StretchExp() {}
+ ~StretchExp() override {}
/// overwrite IFunction base class methods
- std::string name() const { return "StretchExp"; }
- virtual const std::string category() const { return "General"; }
+ std::string name() const override { return "StretchExp"; }
+ const std::string category() const override { return "General"; }
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDeriv1D(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExpMuon.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExpMuon.h
index 4816212d1a4a8840e2538c9e249c829f96f39e43..87666d5f678e5833f9818b57a09b8e8a2a87d4bf 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExpMuon.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/StretchExpMuon.h
@@ -41,16 +41,16 @@ class DLLExport StretchExpMuon : public API::ParamFunction,
public API::IFunction1D {
public:
/// Destructor
- virtual ~StretchExpMuon(){};
+ ~StretchExpMuon() override{};
/// overwrite IFunction base class methods
- std::string name() const { return "StretchExpMuon"; }
- virtual const std::string category() const { return "Muon"; }
+ std::string name() const override { return "StretchExpMuon"; }
+ const std::string category() const override { return "Muon"; }
protected:
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
- virtual void init();
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
+ void init() override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/TabulatedFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/TabulatedFunction.h
index a4e4812efbeb5b7ca51bc888c8f604f1af4503da..75b1fa77b51386f73bd8bb2a6c7d3495d3305716 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/TabulatedFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/TabulatedFunction.h
@@ -75,16 +75,17 @@ public:
TabulatedFunction();
/// overwrite IFunction base class methods
- std::string name() const { return "TabulatedFunction"; }
- virtual const std::string category() const { return "General"; }
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ std::string name() const override { return "TabulatedFunction"; }
+ const std::string category() const override { return "General"; }
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// function derivatives
void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
/// Set a value to attribute attName
void setAttribute(const std::string &attName,
- const IFunction::Attribute &value);
+ const IFunction::Attribute &value) override;
private:
/// Call the appropriate load function
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h
index 5ee5b6e50b500c5dfa5e7a0c9b76294195214587..9ba9374c7bd70dd4ad4fe75c51b6954c9ca6f543 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpAlpha.h
@@ -39,21 +39,21 @@ class DLLExport ThermalNeutronBk2BkExpAlpha : virtual public API::IFunction1D,
public API::ParamFunction {
public:
ThermalNeutronBk2BkExpAlpha();
- virtual ~ThermalNeutronBk2BkExpAlpha();
+ ~ThermalNeutronBk2BkExpAlpha() override;
/// Override
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// overwrite IFunction base class methods
- std::string name() const { return "ThermalNeutronBk2BkExpAlpha"; }
+ std::string name() const override { return "ThermalNeutronBk2BkExpAlpha"; }
/// Overwrite IFunction
- virtual const std::string category() const { return "General"; }
+ const std::string category() const override { return "General"; }
protected:
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
private:
/// Derivative
@@ -61,7 +61,7 @@ private:
/// Derivative to overwrite
void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
+ API::Jacobian &jacobian) override;
/// Core function (inline) to calcualte TOF_h from d-spacing
inline double corefunction(double dh, double width, double tcross,
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h
index 31e1d7efd7975e0257a0fab7d6865f37a9225fa5..1d2174986619d0a5736f0f190c5e732781b6b2ee 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpBeta.h
@@ -39,21 +39,21 @@ class DLLExport ThermalNeutronBk2BkExpBeta : virtual public API::IFunction1D,
public API::ParamFunction {
public:
ThermalNeutronBk2BkExpBeta();
- virtual ~ThermalNeutronBk2BkExpBeta();
+ ~ThermalNeutronBk2BkExpBeta() override;
/// Override
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// overwrite IFunction base class methods
- std::string name() const { return "ThermalNeutronBk2BkExpBeta"; }
+ std::string name() const override { return "ThermalNeutronBk2BkExpBeta"; }
/// Overwrite IFunction
- virtual const std::string category() const { return "General"; }
+ const std::string category() const override { return "General"; }
protected:
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
private:
/// Derivative
@@ -61,7 +61,7 @@ private:
/// Derivative to overwrite
void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
+ API::Jacobian &jacobian) override;
/// Core function (inline) to calcualte TOF_h from d-spacing
inline double corefunction(double dh, double width, double tcross,
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h
index f758df0dcfcb46ef687b3922ae62950748549662..162366961040ead738229f36ece2ca56f184ec05 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpConvPVoigt.h
@@ -42,11 +42,13 @@ class DLLExport ThermalNeutronBk2BkExpConvPVoigt
: public API::IPowderDiffPeakFunction {
public:
ThermalNeutronBk2BkExpConvPVoigt();
- virtual ~ThermalNeutronBk2BkExpConvPVoigt();
+ ~ThermalNeutronBk2BkExpConvPVoigt() override;
/// Overwrite IFunction base class methods
- std::string name() const { return "ThermalNeutronBk2BkExpConvPVoigt"; }
- virtual const std::string category() const { return "General"; }
+ std::string name() const override {
+ return "ThermalNeutronBk2BkExpConvPVoigt";
+ }
+ const std::string category() const override { return "General"; }
/// Overwrite IPeakFunction base class methods
/*
@@ -66,10 +68,10 @@ public:
// virtual void getMillerIndex(int& h, int &k, int &l);
/// Get peak parameters
- virtual double getPeakParameter(std::string);
+ double getPeakParameter(std::string) override;
/// Calculate peak parameters (alpha, beta, sigma2..)
- virtual void calculateParameters(bool explicitoutput) const;
+ void calculateParameters(bool explicitoutput) const override;
/// Core function to calcualte peak values for whole region
// void functionLocal(vector<double>& out, const vector<double> &xValues)
@@ -84,12 +86,12 @@ public:
*/
/// Override setting a new value to the i-th parameter
- virtual void setParameter(size_t i, const double &value,
- bool explicitlySet = true);
+ void setParameter(size_t i, const double &value,
+ bool explicitlySet = true) override;
/// Override setting a new value to a parameter by name
- virtual void setParameter(const std::string &name, const double &value,
- bool explicitlySe = true);
+ void setParameter(const std::string &name, const double &value,
+ bool explicitlySe = true) override;
/// Set peak's height
// virtual void setHeight(const double h);
@@ -97,12 +99,12 @@ public:
// virtual double height()const;
using IFunction1D::function;
- virtual void function(std::vector<double> &out,
- const std::vector<double> &xValues) const;
+ void function(std::vector<double> &out,
+ const std::vector<double> &xValues) const override;
/// Function you want to fit to.
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
private:
//----- Overwrite IFunction ------------------------------------------------
@@ -113,11 +115,11 @@ private:
virtual void functionDerivLocal(API::Jacobian *out, const double *xValues,
const size_t nData);
/// Derivative
- virtual void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
+ void functionDeriv(const API::FunctionDomain &domain,
+ API::Jacobian &jacobian) override;
/// Overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
static int s_peakRadius;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h
index 412ea0d44021b1cacac2edfdc884cf7a9b61e604..744ecdcc1e87ff7c2c191936b448feb70a07ed63 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronBk2BkExpSigma.h
@@ -39,21 +39,21 @@ class DLLExport ThermalNeutronBk2BkExpSigma : virtual public API::IFunction1D,
public API::ParamFunction {
public:
ThermalNeutronBk2BkExpSigma();
- virtual ~ThermalNeutronBk2BkExpSigma();
+ ~ThermalNeutronBk2BkExpSigma() override;
/// Override
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// overwrite IFunction base class methods
- std::string name() const { return "ThermalNeutronBk2BkExpSigma"; }
+ std::string name() const override { return "ThermalNeutronBk2BkExpSigma"; }
/// Overwrite IFunction
- virtual const std::string category() const { return "General"; }
+ const std::string category() const override { return "General"; }
protected:
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
private:
/// Derivative
@@ -61,7 +61,7 @@ private:
/// Derivative to overwrite
void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
+ API::Jacobian &jacobian) override;
/// Core function (inline) to calcualte TOF_h from d-spacing
inline double corefunction(double dh, double sig0sq, double sig1sq,
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h
index 8d0c4a2ed846b5bcd0b3636a287ceb33606ef2a5..c1ce697987847e8fa8d8bdcc3cfaf14b6131979e 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/ThermalNeutronDtoTOFFunction.h
@@ -43,17 +43,17 @@ class DLLExport ThermalNeutronDtoTOFFunction : virtual public API::IFunction1D,
public API::ParamFunction {
public:
ThermalNeutronDtoTOFFunction();
- virtual ~ThermalNeutronDtoTOFFunction();
+ ~ThermalNeutronDtoTOFFunction() override;
/// Override
- virtual void function1D(double *out, const double *xValues,
- const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// overwrite IFunction base class methods
- std::string name() const { return "ThermalNeutronDtoTOFFunction"; }
+ std::string name() const override { return "ThermalNeutronDtoTOFFunction"; }
/// Overwrite IFunction
- virtual const std::string category() const { return "General"; }
+ const std::string category() const override { return "General"; }
/// Calculate function values
void function1D(std::vector<double> &out,
@@ -61,7 +61,7 @@ public:
protected:
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
private:
/// Core function (inline) to calcualte TOF_h from d-spacing
@@ -78,7 +78,7 @@ private:
/// Derviate to overwritten
void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
// void functionDeriv(const API::FunctionDomain& domain, API::Jacobian&
// jacobian);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h
index cd6e468fee151c7a2463f3e30729b01f0a54bcb3..d042653957f6e328b1431c6c886336a871a988b4 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h
@@ -48,33 +48,35 @@ public:
/// Constructor
UserFunction();
/// Destructor
- ~UserFunction();
+ ~UserFunction() override;
/// Returns the function's name
- std::string name() const { return "UserFunction"; }
+ std::string name() const override { return "UserFunction"; }
// Returns Category
- virtual const std::string category() const { return "General"; }
+ const std::string category() const override { return "General"; }
/// Function you want to fit to.
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// Derivatives of function with respect to active parameters
void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
+ API::Jacobian &jacobian) override;
/// Returns the number of attributes associated with the function
- size_t nAttributes() const { return 1; }
+ size_t nAttributes() const override { return 1; }
/// Returns a list of attribute names
- std::vector<std::string> getAttributeNames() const {
+ std::vector<std::string> getAttributeNames() const override {
return std::vector<std::string>(1, "Formula");
}
/// Return a value of attribute attName
- Attribute getAttribute(const std::string &attName) const {
+ Attribute getAttribute(const std::string &attName) const override {
return attName == "Formula" ? Attribute(m_formula) : getAttribute(attName);
}
/// Set a value to attribute attName
- void setAttribute(const std::string &attName, const Attribute &value);
+ void setAttribute(const std::string &attName,
+ const Attribute &value) override;
/// Check if attribute attName exists
- bool hasAttribute(const std::string &attName) const {
+ bool hasAttribute(const std::string &attName) const override {
return attName == "Formula";
}
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h
index fefde7f6549aa277abcce768ea6d1d2a5f6d7a43..b923625e289f9daa72a2085b396c2e9711cefcf2 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction1D.h
@@ -77,31 +77,31 @@ public:
UserFunction1D()
: m_x(0.0), m_x_set(false), m_parameters(new double[100]), m_nPars(0){};
/// Destructor
- virtual ~UserFunction1D(){};
+ ~UserFunction1D() override{};
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "UserFunction1D"; }
+ const std::string name() const override { return "UserFunction1D"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Optimization\\FitAlgorithms";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Fits a histogram from a workspace to a user defined function.";
}
protected:
/// overwrite base class methods
// double function(const double* in, const double& x);
- virtual void function(const double *in, double *out, const double *xValues,
- const size_t nData);
- virtual void declareAdditionalProperties();
- virtual void declareParameters(){};
- virtual void prepare();
+ void function(const double *in, double *out, const double *xValues,
+ const size_t nData) override;
+ void declareAdditionalProperties() override;
+ void declareParameters() override{};
+ void prepare() override;
/// Derivatives of function with respect to parameters you are trying to fit
- virtual void functionDeriv(const double *in, API::Jacobian *out,
- const double *xValues, const size_t nData);
+ void functionDeriv(const double *in, API::Jacobian *out,
+ const double *xValues, const size_t nData) override;
static double *AddVariable(const char *varName, void *palg);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
index b32253e81a107f09f9b0403420acbc9a1f768f2e..40e390ea5325b8265caed02d490eb99aa53b158c 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/VesuvioResolution.h
@@ -69,19 +69,20 @@ public:
/** @name Function evaluation */
///@{
/// A string identifier for this function
- std::string name() const;
+ std::string name() const override;
/// Access total resolution width
inline double resolutionFWHM() const { return m_resolutionSigma; }
/// Access lorentz FWHM
inline double lorentzFWHM() const { return m_lorentzFWHM; }
/// Calculate the function
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// Ensure the object is ready to be fitted
- void setUpForFit();
+ void setUpForFit() override;
/// Cache a copy of the workspace pointer and pull out the parameters
void
setMatrixWorkspace(boost::shared_ptr<const API::MatrixWorkspace> workspace,
- size_t wi, double startX, double endX);
+ size_t wi, double startX, double endX) override;
/// Pre-calculate the resolution components values
void cacheResolutionComponents(const Algorithms::DetectorParams &detpar,
const ResolutionParams &respar);
@@ -101,9 +102,9 @@ public:
private:
/// Declare parameters that will never participate in the fit
- void declareAttributes();
+ void declareAttributes() override;
/// Set an attribute value (and possibly cache its value)
- void setAttribute(const std::string &name, const Attribute &value);
+ void setAttribute(const std::string &name, const Attribute &value) override;
/// Logger
mutable Kernel::Logger m_log;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Voigt.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Voigt.h
index 780771239cdf771d7854ff0918fab2af18cf2ab4..36b14ecff7d2c7b9164599b21079dc94e83c9890 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Voigt.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/Voigt.h
@@ -37,16 +37,16 @@ namespace Functions {
class MANTID_CURVEFITTING_DLL Voigt : public API::IPeakFunction {
private:
/// Return a string identifier for the function
- std::string name() const { return "Voigt"; }
+ std::string name() const override { return "Voigt"; }
/// Declare parameters
- void declareParameters();
+ void declareParameters() override;
/// Fill out with function values at given x points
void functionLocal(double *out, const double *xValues,
- const size_t nData) const;
+ const size_t nData) const override;
/// Derivatives of function with respect to active parameters
void functionDerivLocal(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
/// Calculate both function & derivative together
void calculateFunctionAndDerivative(const double *xValues, const size_t nData,
@@ -54,17 +54,17 @@ private:
API::Jacobian *derivatives) const;
/// Return value of centre of peak
- double centre() const;
+ double centre() const override;
/// Return value of height of peak
- double height() const;
+ double height() const override;
/// Return value of FWHM of peak
- double fwhm() const;
+ double fwhm() const override;
/// Set the centre of the peak
- void setCentre(const double value);
+ void setCentre(const double value) override;
/// Set the height of the peak
- void setHeight(const double value);
+ void setHeight(const double value) override;
/// Set the FWHM of the peak
- void setFwhm(const double value);
+ void setFwhm(const double value) override;
};
} // namespace Functions
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/GSLFunctions.h b/Framework/CurveFitting/inc/MantidCurveFitting/GSLFunctions.h
index bde389d04c861786ba31393bf215c6d456523b21..891f04b780ffaaea0cfec57710e49b07d3360177 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/GSLFunctions.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/GSLFunctions.h
@@ -55,7 +55,7 @@ public:
/// @param iActiveP :: the index of the parameter
/// @throw runtime_error Thrown if column of Jacobian to add number to does
/// not exist
- void addNumberToColumn(const double &value, const size_t &iActiveP) {
+ void addNumberToColumn(const double &value, const size_t &iActiveP) override {
if (iActiveP < m_J->size2) {
// add penalty to first and last point and every 10th point in between
m_J->data[iActiveP] += value;
@@ -68,13 +68,13 @@ public:
}
}
/// overwrite base method
- void set(size_t iY, size_t iP, double value) {
+ void set(size_t iY, size_t iP, double value) override {
int j = m_index[iP];
if (j >= 0)
gsl_matrix_set(m_J, iY, j, value);
}
/// overwrite base method
- double get(size_t iY, size_t iP) {
+ double get(size_t iY, size_t iP) override {
int j = m_index[iP];
if (j >= 0)
return gsl_matrix_get(m_J, iY, j);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/GSLJacobian.h b/Framework/CurveFitting/inc/MantidCurveFitting/GSLJacobian.h
index 4a100eaf89a8214ea1ab806be05bc35c9b8a6fb0..e0032d5e4a14e5e37b3cd835248055094638a555 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/GSLJacobian.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/GSLJacobian.h
@@ -59,7 +59,7 @@ public:
}
/// Destructor.
- ~GSLJacobian() {}
+ ~GSLJacobian() override {}
GSLMatrix &matrix() { return m_J; }
@@ -71,7 +71,7 @@ public:
/// @param iActiveP :: the index of the parameter
/// @throw runtime_error Thrown if column of Jacobian to add number to does
/// not exist
- void addNumberToColumn(const double &value, const size_t &iActiveP) {
+ void addNumberToColumn(const double &value, const size_t &iActiveP) override {
if (iActiveP < m_J.size2()) {
// add penalty to first and last point and every 10th point in between
m_J.gsl()->data[iActiveP] += value;
@@ -84,13 +84,13 @@ public:
}
}
/// overwrite base method
- void set(size_t iY, size_t iP, double value) {
+ void set(size_t iY, size_t iP, double value) override {
int j = m_index[iP];
if (j >= 0)
m_J.set(iY, j, value);
}
/// overwrite base method
- double get(size_t iY, size_t iP) {
+ double get(size_t iY, size_t iP) override {
int j = m_index[iP];
if (j >= 0)
return m_J.get(iY, j);
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/IFittingAlgorithm.h b/Framework/CurveFitting/inc/MantidCurveFitting/IFittingAlgorithm.h
index 39336987c4c04b84412bf0e09fce4f280f153190..9d9b49dac38e1e0639b62c9a488b6ce34422dca9 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/IFittingAlgorithm.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/IFittingAlgorithm.h
@@ -50,19 +50,19 @@ namespace CurveFitting {
class DLLExport IFittingAlgorithm : public API::Algorithm {
public:
IFittingAlgorithm();
- virtual ~IFittingAlgorithm();
+ ~IFittingAlgorithm() override;
- virtual const std::string category() const;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Child classes declare their properties here.
virtual void initConcrete() = 0;
/// Child classes implement the algorithm logic here.
virtual void execConcrete() = 0;
- virtual void afterPropertySet(const std::string &propName);
+ void afterPropertySet(const std::string &propName) override;
void addWorkspace(const std::string &workspaceNameProperty,
bool addProperties = true);
/// Read domain type property and cache the value
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Jacobian.h b/Framework/CurveFitting/inc/MantidCurveFitting/Jacobian.h
index f7a9b1caf5944d97539736c52ce544a6b2a41815..bb9ff2ce4e373046485bf7161028218a6c3a46b2 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/Jacobian.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/Jacobian.h
@@ -56,7 +56,7 @@ public:
/// @param iP :: the index of the parameter
/// @throw runtime_error Thrown if column of Jacobian to add number to does
/// not exist
- void addNumberToColumn(const double &value, const size_t &iP) {
+ void addNumberToColumn(const double &value, const size_t &iP) override {
if (iP < m_np) {
// add penalty to first and last point and every 10th point in between
m_data[iP] += value;
@@ -69,7 +69,7 @@ public:
}
}
/// overwrite base method
- void set(size_t iY, size_t iP, double value) {
+ void set(size_t iY, size_t iP, double value) override {
if (iY >= m_ny) {
throw std::out_of_range("Data index in Jacobian is out of range");
}
@@ -79,7 +79,7 @@ public:
m_data[iY * m_np + iP] = value;
}
/// overwrite base method
- double get(size_t iY, size_t iP) {
+ double get(size_t iY, size_t iP) override {
if (iY >= m_ny) {
throw std::out_of_range("Data index in Jacobian is out of range");
}
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LatticeDomainCreator.h b/Framework/CurveFitting/inc/MantidCurveFitting/LatticeDomainCreator.h
index 71e270e96636a275de1f97dad9c4c1011044147d..abfa147f66bcded5bdb972ecefd580d768927a5a 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/LatticeDomainCreator.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/LatticeDomainCreator.h
@@ -44,20 +44,19 @@ public:
const std::string &workspacePropertyName,
DomainType domainType = Simple);
- virtual ~LatticeDomainCreator() {}
+ ~LatticeDomainCreator() override {}
- virtual void createDomain(boost::shared_ptr<API::FunctionDomain> &domain,
- boost::shared_ptr<API::FunctionValues> &values,
- size_t i0);
+ void createDomain(boost::shared_ptr<API::FunctionDomain> &domain,
+ boost::shared_ptr<API::FunctionValues> &values,
+ size_t i0) override;
- virtual API::Workspace_sptr
- createOutputWorkspace(const std::string &baseName,
- API::IFunction_sptr function,
- boost::shared_ptr<API::FunctionDomain> domain,
- boost::shared_ptr<API::FunctionValues> values,
- const std::string &outputWorkspacePropertyName);
+ API::Workspace_sptr createOutputWorkspace(
+ const std::string &baseName, API::IFunction_sptr function,
+ boost::shared_ptr<API::FunctionDomain> domain,
+ boost::shared_ptr<API::FunctionValues> values,
+ const std::string &outputWorkspacePropertyName) override;
- virtual size_t getDomainSize() const;
+ size_t getDomainSize() const override;
protected:
void setWorkspaceFromPropertyManager();
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/LatticeFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/LatticeFunction.h
index 10d92176be846df09948184274be814cb4469ee7..c214d0887aef4ef2f6c1a427ee90d871c5ea7495 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/LatticeFunction.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/LatticeFunction.h
@@ -44,21 +44,21 @@ namespace CurveFitting {
class DLLExport LatticeFunction : public API::ILatticeFunction {
public:
LatticeFunction();
- virtual ~LatticeFunction() {}
+ ~LatticeFunction() override {}
- std::string name() const { return "LatticeFunction"; }
+ std::string name() const override { return "LatticeFunction"; }
void functionLattice(const API::LatticeDomain &latticeDomain,
- API::FunctionValues &values) const;
+ API::FunctionValues &values) const override;
- void setLatticeSystem(const std::string &crystalSystem);
- void setUnitCell(const std::string &unitCellString);
- void setUnitCell(const Geometry::UnitCell &unitCell);
- Geometry::UnitCell getUnitCell() const;
+ void setLatticeSystem(const std::string &crystalSystem) override;
+ void setUnitCell(const std::string &unitCellString) override;
+ void setUnitCell(const Geometry::UnitCell &unitCell) override;
+ Geometry::UnitCell getUnitCell() const override;
protected:
- void init();
- void beforeDecoratedFunctionSet(const API::IFunction_sptr &fn);
+ void init() override;
+ void beforeDecoratedFunctionSet(const API::IFunction_sptr &fn) override;
private:
Functions::PawleyParameterFunction_sptr m_cellParameters;
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/MultiDomainCreator.h b/Framework/CurveFitting/inc/MantidCurveFitting/MultiDomainCreator.h
index 2c098c4a279fd25a791107b0b35fd0e4697e00a5..321716e60a3ec2d6331afcf97a200fc3cd478b70 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/MultiDomainCreator.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/MultiDomainCreator.h
@@ -47,26 +47,25 @@ public:
m_creators(workspacePropertyNames.size()) {}
/// Create a domain from the input workspace
- virtual void createDomain(boost::shared_ptr<API::FunctionDomain> &domain,
- boost::shared_ptr<API::FunctionValues> &values,
- size_t i0 = 0);
+ void createDomain(boost::shared_ptr<API::FunctionDomain> &domain,
+ boost::shared_ptr<API::FunctionValues> &values,
+ size_t i0 = 0) override;
/// Create the output workspace
- boost::shared_ptr<API::Workspace>
- createOutputWorkspace(const std::string &baseName,
- API::IFunction_sptr function,
- boost::shared_ptr<API::FunctionDomain> domain,
- boost::shared_ptr<API::FunctionValues> values,
- const std::string &outputWorkspacePropertyName);
+ boost::shared_ptr<API::Workspace> createOutputWorkspace(
+ const std::string &baseName, API::IFunction_sptr function,
+ boost::shared_ptr<API::FunctionDomain> domain,
+ boost::shared_ptr<API::FunctionValues> values,
+ const std::string &outputWorkspacePropertyName) override;
/// Return the size of the domain to be created.
- virtual size_t getDomainSize() const { return 0; }
+ size_t getDomainSize() const override { return 0; }
/// Set ith creator
void setCreator(size_t i, API::IDomainCreator *creator);
bool hasCreator(size_t i) const;
/// Get number of creators
size_t getNCreators() const { return m_creators.size(); }
/// Initialize the function
- void initFunction(API::IFunction_sptr function);
+ void initFunction(API::IFunction_sptr function) override;
protected:
/// Vector of creators.
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/ParDomain.h b/Framework/CurveFitting/inc/MantidCurveFitting/ParDomain.h
index c695e7c06bdb07dae06f7888c0898215e8318819..096c1a8723fb67ce635fc9acb6a25842ae1e5f8e 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/ParDomain.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/ParDomain.h
@@ -40,16 +40,16 @@ class MANTID_CURVEFITTING_DLL ParDomain : public SeqDomain {
public:
ParDomain() : SeqDomain() {}
/// Create and return i-th domain and i-th values, (i-1)th domain is released.
- virtual void getDomainAndValues(size_t i, API::FunctionDomain_sptr &domain,
- API::FunctionValues_sptr &values) const;
+ void getDomainAndValues(size_t i, API::FunctionDomain_sptr &domain,
+ API::FunctionValues_sptr &values) const override;
/// Calculate the value of a least squares cost function
- virtual void
- leastSquaresVal(const CostFunctions::CostFuncLeastSquares &leastSquares);
+ void leastSquaresVal(
+ const CostFunctions::CostFuncLeastSquares &leastSquares) override;
/// Calculate the value, first and second derivatives of a least squares cost
/// function
- virtual void leastSquaresValDerivHessian(
+ void leastSquaresValDerivHessian(
const CostFunctions::CostFuncLeastSquares &leastSquares, bool evalDeriv,
- bool evalHessian);
+ bool evalHessian) override;
};
} // namespace CurveFitting
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h b/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h
index 7066b276f113f0883a8e7dc08376f473dfead9ec..5d6e8d6c223a98b0b2a2b68c6f0ef91187ff43e6 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomain.h
@@ -46,9 +46,9 @@ namespace CurveFitting {
class MANTID_CURVEFITTING_DLL SeqDomain : public API::FunctionDomain {
public:
SeqDomain() : API::FunctionDomain(), m_currentIndex(0) {}
- virtual ~SeqDomain() {}
+ ~SeqDomain() override {}
/// Return the number of points in the domain
- virtual size_t size() const;
+ size_t size() const override;
/// Return the number of parts in the domain
virtual size_t getNDomains() const;
/// Create and return i-th domain and i-th values, (i-1)th domain is released.
diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomainSpectrumCreator.h b/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomainSpectrumCreator.h
index 6a521e3ab34193271bf9bcbe3cb6feb9efc500e8..ef4157feee2f462b51188461cfc6ec2227ae0574 100644
--- a/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomainSpectrumCreator.h
+++ b/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomainSpectrumCreator.h
@@ -47,18 +47,20 @@ public:
SeqDomainSpectrumCreator(Kernel::IPropertyManager *manager,
const std::string &workspacePropertyName);
- virtual ~SeqDomainSpectrumCreator() {}
-
- virtual void createDomain(boost::shared_ptr<API::FunctionDomain> &domain,
- boost::shared_ptr<API::FunctionValues> &values,
- size_t i0 = 0);
-
- virtual API::Workspace_sptr createOutputWorkspace(
- const std::string &baseName, API::IFunction_sptr function,
- boost::shared_ptr<API::FunctionDomain> domain,
- boost::shared_ptr<API::FunctionValues> values,
- const std::string &outputWorkspacePropertyName = "OutputWorkspace");
- virtual size_t getDomainSize() const;
+ ~SeqDomainSpectrumCreator() override {}
+
+ void createDomain(boost::shared_ptr<API::FunctionDomain> &domain,
+ boost::shared_ptr<API::FunctionValues> &values,
+ size_t i0 = 0) override;
+
+ API::Workspace_sptr
+ createOutputWorkspace(const std::string &baseName,
+ API::IFunction_sptr function,
+ boost::shared_ptr<API::FunctionDomain> domain,
+ boost::shared_ptr<API::FunctionValues> values,
+ const std::string &outputWorkspacePropertyName =
+ "OutputWorkspace") override;
+ size_t getDomainSize() const override;
protected:
void setParametersFromPropertyManager();
diff --git a/Framework/CurveFitting/src/Algorithms/Fit1D.cpp b/Framework/CurveFitting/src/Algorithms/Fit1D.cpp
index d023c5125844cf827e8547d0bf81b2469702b671..81f44e3f35c487cdf01da533faf2ab18d6b58f3a 100644
--- a/Framework/CurveFitting/src/Algorithms/Fit1D.cpp
+++ b/Framework/CurveFitting/src/Algorithms/Fit1D.cpp
@@ -45,7 +45,7 @@ public:
* of fixed parameters in a particular fit.
* @param value :: The derivative value.
*/
- void set(size_t iY, size_t iP, double value) {
+ void set(size_t iY, size_t iP, double value) override {
int j = m_map[static_cast<int>(iP)];
if (j >= 0)
gsl_matrix_set(m_J, iY, j, value);
@@ -55,7 +55,7 @@ public:
* @param iP :: The index of the parameter. It does not depend on the number
* of fixed parameters in a particular fit.
*/
- double get(size_t iY, size_t iP) {
+ double get(size_t iY, size_t iP) override {
int j = m_map[static_cast<int>(iP)];
if (j >= 0)
return gsl_matrix_get(m_J, iY, j);
diff --git a/Framework/CurveFitting/src/FitMW.cpp b/Framework/CurveFitting/src/FitMW.cpp
index 7c6c99b9ea4ba0fdaed462ca301882157fd376b8..0c83e01452dcf85cfae488950d8a24c0556da622 100644
--- a/Framework/CurveFitting/src/FitMW.cpp
+++ b/Framework/CurveFitting/src/FitMW.cpp
@@ -36,11 +36,11 @@ public:
SimpleJacobian(size_t nData, size_t nParams)
: m_nParams(nParams), m_data(nData * nParams) {}
/// Setter
- virtual void set(size_t iY, size_t iP, double value) {
+ void set(size_t iY, size_t iP, double value) override {
m_data[iY * m_nParams + iP] = value;
}
/// Getter
- virtual double get(size_t iY, size_t iP) {
+ double get(size_t iY, size_t iP) override {
return m_data[iY * m_nParams + iP];
}
diff --git a/Framework/DataHandling/inc/MantidDataHandling/AppendGeometryToSNSNexus.h b/Framework/DataHandling/inc/MantidDataHandling/AppendGeometryToSNSNexus.h
index 82d4978d6b021e440694cf523f18c3400b8a0800..3ee3f1bd9731b4a98209eb37292539e17093d5de 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/AppendGeometryToSNSNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/AppendGeometryToSNSNexus.h
@@ -35,21 +35,21 @@ namespace DataHandling {
class DLLExport AppendGeometryToSNSNexus : public API::Algorithm {
public:
AppendGeometryToSNSNexus();
- virtual ~AppendGeometryToSNSNexus();
+ ~AppendGeometryToSNSNexus() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Appends the resolved instrument geometry (detectors and monitors "
"for now) to a SNS ADARA NeXus file.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// The filename of the NeXus file to append geometry info to
std::string m_filename;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/AsciiPointBase.h b/Framework/DataHandling/inc/MantidDataHandling/AsciiPointBase.h
index 6213b2ee25c05a1f0b1c54f933aa27d8ab0c31fb..c3e6191446e896db458bdc310e8134a46d4fd4ad 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/AsciiPointBase.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/AsciiPointBase.h
@@ -44,13 +44,13 @@ public:
/// Default constructor
AsciiPointBase() : m_qres(0), m_xlength(0), m_ws() {}
/// Destructor
- ~AsciiPointBase() {}
+ ~AsciiPointBase() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const = 0;
+ const std::string name() const override = 0;
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const = 0;
+ int version() const override = 0;
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Text"; }
+ const std::string category() const override { return "DataHandling\\Text"; }
private:
/// Return the file extension this algorthm should output.
@@ -63,9 +63,9 @@ private:
virtual void extraHeaders(std::ofstream &file) = 0;
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// returns true if the value is NaN
bool checkIfNan(const double &value) const;
/// returns true if the value if + or - infinity
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CheckMantidVersion.h b/Framework/DataHandling/inc/MantidDataHandling/CheckMantidVersion.h
index 0b176834ab85f12292f923902cde864c7dee6865..0be79b4ed89633d014163405ca3c1bc10eaa4978 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CheckMantidVersion.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CheckMantidVersion.h
@@ -34,20 +34,20 @@ namespace DataHandling {
class DLLExport CheckMantidVersion : public API::Algorithm {
public:
CheckMantidVersion();
- virtual ~CheckMantidVersion();
+ ~CheckMantidVersion() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
protected:
virtual std::string getVersionsFromGitHub(const std::string &url);
virtual std::string getCurrentVersion() const;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
std::string cleanVersionTag(const std::string &versionTag) const;
std::vector<int> splitVersionString(const std::string &versionString) const;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CompressEvents.h b/Framework/DataHandling/inc/MantidDataHandling/CompressEvents.h
index e5395ed3549177f91aa0b2d8af57487f9754a721..5fd5477cb5d92ab4d99774d89c68ae02cdc4e1ef 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CompressEvents.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CompressEvents.h
@@ -46,26 +46,26 @@ namespace DataHandling {
class DLLExport CompressEvents : public API::Algorithm {
public:
CompressEvents();
- virtual ~CompressEvents();
+ ~CompressEvents() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CompressEvents"; };
+ const std::string name() const override { return "CompressEvents"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Reduce the number of events in an EventWorkspace by grouping "
"together events with identical or similar X-values "
"(time-of-flight).";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Events"; }
+ const std::string category() const override { return "Events"; }
private:
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CreateChopperModel.h b/Framework/DataHandling/inc/MantidDataHandling/CreateChopperModel.h
index 8a143af2e605d2171050a608ac8ace2a8a110fff..a168a0931b5a3b05646f0e4b5642b9bb21f71fae 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CreateChopperModel.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CreateChopperModel.h
@@ -34,18 +34,18 @@ namespace DataHandling {
*/
class DLLExport CreateChopperModel : public API::Algorithm {
public:
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates a chopper model for a given workspace";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CreateChunkingFromInstrument.h b/Framework/DataHandling/inc/MantidDataHandling/CreateChunkingFromInstrument.h
index 8d575a0800f180e96108ca70cc8c446722ea1eae..b0a9c6133910f15818ddcbf88e605fd6727d9cd5 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CreateChunkingFromInstrument.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CreateChunkingFromInstrument.h
@@ -34,17 +34,17 @@ namespace DataHandling {
class DLLExport CreateChunkingFromInstrument : public API::Algorithm {
public:
CreateChunkingFromInstrument();
- virtual ~CreateChunkingFromInstrument();
+ ~CreateChunkingFromInstrument() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
- virtual std::map<std::string, std::string> validateInputs();
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
+ std::map<std::string, std::string> validateInputs() override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
Geometry::Instrument_const_sptr getInstrument();
};
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CreateModeratorModel.h b/Framework/DataHandling/inc/MantidDataHandling/CreateModeratorModel.h
index 7f3d4329daa14a3638b510d25d9875e3e581e9f5..d607e816ea0c2d11361e17581815d37d98904c16 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CreateModeratorModel.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CreateModeratorModel.h
@@ -32,19 +32,19 @@ namespace DataHandling {
*/
class DLLExport CreateModeratorModel : public API::Algorithm {
public:
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates the given moderator model and attaches it to the input "
"workspace.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CreateSampleShape.h b/Framework/DataHandling/inc/MantidDataHandling/CreateSampleShape.h
index e7ce5519698d7d679d5046a040c3c83c140330c0..33f018052c7f7dfd1942c2690bb8d953f396dc4b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CreateSampleShape.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CreateSampleShape.h
@@ -43,24 +43,24 @@ public:
/// (Empty) Constructor
CreateSampleShape() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~CreateSampleShape() {}
+ ~CreateSampleShape() override {}
/// Algorithm's name
- virtual const std::string name() const { return "CreateSampleShape"; }
+ const std::string name() const override { return "CreateSampleShape"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Create a shape object to model the sample.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Sample;"; }
+ const std::string category() const override { return "Sample;"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/DataHandling/inc/MantidDataHandling/CreateSimulationWorkspace.h b/Framework/DataHandling/inc/MantidDataHandling/CreateSimulationWorkspace.h
index 48c1923cc585095616f0470e1989770a673ea605..4dba29a17920947795c1af3ec0c123485e8c5e1c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/CreateSimulationWorkspace.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/CreateSimulationWorkspace.h
@@ -32,18 +32,18 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
class DLLExport CreateSimulationWorkspace : public API::Algorithm {
public:
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Create a blank workspace for a given instrument.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Create the instrument
void createInstrument();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DefineGaugeVolume.h b/Framework/DataHandling/inc/MantidDataHandling/DefineGaugeVolume.h
index 5fb4d988b10ade5effc03666f755557996b92eaa..d0f186f172ccf5e9c0c054f0c7d571081c3f47fa 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DefineGaugeVolume.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DefineGaugeVolume.h
@@ -43,25 +43,25 @@ public:
/// (Empty) Constructor
DefineGaugeVolume() : API::Algorithm() {}
/// Virtual destructor
- virtual ~DefineGaugeVolume() {}
+ ~DefineGaugeVolume() override {}
/// Algorithm's name
- virtual const std::string name() const { return "DefineGaugeVolume"; }
+ const std::string name() const override { return "DefineGaugeVolume"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Defines a geometrical shape object to be used as the gauge volume "
"in the AbsorptionCorrection algorithm.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Sample"; }
+ const std::string category() const override { return "Sample"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DeleteTableRows.h b/Framework/DataHandling/inc/MantidDataHandling/DeleteTableRows.h
index 6232bd0acd9597ed33ef8023f8797bd85e228111..93ac211c015f4d419989a75264cf351e7176a38c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DeleteTableRows.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DeleteTableRows.h
@@ -41,22 +41,22 @@ public:
/// Default constructor
DeleteTableRows() {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "DeleteTableRows"; }
+ const std::string name() const override { return "DeleteTableRows"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Deletes rows from a TableWorkspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Category
- virtual const std::string category() const { return "Utility\\Workspaces"; }
+ const std::string category() const override { return "Utility\\Workspaces"; }
private:
/// Initialize the static base properties
- void init();
+ void init() override;
/// Execute
- void exec();
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DetermineChunking.h b/Framework/DataHandling/inc/MantidDataHandling/DetermineChunking.h
index d49592f45ba0c433f196f80492e7ce5c4cfd8cad..304eba9a6092b90828947dd3057b1bebb0dcf0e0 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DetermineChunking.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DetermineChunking.h
@@ -61,21 +61,21 @@ enum FileType {
class DLLExport DetermineChunking : public API::Algorithm {
public:
DetermineChunking();
- virtual ~DetermineChunking();
+ ~DetermineChunking() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Workflow algorithm to determine chunking strategy for event nexus, "
"runinfo.xml, raw, or histo nexus files.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
std::string setTopEntryName(std::string filename);
FileType getFileType(const std::string &filename);
};
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DownloadFile.h b/Framework/DataHandling/inc/MantidDataHandling/DownloadFile.h
index f0b20adac73d7d3f3a53ef98c0c890ed53dc75fb..dcf95a8715e1b997a5d7ef32d293aeacff53e80d 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DownloadFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DownloadFile.h
@@ -39,19 +39,19 @@ namespace DataHandling {
class DLLExport DownloadFile : public API::Algorithm {
public:
DownloadFile();
- virtual ~DownloadFile();
+ ~DownloadFile() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
protected:
Kernel::InternetHelper *m_internetHelper;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/DownloadInstrument.h b/Framework/DataHandling/inc/MantidDataHandling/DownloadInstrument.h
index 0ea5996cd91158845c01fefae37bce4554c223e7..e9e4453764fff6176d3663efae79e7bc0d7913fa 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/DownloadInstrument.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/DownloadInstrument.h
@@ -38,18 +38,18 @@ class DLLExport DownloadInstrument : public API::Algorithm {
public:
DownloadInstrument();
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
protected:
// Convenience typedef
typedef std::map<std::string, std::string> StringToStringMap;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
virtual int
doDownloadFile(const std::string &urlFile,
const std::string &localFilePath = "",
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ExtractMonitorWorkspace.h b/Framework/DataHandling/inc/MantidDataHandling/ExtractMonitorWorkspace.h
index cb9bc89e86f960c9e39b87757871774ec7e9016d..84923dd1a54074aa0807cb384a205fc49623da73 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ExtractMonitorWorkspace.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ExtractMonitorWorkspace.h
@@ -35,16 +35,16 @@ namespace DataHandling {
class DLLExport ExtractMonitorWorkspace : public API::Algorithm {
public:
ExtractMonitorWorkspace();
- virtual ~ExtractMonitorWorkspace();
+ ~ExtractMonitorWorkspace() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/FilterEventsByLogValuePreNexus.h b/Framework/DataHandling/inc/MantidDataHandling/FilterEventsByLogValuePreNexus.h
index cdb6f0ca0e2840b149155aa13c640fb640e82c99..433aa978322269878f37d8e9185d97fee3b8be14 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/FilterEventsByLogValuePreNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/FilterEventsByLogValuePreNexus.h
@@ -95,33 +95,33 @@ public:
/// Constructor
FilterEventsByLogValuePreNexus();
/// Virtual destructor
- virtual ~FilterEventsByLogValuePreNexus();
+ ~FilterEventsByLogValuePreNexus() override;
/// Algorithm's name
- virtual const std::string name() const {
+ const std::string name() const override {
return "FilterEventsByLogValuePreNexus";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\PreNexus";
}
/// Algorithm's aliases
- virtual const std::string alias() const { return "LoadEventPreNeXus2"; }
+ const std::string alias() const override { return "LoadEventPreNeXus2"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load and split SNS raw neutron event data format and stores it in "
"a workspace";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Process properties
void processProperties();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsInShape.h b/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsInShape.h
index 5e5bf5684e4818955e6cd94de129c9115459a4c7..49a79dab67a2c69ce11538dce5cce9d539bcac55 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsInShape.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsInShape.h
@@ -58,25 +58,25 @@ namespace DataHandling {
class DLLExport FindDetectorsInShape : public API::Algorithm {
public:
FindDetectorsInShape();
- virtual ~FindDetectorsInShape();
+ ~FindDetectorsInShape() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FindDetectorsInShape"; };
+ const std::string name() const override { return "FindDetectorsInShape"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Used to find which instrument detectors are contained within a "
"user-defined 3-D shape.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Utility\\Instrument"; }
+ const std::string category() const override { return "Utility\\Instrument"; }
private:
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsPar.h b/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsPar.h
index ba4a6768804d8628c214888f9cae3106c93805d3..6e8afaf91027d32f7b5831903f6981f2bb71235a 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsPar.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/FindDetectorsPar.h
@@ -138,21 +138,21 @@ class DetParameters;
class DLLExport FindDetectorsPar : public API::Algorithm {
public:
FindDetectorsPar();
- virtual ~FindDetectorsPar();
+ ~FindDetectorsPar() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FindDetectorsPar"; };
+ const std::string name() const override { return "FindDetectorsPar"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The algorithm returns the angular parameters and second flight "
"path for a workspace detectors (data, usually availble in par or "
"phx file)";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument";
}
/// the accessors, used to return algorithm results when called as Child
@@ -170,8 +170,8 @@ public:
private:
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/** the variable defines if algorithm needs to calculate linear ranges for
* the detectors (dX,dY)
* instead of azimuthal_width and polar_width */
diff --git a/Framework/DataHandling/inc/MantidDataHandling/GenerateGroupingPowder.h b/Framework/DataHandling/inc/MantidDataHandling/GenerateGroupingPowder.h
index 1088d198e2282d72e6097ba6588f51d1d4dbf9b4..b22be8c33c7e848e2b353246cdd06439c373bfd3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/GenerateGroupingPowder.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/GenerateGroupingPowder.h
@@ -36,20 +36,20 @@ namespace DataHandling {
class DLLExport GenerateGroupingPowder : public API::Algorithm {
public:
GenerateGroupingPowder();
- virtual ~GenerateGroupingPowder();
+ ~GenerateGroupingPowder() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Generate grouping by angles.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors.h b/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors.h
index ed052da62cc879e60cb0cdea72db5b0470958e0d..a8f50a58634e4cef7417d76d66a3c5f189835b8f 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors.h
@@ -61,12 +61,12 @@ namespace DataHandling {
class DLLExport GroupDetectors : public API::Algorithm {
public:
GroupDetectors();
- virtual ~GroupDetectors();
+ ~GroupDetectors() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "GroupDetectors"; };
+ const std::string name() const override { return "GroupDetectors"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Sums spectra bin-by-bin, equivalent to grouping the data from a "
"set of detectors. Individual groups can be specified by passing "
"the algorithm a list of spectrum numbers, detector IDs or "
@@ -75,14 +75,14 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Grouping"; }
+ const std::string category() const override { return "Transforms\\Grouping"; }
private:
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h b/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h
index 31d655085404dd2d100e58e9425f4bd00f09a558..ea2fd7cab8acacc66cf358862518910cc606dafb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/GroupDetectors2.h
@@ -110,12 +110,12 @@ namespace DataHandling {
class DLLExport GroupDetectors2 : public API::Algorithm {
public:
GroupDetectors2();
- virtual ~GroupDetectors2();
+ ~GroupDetectors2() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "GroupDetectors"; };
+ const std::string name() const override { return "GroupDetectors"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Sums spectra bin-by-bin, equivalent to grouping the data from a "
"set of detectors. Individual groups can be specified by passing "
"the algorithm a list of spectrum numbers, detector IDs or "
@@ -124,12 +124,12 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 2; };
+ int version() const override { return 2; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Grouping"; }
+ const std::string category() const override { return "Transforms\\Grouping"; }
/// Validate inputs
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
/// provides a function that expands pairs of integers separated with a hyphen
@@ -162,8 +162,8 @@ private:
storage_map m_GroupSpecInds;
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void execEvent();
/// read in the input parameters and see what findout what will be to grouped
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ISISDataArchive.h b/Framework/DataHandling/inc/MantidDataHandling/ISISDataArchive.h
index 7ab61d44624a13f3939cb302d217a96a7922fe57..dafe2aa16e19161417e4f39c74a223f82a329283 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ISISDataArchive.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ISISDataArchive.h
@@ -42,8 +42,9 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport ISISDataArchive : public API::IArchiveSearch {
public:
/// Returns the path to a filename given the list of extensions to try
- std::string getArchivePath(const std::set<std::string> &filenames,
- const std::vector<std::string> &exts) const;
+ std::string
+ getArchivePath(const std::set<std::string> &filenames,
+ const std::vector<std::string> &exts) const override;
private:
/// Queries the archive & returns the path to a single file.
diff --git a/Framework/DataHandling/inc/MantidDataHandling/Load.h b/Framework/DataHandling/inc/MantidDataHandling/Load.h
index 6d10b3f76810ea8bcfcff37bec9418f55d43ac91..521d80f563fcd35f1777fddc9e79f61b9ddba6ee 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/Load.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/Load.h
@@ -42,22 +42,22 @@ public:
/// Default constructor
Load();
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "Load"; }
+ const std::string name() const override { return "Load"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Attempts to load a given file by finding an appropriate Load "
"algorithm.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Category
- virtual const std::string category() const { return "DataHandling"; }
+ const std::string category() const override { return "DataHandling"; }
/// Aliases
- virtual const std::string alias() const { return "load"; }
+ const std::string alias() const override { return "load"; }
/// Override setPropertyValue
- virtual void setPropertyValue(const std::string &name,
- const std::string &value);
+ void setPropertyValue(const std::string &name,
+ const std::string &value) override;
private:
/// This method returns shared pointer to a load algorithm which got
@@ -68,9 +68,9 @@ private:
void declareLoaderProperties(const API::IAlgorithm_sptr &loader);
/// Initialize the static base properties
- void init();
+ void init() override;
/// Execute
- void exec();
+ void exec() override;
/// Called when there is only one file to load.
void loadSingleFile();
@@ -78,7 +78,7 @@ private:
void loadMultipleFiles();
/// Overrides the cancel() method to call m_loader->cancel()
- void cancel();
+ void cancel() override;
/// Create the concrete instance use for the actual loading.
API::IAlgorithm_sptr createLoader(const double startProgress = -1.0,
const double endProgress = -1.0,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOHelper.h b/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOHelper.h
index 134809d2757324a1e06eb5ab96e667ced139839e..3b0e7bbe2460f938f41c6919904f1da986ccdef0 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOHelper.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadANSTOHelper.h
@@ -86,8 +86,8 @@ protected:
double m_tofMax;
// methods
- virtual void endOfFrameImpl();
- virtual void addEventImpl(size_t id, double tof);
+ void endOfFrameImpl() override;
+ void addEventImpl(size_t id, double tof) override;
public:
// construction
@@ -108,8 +108,8 @@ protected:
std::vector<EventVector_pt> &m_eventVectors;
// methods
- virtual void endOfFrameImpl();
- virtual void addEventImpl(size_t id, double tof);
+ void endOfFrameImpl() override;
+ void addEventImpl(size_t id, double tof) override;
public:
// construction
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h b/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h
index cf495c009be312933a224018d34b0deb1079edab..8a8729c7f29139e547f09e38afe0ee7ac6b6f9ab 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadAscii.h
@@ -52,19 +52,19 @@ public:
/// Default constructor
LoadAscii();
/// The name of the algorithm
- virtual const std::string name() const { return "LoadAscii"; }
+ const std::string name() const override { return "LoadAscii"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads data from a text file and stores it in a 2D workspace "
"(Workspace2D class).";
}
/// The version number
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// The category
- virtual const std::string category() const { return "DataHandling\\Text"; }
+ const std::string category() const override { return "DataHandling\\Text"; }
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
protected:
/// Process the header information within the file.
@@ -88,9 +88,9 @@ protected:
private:
/// Declare properties
- void init();
+ void init() override;
/// Execute the algorithm
- void exec();
+ void exec() override;
/// Map the separator options to their string equivalents
std::map<std::string, std::string> m_separatorIndex;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadAscii2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadAscii2.h
index fe0cbfb27321d04a606a2d62add607d13b07dfe1..1a6a8d64fc5365387390f027253cd55a07ce02f4 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadAscii2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadAscii2.h
@@ -52,19 +52,19 @@ public:
/// Default constructor
LoadAscii2();
/// The name of the algorithm
- virtual const std::string name() const { return "LoadAscii"; }
+ const std::string name() const override { return "LoadAscii"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads data from a text file and stores it in a 2D workspace "
"(Workspace2D class).";
}
/// The version number
- virtual int version() const { return 2; }
+ int version() const override { return 2; }
/// The category
- virtual const std::string category() const { return "DataHandling\\Text"; }
+ const std::string category() const override { return "DataHandling\\Text"; }
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
protected:
/// Read the data from the file
@@ -103,9 +103,9 @@ protected:
private:
/// Declare properties
- void init();
+ void init() override;
/// Execute the algorithm
- void exec();
+ void exec() override;
/// Map the separator options to their string equivalents
std::map<std::string, std::string> m_separatorIndex;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadBBY.h b/Framework/DataHandling/inc/MantidDataHandling/LoadBBY.h
index 7cabf92f0a8c93437ac1e5568cf94675ec82e6fc..4ac247b96ee12a2e86497ba6db5ca8f3d7bcc52e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadBBY.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadBBY.h
@@ -73,24 +73,24 @@ class DLLExport LoadBBY : public API::IFileLoader<Kernel::FileDescriptor> {
public:
// construction
LoadBBY() {}
- virtual ~LoadBBY() {}
+ ~LoadBBY() override {}
// description
- virtual int version() const { return 1; }
- virtual const std::string name() const { return "LoadBBY"; }
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
- virtual const std::string summary() const {
+ int version() const override { return 1; }
+ const std::string name() const override { return "LoadBBY"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
+ const std::string summary() const override {
return "Loads a BilBy data file into an workspace.";
}
// returns a confidence value that this algorithm can load a specified file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
protected:
// initialisation
- virtual void init();
+ void init() override;
// execution
- virtual void exec();
+ void exec() override;
private:
// region of intreset
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadCalFile.h b/Framework/DataHandling/inc/MantidDataHandling/LoadCalFile.h
index ecdc7eb2bc8212b8ae7b57e4e437ee8b4eabd570..daaff7be4f596a4ca64ff8abc641493136285952 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadCalFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadCalFile.h
@@ -22,20 +22,20 @@ namespace DataHandling {
class DLLExport LoadCalFile : public API::Algorithm {
public:
LoadCalFile();
- ~LoadCalFile();
+ ~LoadCalFile() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "LoadCalFile"; };
+ const std::string name() const override { return "LoadCalFile"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a 5-column ASCII .cal file into up to 3 workspaces: a "
"GroupingWorkspace, OffsetsWorkspace and/or MaskWorkspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Text;Diffraction\\DataHandling\\CalFiles";
}
@@ -52,9 +52,9 @@ public:
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Checks if a detector ID is for a monitor on a given instrument
static bool idIsMonitor(Mantid::Geometry::Instrument_const_sptr inst,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D.h b/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D.h
index 234cc7876d45de381950efd6b8429afa8db7feb6..0681168e4f009353fd2ee2b32460622ae9a503c1 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D.h
@@ -57,23 +57,23 @@ public:
/// default constructor
LoadCanSAS1D();
/// destructor
- virtual ~LoadCanSAS1D();
+ ~LoadCanSAS1D() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadCanSAS1D"; }
+ const std::string name() const override { return "LoadCanSAS1D"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load a file written in the canSAS 1-D data format";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\XML;SANS\\DataHandling";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
protected:
/// If a workspace group is created this is set from empty to the root name of
@@ -85,9 +85,9 @@ protected:
int m_groupNumber;
/// Overwrites Algorithm method.
- virtual void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// Loads an individual SASentry element into a new workspace
virtual API::MatrixWorkspace_sptr
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D2.h
index 4cb45cba6d603ce8e7f340bd5742b09316f362c3..9c885113a67b72ac1abc9f286d89153090a70224 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadCanSAS1D2.h
@@ -73,18 +73,18 @@ public:
/// default constructor
LoadCanSAS1D2();
/// destructor
- virtual ~LoadCanSAS1D2();
+ ~LoadCanSAS1D2() override;
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 2; }
+ int version() const override { return 2; }
protected:
/// Overwrites Algorithm method. Extend to create the LoadTransmission flag.
- virtual void init();
+ void init() override;
- virtual void exec();
+ void exec() override;
/// Extends the LoadEntry to deal with the possibility of Transmission data.
- virtual API::MatrixWorkspace_sptr
- loadEntry(Poco::XML::Node *const workspaceData, std::string &runName);
+ API::MatrixWorkspace_sptr loadEntry(Poco::XML::Node *const workspaceData,
+ std::string &runName) override;
/// Add new method to deal with loading the transmission related data.
API::MatrixWorkspace_sptr loadTransEntry(Poco::XML::Node *const workspaceData,
std::string &runName,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h b/Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h
index 21e04b825361dba4b1eeb058d0c5a114169b6c32..ea9740d87aba36a80df2a186a7311222922f44c3 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadDaveGrp.h
@@ -46,29 +46,29 @@ public:
/// Constructor
LoadDaveGrp();
/// Virtual destructor
- virtual ~LoadDaveGrp() {}
+ ~LoadDaveGrp() override {}
/// Algorithm's name
- virtual const std::string name() const { return "LoadDaveGrp"; }
+ const std::string name() const override { return "LoadDaveGrp"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads data from a DAVE grouped ASCII file and stores it in a 2D "
"workspace (Workspace2D class).";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Text;Inelastic\\DataHandling";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
/// Initialization code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/**
* Function to retrieve the lengths of the x and y axes. This function uses
* the same code for each call, but it is the order which determines the axis
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorInfo.h b/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorInfo.h
index e82267fe0c11eec870a15250031522c12524cecd..14899b34196826c42410046be31d9d7d65571725 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorInfo.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorInfo.h
@@ -36,18 +36,18 @@ public:
LoadDetectorInfo();
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadDetectorInfo"; }
+ const std::string name() const override { return "LoadDetectorInfo"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads delay times, tube pressures, tube wall thicknesses and, if "
"necessary, the detectors positions from a given special format "
"file";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Raw"; }
+ const std::string category() const override { return "DataHandling\\Raw"; }
private:
/// Simple data holder for passing the detector info around when
@@ -60,8 +60,8 @@ private:
std::vector<double> pressures, thicknesses;
};
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Cache the user input that will be frequently accessed
void cacheInputs();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorsGroupingFile.h b/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorsGroupingFile.h
index 23111f80d043c3aa82d3b68ae876350a3b8856fb..72e33e08b03ab1f1fac48ba081f0f3d5326b93cb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorsGroupingFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorsGroupingFile.h
@@ -51,30 +51,30 @@ namespace DataHandling {
class DLLExport LoadDetectorsGroupingFile : public API::Algorithm {
public:
LoadDetectorsGroupingFile();
- virtual ~LoadDetectorsGroupingFile();
+ ~LoadDetectorsGroupingFile() override;
///
- virtual const std::string name() const {
+ const std::string name() const override {
return "LoadDetectorsGroupingFile";
};
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load an XML or Map file, which contains definition of detectors "
"grouping, to a GroupingWorkspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Grouping;Transforms\\Grouping";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Initialize XML parser
void initializeXMLParser(const std::string &filename);
/// Parse XML
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadDiffCal.h b/Framework/DataHandling/inc/MantidDataHandling/LoadDiffCal.h
index 2f33eb56c863dec5d82421d79fba3da8d6e12939..779181b90bb841c373885c65b2b572586827b621 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadDiffCal.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadDiffCal.h
@@ -38,16 +38,16 @@ namespace DataHandling {
class DLLExport LoadDiffCal : public API::Algorithm {
public:
LoadDiffCal();
- virtual ~LoadDiffCal();
+ ~LoadDiffCal() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void getInstrument(H5::H5File &file);
std::vector<int32_t> readInt32Array(H5::Group &group,
const std::string &name);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadDspacemap.h b/Framework/DataHandling/inc/MantidDataHandling/LoadDspacemap.h
index 365366da601eb6ccb729a806015f58566c30aa6c..acb48b4be76716d42ce901cffef72df3c6832330 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadDspacemap.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadDspacemap.h
@@ -19,26 +19,26 @@ namespace DataHandling {
class DLLExport LoadDspacemap : public API::Algorithm {
public:
LoadDspacemap();
- ~LoadDspacemap();
+ ~LoadDspacemap() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "LoadDspacemap"; };
+ const std::string name() const override { return "LoadDspacemap"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a Dspacemap file (POWGEN binary, VULCAN binary or ascii "
"format) into an OffsetsWorkspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "DataHandling\\Text"; }
+ const std::string category() const override { return "DataHandling\\Text"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
void readVulcanAsciiFile(const std::string &fileName,
std::map<detid_t, double> &vulcan);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEmptyInstrument.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEmptyInstrument.h
index ab5834a0271a4e5434198c6e2cc5cf9dc2ed5304..0b56f197bd78e168cc60452da6a69a154e02dc9d 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEmptyInstrument.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEmptyInstrument.h
@@ -64,27 +64,27 @@ public:
/// Default constructor
LoadEmptyInstrument();
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadEmptyInstrument"; }
+ const std::string name() const override { return "LoadEmptyInstrument"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads an Instrument Definition File (IDF) into a workspace rather "
"than a data file.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
API::MatrixWorkspace_sptr runLoadInstrument();
};
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
index 07730b4db04c69d216839ec8c3ca91780c3d5259..5d45b49ac3e9fee8ef4f2b3d1c4382318ed5b49d 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
@@ -90,25 +90,25 @@ class DLLExport LoadEventNexus
public:
LoadEventNexus();
- virtual ~LoadEventNexus();
+ ~LoadEventNexus() override;
- virtual const std::string name() const { return "LoadEventNexus"; };
+ const std::string name() const override { return "LoadEventNexus"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads an Event NeXus file and stores as an "
"EventWorkspace. Optionally, you can filter out events falling "
"outside a range of times-of-flight and/or a time interval.";
}
/// Version
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Category
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
/// Returns a confidence value that this algorithm can load a file
- int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
/** Sets whether the pixel counts will be pre-counted.
* @param value :: true if you want to precount. */
@@ -247,10 +247,10 @@ public:
private:
/// Intialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
DataObjects::EventWorkspace_sptr createEmptyEventWorkspace();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h
index 328be8a18896d921be8e0a25bd1c6ff8f0185c86..09dfd3ebdd57c5c9dbe441b665d66d6da6acb248 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus.h
@@ -95,32 +95,32 @@ public:
/// Constructor
LoadEventPreNexus();
/// Virtual destructor
- virtual ~LoadEventPreNexus();
+ ~LoadEventPreNexus() override;
/// Algorithm's name
- virtual const std::string name() const { return "LoadEventPreNexus"; }
+ const std::string name() const override { return "LoadEventPreNexus"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads SNS raw neutron event data format and stores it in a "
"workspace (EventWorkspace class).";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\PreNexus";
}
/// Algorithm's aliases
- virtual const std::string alias() const { return "LoadEventPreNeXus"; }
+ const std::string alias() const override { return "LoadEventPreNeXus"; }
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
Mantid::API::Progress *prog;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h
index 9f99dd1ce1b648dc7a6e577c371633bcdd301b06..48cc524dbbf20388902310a15c764797e6a33405 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEventPreNexus2.h
@@ -93,30 +93,30 @@ public:
/// Constructor
LoadEventPreNexus2();
/// Virtual destructor
- virtual ~LoadEventPreNexus2();
+ ~LoadEventPreNexus2() override;
/// Algorithm's name
- virtual const std::string name() const { return "LoadEventPreNexus"; }
+ const std::string name() const override { return "LoadEventPreNexus"; }
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\PreNexus";
}
/// Algorithm's aliases
- virtual const std::string alias() const { return "LoadEventPreNeXus2"; }
+ const std::string alias() const override { return "LoadEventPreNeXus2"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads SNS raw neutron event data format and stores it in a "
"workspace.";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
Mantid::API::Progress *prog;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadFITS.h b/Framework/DataHandling/inc/MantidDataHandling/LoadFITS.h
index f576cc2c4c0094ab6707fc9c1229fb1d584ea350..b15d12056d3658f5706e5f967b6af583d5ca26af 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadFITS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadFITS.h
@@ -66,36 +66,36 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport LoadFITS : public API::IFileLoader<Kernel::FileDescriptor> {
public:
LoadFITS();
- virtual ~LoadFITS() {}
+ ~LoadFITS() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadFITS"; }
+ const std::string name() const override { return "LoadFITS"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load FITS files into workspaces of type Workspace2D.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Tomography";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
/// Returns a value indicating whether or not loader wants to load multiple
/// files into a single workspace
- virtual bool loadMutipleAsOne() { return true; }
+ bool loadMutipleAsOne() override { return true; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Loads the FITS header(s) into a struct
void doLoadHeaders(const std::vector<std::string> &paths,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadFullprofResolution.h b/Framework/DataHandling/inc/MantidDataHandling/LoadFullprofResolution.h
index 0f365d85dd86476852bdcf3c9048b2da77495deb..106080742031d52e5e110a7cfab48305f7999b3d 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadFullprofResolution.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadFullprofResolution.h
@@ -42,20 +42,20 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport LoadFullprofResolution : public API::Algorithm {
public:
LoadFullprofResolution();
- virtual ~LoadFullprofResolution();
+ ~LoadFullprofResolution() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadFullprofResolution"; }
+ const std::string name() const override { return "LoadFullprofResolution"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load Fullprof's resolution (.irf) file to one or multiple "
"TableWorkspace(s) and/or where this is supported."
" See description section, translate fullprof resolution fitting "
@@ -125,9 +125,9 @@ public:
private:
/// Implement abstract Algorithm methods
- void init();
+ void init() override;
/// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
/// Load file to a vector of strings
void loadFile(std::string filename, std::vector<std::string> &lines);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadGSASInstrumentFile.h b/Framework/DataHandling/inc/MantidDataHandling/LoadGSASInstrumentFile.h
index 1f998b15ee3d3fe653120fe893a23eacde992d85..20b95bca789c4c347399507447e9ed8400b9274d 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadGSASInstrumentFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadGSASInstrumentFile.h
@@ -41,28 +41,28 @@ namespace DataHandling {
class DLLExport LoadGSASInstrumentFile : public API::Algorithm {
public:
LoadGSASInstrumentFile();
- virtual ~LoadGSASInstrumentFile();
+ ~LoadGSASInstrumentFile() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadGSASInstrumentFile"; }
+ const std::string name() const override { return "LoadGSASInstrumentFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load parameters from a GSAS Instrument file.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling";
}
private:
/// Implement abstract Algorithm methods
- void init();
+ void init() override;
/// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
/// Load file to a vector of strings
void loadFile(std::string filename, std::vector<std::string> &lines);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadGSS.h b/Framework/DataHandling/inc/MantidDataHandling/LoadGSS.h
index 141174955d001b183fd96083f01e9d2fe270598b..393f8de64c724758ee56b494d04ef7bd39aadc3e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadGSS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadGSS.h
@@ -42,13 +42,13 @@ public:
/// Virtual destructor
- virtual ~LoadGSS() {}
+ ~LoadGSS() override {}
/// Algorithm's name
- virtual const std::string name() const { return "LoadGSS"; }
+ const std::string name() const override { return "LoadGSS"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a GSS file such as that saved by SaveGSS. This is not a "
"lossless process, as SaveGSS truncates some data. There is no "
"instrument assosciated with the resulting workspace. 'Please "
@@ -57,22 +57,22 @@ public:
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling;DataHandling\\Text";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Main method to load GSAS
API::MatrixWorkspace_sptr loadGSASFile(const std::string &filename,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadIDFFromNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadIDFFromNexus.h
index 28818aaad5a98f965b50912a615cb492209f5f52..0e5299b5e10e5137c08be0bf883f217471fcb52e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadIDFFromNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadIDFFromNexus.h
@@ -55,12 +55,12 @@ public:
LoadIDFFromNexus();
/// Destructor
- virtual ~LoadIDFFromNexus() {}
+ ~LoadIDFFromNexus() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadIDFFromNexus"; }
+ const std::string name() const override { return "LoadIDFFromNexus"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load an IDF from a Nexus file, if found there. You may need to "
"tell this algorithm where to find the Instrument folder in the "
"Nexus file";
@@ -81,18 +81,18 @@ public:
const API::MatrixWorkspace_sptr localWorkspace);
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument";
}
private:
/// Overwrites Algorithm method. Does nothing at present
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// Load Parameter File specified by full pathname into given workspace,
/// return success
bool loadParameterFile(const std::string &fullPathName,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadILL.h b/Framework/DataHandling/inc/MantidDataHandling/LoadILL.h
index 82c532a8d6b3d0595218cc4942af7c0b4d2e2d11..9e5701068771a452c660902d8d35bf35d4895aea 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadILL.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadILL.h
@@ -38,27 +38,27 @@ class DLLExport LoadILL : public API::IFileLoader<Kernel::NexusDescriptor> {
public:
/// Constructor
LoadILL(); /// Virtual destructor
- virtual ~LoadILL() {}
+ ~LoadILL() override {}
/// Algorithm's name
- virtual const std::string name() const { return "LoadILL"; }
+ const std::string name() const override { return "LoadILL"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a ILL nexus file.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
/// Returns a confidence value that this algorithm can load a file
- int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
private:
// Initialisation code
- void init();
+ void init() override;
// Execution code
- void exec();
+ void exec() override;
int getEPPFromVanadium(const std::string &,
Mantid::API::MatrixWorkspace_sptr);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadILLIndirect.h b/Framework/DataHandling/inc/MantidDataHandling/LoadILLIndirect.h
index 83bfd0a15307e5fe1ee11605969e81626d2565ac..c7cea587d51f39f679bccc2c03fb68baf2d0b51c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadILLIndirect.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadILLIndirect.h
@@ -36,22 +36,22 @@ class DLLExport LoadILLIndirect
: public API::IFileLoader<Kernel::NexusDescriptor> {
public:
LoadILLIndirect();
- virtual ~LoadILLIndirect();
+ ~LoadILLIndirect() override;
/// Returns a confidence value that this algorithm can load a file
- int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a ILL/IN16B nexus file.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void loadDataDetails(NeXus::NXEntry &entry);
void initWorkSpace(NeXus::NXEntry &entry,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadILLReflectometry.h b/Framework/DataHandling/inc/MantidDataHandling/LoadILLReflectometry.h
index 6e90a7bf849e97858d5159ecc0edd38955c45f90..eb42e72daae0b42724426f1a6864945d10172ef4 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadILLReflectometry.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadILLReflectometry.h
@@ -38,21 +38,21 @@ class DLLExport LoadILLReflectometry
: public API::IFileLoader<Kernel::NexusDescriptor> {
public:
LoadILLReflectometry();
- virtual ~LoadILLReflectometry();
+ ~LoadILLReflectometry() override;
/// Returns a confidence value that this algorithm can load a file
- int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a ILL/D17 nexus file.";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void initWorkSpace(NeXus::NXEntry &entry,
std::vector<std::vector<int>> monitorsData);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h b/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h
index ad65796257a4a3c9f3b0a878848eb1652f0fe438..f49c75ed73952bbad22a6d67bd42f670cbb334f8 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadILLSANS.h
@@ -61,22 +61,22 @@ std::ostream &operator<<(std::ostream &strm, const DetectorPosition &p) {
class DLLExport LoadILLSANS : public API::IFileLoader<Kernel::NexusDescriptor> {
public:
LoadILLSANS();
- virtual ~LoadILLSANS();
+ ~LoadILLSANS() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a ILL nexus files for SANS instruments.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
/// Returns a confidence value that this algorithm can load a file
- int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void setInstrumentName(const NeXus::NXEntry &, const std::string &);
DetectorPosition getDetectorPosition(const NeXus::NXEntry &,
const std::string &);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h
index 3b6ed257804f840d63596fb465ce50c329d869f3..eece7bccab24bb30ac71e89af5a199dc6b29b444 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadISISNexus2.h
@@ -76,20 +76,20 @@ public:
/// Default constructor
LoadISISNexus2();
/// Destructor
- virtual ~LoadISISNexus2() {}
+ ~LoadISISNexus2() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadISISNexus"; }
+ const std::string name() const override { return "LoadISISNexus"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 2; }
+ int version() const override { return 2; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a file in ISIS NeXus format.";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
/// Spectra block descriptor
struct SpectraBlock {
@@ -131,9 +131,9 @@ public:
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
// Validate the optional input properties
void checkOptionalProperties(
const std::map<int64_t, std::string> &ExcludedMonitors);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadInstrument.h b/Framework/DataHandling/inc/MantidDataHandling/LoadInstrument.h
index c734b5d9383ea97ffaa29d690be6d50204d186bf..739bdc2846672b69dee22d23fec16234d7df9538 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadInstrument.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadInstrument.h
@@ -79,11 +79,11 @@ public:
LoadInstrument();
/// Destructor
- virtual ~LoadInstrument() {}
+ ~LoadInstrument() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadInstrument"; };
+ const std::string name() const override { return "LoadInstrument"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads an Instrument Definition File (IDF) into a workspace. After "
"the IDF has been read this algorithm will attempt to run the Child "
"Algorithm LoadParameterFile; where if IDF filename is of the form "
@@ -92,15 +92,15 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Run the Child Algorithm LoadParameters
void runLoadParameterFile();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromNexus.h
index f2b2589948c8e3a1d347bb26250af3cc440adc63..e1fe8c182532e3ebe7faddd98e34d642de81dc02 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromNexus.h
@@ -71,12 +71,12 @@ public:
LoadInstrumentFromNexus();
/// Destructor
- virtual ~LoadInstrumentFromNexus() {}
+ ~LoadInstrumentFromNexus() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadInstrumentFromNexus"; };
+ const std::string name() const override { return "LoadInstrumentFromNexus"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Attempts to load some information about the instrument from a "
"Nexus file. It adds dummy source and samplepos components to "
"instrument. If the L1 source - sample distance is not available in "
@@ -86,19 +86,19 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument";
}
private:
/// Overwrites Algorithm method. Does nothing at present
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// The name and path of the input file
std::string m_filename;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromRaw.h b/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromRaw.h
index 75865046bf0b5af7e33b713b8c4eb66097f2b99f..ef41d98b729157be671536381bcb97a3b588a239 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromRaw.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadInstrumentFromRaw.h
@@ -68,12 +68,12 @@ public:
LoadInstrumentFromRaw();
/// Destructor
- ~LoadInstrumentFromRaw() {}
+ ~LoadInstrumentFromRaw() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadInstrumentFromRaw"; };
+ const std::string name() const override { return "LoadInstrumentFromRaw"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Attempts to load information about the instrument from a ISIS raw "
"file. In particular attempt to read L2 and 2-theta detector "
"position values and add detectors which are positioned relative to "
@@ -86,19 +86,19 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument;DataHandling\\Raw";
}
private:
/// Overwrites Algorithm method. Does nothing at present
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// The name and path of the input file
std::string m_filename;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadIsawDetCal.h b/Framework/DataHandling/inc/MantidDataHandling/LoadIsawDetCal.h
index bc1431107eb0b5b333bb70cd5eb2889a42fdc7ff..6e2e518283622b757ed3e528eee666edc7d6b3b4 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadIsawDetCal.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadIsawDetCal.h
@@ -46,11 +46,11 @@ public:
/// Default constructor
LoadIsawDetCal();
/// Destructor
- virtual ~LoadIsawDetCal();
+ ~LoadIsawDetCal() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadIsawDetCal"; }
+ const std::string name() const override { return "LoadIsawDetCal"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Since ISAW already has the capability to calibrate the instrument "
"using single crystal peaks, this algorithm leverages this in "
"mantid. It loads in a detcal file from ISAW and moves all of the "
@@ -59,9 +59,9 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling;DataHandling\\Isaw";
}
/// Function to optimize
@@ -70,8 +70,8 @@ public:
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
Geometry::Instrument_sptr getCheckInst(API::Workspace_sptr ws);
};
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadLLB.h b/Framework/DataHandling/inc/MantidDataHandling/LoadLLB.h
index 5dd2ba81014930816e68216f95accc430e25e41c..089f1242db70d6d3edeca1172d9b75fcb0a9bbb9 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadLLB.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadLLB.h
@@ -36,21 +36,21 @@ namespace DataHandling {
class DLLExport LoadLLB : public API::IFileLoader<Kernel::NexusDescriptor> {
public:
LoadLLB();
- virtual ~LoadLLB();
+ ~LoadLLB() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const { return "Loads LLB nexus file."; }
+ const std::string summary() const override { return "Loads LLB nexus file."; }
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void setInstrumentName(NeXus::NXEntry &entry);
void initWorkSpace(NeXus::NXEntry &);
void loadTimeDetails(NeXus::NXEntry &entry);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadLog.h b/Framework/DataHandling/inc/MantidDataHandling/LoadLog.h
index 1fb41e3f147b46981750ca074451028ceb37cc7f..6c3bc2c853b4d228c328770bcddc5890cbaa0fa6 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadLog.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadLog.h
@@ -77,28 +77,28 @@ public:
LoadLog();
/// Destructor
- ~LoadLog() {}
+ ~LoadLog() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadLog"; };
+ const std::string name() const override { return "LoadLog"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load ISIS log file(s) into a workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Logs"; }
+ const std::string category() const override { return "DataHandling\\Logs"; }
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// SNS text
bool LoadSNSText();
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// The name and path of an input file. This may be the filename of a raw
/// datafile or the name of a specific log file.
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadLogsForSNSPulsedMagnet.h b/Framework/DataHandling/inc/MantidDataHandling/LoadLogsForSNSPulsedMagnet.h
index f59cd95c11fe8768674bb6e8aa664e6ebb7471fd..5858426957c96b1b23271194f783a25b99907805 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadLogsForSNSPulsedMagnet.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadLogsForSNSPulsedMagnet.h
@@ -19,27 +19,27 @@ namespace DataHandling {
class DLLExport LoadLogsForSNSPulsedMagnet : public API::Algorithm {
public:
LoadLogsForSNSPulsedMagnet();
- ~LoadLogsForSNSPulsedMagnet();
+ ~LoadLogsForSNSPulsedMagnet() override;
/// Algorithm's name for identification
- virtual const std::string name() const {
+ const std::string name() const override {
return "LoadLogsForSNSPulsedMagnet";
};
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Both log files are in binary format";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "DataHandling\\Logs"; }
+ const std::string category() const override { return "DataHandling\\Logs"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Parse DelayTime log file
void ParseDelayTimeLogFile();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMLZ.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMLZ.h
index b9b37f385b24a98a7f9ae134d44397efb9cbfb39..9451d6791fce7938ec40ff14c5473f2e706bd6d6 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMLZ.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMLZ.h
@@ -37,23 +37,23 @@ namespace DataHandling {
class DLLExport LoadMLZ : public API::IFileLoader<Kernel::NexusDescriptor> {
public:
LoadMLZ();
- virtual ~LoadMLZ();
+ ~LoadMLZ() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a nexus file from MLZ facility.";
}
/// Returns a confidence value that this algorithm can load a file
- int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
// int getEPPFromVanadium(const std::string
// &,Mantid::API::MatrixWorkspace_sptr);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMappingTable.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMappingTable.h
index 700157b3d286b715aff29009e0d87b9c1f9ab7e1..7b6511f380885864a08f0668d66088ada29f41e8 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMappingTable.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMappingTable.h
@@ -59,19 +59,19 @@ public:
LoadMappingTable();
/// Destructor
- ~LoadMappingTable() {}
+ ~LoadMappingTable() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadMappingTable"; };
+ const std::string name() const override { return "LoadMappingTable"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Builds up the mapping between spectrum number and the detector "
"objects in the instrument Geometry.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument;DataHandling\\Raw";
}
@@ -80,10 +80,10 @@ private:
std::string m_filename;
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMask.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMask.h
index cb3db73b498535f4ced995024728fdbed48cf055..2c798b1ee97be88359e7718c625eacac1841c3fa 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMask.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMask.h
@@ -46,29 +46,29 @@ namespace DataHandling {
class DLLExport LoadMask : public API::Algorithm {
public:
LoadMask();
- ~LoadMask();
+ ~LoadMask() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "LoadMask"; };
+ const std::string name() const override { return "LoadMask"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load file containing masking information to a SpecialWorkspace2D "
"(masking workspace). This algorithm is renamed from "
"LoadMaskingFile.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Masking;Transforms\\Masking";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Initialize XML parser
void initializeXMLParser(const std::string &filename);
/// Parse XML
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMcStas.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMcStas.h
index de8ef107190c39c23c2ec5d5f07ac567796b1bda..05efdc5f20836e65f1fa1af5ac51116e294736a6 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMcStas.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMcStas.h
@@ -36,23 +36,23 @@ namespace DataHandling {
class DLLExport LoadMcStas : public API::IFileLoader<Kernel::NexusDescriptor> {
public:
LoadMcStas();
- virtual ~LoadMcStas();
+ ~LoadMcStas() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a McStas NeXus file into an workspace.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void readEventData(const std::map<std::string, std::string> &eventEntries,
API::WorkspaceGroup_sptr &outputGroup,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasNexus.h
index 06238ed478575b828cb83798d3ecc420650650bd..cdc485c9e2e0e89db2b45b6187ad842fdcbbcae1 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMcStasNexus.h
@@ -34,23 +34,23 @@ class DLLExport LoadMcStasNexus
: public API::IFileLoader<Kernel::NexusDescriptor> {
public:
LoadMcStasNexus();
- virtual ~LoadMcStasNexus();
+ ~LoadMcStasNexus() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads an McStas NeXus file into a group workspace.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonLog.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonLog.h
index df8de957cac498e9860194476cc808d2b03c23ee..79c95dd22a79bb90dbe36179d4f17d85a0c0b649 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonLog.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonLog.h
@@ -59,27 +59,27 @@ public:
LoadMuonLog();
/// Destructor
- virtual ~LoadMuonLog() {}
+ ~LoadMuonLog() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadMuonLog"; };
+ const std::string name() const override { return "LoadMuonLog"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load log data from within Muon Nexus files into a workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Logs;Muon\\DataHandling";
}
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// The name and path of an input file. This may be the filename of a raw
/// datafile or the name of a specific log file.
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h
index 33369a5e26cf0189027955bde83c48427ea97bde..821ab73903b6245b90e4b21900702ff16d7efc45 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus.h
@@ -68,11 +68,11 @@ public:
/// Default constructor
LoadMuonNexus();
/// Destructor
- virtual ~LoadMuonNexus() {}
+ ~LoadMuonNexus() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadMuonNexus"; }
+ const std::string name() const override { return "LoadMuonNexus"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The LoadMuonNexus algorithm will read the given NeXus Muon data "
"file Version 1 and use the results to populate the named "
"workspace. LoadMuonNexus may be invoked by LoadNexus if it is "
@@ -80,14 +80,14 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Nexus;Muon\\DataHandling";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
protected:
virtual void runLoadInstrumentFromNexus(DataObjects::Workspace2D_sptr) {}
@@ -125,7 +125,7 @@ protected:
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus1.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus1.h
index 88659acb2dff34a540e7433e205c89ffbcb24b57..a94ec17a30cbc1df2fec782f93a24f8a5e7d85e9 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus1.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus1.h
@@ -74,11 +74,11 @@ public:
/// Default constructor
LoadMuonNexus1();
/// Destructor
- virtual ~LoadMuonNexus1() {}
+ ~LoadMuonNexus1() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadMuonNexus"; }
+ const std::string name() const override { return "LoadMuonNexus"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The LoadMuonNexus algorithm will read the given NeXus Muon data "
"file Version 1 and use the results to populate the named "
"workspace. LoadMuonNexus may be invoked by LoadNexus if it is "
@@ -86,18 +86,18 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Nexus;Muon\\DataHandling";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
protected:
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
private:
void loadData(size_t hist, specid_t &i, specid_t specNo,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus2.h
index 227034f4f53c2ef784de6b236b62f8d4df8d7a3f..e3f14f7e6c45a031848a45272b55a9b643ffff67 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus2.h
@@ -64,11 +64,11 @@ public:
/// Default constructor
LoadMuonNexus2();
/// Destructor
- ~LoadMuonNexus2() {}
+ ~LoadMuonNexus2() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadMuonNexus"; }
+ const std::string name() const override { return "LoadMuonNexus"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The LoadMuonNexus algorithm will read the given NeXus Muon data "
"file Version 2 and use the results to populate the named "
"workspace. LoadMuonNexus may be invoked by LoadNexus if it is "
@@ -76,18 +76,18 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 2; }
+ int version() const override { return 2; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Nexus;Muon\\DataHandling";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
private:
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// Execute this version of the algorithm
void doExec();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h
index 128a93ce59be578fc63ab43ae58bf02c42e66202..0604021b9757aa15c0bc3f010b1fb42b1ac29497 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h
@@ -43,33 +43,33 @@ namespace DataHandling {
class DLLExport LoadNXSPE : public API::IFileLoader<Kernel::NexusDescriptor> {
public:
LoadNXSPE();
- ~LoadNXSPE();
+ ~LoadNXSPE() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "LoadNXSPE"; };
+ const std::string name() const override { return "LoadNXSPE"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return " Algorithm to load an NXSPE file into a workspace2D.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Nexus;DataHandling\\SPE;Inelastic\\DataHandling";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
/// Confidence in identifier.
static int identiferConfidence(const std::string &value);
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Function to return a cuboid shape, with widths dx,dy,dz
Geometry::Object_sptr createCuboid(double dx, double dy, double dz);
};
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNexus.h
index 3289d1749209ef1814df2fc879f1a52ddfedd21d..08f18769840efd7457eaaff8bbef520fa370f5e1 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNexus.h
@@ -61,27 +61,27 @@ public:
LoadNexus();
/// Destructor
- ~LoadNexus() {}
+ ~LoadNexus() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadNexus"; };
+ const std::string name() const override { return "LoadNexus"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The LoadNexus algorithm will try to identify the type of Nexus "
"file given to it and invoke the appropriate algorithm to read the "
"data and populate the named workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// The name and path of the input file
std::string m_filename;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusLogs.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusLogs.h
index 423839ca5477644c13a12003b9b0a56d020b1eac..9ec9edc86304ee3b9ee10901bc03068bb158dc68 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusLogs.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusLogs.h
@@ -59,27 +59,27 @@ public:
/// Default constructor
LoadNexusLogs();
/// Destructor
- virtual ~LoadNexusLogs() {}
+ ~LoadNexusLogs() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadNexusLogs"; }
+ const std::string name() const override { return "LoadNexusLogs"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads run logs (temperature, pulse charges, etc.) from a NeXus "
"file and adds it to the run information in a workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Logs;DataHandling\\Nexus";
}
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// Load log data from a group
void loadLogs(::NeXus::File &file, const std::string &entry_name,
const std::string &entry_class,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h
index 6f54c05dc3ad5464299b9ef007b79cafbb6f6132..ec12d0b000d397f9f47800ed78f0fdb6319d5696 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors.h
@@ -46,28 +46,28 @@ public:
LoadNexusMonitors();
/// Destructor
- virtual ~LoadNexusMonitors();
+ ~LoadNexusMonitors() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadNexusMonitors"; }
+ const std::string name() const override { return "LoadNexusMonitors"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load all monitors from a NeXus file into a workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
protected:
/// Intialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors2.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors2.h
index bc0eb64099fb345c2a57bd8c5101ee7e66877eaf..591d974f568eaa2b25911b6ae42d4d58d4b51857 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusMonitors2.h
@@ -49,32 +49,28 @@ public:
LoadNexusMonitors2();
/// Destructor
- virtual ~LoadNexusMonitors2();
+ ~LoadNexusMonitors2() override;
/// Algorithm's name for identification
- virtual const std::string name() const override {
- return "LoadNexusMonitors";
- }
+ const std::string name() const override { return "LoadNexusMonitors"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const override {
+ const std::string summary() const override {
return "Load all monitors from a NeXus file into a workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const override { return 2; }
+ int version() const override { return 2; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const override {
- return "DataHandling\\Nexus";
- }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
protected:
/// Initialise algorithm
- virtual void init() override;
+ void init() override;
/// Execute algorithm
- virtual void exec() override;
+ void exec() override;
private:
/// Fix the detector numbers if the defaults are not correct
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h
index 1d6da5f86a70d89003326c84ef0a0771ce26f6a1..0e41083ce7527a1fa15137aef9b6e9ecdc0a782e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h
@@ -59,11 +59,11 @@ public:
/// Default constructor
LoadNexusProcessed();
/// Destructor
- ~LoadNexusProcessed();
+ ~LoadNexusProcessed() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadNexusProcessed"; }
+ const std::string name() const override { return "LoadNexusProcessed"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The LoadNexusProcessed algorithm will read the given Nexus "
"Processed data file containing a Mantid Workspace. The data is "
"placed in the named workspace. LoadNexusProcessed may be invoked "
@@ -71,18 +71,18 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// Create the workspace name if it's part of a group workspace
std::string buildWorkspaceName(const std::string &name,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadPDFgetNFile.h b/Framework/DataHandling/inc/MantidDataHandling/LoadPDFgetNFile.h
index 660e38d32940b40f23ad8d13aa19781820d12a72..1238ee4466664b6e119ac0fc6e2038558d4f5d53 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadPDFgetNFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadPDFgetNFile.h
@@ -35,30 +35,30 @@ class DLLExport LoadPDFgetNFile
: public API::IFileLoader<Kernel::FileDescriptor> {
public:
LoadPDFgetNFile();
- virtual ~LoadPDFgetNFile();
+ ~LoadPDFgetNFile() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadPDFgetNFile"; }
+ const std::string name() const override { return "LoadPDFgetNFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Types of PDFgetN data files include .sqa, .sq, .gr, and etc.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling;DataHandling\\Text";
}
private:
/// Implement abstract Algorithm methods
- void init();
+ void init() override;
/// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
/// Parse PDFgetN data file
void parseDataFile(std::string filename);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadParameterFile.h b/Framework/DataHandling/inc/MantidDataHandling/LoadParameterFile.h
index 92ddd161968b2eeda96ab085186d14529dce20fb..d3544e9de77a444f47d213014dd51e3d113bf77b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadParameterFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadParameterFile.h
@@ -74,11 +74,11 @@ public:
LoadParameterFile();
/// Destructor
- ~LoadParameterFile() {}
+ ~LoadParameterFile() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadParameterFile"; };
+ const std::string name() const override { return "LoadParameterFile"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads instrument parameters into a workspace. where these "
"parameters are associated component names as defined in Instrument "
"Definition File (IDF) or a string consisting of the contents of "
@@ -86,15 +86,15 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
} // namespace Mantid
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexus.h
index 0505eaabe5bdf16d3c8ceed98a1e86bf773f5e9d..ba624f732f325f9c1279d6987359db7e8411ec11 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexus.h
@@ -38,24 +38,24 @@ namespace DataHandling {
class DLLExport LoadPreNexus : public API::IFileLoader<Kernel::FileDescriptor> {
public:
LoadPreNexus();
- virtual ~LoadPreNexus();
+ ~LoadPreNexus() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load a collection of PreNexus files.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
void parseRuninfo(const std::string &runinfo, std::string &dataDir,
std::vector<std::string> &eventFilenames);
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void runLoadNexusLogs(const std::string &runinfo, const std::string &dataDir,
const double prog_start, const double prog_stop);
void runLoadMonitors(const double prog_start, const double prog_stop);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexusMonitors.h b/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexusMonitors.h
index 7b69dd97083615549e255a5c46a03ce6e10f526d..b2a91ff5178f76c4cb215d597f18c1976f4a2f9e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexusMonitors.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadPreNexusMonitors.h
@@ -38,29 +38,29 @@ public:
/// (Empty) Constructor
LoadPreNexusMonitors();
/// Virtual destructor
- virtual ~LoadPreNexusMonitors() {}
+ ~LoadPreNexusMonitors() override {}
/// Algorithm's name
- virtual const std::string name() const { return "LoadPreNexusMonitors"; }
+ const std::string name() const override { return "LoadPreNexusMonitors"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This is a routine to load in the beam monitors from SNS preNeXus "
"files into a workspace.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\PreNexus";
}
/// Algorithm's aliases
- virtual const std::string alias() const { return "LoadPreNeXusMonitors"; }
+ const std::string alias() const override { return "LoadPreNeXusMonitors"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Number of monitors
int nMonitors;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadQKK.h b/Framework/DataHandling/inc/MantidDataHandling/LoadQKK.h
index dc9ae28a80e91b3ebd90cde5aea0d85663b17b2d..c5c84625e5b56218293ce5e0c13bc8608e877611 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadQKK.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadQKK.h
@@ -42,27 +42,27 @@ public:
/// (Empty) Constructor
LoadQKK() {}
/// Virtual destructor
- virtual ~LoadQKK() {}
+ ~LoadQKK() override {}
/// Algorithm's name
- virtual const std::string name() const { return "LoadQKK"; }
+ const std::string name() const override { return "LoadQKK"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a ANSTO QKK file. ";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h b/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h
index 1520f1a6a0b143f2c5ff863dcdf957430a00f347..ce9bd39758356cdcd48cd0dffbce9bc602ea4f0a 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h
@@ -48,23 +48,23 @@ public:
/// Constructor
LoadRKH() : m_unitKeys(), m_RKHKeys() {}
/// Virtual destructor
- virtual ~LoadRKH() {}
+ ~LoadRKH() override {}
/// Algorithm's name
- virtual const std::string name() const { return "LoadRKH"; }
+ const std::string name() const override { return "LoadRKH"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load a file written in the RKH format";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Text;SANS\\DataHandling";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
/// Store the units known to the UnitFactory
@@ -75,9 +75,9 @@ private:
std::ifstream m_fileIn;
// Initialisation code
- void init();
+ void init() override;
// Execution code
- void exec();
+ void exec() override;
bool is2D(const std::string &testLine);
const API::MatrixWorkspace_sptr read1D();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadRaw3.h b/Framework/DataHandling/inc/MantidDataHandling/LoadRaw3.h
index 68e2455b2e14e3a081ef2ebc4893a787cb8e0eda..9dacc46cb9ddfcec2c0fc64b80ba4afc69af84bb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadRaw3.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadRaw3.h
@@ -49,25 +49,25 @@ public:
/// Default constructor
LoadRaw3();
/// Destructor
- ~LoadRaw3();
+ ~LoadRaw3() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadRaw"; }
+ const std::string name() const override { return "LoadRaw"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a data file in ISIS RAW format and stores it in a 2D "
"workspace (Workspace2D class).";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 3; }
+ int version() const override { return 3; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Raw"; }
+ const std::string category() const override { return "DataHandling\\Raw"; }
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// returns true if the given spectrum is a monitor
bool isMonitor(const std::vector<specid_t> &monitorIndexes,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadRawBin0.h b/Framework/DataHandling/inc/MantidDataHandling/LoadRawBin0.h
index 3b84342ef48a7beca57594e0d0e0c5aca157b07d..961b831585afd6a424cb7982d4e8d490c30532b9 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadRawBin0.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadRawBin0.h
@@ -69,27 +69,27 @@ public:
/// Default constructor
LoadRawBin0();
/// Destructor
- ~LoadRawBin0();
+ ~LoadRawBin0() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadRawBin0"; }
+ const std::string name() const override { return "LoadRawBin0"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads bin zero from ISIS raw file and stores it in a 2D "
"workspace (Workspace2D class).";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diagnostics\\Raw;DataHandling\\Raw";
}
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
///
void setOptionalProperties();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h b/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h
index 1e5dfffeba9969721f5079e8e0424e401178e429..e99f195243d416024b44450fe3d7edb5ea2e3d4e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadRawHelper.h
@@ -57,13 +57,13 @@ public:
/// Default constructor
LoadRawHelper();
/// Destructor
- ~LoadRawHelper();
+ ~LoadRawHelper() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadRawHelper"; }
+ const std::string name() const override { return "LoadRawHelper"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Helper class for LoadRaw algorithms.";
}
/// Opens Raw File
@@ -73,7 +73,7 @@ public:
ISISRAW *const = NULL) const;
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
/// returns true if the Exclude Monitor option(property) selected
static bool isExcludeMonitors(const std::string &monitorOption);
@@ -124,7 +124,7 @@ public:
protected:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// checks the file is an ascii file
bool isAscii(FILE *file) const;
/// Reads title from the isisraw class
@@ -222,7 +222,7 @@ protected:
private:
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// convert month label to int string
std::string convertMonthLabelToIntStr(std::string month) const;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadRawSpectrum0.h b/Framework/DataHandling/inc/MantidDataHandling/LoadRawSpectrum0.h
index 1dc3a6ad9147fa7316c483bb5844e62da7b2f0ff..11a49f0b16b517d8e510b7c3bd0742f2bbfd628d 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadRawSpectrum0.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadRawSpectrum0.h
@@ -61,27 +61,27 @@ public:
/// Default constructor
LoadRawSpectrum0();
/// Destructor
- ~LoadRawSpectrum0();
+ ~LoadRawSpectrum0() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadRawSpectrum0"; }
+ const std::string name() const override { return "LoadRawSpectrum0"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads spectrum zero from ISIS raw file and stores it in a 2D "
"workspace (Workspace2D class).";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diagnostics\\Raw;DataHandling\\Raw";
}
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// ISISRAW class instance which does raw file reading. Shared pointer to
/// prevent memory leak when an exception is thrown.
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadReflTBL.h b/Framework/DataHandling/inc/MantidDataHandling/LoadReflTBL.h
index 7056d4326caea7a298e3ce72e89b4932a81b1c9a..4c3643363d2a1107cfdc41ffcc491c613857a50e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadReflTBL.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadReflTBL.h
@@ -39,25 +39,25 @@ public:
/// Default constructor
LoadReflTBL();
/// The name of the algorithm
- virtual const std::string name() const { return "LoadReflTBL"; }
+ const std::string name() const override { return "LoadReflTBL"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads data from a reflectometry table file and stores it in a "
"table workspace (TableWorkspace class).";
}
/// The version number
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// The category
- virtual const std::string category() const { return "DataHandling\\Text"; }
+ const std::string category() const override { return "DataHandling\\Text"; }
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
/// Declare properties
- void init();
+ void init() override;
/// Execute the algorithm
- void exec();
+ void exec() override;
/// Split into columns with respect to the comma delimiters
size_t getCells(std::string line, std::vector<std::string> &cols) const;
/// count the number of commas in the line
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSINQFocus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSINQFocus.h
index 10e6588a8a0d6397c58326f5faaca7896b630cbc..7b439cc63c5b531f9326e863ccdf142c29ce98a0 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSINQFocus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSINQFocus.h
@@ -48,23 +48,23 @@ class DLLExport LoadSINQFocus
public API::DeprecatedAlgorithm {
public:
LoadSINQFocus();
- virtual ~LoadSINQFocus();
+ ~LoadSINQFocus() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a FOCUS nexus file from the PSI";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void setInstrumentName(NeXus::NXEntry &entry);
void initWorkSpace(NeXus::NXEntry &);
void loadDataIntoTheWorkSpace(NeXus::NXEntry &);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h
index 8cbaae8b984ffe85235f83d9aef0563fb42b3854..60e633074d66421b1396123636f93b2686d11e0f 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSNSspec.h
@@ -48,23 +48,23 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport LoadSNSspec : public API::IFileLoader<Kernel::FileDescriptor> {
public:
LoadSNSspec();
- ~LoadSNSspec() {}
- virtual const std::string name() const { return "LoadSNSspec"; }
+ ~LoadSNSspec() override {}
+ const std::string name() const override { return "LoadSNSspec"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads data from a text file and stores it in a 2D workspace "
"(Workspace2D class).";
}
- virtual int version() const { return 1; }
- virtual const std::string category() const { return "DataHandling\\Text"; }
+ int version() const override { return 1; }
+ const std::string category() const override { return "DataHandling\\Text"; }
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Allowed values for the cache property
std::vector<std::string> m_seperator_options;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSPE.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSPE.h
index b46031ae1eaf8373056eaa4b932f4785dde7d3b0..b4348d18a363b66bc78096c3ba700916257962a7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSPE.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSPE.h
@@ -46,28 +46,28 @@ public:
/// Constructor
LoadSPE() : API::IFileLoader<Kernel::FileDescriptor>() {}
/// Virtual destructor
- virtual ~LoadSPE() {}
+ ~LoadSPE() override {}
/// Algorithm's name
- virtual const std::string name() const { return "LoadSPE"; }
+ const std::string name() const override { return "LoadSPE"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a file written in the spe format.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\SPE;Inelastic\\DataHandling";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
// Initialisation code
- void init();
+ void init() override;
// Execution code
- void exec();
+ void exec() override;
void readHistogram(FILE *speFile, API::MatrixWorkspace_sptr workspace,
size_t index);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSampleDetailsFromRaw.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSampleDetailsFromRaw.h
index 38a2e6625035cdea211555411a5bfadff75b9b27..8d5960d19bbdbfa60b8e85e78278e478e2d04085 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSampleDetailsFromRaw.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSampleDetailsFromRaw.h
@@ -47,27 +47,27 @@ public:
/// (Empty) Constructor
LoadSampleDetailsFromRaw() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~LoadSampleDetailsFromRaw() {}
+ ~LoadSampleDetailsFromRaw() override {}
/// Algorithm's name
- virtual const std::string name() const { return "LoadSampleDetailsFromRaw"; }
+ const std::string name() const override { return "LoadSampleDetailsFromRaw"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads the simple sample geometry that is defined within an ISIS "
"raw file.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Raw;Sample";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h
index dd959033cc2d04efdb6cc29f875996b08c726b3d..d54d61b1a6e30531116dcedaa14d6fce87ac911e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSassena.h
@@ -57,21 +57,23 @@ public:
/// Constructor
LoadSassena() : API::IFileLoader<Kernel::NexusDescriptor>(), m_filename(""){};
/// Virtual Destructor
- virtual ~LoadSassena() {}
+ ~LoadSassena() override {}
/// Algorithm's name
- virtual const std::string name() const { return "LoadSassena"; }
+ const std::string name() const override { return "LoadSassena"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return " load a Sassena output file into a group workspace.";
}
/// Algorithm's version
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const { return "DataHandling\\Sassena"; }
+ const std::string category() const override {
+ return "DataHandling\\Sassena";
+ }
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
protected:
/// Add a workspace to the group and register in the analysis data service
@@ -99,9 +101,9 @@ protected:
private:
/// Initialization code
- void init(); // Overwrites Algorithm method.
+ void init() override; // Overwrites Algorithm method.
/// Execution code
- void exec(); // Overwrites Algorithm method
+ void exec() override; // Overwrites Algorithm method
/// Loads one dataset
void loadSet(const std::string &version, const std::string &setName);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSavuTomoConfig.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSavuTomoConfig.h
index 76ba4d62f1d6a9a86f8e6cf513e45524f76001ff..8cc4e87d7fe61659894a60bada2d44cb99b95174 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSavuTomoConfig.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSavuTomoConfig.h
@@ -41,29 +41,29 @@ class DLLExport LoadSavuTomoConfig : public API::Algorithm {
public:
LoadSavuTomoConfig();
- virtual ~LoadSavuTomoConfig();
+ ~LoadSavuTomoConfig() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadSavuTomoConfig"; }
+ const std::string name() const override { return "LoadSavuTomoConfig"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load configuration parameters from a tomographic "
"reconstruction parameter file.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Tomography";
}
private:
/// Implement abstract Algorithm methods
- void init();
+ void init() override;
/// Implement abstract Algorithm methods
- void exec();
+ void exec() override;
// do the real loading
Mantid::API::ITableWorkspace_sptr loadFile(std::string &fname,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSpec.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSpec.h
index 6fb496f3ac663daad6ad0dc36e2f80017636a5cc..f770b5974d19a2c99500ed75b7b71156a9eeca96 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSpec.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSpec.h
@@ -48,20 +48,20 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport LoadSpec : public API::Algorithm {
public:
LoadSpec();
- ~LoadSpec() {}
- virtual const std::string name() const { return "LoadSpec"; }
+ ~LoadSpec() override {}
+ const std::string name() const override { return "LoadSpec"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads data from a text file and stores it in a 2D workspace "
"(Workspace2D class).";
}
- virtual int version() const { return 1; }
- virtual const std::string category() const { return "DataHandling\\Text"; }
+ int version() const override { return 1; }
+ const std::string category() const override { return "DataHandling\\Text"; }
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Allowed values for the cache property
std::vector<std::string> m_seperator_options;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h
index 9888992477e1677e3b815eadfcac85d5d5ec9e2c..7d65ea1b6d799d3fa56025dc9f97e707ec455361 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSpice2D.h
@@ -56,33 +56,33 @@ public:
/// default constructor
LoadSpice2D();
/// destructor
- ~LoadSpice2D();
+ ~LoadSpice2D() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadSpice2D"; }
+ const std::string name() const override { return "LoadSpice2D"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a SANS data file produce by the HFIR instruments at ORNL. "
"The instrument geometry is also loaded. The center of the detector "
"is placed at (0,0,D), where D is the sample-to-detector distance.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Text;SANS\\DataHandling";
}
/// Number of monitors
static const int nMonitors = 2;
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// This method throws not found error if a element is not found in the xml
/// file
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceAscii.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceAscii.h
index d72a13d9cfeab67555df1f02889456e174e5fbec..33a7e2d6630d3cc53a3586c72b9339bbe239f36b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceAscii.h
@@ -36,16 +36,16 @@ namespace DataHandling {
class DLLExport LoadSpiceAscii : public API::Algorithm {
public:
LoadSpiceAscii();
- virtual ~LoadSpiceAscii();
+ ~LoadSpiceAscii() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
bool validateLogNamesType(const std::vector<std::string> &floatlognames,
const std::vector<std::string> &intlognames,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceXML2DDet.h b/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceXML2DDet.h
index 30a123488a5ccd2cd354bef5dc25ccaad4accad3..890aa7acd1dc7375feec0d837752cf122eb0cb62 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceXML2DDet.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadSpiceXML2DDet.h
@@ -64,23 +64,23 @@ public:
class DLLExport LoadSpiceXML2DDet : public API::Algorithm {
public:
LoadSpiceXML2DDet();
- virtual ~LoadSpiceXML2DDet();
+ ~LoadSpiceXML2DDet() override;
/// Algoriothm name
- virtual const std::string name() const;
+ const std::string name() const override;
/// Algorithm version
- virtual int version() const;
+ int version() const override;
/// Category
- virtual const std::string category() const;
+ const std::string category() const override;
/// Summary
- virtual const std::string summary() const;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Parse SPICE XML file
void parseSpiceXML(const std::string &xmlfilename,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h
index ba09ca893f78f7210eb851dd68dc652ecabeff35..0ee2f1eb2a8f8c7cf1c9f8a4b393f8a4a2e7860e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadTOFRawNexus.h
@@ -46,26 +46,26 @@ public:
LoadTOFRawNexus();
// Destructor
- virtual ~LoadTOFRawNexus() {}
+ ~LoadTOFRawNexus() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "LoadTOFRawNexus"; }
+ const std::string name() const override { return "LoadTOFRawNexus"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a NeXus file confirming to the TOFRaw format";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
static std::string getEntryName(const std::string &filename);
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
void countPixels(const std::string &nexusfilename,
const std::string &entry_name,
@@ -78,8 +78,8 @@ public:
int m_signalNo;
protected:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Validate the optional input properties
void checkOptionalProperties();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadVulcanCalFile.h b/Framework/DataHandling/inc/MantidDataHandling/LoadVulcanCalFile.h
index 61a049fc32eb1f44e831b227dd5cf6df3b9b1b63..4816a8b09a8ea448bc082d09e825b37b3a4df503 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadVulcanCalFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadVulcanCalFile.h
@@ -27,20 +27,20 @@ enum VULCAN_OFFSET_LEVEL {
class DLLExport LoadVulcanCalFile : public API::Algorithm {
public:
LoadVulcanCalFile();
- ~LoadVulcanCalFile();
+ ~LoadVulcanCalFile() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "LoadVulcanCalFile"; }
+ const std::string name() const override { return "LoadVulcanCalFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads set of VULCAN's offset files into up to 3 workspaces: a "
"GroupingWorkspace, OffsetsWorkspace and/or MaskWorkspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Text;Diffraction\\DataHandling";
}
@@ -55,9 +55,9 @@ public:
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
void processInOutProperites();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/MaskDetectors.h b/Framework/DataHandling/inc/MantidDataHandling/MaskDetectors.h
index d684dd7e1b7d2a7d9f11d2f7a13b159158147622..5f801ec5979a106230e7076e86dde7c38b87d0c8 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/MaskDetectors.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/MaskDetectors.h
@@ -55,29 +55,33 @@ namespace DataHandling {
class DLLExport MaskDetectors : public API::Algorithm {
public:
MaskDetectors();
- virtual ~MaskDetectors();
+ ~MaskDetectors() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "MaskDetectors"; };
+ const std::string name() const override { return "MaskDetectors"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "An algorithm to mask a detector, or set of detectors, as not to be "
"used. The workspace spectra associated with those detectors are "
"zeroed.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Masking"; }
+ const std::string category() const override { return "Transforms\\Masking"; }
private:
- const std::string workspaceMethodName() const { return "maskDetectors"; }
- const std::string workspaceMethodInputProperty() const { return "Workspace"; }
+ const std::string workspaceMethodName() const override {
+ return "maskDetectors";
+ }
+ const std::string workspaceMethodInputProperty() const override {
+ return "Workspace";
+ }
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void execPeaks(DataObjects::PeaksWorkspace_sptr WS);
void fillIndexListFromSpectra(std::vector<size_t> &indexList,
const std::vector<specid_t> &spectraList,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/MaskDetectorsInShape.h b/Framework/DataHandling/inc/MantidDataHandling/MaskDetectorsInShape.h
index c55f47ef43acde167f160c2ffd2e6170033398fd..8e914cf1ec3ede058a5daecab1a344d54087da20 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/MaskDetectorsInShape.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/MaskDetectorsInShape.h
@@ -58,23 +58,23 @@ namespace DataHandling {
class DLLExport MaskDetectorsInShape : public API::Algorithm {
public:
MaskDetectorsInShape();
- virtual ~MaskDetectorsInShape();
+ ~MaskDetectorsInShape() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "MaskDetectorsInShape"; };
+ const std::string name() const override { return "MaskDetectorsInShape"; };
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Transforms\\Masking"; }
+ const std::string category() const override { return "Transforms\\Masking"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Masks detectors whose centres fall within the given 3D shape.";
}
private:
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
// internal functions
std::vector<int> runFindDetectorsInShape(API::MatrixWorkspace_sptr workspace,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/MergeLogs.h b/Framework/DataHandling/inc/MantidDataHandling/MergeLogs.h
index c9fa8a949cbe9bd91ebc4fa299cb7a774caf1cea..b376f5f19ee5944864fa2b17d7037b4265fb634b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/MergeLogs.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/MergeLogs.h
@@ -37,24 +37,24 @@ namespace DataHandling {
class DLLExport Merge2WorkspaceLogs : public API::Algorithm {
public:
Merge2WorkspaceLogs();
- virtual ~Merge2WorkspaceLogs();
+ ~Merge2WorkspaceLogs() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "MergeLogs"; };
+ const std::string name() const override { return "MergeLogs"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Merge 2 TimeSeries logs in a given Workspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "DataHandling\\Logs"; }
+ const std::string category() const override { return "DataHandling\\Logs"; }
private:
- void init();
+ void init() override;
- void exec();
+ void exec() override;
void mergeLogs(std::string ilogname1, std::string ilogname2,
std::string ologname, bool resetlogvalue, double logvalue1,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ModifyDetectorDotDatFile.h b/Framework/DataHandling/inc/MantidDataHandling/ModifyDetectorDotDatFile.h
index 3060bb28978028f2fb704b7bf0827ae85673a051..ef87c5d46584476e0d9ea37217e7b55379cfd8f1 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ModifyDetectorDotDatFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ModifyDetectorDotDatFile.h
@@ -37,28 +37,30 @@ namespace DataHandling {
class DLLExport ModifyDetectorDotDatFile : public API::Algorithm {
public:
ModifyDetectorDotDatFile();
- ~ModifyDetectorDotDatFile();
+ ~ModifyDetectorDotDatFile() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "ModifyDetectorDotDatFile"; };
+ const std::string name() const override {
+ return "ModifyDetectorDotDatFile";
+ };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Modifies an ISIS detector dot data file, so that the detector "
"positions are as in the given workspace";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/MoveInstrumentComponent.h b/Framework/DataHandling/inc/MantidDataHandling/MoveInstrumentComponent.h
index 9b5954d793d4fed6d3ce5a6a14e3be3f0307b86c..0f2aaefb3b41d82ddfbf4b3cdb8513abae3b8832 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/MoveInstrumentComponent.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/MoveInstrumentComponent.h
@@ -67,27 +67,27 @@ public:
MoveInstrumentComponent();
/// Destructor
- ~MoveInstrumentComponent() {}
+ ~MoveInstrumentComponent() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "MoveInstrumentComponent"; };
+ const std::string name() const override { return "MoveInstrumentComponent"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Moves an instrument component to a new position.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument";
}
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/NexusTester.h b/Framework/DataHandling/inc/MantidDataHandling/NexusTester.h
index b5a734e30a6a49ca50242d507b4151ef13aa332b..dcf00127d2f398dfeea3a2747e39905b11bc40da 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/NexusTester.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/NexusTester.h
@@ -36,20 +36,20 @@ namespace DataHandling {
class DLLExport NexusTester : public API::Algorithm {
public:
NexusTester();
- virtual ~NexusTester();
+ ~NexusTester() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Algorithm for testing and debugging purposes only!";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/PDLoadCharacterizations.h b/Framework/DataHandling/inc/MantidDataHandling/PDLoadCharacterizations.h
index fbf31e152710aeb075c6e38662c8742bb9c6a8ee..3bab86defd9e63739ae0f443276b10adc58236c6 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/PDLoadCharacterizations.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/PDLoadCharacterizations.h
@@ -35,19 +35,19 @@ namespace DataHandling {
class DLLExport PDLoadCharacterizations : public API::Algorithm {
public:
PDLoadCharacterizations();
- virtual ~PDLoadCharacterizations();
+ ~PDLoadCharacterizations() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load a characterization file used in Powder Diffraction Reduction.";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void readFocusInfo(std::ifstream &file);
void readCharInfo(std::ifstream &file, API::ITableWorkspace_sptr &wksp);
void readExpIni(const std::string &filename, API::ITableWorkspace_sptr &wksp);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/ProcessDasNexusLog.h b/Framework/DataHandling/inc/MantidDataHandling/ProcessDasNexusLog.h
index fd8bbcc0dc42fe1f2957ff56911d55f4c7c513c8..33cb7ff3fe174b0a98980256b8a3ee8fd1fdbe8c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/ProcessDasNexusLog.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/ProcessDasNexusLog.h
@@ -37,21 +37,21 @@ class DLLExport ProcessDasNexusLog : public API::Algorithm,
public API::DeprecatedAlgorithm {
public:
ProcessDasNexusLog();
- virtual ~ProcessDasNexusLog();
+ ~ProcessDasNexusLog() override;
- virtual const std::string name() const { return "ProcessDasNexusLog"; };
+ const std::string name() const override { return "ProcessDasNexusLog"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Very specialized algorithm to fix certain SNS DAS logs that cannot "
"be used directly.";
}
- virtual int version() const { return 1; };
- virtual const std::string category() const { return "DataHandling\\Logs"; };
+ int version() const override { return 1; };
+ const std::string category() const override { return "DataHandling\\Logs"; };
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void convertToAbsoluteTime(API::MatrixWorkspace_sptr ws, std::string logname,
std::vector<Kernel::DateAndTime> &abstimeve,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/RawFileInfo.h b/Framework/DataHandling/inc/MantidDataHandling/RawFileInfo.h
index f952e4c6bb8de62686158ab2ec07389e00eedb78..034d3c26cf074cdfc69d1c988b72c09ba1c7cdbf 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/RawFileInfo.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/RawFileInfo.h
@@ -66,24 +66,24 @@ public:
/// (Empty) Constructor
RawFileInfo() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~RawFileInfo() {}
+ ~RawFileInfo() override {}
/// Algorithm's name
- virtual const std::string name() const { return "RawFileInfo"; }
+ const std::string name() const override { return "RawFileInfo"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Extract run parameters from a RAW file as output properties.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "DataHandling\\Raw"; }
+ const std::string category() const override { return "DataHandling\\Raw"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/DataHandling/inc/MantidDataHandling/RemoveLogs.h b/Framework/DataHandling/inc/MantidDataHandling/RemoveLogs.h
index 22a0bf02f8f8bcf9c92e659e39e6e26c4f479fa1..5d708798720928a19ddd6712d4379f594509b1fd 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/RemoveLogs.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/RemoveLogs.h
@@ -78,25 +78,25 @@ public:
RemoveLogs();
/// Destructor
- ~RemoveLogs() {}
+ ~RemoveLogs() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "RemoveLogs"; };
+ const std::string name() const override { return "RemoveLogs"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Remove logs from a workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Logs"; }
+ const std::string category() const override { return "DataHandling\\Logs"; }
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/RenameLog.h b/Framework/DataHandling/inc/MantidDataHandling/RenameLog.h
index 447e8094ffda2664abe581f29e4c112d08655405..e88c423e4a06dcc8f956e4800f1717de05375426 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/RenameLog.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/RenameLog.h
@@ -35,24 +35,24 @@ namespace DataHandling {
class DLLExport RenameLog : public API::Algorithm {
public:
RenameLog();
- virtual ~RenameLog();
+ ~RenameLog() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "RenameLog"; };
+ const std::string name() const override { return "RenameLog"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Rename a TimeSeries log in a given Workspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "DataHandling\\Logs"; }
+ const std::string category() const override { return "DataHandling\\Logs"; }
private:
- void init();
+ void init() override;
- void exec();
+ void exec() override;
API::MatrixWorkspace_sptr matrixWS;
};
diff --git a/Framework/DataHandling/inc/MantidDataHandling/RotateInstrumentComponent.h b/Framework/DataHandling/inc/MantidDataHandling/RotateInstrumentComponent.h
index ae8cfcf489335b6255d9707dae4b67541406b946..cd1b15398afd12aeebff466538b485266b9ac517 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/RotateInstrumentComponent.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/RotateInstrumentComponent.h
@@ -64,29 +64,29 @@ public:
RotateInstrumentComponent();
/// Destructor
- ~RotateInstrumentComponent() {}
+ ~RotateInstrumentComponent() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const {
+ const std::string name() const override {
return "RotateInstrumentComponent";
};
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Rotates an instrument component.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument";
}
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/RotateSource.h b/Framework/DataHandling/inc/MantidDataHandling/RotateSource.h
index a2bb8514eb5c98b970176e55c532b16e5cb40ee8..07cdc95614c1b179ebac1e2d65ce733089dfc422 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/RotateSource.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/RotateSource.h
@@ -35,20 +35,20 @@ namespace DataHandling {
class DLLExport RotateSource : public API::Algorithm {
public:
RotateSource(){};
- virtual ~RotateSource(){};
+ ~RotateSource() override{};
- virtual const std::string name() const { return "RotateSource"; };
- virtual int version() const { return 1; };
- virtual const std::string category() const {
+ const std::string name() const override { return "RotateSource"; };
+ int version() const override { return 1; };
+ const std::string category() const override {
return "DataHandling\\Instrument";
};
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Rotates the source by a given angle";
};
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SNSDataArchive.h b/Framework/DataHandling/inc/MantidDataHandling/SNSDataArchive.h
index a6224422b2bf47cf393f4db8bc15227dfbe86e88..71c450f5221eb61c8c55d811805988675015e404 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SNSDataArchive.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SNSDataArchive.h
@@ -41,8 +41,9 @@ namespace DataHandling {
class DLLExport SNSDataArchive : public API::IArchiveSearch {
public:
/// Find the archive location of a set of files.
- std::string getArchivePath(const std::set<std::string> &filenames,
- const std::vector<std::string> &exts) const;
+ std::string
+ getArchivePath(const std::set<std::string> &filenames,
+ const std::vector<std::string> &exts) const override;
};
}
}
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveANSTOAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveANSTOAscii.h
index f5d275d917d2ae695e12010e427f6dbd60854314..eb2cf6e01c5145c93ce79c35480d86e3e51afd39 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveANSTOAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveANSTOAscii.h
@@ -42,26 +42,26 @@ public:
/// Default constructor
SaveANSTOAscii() {}
/// Destructor
- ~SaveANSTOAscii() {}
+ ~SaveANSTOAscii() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveANSTOAscii"; }
+ const std::string name() const override { return "SaveANSTOAscii"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a 2D workspace to a ascii file.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
private:
/// Return the file extension this algorthm should output.
- virtual std::string ext() { return ".txt"; }
+ std::string ext() override { return ".txt"; }
/// return if the line should start with a separator
- virtual bool leadingSep() { return false; }
+ bool leadingSep() override { return false; }
/// no extra properties required so override blank
- virtual void extraProps() {}
+ void extraProps() override {}
/// no extra information required so override blank
- virtual void extraHeaders(std::ofstream &file);
+ void extraHeaders(std::ofstream &file) override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveAscii.h
index 30257caa159efa2f01f77fc1f1443113f2eaa8c3..2127facda26c5822773a73b0a845fab1f08ab9e9 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveAscii.h
@@ -54,24 +54,24 @@ public:
/// Default constructor
SaveAscii();
/// Destructor
- ~SaveAscii() {}
+ ~SaveAscii() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveAscii"; }
+ const std::string name() const override { return "SaveAscii"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a 2D workspace to a ascii file.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Text"; }
+ const std::string category() const override { return "DataHandling\\Text"; }
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// Map the separator options to their string equivalents
std::map<std::string, std::string> m_separatorIndex;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveAscii2.h b/Framework/DataHandling/inc/MantidDataHandling/SaveAscii2.h
index 15032f39b9f67f72f91c5eebb73715f20bf2f31e..eb8f63b1992f4c6920c3bdf9b0448a3fc88373b9 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveAscii2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveAscii2.h
@@ -55,23 +55,23 @@ public:
/// Default constructor
SaveAscii2();
/// Destructor
- ~SaveAscii2() {}
+ ~SaveAscii2() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveAscii"; }
+ const std::string name() const override { return "SaveAscii"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a 2D workspace to a ascii file.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 2; }
+ int version() const override { return 2; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Text"; }
+ const std::string category() const override { return "DataHandling\\Text"; }
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/**writes a spectra to the file using a workspace ID
@param spectraIndex :: an integer relating to a workspace ID
@param file :: the file writer object
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveCSV.h b/Framework/DataHandling/inc/MantidDataHandling/SaveCSV.h
index 5b717e4fb85aae42e433cf3d6917abe9c973bb37..1a0632ee4419fa5c3a1af930376df394bb46aef2 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveCSV.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveCSV.h
@@ -86,25 +86,25 @@ public:
SaveCSV();
/// Destructor
- ~SaveCSV() {}
+ ~SaveCSV() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveCSV"; };
+ const std::string name() const override { return "SaveCSV"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a 1D or 2D workspace to a CSV file.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Text"; }
+ const std::string category() const override { return "DataHandling\\Text"; }
private:
/// Overwrites Algorithm method. Does nothing at present
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// Saves out x errors
void saveXerrors(std::ofstream &stream,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveCalFile.h b/Framework/DataHandling/inc/MantidDataHandling/SaveCalFile.h
index 7702f440226ce5d8efd8da0f80d91175c57c62a7..7750b4e349dcd04221b1560ed749f51eafe17288 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveCalFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveCalFile.h
@@ -20,20 +20,20 @@ namespace DataHandling {
class DLLExport SaveCalFile : public API::Algorithm {
public:
SaveCalFile();
- ~SaveCalFile();
+ ~SaveCalFile() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SaveCalFile"; };
+ const std::string name() const override { return "SaveCalFile"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a 5-column ASCII .cal file from up to 3 workspaces: a "
"GroupingWorkspace, OffsetsWorkspace and/or MaskWorkspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Text;Diffraction\\DataHandling\\CalFiles";
}
@@ -44,9 +44,9 @@ public:
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Offset precision
int m_precision;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D.h b/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D.h
index 88f63ed69808fc4d5e4a00d7030beda505dd6944..1fac377d0f9fd3a56c330d3da551445cafb4e4df 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D.h
@@ -98,25 +98,26 @@ class DLLExport SaveCanSAS1D : public API::Algorithm {
public:
/// default constructor
SaveCanSAS1D();
- virtual ~SaveCanSAS1D();
+ ~SaveCanSAS1D() override;
- virtual const std::string name() const { return "SaveCanSAS1D"; }
- virtual const std::string summary() const {
+ const std::string name() const override { return "SaveCanSAS1D"; }
+ const std::string summary() const override {
return "Save a MatrixWorkspace to a file in the canSAS 1-D format";
}
- virtual int version() const { return 1; }
- virtual const std::string category() const {
+ int version() const override { return 1; }
+ const std::string category() const override {
return "DataHandling\\XML;SANS\\DataHandling";
}
protected:
/// Overwrites Algorithm method.
- virtual void init();
+ void init() override;
/// overriden method sets appending for workspace groups
void setOtherProperties(API::IAlgorithm *alg, const std::string &propertyName,
- const std::string &propertyValue, int perioidNum);
+ const std::string &propertyValue,
+ int perioidNum) override;
/// Overwrites Algorithm method
- virtual void exec();
+ void exec() override;
/// Opens the output file and, as necessary blanks it, writes the file header
/// and moves the file pointer
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D2.h b/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D2.h
index 9b8a1bd9dbfaffaeeb6067e9df0f46cd43fad336..fd8becc8450c926c70821b0ad39208d2b9854e5b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D2.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveCanSAS1D2.h
@@ -80,24 +80,24 @@ class DLLExport SaveCanSAS1D2 : public SaveCanSAS1D {
public:
/// default constructor
SaveCanSAS1D2();
- virtual ~SaveCanSAS1D2();
+ ~SaveCanSAS1D2() override;
- virtual int version() const { return 2; }
+ int version() const override { return 2; }
protected:
/// Extends the SaveCanSAS1D init method
- virtual void init();
+ void init() override;
/// Overwrites Algorithm method
- virtual void exec();
+ void exec() override;
/// Create the SASRoot element
- virtual void createSASRootElement(std::string &rootElem);
+ void createSASRootElement(std::string &rootElem) override;
/// this method creates SAStransmission_spectrum element
void createSASTransElement(std::string &sasTrans, const std::string &name);
/// Overwrites writeHeader method
- virtual void writeHeader(const std::string &fileName);
+ void writeHeader(const std::string &fileName) override;
/// points to the workspace that will be written to file
API::MatrixWorkspace_const_sptr m_trans_ws, m_transcan_ws;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveDaveGrp.h b/Framework/DataHandling/inc/MantidDataHandling/SaveDaveGrp.h
index 1f2b3f768c79c28508e9898dbd0a05baade537c7..d19dc8d4c13b0787cd3f20bd70862347193d5efd 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveDaveGrp.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveDaveGrp.h
@@ -45,30 +45,30 @@ namespace DataHandling {
class DLLExport SaveDaveGrp : public API::Algorithm {
public:
SaveDaveGrp();
- ~SaveDaveGrp();
+ ~SaveDaveGrp() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SaveDaveGrp"; };
+ const std::string name() const override { return "SaveDaveGrp"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a 2D workspace to DAVE grouped data format file.See "
"http://www.ncnr.nist.gov/dave/documentation/ascii_help.pdf";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Text;Inelastic\\DataHandling";
}
/// Algorithm's aliases
- virtual const std::string alias() const { return "SaveDASC"; }
+ const std::string alias() const override { return "SaveDASC"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveDetectorsGrouping.h b/Framework/DataHandling/inc/MantidDataHandling/SaveDetectorsGrouping.h
index 96fd3fdd1dd340d8f6811c77b5c60928be025341..90b4d0ac75ddea4ba91bcf72d00bf7f0631f632d 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveDetectorsGrouping.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveDetectorsGrouping.h
@@ -36,27 +36,27 @@ namespace DataHandling {
class DLLExport SaveDetectorsGrouping : public API::Algorithm {
public:
SaveDetectorsGrouping();
- virtual ~SaveDetectorsGrouping();
+ ~SaveDetectorsGrouping() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SaveDetectorsGrouping"; };
+ const std::string name() const override { return "SaveDetectorsGrouping"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save a GroupingWorkspace to an XML file.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Grouping;Transforms\\Grouping";
}
private:
/// Define input parameters
- void init();
+ void init() override;
/// Main body to execute algorithm
- void exec();
+ void exec() override;
/// Create map for GroupID -- vector<detector ID>
void
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveDiffCal.h b/Framework/DataHandling/inc/MantidDataHandling/SaveDiffCal.h
index 6e6aea29c91cac31a3c06d6519e41d8ce8d46ef3..eef425b9a8d3510c858782478fba685f37cbe447 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveDiffCal.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveDiffCal.h
@@ -39,17 +39,17 @@ namespace DataHandling {
class DLLExport SaveDiffCal : public API::Algorithm {
public:
SaveDiffCal();
- virtual ~SaveDiffCal();
+ ~SaveDiffCal() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
- std::map<std::string, std::string> validateInputs();
+ void init() override;
+ void exec() override;
+ std::map<std::string, std::string> validateInputs() override;
void writeDoubleFieldFromTable(H5::Group &group, const std::string &name);
void writeIntFieldFromTable(H5::Group &group, const std::string &name);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveDspacemap.h b/Framework/DataHandling/inc/MantidDataHandling/SaveDspacemap.h
index 4ba6fdd16b7d125c50ea112934f72cef2336cd0a..eca7a833801cf6565ef3843d1cdae29d5ab3bcbc 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveDspacemap.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveDspacemap.h
@@ -16,26 +16,26 @@ namespace DataHandling {
class DLLExport SaveDspacemap : public API::Algorithm {
public:
SaveDspacemap();
- ~SaveDspacemap();
+ ~SaveDspacemap() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SaveDspacemap"; };
+ const std::string name() const override { return "SaveDspacemap"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves an OffsetsWorkspace into a POWGEN-format binary dspace map "
"file.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "DataHandling\\Text"; }
+ const std::string category() const override { return "DataHandling\\Text"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
void
CalculateDspaceFromCal(Mantid::DataObjects::OffsetsWorkspace_sptr offsetsWS,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveFocusedXYE.h b/Framework/DataHandling/inc/MantidDataHandling/SaveFocusedXYE.h
index 6f939671be15c1ea1d69e73af05a8573d0f3f842..947e9e5ee80ae3ccd5e22938563fd526c6e39d55 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveFocusedXYE.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveFocusedXYE.h
@@ -64,28 +64,28 @@ public:
/// Constructor
SaveFocusedXYE();
/// Virtual destructor
- virtual ~SaveFocusedXYE() {}
+ ~SaveFocusedXYE() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SaveFocusedXYE"; }
+ const std::string name() const override { return "SaveFocusedXYE"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a focused data set (usually the output of a diffraction "
"focusing routine but not exclusively) into a three column format "
"containing X_i, Y_i, and E_i.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling;DataHandling\\Text";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Write the header information
void writeHeaders(std::ostream &os,
API::MatrixWorkspace_const_sptr &workspace) const;
@@ -114,7 +114,8 @@ private:
/// sets non workspace properties for the algorithm
void setOtherProperties(IAlgorithm *alg, const std::string &propertyName,
- const std::string &propertyValue, int perioidNum);
+ const std::string &propertyValue,
+ int perioidNum) override;
/// Header type
HeaderType m_headerType;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveFullprofResolution.h b/Framework/DataHandling/inc/MantidDataHandling/SaveFullprofResolution.h
index 8f5f301a4b14f31253b66ea1a88975b0f865e223..b5d83d05de17cf31a14084bff358ea375ceafe95 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveFullprofResolution.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveFullprofResolution.h
@@ -34,28 +34,28 @@ namespace DataHandling {
class DLLExport SaveFullprofResolution : public API::Algorithm {
public:
SaveFullprofResolution();
- virtual ~SaveFullprofResolution();
+ ~SaveFullprofResolution() override;
/// Algorithm's name
- virtual const std::string name() const { return "SaveFullprofResolution"; }
+ const std::string name() const override { return "SaveFullprofResolution"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save a Table workspace, which contains peak profile parameters' "
"values, to a Fullprof resolution (.irf) file.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling;DataHandling\\Text";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Write the header information
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveGSASInstrumentFile.h b/Framework/DataHandling/inc/MantidDataHandling/SaveGSASInstrumentFile.h
index 93ab735e40754501e502af5f9b9976ddc2bc9c29..3f881ed7843598ca5f0e4922037a03ae6cd531fb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveGSASInstrumentFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveGSASInstrumentFile.h
@@ -39,28 +39,28 @@ class ChopperConfiguration;
class DLLExport SaveGSASInstrumentFile : public API::Algorithm {
public:
SaveGSASInstrumentFile();
- virtual ~SaveGSASInstrumentFile();
+ ~SaveGSASInstrumentFile() override;
/// Algorithm's name
- virtual const std::string name() const { return "SaveGSASInstrumentFile"; }
+ const std::string name() const override { return "SaveGSASInstrumentFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Generate a GSAS instrument file from either a table workspace "
"containing profile parameters or a Fullprof's instrument "
"resolution file (.irf file). ";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Process properties
void processProperties();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveGSS.h b/Framework/DataHandling/inc/MantidDataHandling/SaveGSS.h
index 805b2a3a9b873a0f2ce02e6ec54b6578a6ac6738..f53c994bc784cba577a1b730822f89279ee766fd 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveGSS.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveGSS.h
@@ -65,26 +65,26 @@ public:
/// Constructor
SaveGSS();
/// Virtual destructor
- virtual ~SaveGSS() {}
+ ~SaveGSS() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SaveGSS"; }
+ const std::string name() const override { return "SaveGSS"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a focused data set into a three column GSAS format.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling;DataHandling\\Text";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Write GSAS file
void writeGSASFile(const std::string &outfilename, bool append,
@@ -104,7 +104,8 @@ private:
const MantidVec &Y, const MantidVec &E) const;
/// sets non workspace properties for the algorithm
void setOtherProperties(IAlgorithm *alg, const std::string &propertyName,
- const std::string &propertyValue, int periodNum);
+ const std::string &propertyValue,
+ int periodNum) override;
bool m_useSpecAsBank;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveILLCosmosAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveILLCosmosAscii.h
index 67293d0071652366d3a511e1cedfcc039a905410..a4d518cc5a430e6b93d3992a54b0ea3dfeb28220 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveILLCosmosAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveILLCosmosAscii.h
@@ -43,24 +43,24 @@ public:
/// Default constructor
SaveILLCosmosAscii() {}
/// Destructor
- ~SaveILLCosmosAscii() {}
+ ~SaveILLCosmosAscii() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveILLCosmosAscii"; }
+ const std::string name() const override { return "SaveILLCosmosAscii"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a 2D workspace to a ascii file.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
private:
/// Return the file extension this algorthm should output.
- virtual std::string ext() { return ".mft"; }
+ std::string ext() override { return ".mft"; }
/// extra properties specifically for this
- virtual void extraProps();
+ void extraProps() override;
/// write any extra information required
- virtual void extraHeaders(std::ofstream &file);
+ void extraHeaders(std::ofstream &file) override;
};
} // namespace DataHandling
} // namespace Mantid
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveISISNexus.h b/Framework/DataHandling/inc/MantidDataHandling/SaveISISNexus.h
index 568750f4d3b55c993ee10fe746bc17354ecf8577..9bae7e5596d66b4a583e4089beca5de261bdf1eb 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveISISNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveISISNexus.h
@@ -54,26 +54,26 @@ public:
SaveISISNexus();
/// Destructor
- ~SaveISISNexus() {}
+ ~SaveISISNexus() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveISISNexus"; };
+ const std::string name() const override { return "SaveISISNexus"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The SaveISISNexus algorithm will convert a RAW file to a NeXus "
"file.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
ISISRAW2 *m_isisRaw;
NXhandle handle;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveIsawDetCal.h b/Framework/DataHandling/inc/MantidDataHandling/SaveIsawDetCal.h
index 65a87faa01647df4b9efc5c7e6ad3ba816d17926..25abf5c142e35e7822be2ef5e32856064b94d78e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveIsawDetCal.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveIsawDetCal.h
@@ -36,28 +36,28 @@ namespace DataHandling {
class DLLExport SaveIsawDetCal : public API::Algorithm {
public:
SaveIsawDetCal();
- ~SaveIsawDetCal();
+ ~SaveIsawDetCal() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SaveIsawDetCal"; };
+ const std::string name() const override { return "SaveIsawDetCal"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves an instrument with RectangularDetectors to an ISAW .DetCal "
"file.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling;DataHandling\\Isaw";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// find position for rectangular and non-rectangular
Kernel::V3D findPixelPos(std::string bankName, int col, int row);
void sizeBanks(std::string bankName, int &NCOLS, int &NROWS, double &xsize,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveMask.h b/Framework/DataHandling/inc/MantidDataHandling/SaveMask.h
index 5fefbe959f1a322b1d3bf9112d8d060c360a14f3..7c2778b8b249d8fd02ec748765da1ec70feb3cd7 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveMask.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveMask.h
@@ -35,28 +35,28 @@ namespace DataHandling {
class DLLExport SaveMask : public API::Algorithm {
public:
SaveMask();
- virtual ~SaveMask();
+ ~SaveMask() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SaveMask"; };
+ const std::string name() const override { return "SaveMask"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save a MaskWorkspace/SpecialWorkspace2D to an XML file.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Masking;Transforms\\Masking";
}
private:
/// Define input parameters
- void init();
+ void init() override;
/// Main body to execute algorithm
- void exec();
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNISTDAT.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNISTDAT.h
index 89a27d4a96a03bf5c9f1836b6bf349d52d040a39..54bb89ba88c01cca355d84e59d241ccf3333e142 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveNISTDAT.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveNISTDAT.h
@@ -26,27 +26,27 @@ public:
/// (Empty) Constructor
SaveNISTDAT() : API::Algorithm() {}
/// Virtual destructor
- virtual ~SaveNISTDAT() {}
+ ~SaveNISTDAT() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SaveNISTDAT"; }
+ const std::string name() const override { return "SaveNISTDAT"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save I(Qx,Qy) data to a text file compatible with NIST and DANSE "
"readers.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "SANS;DataHandling\\Text";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNXSPE.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNXSPE.h
index d31cb3deee2c612f0007623490447035514b9f80..7cad2d1b04bf497aea1af57d6b14945b4804a9cd 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveNXSPE.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveNXSPE.h
@@ -38,25 +38,25 @@ public:
/// Constructor
SaveNXSPE();
/// Virtual dtor
- virtual ~SaveNXSPE() {}
- virtual const std::string name() const { return "SaveNXSPE"; }
+ ~SaveNXSPE() override {}
+ const std::string name() const override { return "SaveNXSPE"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Writes a MatrixWorkspace to a file in the NXSPE format.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Nexus;DataHandling\\SPE;Inelastic\\DataHandling";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
// Some constants to be written for masked values.
/// Value for data if pixel is masked
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h
index d2c82e6f9a0ff4270dd1d097cf42fc1aa25345b9..2f9a25761ed7e0db1df5a4da07638638c4d94219 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h
@@ -50,32 +50,32 @@ class DLLExport SaveNXTomo : public API::Algorithm {
public:
SaveNXTomo();
/// Virtual dtor
- virtual ~SaveNXTomo() {}
+ ~SaveNXTomo() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveNXTomo"; }
+ const std::string name() const override { return "SaveNXTomo"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Writes a MatrixWorkspace to a file in the NXTomo format.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Nexus;DataHandling\\Tomography;"
"Diffraction\\DataHandling";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code : Single workspace
- void exec();
+ void exec() override;
/// Alternative execution code when operating on a WorkspaceGroup
- bool processGroups();
+ bool processGroups() override;
/// Creates the format for the output file if it doesn't exist
::NeXus::File setupFile();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNexus.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNexus.h
index 8be8b06961b64bc853ed9004a749e29db7957edc..fec84d02540f6fc5938dac72dc9e46ecd110c10b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveNexus.h
@@ -52,26 +52,26 @@ public:
SaveNexus();
/// Destructor
- ~SaveNexus() {}
+ ~SaveNexus() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveNexus"; };
+ const std::string name() const override { return "SaveNexus"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The SaveNexus algorithm will write the given Mantid workspace to a "
"NeXus file. SaveNexus currently just invokes SaveNexusProcessed.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// The name and path of the input file
std::string m_filename;
@@ -87,11 +87,12 @@ private:
void runSaveNexusProcessed();
/// sets non workspace properties for the algorithm
void setOtherProperties(IAlgorithm *alg, const std::string &propertyName,
- const std::string &propertyValue, int perioidNum);
+ const std::string &propertyValue,
+ int perioidNum) override;
protected:
/// Override process groups
- virtual bool processGroups();
+ bool processGroups() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveNexusProcessed.h b/Framework/DataHandling/inc/MantidDataHandling/SaveNexusProcessed.h
index f4f759a3cfc3e7f7b279090821a6a90ca3c16ad1..397ef7d1c642a18290d9310637e1792fbc92b939 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveNexusProcessed.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveNexusProcessed.h
@@ -53,30 +53,30 @@ public:
/// Default constructor
SaveNexusProcessed();
/// Destructor
- ~SaveNexusProcessed() {}
+ ~SaveNexusProcessed() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveNexusProcessed"; };
+ const std::string name() const override { return "SaveNexusProcessed"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "The SaveNexusProcessed algorithm will write the given Mantid "
"workspace to a Nexus file. SaveNexusProcessed may be invoked by "
"SaveNexus.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
protected:
/// Override process groups
- virtual bool processGroups();
+ bool processGroups() override;
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
void getSpectrumList(std::vector<int> &spec,
Mantid::API::MatrixWorkspace_const_sptr matrixWorkspace);
@@ -90,7 +90,8 @@ private:
const bool uniformSpectra, const std::vector<int> spec);
/// sets non workspace properties for the algorithm
void setOtherProperties(IAlgorithm *alg, const std::string &propertyName,
- const std::string &propertyValue, int perioidNum);
+ const std::string &propertyValue,
+ int perioidNum) override;
/// execute the algorithm.
void doExec(Mantid::API::Workspace_sptr workspace,
Mantid::NeXus::NexusFileIO_sptr &nexusFile,
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveOpenGenieAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveOpenGenieAscii.h
index 7ee37d3637d7c76390dcfec93f7cfb4d85a7b5de..4251e02107751eed5a486df0069b47f50affccda 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveOpenGenieAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveOpenGenieAscii.h
@@ -17,30 +17,30 @@ public:
SaveOpenGenieAscii();
//// Virtual destructor
- virtual ~SaveOpenGenieAscii() {}
+ ~SaveOpenGenieAscii() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SaveOpenGenieAscii"; }
+ const std::string name() const override { return "SaveOpenGenieAscii"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a focused data set into an OpenGenie ASCII file ";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\DataHandling;DataHandling\\Text";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
// write file header
void writeFileHeader(std::ofstream &outfile);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SavePAR.h b/Framework/DataHandling/inc/MantidDataHandling/SavePAR.h
index b29923912e80e1474d9330b6917fe85833f075ee..47c3e7fd1f83c97fc50694164047bb2dd0aefe5c 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SavePAR.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SavePAR.h
@@ -61,19 +61,19 @@ public:
/// (Empty) Constructor
SavePAR() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~SavePAR() {}
+ ~SavePAR() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SavePAR"; }
+ const std::string name() const override { return "SavePAR"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Writes the detector geometry information of a workspace into a "
"Tobyfit PAR format file.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\SPE;Inelastic\\DataHandling";
}
/** the method used in tests. It requested the ChildAlgorithm, which does the
@@ -88,9 +88,9 @@ public:
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// The name of the table workpsace with detectors positions used in tests
std::string det_par_ws_name;
};
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SavePDFGui.h b/Framework/DataHandling/inc/MantidDataHandling/SavePDFGui.h
index 191538d86104272286be5665b6e2662570b3f588..c02a7b608e40368cfcab25968c9bb8a243a0618e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SavePDFGui.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SavePDFGui.h
@@ -33,17 +33,17 @@ namespace DataHandling {
class DLLExport SavePDFGui : public API::Algorithm {
public:
SavePDFGui();
- virtual ~SavePDFGui();
+ ~SavePDFGui() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
- virtual std::map<std::string, std::string> validateInputs();
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
+ std::map<std::string, std::string> validateInputs() override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SavePHX.h b/Framework/DataHandling/inc/MantidDataHandling/SavePHX.h
index 5fda68e14f4f657ef6bf72b351655f227adfebb8..d1f1c41065cdfbea7f92c32b8f8f06d430e46621 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SavePHX.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SavePHX.h
@@ -46,19 +46,19 @@ public:
/// (Empty) Constructor
SavePHX() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~SavePHX() {}
+ ~SavePHX() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SavePHX"; }
+ const std::string name() const override { return "SavePHX"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Writes the detector geometry information of a workspace into a PHX "
"format file.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\SPE;Inelastic\\DataHandling";
}
@@ -74,9 +74,9 @@ public:
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// The name of the table workpsace with detectors positions used in tests
std::string det_par_ws_name;
};
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveParameterFile.h b/Framework/DataHandling/inc/MantidDataHandling/SaveParameterFile.h
index 02d1b27be45e57998693722a622f51d02e4b7eb7..440154846822ca6a08dff35d6aa6ecf00428e373 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveParameterFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveParameterFile.h
@@ -38,20 +38,20 @@ namespace DataHandling {
class DLLExport SaveParameterFile : public API::Algorithm {
public:
SaveParameterFile();
- virtual ~SaveParameterFile();
+ ~SaveParameterFile() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save an instrument's parameters to an instrument parameter file.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveRKH.h b/Framework/DataHandling/inc/MantidDataHandling/SaveRKH.h
index 10489e415021ed4f4879c1074c3eb840785a541b..be466211cd06063f85578d01ff69bb58b8cdf0d0 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveRKH.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveRKH.h
@@ -48,18 +48,18 @@ public:
/// Constructor
SaveRKH();
/// Virtual destructor
- virtual ~SaveRKH();
+ ~SaveRKH() override;
/// Algorithm's name
- virtual const std::string name() const { return "SaveRKH"; }
+ const std::string name() const override { return "SaveRKH"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save a file in the LOQ RKH/'FISH' format";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "DataHandling\\Text"; }
+ const std::string category() const override { return "DataHandling\\Text"; }
/// Constants used in RKH files
enum FileConstants {
@@ -70,9 +70,9 @@ public:
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void writeHeader();
void write1D();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveReflCustomAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveReflCustomAscii.h
index bd823921f100fcaf9d4c27503769619b99dc42ae..8769051a6a63c163d40c266e01cab26654178d62 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveReflCustomAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveReflCustomAscii.h
@@ -43,27 +43,27 @@ public:
/// Default constructor
SaveReflCustomAscii() {}
/// Destructor
- ~SaveReflCustomAscii() {}
+ ~SaveReflCustomAscii() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveReflCustomAscii"; }
+ const std::string name() const override { return "SaveReflCustomAscii"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a 2D workspace to a ascii file.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
///
void data(std::ofstream &file, const std::vector<double> &XData,
- bool exportDeltaQ);
+ bool exportDeltaQ) override;
private:
/// Return the file extension this algorthm should output.
- virtual std::string ext() { return ".dat"; }
+ std::string ext() override { return ".dat"; }
/// extra properties specifically for this
- virtual void extraProps();
+ void extraProps() override;
/// write any extra information required
- virtual void extraHeaders(std::ofstream &file);
+ void extraHeaders(std::ofstream &file) override;
};
} // namespace DataHandling
} // namespace Mantid
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveReflTBL.h b/Framework/DataHandling/inc/MantidDataHandling/SaveReflTBL.h
index 34dd307385909b947c7ddf8e71e43de02550a911..eff88fdac307957af4b6e9f785a6cf38d51d1245 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveReflTBL.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveReflTBL.h
@@ -41,24 +41,24 @@ public:
/// Default constructor
SaveReflTBL();
/// Destructor
- ~SaveReflTBL() {}
+ ~SaveReflTBL() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveReflTBL"; }
+ const std::string name() const override { return "SaveReflTBL"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a table workspace to a reflectometry tbl format ascii file.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Text"; }
+ const std::string category() const override { return "DataHandling\\Text"; }
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// Writes a value to the file
void writeVal(std::string &val, std::ofstream &file, bool endsep = true,
bool endline = false);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveReflThreeColumnAscii.h b/Framework/DataHandling/inc/MantidDataHandling/SaveReflThreeColumnAscii.h
index 8aded199c848cf5e6590daddf198b7b6b04fbad8..745ec2b53c999f434372b183a48c341e20654225 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveReflThreeColumnAscii.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveReflThreeColumnAscii.h
@@ -45,26 +45,26 @@ public:
/// Default constructor
SaveReflThreeColumnAscii() {}
/// Destructor
- ~SaveReflThreeColumnAscii() {}
+ ~SaveReflThreeColumnAscii() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveReflThreeColumnAscii"; }
+ const std::string name() const override { return "SaveReflThreeColumnAscii"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a 2D workspace to a ascii file.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's version for data output overriding a virtual method
void data(std::ofstream &file, const std::vector<double> &XData,
- bool exportDeltaQ = false);
+ bool exportDeltaQ = false) override;
private:
/// Return the file extension this algorthm should output.
- virtual std::string ext() { return ".dat"; }
+ std::string ext() override { return ".dat"; }
/// extra properties specifically for this
- virtual void extraProps();
+ void extraProps() override;
/// write any extra information required
- virtual void extraHeaders(std::ofstream &file);
+ void extraHeaders(std::ofstream &file) override;
};
} // namespace DataHandling
} // namespace Mantid
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveSPE.h b/Framework/DataHandling/inc/MantidDataHandling/SaveSPE.h
index e8a38a65bcd0da421bac018192b2fdecf372cf9c..d617f7618a2a2a6f4c602abc2128ac77176334ea 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveSPE.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveSPE.h
@@ -43,18 +43,18 @@ public:
/// Constructor
SaveSPE();
/// Virtual destructor
- virtual ~SaveSPE() {}
+ ~SaveSPE() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SaveSPE"; }
+ const std::string name() const override { return "SaveSPE"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Writes a workspace into a file the spe format.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\SPE;Inelastic\\DataHandling";
}
@@ -64,9 +64,9 @@ public:
private:
/// Initialization code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void writeSPEFile(FILE *outSPEFile,
const API::MatrixWorkspace_const_sptr &inputWS);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveSavuTomoConfig.h b/Framework/DataHandling/inc/MantidDataHandling/SaveSavuTomoConfig.h
index 380fdd56f90bb2a97a783e7df70307a5159e51bb..28d3f89c9b80770888789a9eef8fe1e0d479030e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveSavuTomoConfig.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveSavuTomoConfig.h
@@ -45,29 +45,29 @@ class DLLExport SaveSavuTomoConfig : public API::Algorithm {
public:
SaveSavuTomoConfig();
/// Virtual dtor
- virtual ~SaveSavuTomoConfig() {}
+ ~SaveSavuTomoConfig() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveSavuTomoConfig"; }
+ const std::string name() const override { return "SaveSavuTomoConfig"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Writes a configuration file for a tomographic reconstruction job.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Tomography;";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code : Single workspace
- void exec();
+ void exec() override;
/// basic check on a table workspace properties
bool tableLooksGenuine(const API::ITableWorkspace_sptr &tws);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h b/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h
index b0f84c9b87f83e6271a0ee760996d307d9374081..ce4adad262e712b12efc3f0bed6953d142df0773 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveToSNSHistogramNexus.h
@@ -54,27 +54,27 @@ public:
SaveToSNSHistogramNexus();
/// Destructor
- ~SaveToSNSHistogramNexus() {}
+ ~SaveToSNSHistogramNexus() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SaveToSNSHistogramNexus"; };
+ const std::string name() const override { return "SaveToSNSHistogramNexus"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Saves a workspace into SNS histogrammed NeXus format, using an "
"original file as the starting point. This only works for "
"instruments with Rectangular Detectors.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// The name and path of the output file
std::string m_outputFilename;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SaveVTK.h b/Framework/DataHandling/inc/MantidDataHandling/SaveVTK.h
index bfa4a9fcdfa57a12bfece14f5c37b27a06d2cf91..d22b3930638b63b51b2ccc231760f31463c11b47 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SaveVTK.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SaveVTK.h
@@ -62,24 +62,24 @@ public:
SaveVTK();
/// Algorithm's name
- virtual const std::string name() const { return "SaveVTK"; };
+ const std::string name() const override { return "SaveVTK"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save a workspace out to a VTK file format for use with 3D "
"visualisation tools such as Paraview.";
}
/// Algorithm's version
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category
- virtual const std::string category() const { return "DataHandling\\XML"; }
+ const std::string category() const override { return "DataHandling\\XML"; }
private:
/// Override virtual init function
- void init();
+ void init() override;
/// Override virtual exec function
- void exec();
+ void exec() override;
/// Check the optional properties
void checkOptionalProperties();
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SetSampleMaterial.h b/Framework/DataHandling/inc/MantidDataHandling/SetSampleMaterial.h
index 8760598e32541ee87d77c0aef811164d3ef40fb1..23734cb659bbdfaae0d30807b82ddc7c1d140210 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SetSampleMaterial.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SetSampleMaterial.h
@@ -44,25 +44,25 @@ public:
/// (Empty) Constructor
SetSampleMaterial();
/// Virtual destructor
- virtual ~SetSampleMaterial();
+ ~SetSampleMaterial() override;
/// Algorithm's name
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Sets the neutrons information in the sample.";
}
/// Algorithm's version
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification
- virtual const std::string category() const;
- virtual std::map<std::string, std::string> validateInputs();
+ const std::string category() const override;
+ std::map<std::string, std::string> validateInputs() override;
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Print out the list of information for the material
void fixNeutron(PhysicalConstants::NeutronAtom &neutron, double coh_xs,
double inc_xs, double abs_xs, double tot_xs);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SetScalingPSD.h b/Framework/DataHandling/inc/MantidDataHandling/SetScalingPSD.h
index 422dd097151e779b2b5392120181edec91ebeb9c..ce1f3448aef09956b554f77f7e8c5bd7183dc10a 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SetScalingPSD.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SetScalingPSD.h
@@ -56,11 +56,11 @@ public:
SetScalingPSD();
/// Destructor
- ~SetScalingPSD() {}
+ ~SetScalingPSD() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "SetScalingPSD"; };
+ const std::string name() const override { return "SetScalingPSD"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "For an instrument with Position Sensitive Detectors (PSDs) the "
"'engineering' positions of individual detectors may not match the "
"true areas where neutrons are detected. This algorithm reads data "
@@ -69,18 +69,18 @@ public:
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "CorrectionFunctions\\InstrumentCorrections";
}
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// The name and path of the input file
std::string m_filename;
diff --git a/Framework/DataHandling/inc/MantidDataHandling/SortTableWorkspace.h b/Framework/DataHandling/inc/MantidDataHandling/SortTableWorkspace.h
index 6bd23f18b2f1bb890f32f56010f4be58d2ec1255..1359ee114477707bae2b3ddce49c14f594387b9b 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/SortTableWorkspace.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/SortTableWorkspace.h
@@ -33,16 +33,16 @@ namespace DataHandling {
class DLLExport SortTableWorkspace : public API::Algorithm {
public:
SortTableWorkspace();
- virtual ~SortTableWorkspace();
+ ~SortTableWorkspace() override;
- virtual const std::string name() const { return "SortTableWorkspace"; }
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override { return "SortTableWorkspace"; }
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataHandling
diff --git a/Framework/DataHandling/inc/MantidDataHandling/UpdateInstrumentFromFile.h b/Framework/DataHandling/inc/MantidDataHandling/UpdateInstrumentFromFile.h
index 45f5c9a0b4bbd72ee2c89288a90448898eee7274..e392baf50d505d830603c406a6a81f36b01af7f0 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/UpdateInstrumentFromFile.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/UpdateInstrumentFromFile.h
@@ -62,32 +62,32 @@ public:
UpdateInstrumentFromFile();
/// Destructor
- ~UpdateInstrumentFromFile() {}
+ ~UpdateInstrumentFromFile() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "UpdateInstrumentFromFile"; }
+ const std::string name() const override { return "UpdateInstrumentFromFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Updates detector positions initially loaded in from the Instrument "
"Definition File (IDF) with information from the provided file.";
}
/// Algorithm's alias for the old UpdateInstrumentFromRaw
- virtual const std::string alias() const { return "UpdateInstrumentFromRaw"; }
+ const std::string alias() const override { return "UpdateInstrumentFromRaw"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\Instrument;DataHandling\\Raw";
}
private:
/// Overwrites Algorithm method. Does nothing at present
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// Assumes the file is a raw file
void updateFromRaw(const std::string &filename);
diff --git a/Framework/DataHandling/src/LoadEventNexus.cpp b/Framework/DataHandling/src/LoadEventNexus.cpp
index d8c83e8325bf24e491c588296157a87b71dbc047..75da18c064e83ce34c18eede9173628634748e2f 100644
--- a/Framework/DataHandling/src/LoadEventNexus.cpp
+++ b/Framework/DataHandling/src/LoadEventNexus.cpp
@@ -186,7 +186,7 @@ public:
//----------------------------------------------------------------------------------------------
/** Run the data processing
*/
- void run() {
+ void run() override {
// Local tof limits
double my_shortest_tof =
static_cast<double>(std::numeric_limits<uint32_t>::max()) * 0.1;
@@ -792,7 +792,7 @@ public:
}
//---------------------------------------------------------------------------------------------------
- void run() {
+ void run() override {
// The vectors we will be filling
auto event_index_ptr = new std::vector<uint64_t>();
std::vector<uint64_t> &event_index = *event_index_ptr;
diff --git a/Framework/DataHandling/src/LoadRaw/isisraw2.h b/Framework/DataHandling/src/LoadRaw/isisraw2.h
index 070f9195f77f36bf60181d414a572b44cddfe2f0..99a8640179a3bf0ceb9eb1b3d935611986090f32 100644
--- a/Framework/DataHandling/src/LoadRaw/isisraw2.h
+++ b/Framework/DataHandling/src/LoadRaw/isisraw2.h
@@ -8,9 +8,9 @@
class ISISRAW2 : public ISISRAW {
public:
ISISRAW2();
- virtual ~ISISRAW2();
+ ~ISISRAW2() override;
- virtual int ioRAW(FILE *file, bool from_file, bool do_data = true);
+ int ioRAW(FILE *file, bool from_file, bool do_data = true) override;
void skipData(FILE *file, int i);
bool readData(FILE *file, int i);
diff --git a/Framework/DataObjects/inc/MantidDataObjects/AffineMatrixParameter.h b/Framework/DataObjects/inc/MantidDataObjects/AffineMatrixParameter.h
index 170b73950c46e0e1490db8e52bea2e6bb93f84d0..0dcf3f9b0a5e71676eae0aff8fa13ff53e7aeda4 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/AffineMatrixParameter.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/AffineMatrixParameter.h
@@ -20,15 +20,15 @@ class DLLExport AffineMatrixParameter
: public Mantid::API::ImplicitFunctionParameter {
public:
// ImplcitFunctionParameter Methods.
- virtual std::string getName() const;
- virtual bool isValid() const;
- virtual std::string toXMLString() const;
- virtual AffineMatrixParameter *clone() const;
+ std::string getName() const override;
+ bool isValid() const override;
+ std::string toXMLString() const override;
+ AffineMatrixParameter *clone() const override;
void setMatrix(const AffineMatrixType newMatrix);
AffineMatrixParameter(size_t outD, size_t inD);
AffineMatrixParameter(const AffineMatrixParameter &);
AffineMatrixParameter &operator=(const AffineMatrixParameter &other);
- ~AffineMatrixParameter();
+ ~AffineMatrixParameter() override;
coord_t **getRawMatrix();
AffineMatrixType getAffineMatrix() const;
diff --git a/Framework/DataObjects/inc/MantidDataObjects/AffineMatrixParameterParser.h b/Framework/DataObjects/inc/MantidDataObjects/AffineMatrixParameterParser.h
index b8ffc66f4ae2390bc94bda96f06445d51453aa05..f0dee7c68684b65f43b1b2dc99f7933753fc8959 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/AffineMatrixParameterParser.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/AffineMatrixParameterParser.h
@@ -21,12 +21,12 @@ public:
* @param parameterElement : xml element to parser from.
* @return Fully constructed AffineMatrixParameter.
*/
- virtual AffineMatrixParameter *
- createParameter(Poco::XML::Element *parameterElement);
+ AffineMatrixParameter *
+ createParameter(Poco::XML::Element *parameterElement) override;
/// Set a successor parser for chain-of-responsibility type reading.
- virtual void setSuccessorParser(ImplicitFunctionParameterParser *);
+ void setSuccessorParser(ImplicitFunctionParameterParser *) override;
/// Destructor
- virtual ~AffineMatrixParameterParser();
+ ~AffineMatrixParameterParser() override;
private:
/// Assignment operator
diff --git a/Framework/DataObjects/inc/MantidDataObjects/BoxControllerNeXusIO.h b/Framework/DataObjects/inc/MantidDataObjects/BoxControllerNeXusIO.h
index 71ee97597bb926fb66ed7dae6e77a1e092caf0a2..1405bd6adfe79eb03f607208423d288ef8f34f80 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/BoxControllerNeXusIO.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/BoxControllerNeXusIO.h
@@ -43,33 +43,33 @@ public:
BoxControllerNeXusIO(API::BoxController *const theBC);
///@return true if the file to write events is opened and false otherwise
- virtual bool isOpened() const { return (m_File != NULL); }
+ bool isOpened() const override { return (m_File != NULL); }
/// get the full file name of the file used for IO operations
- virtual const std::string &getFileName() const { return m_fileName; }
+ const std::string &getFileName() const override { return m_fileName; }
/**Return the size of the NeXus data block used in NeXus data array*/
- size_t getDataChunk() const { return m_dataChunk; }
+ size_t getDataChunk() const override { return m_dataChunk; }
- virtual bool openFile(const std::string &fileName, const std::string &mode);
+ bool openFile(const std::string &fileName, const std::string &mode) override;
- virtual void saveBlock(const std::vector<float> & /* DataBlock */,
- const uint64_t /*blockPosition*/) const;
- virtual void loadBlock(std::vector<float> & /* Block */,
+ void saveBlock(const std::vector<float> & /* DataBlock */,
+ const uint64_t /*blockPosition*/) const override;
+ void loadBlock(std::vector<float> & /* Block */,
const uint64_t /*blockPosition*/,
- const size_t /*BlockSize*/) const;
- virtual void saveBlock(const std::vector<double> & /* DataBlock */,
- const uint64_t /*blockPosition*/) const;
- virtual void loadBlock(std::vector<double> & /* Block */,
+ const size_t /*BlockSize*/) const override;
+ void saveBlock(const std::vector<double> & /* DataBlock */,
+ const uint64_t /*blockPosition*/) const override;
+ void loadBlock(std::vector<double> & /* Block */,
const uint64_t /*blockPosition*/,
- const size_t /*BlockSize*/) const;
+ const size_t /*BlockSize*/) const override;
- virtual void flushData() const;
- virtual void closeFile();
+ void flushData() const override;
+ void closeFile() override;
- virtual ~BoxControllerNeXusIO();
+ ~BoxControllerNeXusIO() override;
// Auxiliary functions. Used to change default state of this object which is
// not fully supported. Should be replaced by some IBoxControllerIO factory
- virtual void setDataType(const size_t coordSize, const std::string &typeName);
- virtual void getDataType(size_t &coordSize, std::string &typeName) const;
+ void setDataType(const size_t coordSize, const std::string &typeName) override;
+ void getDataType(size_t &coordSize, std::string &typeName) const override;
//------------------------------------------------------------------------------------------------------------------------
// Auxiliary functions (non-virtual, used for testing)
int64_t getNDataColums() const { return m_BlockSize[1]; }
diff --git a/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryKiKf.h b/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryKiKf.h
index f9b01abf80c0c380b00316c49d564ebd10a385ba..2c7dd8c2ae85682b8169beb4df9b175dfe6f4032 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryKiKf.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryKiKf.h
@@ -23,14 +23,14 @@ public:
/**
Destructor
*/
- ~CalculateReflectometryKiKf(){};
+ ~CalculateReflectometryKiKf() override{};
/**
Setter for the incident theta value require for the calculation. Internally
pre-calculates and caches to cos theta for speed.
@param thetaIncident: incident theta value in degrees
*/
- void setThetaIncident(double thetaIncident) {
+ void setThetaIncident(double thetaIncident) override {
m_sin_theta_i = sin(to_radians_factor * thetaIncident);
}
@@ -39,7 +39,7 @@ public:
pre-calculates and caches to cos theta for speed.
@param thetaFinal: final theta value in degrees
*/
- void setThetaFinal(double thetaFinal) {
+ void setThetaFinal(double thetaFinal) override {
m_sin_theta_f = sin(to_radians_factor * thetaFinal);
}
@@ -47,7 +47,7 @@ public:
Executes the calculation to determine Ki
@param wavelength : wavelength in Angstroms
*/
- double calculateDim0(double wavelength) const {
+ double calculateDim0(double wavelength) const override {
double wavenumber = 2 * M_PI / wavelength;
return wavenumber * m_sin_theta_i;
}
@@ -56,13 +56,13 @@ public:
Executes the calculation to determine Kf
@param wavelength : wavelength in Angstroms
*/
- double calculateDim1(double wavelength) const {
+ double calculateDim1(double wavelength) const override {
double wavenumber = 2 * M_PI / wavelength;
return wavenumber * m_sin_theta_f;
}
Mantid::Geometry::Quadrilateral createQuad(double lamUpper, double lamLower,
double thetaUpper,
- double thetaLower) {
+ double thetaLower) override {
setThetaFinal(thetaLower);
const Mantid::Kernel::V2D firstVertex(calculateDim0(lamLower), // highest qx
calculateDim1(lamLower));
diff --git a/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryP.h b/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryP.h
index 55a3463ca4742cd541db58e9ae82651c8477108f..855158c112ad14137752f6a754826e58b6e50e11 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryP.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryP.h
@@ -22,14 +22,14 @@ public:
/**
* Destructor
*/
- ~CalculateReflectometryP(){};
+ ~CalculateReflectometryP() override{};
/**
Setter for the incident theta value require for the calculation. Internally
pre-calculates and caches to cos theta for speed.
@param thetaIncident: incident theta value in degrees
*/
- void setThetaIncident(double thetaIncident) {
+ void setThetaIncident(double thetaIncident) override {
m_sin_theta_i = sin(to_radians_factor * thetaIncident);
}
@@ -38,7 +38,7 @@ public:
pre-calculates and caches to cos theta for speed.
@param thetaFinal: final theta value in degrees
*/
- void setThetaFinal(double thetaFinal) {
+ void setThetaFinal(double thetaFinal) override {
m_sin_theta_f = sin(to_radians_factor * thetaFinal);
}
@@ -46,7 +46,7 @@ public:
Executes the calculation to determine PSum
@param wavelength : wavelength in Angstroms
*/
- double calculateDim0(double wavelength) const {
+ double calculateDim0(double wavelength) const override {
double wavenumber = 2 * M_PI / wavelength;
double ki = wavenumber * m_sin_theta_i;
double kf = wavenumber * m_sin_theta_f;
@@ -57,7 +57,7 @@ public:
Executes the calculation to determine PDiff
@param wavelength : wavelength in Angstroms
*/
- double calculateDim1(double wavelength) const {
+ double calculateDim1(double wavelength) const override {
double wavenumber = 2 * M_PI / wavelength;
double ki = wavenumber * m_sin_theta_i;
double kf = wavenumber * m_sin_theta_f;
@@ -65,7 +65,7 @@ public:
}
Mantid::Geometry::Quadrilateral createQuad(double lamUpper, double lamLower,
double thetaUpper,
- double thetaLower) {
+ double thetaLower) override {
setThetaFinal(thetaLower);
auto dim1UpperRightVertex = calculateDim1(lamLower);
auto dim0LowerLeftVertex = calculateDim0(lamUpper);
diff --git a/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryQxQz.h b/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryQxQz.h
index 6ad81cb03a55111f28577ced957d2cceb9d6e102..b6efd1f58b74a30c5e7bd30f57635db9f9271c3e 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryQxQz.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/CalculateReflectometryQxQz.h
@@ -29,7 +29,7 @@ public:
pre-calculates and caches to cos theta for speed.
@param thetaIncident: incident theta value in degrees
*/
- void setThetaIncident(double thetaIncident) {
+ void setThetaIncident(double thetaIncident) override {
m_cos_theta_i = cos(thetaIncident * to_radians_factor);
m_sin_theta_i = sin(thetaIncident * to_radians_factor);
}
@@ -39,7 +39,7 @@ public:
pre-calculates and caches to cos theta for speed.
@param thetaFinal: final theta value in degrees
*/
- void setThetaFinal(double thetaFinal) {
+ void setThetaFinal(double thetaFinal) override {
const double c_cos_theta_f = cos(thetaFinal * to_radians_factor);
m_dirQx = (c_cos_theta_f - m_cos_theta_i);
const double c_sin_theta_f = sin(thetaFinal * to_radians_factor);
@@ -50,7 +50,7 @@ public:
Executes the calculation to determine Qx
@param wavelength : wavelenght in Anstroms
*/
- double calculateDim0(double wavelength) const {
+ double calculateDim0(double wavelength) const override {
double wavenumber = 2 * M_PI / wavelength;
return wavenumber * m_dirQx;
}
@@ -59,14 +59,14 @@ public:
Executes the calculation to determine Qz
@param wavelength : wavelenght in Anstroms
*/
- double calculateDim1(double wavelength) const {
+ double calculateDim1(double wavelength) const override {
double wavenumber = 2 * M_PI / wavelength;
return wavenumber * m_dirQz;
}
Mantid::Geometry::Quadrilateral createQuad(double lamUpper, double lamLower,
double thetaUpper,
- double thetaLower) {
+ double thetaLower) override {
setThetaFinal(thetaLower);
const Mantid::Kernel::V2D firstVertex(calculateDim0(lamLower), // highest qx
calculateDim1(lamLower));
diff --git a/Framework/DataObjects/inc/MantidDataObjects/CoordTransformAffine.h b/Framework/DataObjects/inc/MantidDataObjects/CoordTransformAffine.h
index 740c7dc709900627c77d8540463fae78bcf0249a..cd4eb075e57c5c3613315f28087b69ce40efe14f 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/CoordTransformAffine.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/CoordTransformAffine.h
@@ -31,13 +31,13 @@ namespace DataObjects {
class DLLExport CoordTransformAffine : public Mantid::API::CoordTransform {
public:
CoordTransformAffine(const size_t inD, const size_t outD);
- virtual CoordTransform *clone() const;
- virtual ~CoordTransformAffine();
- virtual std::string toXMLString() const;
- virtual std::string id() const;
+ CoordTransform *clone() const override;
+ ~CoordTransformAffine() override;
+ std::string toXMLString() const override;
+ std::string id() const override;
void addTranslation(const coord_t *translationVector);
const Mantid::Kernel::Matrix<coord_t> &getMatrix() const;
- Mantid::Kernel::Matrix<coord_t> makeAffineMatrix() const;
+ Mantid::Kernel::Matrix<coord_t> makeAffineMatrix() const override;
void setMatrix(const Mantid::Kernel::Matrix<coord_t> &newMatrix);
void buildOrthogonal(const Mantid::Kernel::VMD &origin,
const std::vector<Mantid::Kernel::VMD> &axes,
@@ -47,7 +47,7 @@ public:
const std::vector<Mantid::Kernel::VMD> &axes,
const Mantid::Kernel::VMD &scaling);
- virtual void apply(const coord_t *inputVector, coord_t *outVector) const;
+ void apply(const coord_t *inputVector, coord_t *outVector) const override;
static CoordTransformAffine *combineTransformations(CoordTransform *first,
CoordTransform *second);
diff --git a/Framework/DataObjects/inc/MantidDataObjects/CoordTransformAligned.h b/Framework/DataObjects/inc/MantidDataObjects/CoordTransformAligned.h
index 59903ca16b65cfdacaad2b5e00c561264714e459..7d965e6d21a66c185e1c7476a1443fd370c7d953 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/CoordTransformAligned.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/CoordTransformAligned.h
@@ -60,13 +60,13 @@ public:
const std::vector<size_t> dimensionToBinFrom,
const std::vector<coord_t> origin,
const std::vector<coord_t> scaling);
- virtual CoordTransform *clone() const;
- virtual ~CoordTransformAligned();
+ CoordTransform *clone() const override;
+ ~CoordTransformAligned() override;
- std::string toXMLString() const;
- std::string id() const;
- void apply(const coord_t *inputVector, coord_t *outVector) const;
- Mantid::Kernel::Matrix<coord_t> makeAffineMatrix() const;
+ std::string toXMLString() const override;
+ std::string id() const override;
+ void apply(const coord_t *inputVector, coord_t *outVector) const override;
+ Mantid::Kernel::Matrix<coord_t> makeAffineMatrix() const override;
protected:
/// For each dimension in the output, index in the input workspace of which
diff --git a/Framework/DataObjects/inc/MantidDataObjects/CoordTransformDistance.h b/Framework/DataObjects/inc/MantidDataObjects/CoordTransformDistance.h
index beec61ac08f3e4bc1421aff6cc0d12afd487632f..dafebb53e16761c39ae90a13b6a03f26ac3be670 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/CoordTransformDistance.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/CoordTransformDistance.h
@@ -36,12 +36,12 @@ class DLLExport CoordTransformDistance : public Mantid::API::CoordTransform {
public:
CoordTransformDistance(const size_t inD, const coord_t *center,
const bool *dimensionsUsed, const size_t outD = 1);
- virtual CoordTransform *clone() const;
- virtual ~CoordTransformDistance();
- virtual std::string toXMLString() const;
- virtual std::string id() const;
+ CoordTransform *clone() const override;
+ ~CoordTransformDistance() override;
+ std::string toXMLString() const override;
+ std::string id() const override;
- void apply(const coord_t *inputVector, coord_t *outVector) const;
+ void apply(const coord_t *inputVector, coord_t *outVector) const override;
/// Return the center coordinate array
const coord_t *getCenter() { return m_center; }
diff --git a/Framework/DataObjects/inc/MantidDataObjects/CoordTransformDistanceParser.h b/Framework/DataObjects/inc/MantidDataObjects/CoordTransformDistanceParser.h
index 1715a94c871ecb15c115d441f4ca2f04f2015e59..27649a993e5449e52b17e865856fcb7465db27c9 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/CoordTransformDistanceParser.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/CoordTransformDistanceParser.h
@@ -19,9 +19,9 @@ class DLLExport CoordTransformDistanceParser
: public CoordTransformAffineParser {
public:
CoordTransformDistanceParser();
- virtual Mantid::API::CoordTransform *
- createTransform(Poco::XML::Element *coordTransElement) const;
- virtual ~CoordTransformDistanceParser();
+ Mantid::API::CoordTransform *
+ createTransform(Poco::XML::Element *coordTransElement) const override;
+ ~CoordTransformDistanceParser() override;
private:
CoordTransformDistanceParser(const CoordTransformDistanceParser &);
diff --git a/Framework/DataObjects/inc/MantidDataObjects/EventList.h b/Framework/DataObjects/inc/MantidDataObjects/EventList.h
index 190224e5391f42c3f3673f3be62cce6fe61ffb24..bac5be19e9b8557d8e51b0b18670ca77898d022b 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/EventList.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/EventList.h
@@ -80,7 +80,7 @@ public:
EventList(const std::vector<WeightedEventNoTime> &events);
- virtual ~EventList();
+ ~EventList() override;
void createFromHistogram(const ISpectrum *spec, bool GenerateZeros,
bool GenerateMultipleEvents, int MaxEventsPerBin);
@@ -138,9 +138,9 @@ public:
this->order = UNSORTED;
}
- Mantid::API::EventType getEventType() const;
+ Mantid::API::EventType getEventType() const override;
- void switchTo(Mantid::API::EventType newType);
+ void switchTo(Mantid::API::EventType newType) override;
WeightedEvent getEvent(size_t event_number);
@@ -153,19 +153,19 @@ public:
std::vector<WeightedEventNoTime> &getWeightedEventsNoTime();
const std::vector<WeightedEventNoTime> &getWeightedEventsNoTime() const;
- void clear(const bool removeDetIDs = true);
+ void clear(const bool removeDetIDs = true) override;
void clearUnused();
- void lockData() const;
- void unlockData() const;
+ void lockData() const override;
+ void unlockData() const override;
void setMRU(EventWorkspaceMRU *newMRU);
EventWorkspaceMRU *getMRU();
- void clearData();
+ void clearData() override;
- void reserve(size_t num);
+ void reserve(size_t num) override;
void sort(const EventSortType order) const;
@@ -180,19 +180,19 @@ public:
void sortTimeAtSample(const double &tofFactor, const double &tofShift,
bool forceResort = false) const;
- bool isSortedByTof() const;
+ bool isSortedByTof() const override;
EventSortType getSortType() const;
// X-vector accessors. These reset the MRU for this spectrum
- void setX(const MantidVecPtr::ptr_type &X);
+ void setX(const MantidVecPtr::ptr_type &X) override;
- void setX(const MantidVecPtr &X);
+ void setX(const MantidVecPtr &X) override;
- void setX(const MantidVec &X);
+ void setX(const MantidVec &X) override;
- MantidVec &dataX();
- const MantidVec &dataX() const;
+ MantidVec &dataX() override;
+ const MantidVec &dataX() const override;
const MantidVec &constDataX() const;
// TODO: This overload will probably be needed in a future to work with Event
@@ -200,47 +200,48 @@ public:
// std::pair<double,double> getXDataRange()const;
/// Disallowed data accessors - can't modify Y/E on a EventList
- void setData(const MantidVec & /*Y*/) {
+ void setData(const MantidVec & /*Y*/) override {
throw std::runtime_error("EventList: cannot set Y or E data directly.");
}
/// Disallowed data accessors - can't modify Y/E on a EventList
- void setData(const MantidVec & /*Y*/, const MantidVec & /*E*/) {
+ void setData(const MantidVec & /*Y*/, const MantidVec & /*E*/) override {
throw std::runtime_error("EventList: cannot set Y or E data directly.");
}
/// Disallowed data accessors - can't modify Y/E on a EventList
- void setData(const MantidVecPtr & /*Y*/) {
+ void setData(const MantidVecPtr & /*Y*/) override {
throw std::runtime_error("EventList: cannot set Y or E data directly.");
}
/// Disallowed data accessors - can't modify Y/E on a EventList
- void setData(const MantidVecPtr & /*Y*/, const MantidVecPtr & /*E*/) {
+ void setData(const MantidVecPtr & /*Y*/,
+ const MantidVecPtr & /*E*/) override {
throw std::runtime_error("EventList: cannot set Y or E data directly.");
}
/// Disallowed data accessors - can't modify Y/E on a EventList
- void setData(const MantidVecPtr::ptr_type & /*Y*/) {
+ void setData(const MantidVecPtr::ptr_type & /*Y*/) override {
throw std::runtime_error("EventList: cannot set Y or E data directly.");
}
/// Disallowed data accessors - can't modify Y/E on a EventList
void setData(const MantidVecPtr::ptr_type & /*Y*/,
- const MantidVecPtr::ptr_type & /*E*/) {
+ const MantidVecPtr::ptr_type & /*E*/) override {
throw std::runtime_error("EventList: cannot set Y or E data directly.");
}
/// Disallowed data accessors - can't modify Y/E on a EventList
- MantidVec &dataY() {
+ MantidVec &dataY() override {
throw std::runtime_error(
"EventList: non-const access to Y data is not possible.");
}
/// Disallowed data accessors - can't modify Y/E on a EventList
- MantidVec &dataE() {
+ MantidVec &dataE() override {
throw std::runtime_error(
"EventList: non-const access to E data is not possible.");
}
// Allowed data accessors - read-only Y/E histogram VIEWS of an event list
/// Return a read-only Y histogram view of an event list
- const MantidVec &dataY() const { return constDataY(); }
+ const MantidVec &dataY() const override { return constDataY(); }
/// Return a read-only E histogram view of an event list
- const MantidVec &dataE() const { return constDataE(); }
+ const MantidVec &dataE() const override { return constDataE(); }
const MantidVec &constDataY() const;
const MantidVec &constDataE() const;
@@ -248,10 +249,10 @@ public:
MantidVec *makeDataY() const;
MantidVec *makeDataE() const;
- std::size_t getNumberEvents() const;
+ std::size_t getNumberEvents() const override;
bool empty() const;
- size_t getMemorySize() const;
+ size_t getMemorySize() const override;
virtual size_t histogram_size() const;
@@ -259,57 +260,61 @@ public:
bool parallel = false);
// get EventType declaration
void generateHistogram(const MantidVec &X, MantidVec &Y, MantidVec &E,
- bool skipError = false) const;
+ bool skipError = false) const override;
void generateHistogramPulseTime(const MantidVec &X, MantidVec &Y,
- MantidVec &E, bool skipError = false) const;
+ MantidVec &E,
+ bool skipError = false) const override;
void generateHistogramTimeAtSample(const MantidVec &X, MantidVec &Y,
MantidVec &E, const double &tofFactor,
const double &tofOffset,
- bool skipError = false) const;
+ bool skipError = false) const override;
void integrate(const double minX, const double maxX, const bool entireRange,
double &sum, double &error) const;
double integrate(const double minX, const double maxX,
- const bool entireRange) const;
+ const bool entireRange) const override;
- void convertTof(std::function<double(double)> func, const int sorting = 0);
+ void convertTof(std::function<double(double)> func,
+ const int sorting = 0) override;
- void convertTof(const double factor, const double offset = 0.);
+ void convertTof(const double factor, const double offset = 0.) override;
- void scaleTof(const double factor);
+ void scaleTof(const double factor) override;
- void addTof(const double offset);
+ void addTof(const double offset) override;
- void addPulsetime(const double seconds);
+ void addPulsetime(const double seconds) override;
- void maskTof(const double tofMin, const double tofMax);
+ void maskTof(const double tofMin, const double tofMax) override;
- void getTofs(std::vector<double> &tofs) const;
- double getTofMin() const;
- double getTofMax() const;
- Mantid::Kernel::DateAndTime getPulseTimeMax() const;
- Mantid::Kernel::DateAndTime getPulseTimeMin() const;
- Mantid::Kernel::DateAndTime getTimeAtSampleMax(const double &tofFactor,
- const double &tofOffset) const;
- Mantid::Kernel::DateAndTime getTimeAtSampleMin(const double &tofFactor,
- const double &tofOffset) const;
+ void getTofs(std::vector<double> &tofs) const override;
+ double getTofMin() const override;
+ double getTofMax() const override;
+ Mantid::Kernel::DateAndTime getPulseTimeMax() const override;
+ Mantid::Kernel::DateAndTime getPulseTimeMin() const override;
+ Mantid::Kernel::DateAndTime
+ getTimeAtSampleMax(const double &tofFactor,
+ const double &tofOffset) const override;
+ Mantid::Kernel::DateAndTime
+ getTimeAtSampleMin(const double &tofFactor,
+ const double &tofOffset) const override;
- std::vector<double> getTofs() const;
+ std::vector<double> getTofs() const override;
/// Return the list of event weight values
- std::vector<double> getWeights() const;
+ std::vector<double> getWeights() const override;
/// Return the list of event weight values
- void getWeights(std::vector<double> &weights) const;
+ void getWeights(std::vector<double> &weights) const override;
/// Return the list of event weight error values
- std::vector<double> getWeightErrors() const;
+ std::vector<double> getWeightErrors() const override;
/// Return the list of event weight error values
- void getWeightErrors(std::vector<double> &weightErrors) const;
+ void getWeightErrors(std::vector<double> &weightErrors) const override;
- std::vector<Mantid::Kernel::DateAndTime> getPulseTimes() const;
+ std::vector<Mantid::Kernel::DateAndTime> getPulseTimes() const override;
- void setTofs(const MantidVec &tofs);
+ void setTofs(const MantidVec &tofs) override;
void reverse();
@@ -339,15 +344,17 @@ public:
void splitByPulseTime(Kernel::TimeSplitterType &splitter,
std::map<int, EventList *> outputs) const;
- void multiply(const double value, const double error = 0.0);
+ void multiply(const double value, const double error = 0.0) override;
EventList &operator*=(const double value);
- void multiply(const MantidVec &X, const MantidVec &Y, const MantidVec &E);
+ void multiply(const MantidVec &X, const MantidVec &Y,
+ const MantidVec &E) override;
- void divide(const double value, const double error = 0.0);
+ void divide(const double value, const double error = 0.0) override;
EventList &operator/=(const double value);
- void divide(const MantidVec &X, const MantidVec &Y, const MantidVec &E);
+ void divide(const MantidVec &X, const MantidVec &Y,
+ const MantidVec &E) override;
void convertUnitsViaTof(Mantid::Kernel::Unit *fromUnit,
Mantid::Kernel::Unit *toUnit);
diff --git a/Framework/DataObjects/inc/MantidDataObjects/EventWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/EventWorkspace.h
index 94d7ba17904924a83a82465ab629874893abaf3a..0ed616a093f93c8271e75f4311d365ad5579525b 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/EventWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/EventWorkspace.h
@@ -39,13 +39,13 @@ class DLLExport EventWorkspace : public API::IEventWorkspace {
public:
// The name of the workspace type.
- virtual const std::string id() const { return "EventWorkspace"; }
+ const std::string id() const override { return "EventWorkspace"; }
// Constructor
EventWorkspace();
// Destructor
- virtual ~EventWorkspace();
+ ~EventWorkspace() override;
/// Returns a clone of the workspace
std::unique_ptr<EventWorkspace> clone() const {
@@ -53,48 +53,51 @@ public:
}
// Initialize the pixels
- void init(const std::size_t &, const std::size_t &, const std::size_t &);
+ void init(const std::size_t &, const std::size_t &,
+ const std::size_t &) override;
void copyDataFrom(const EventWorkspace &source,
std::size_t sourceStartWorkspaceIndex = 0,
std::size_t sourceEndWorkspaceIndex = size_t(-1));
- virtual bool threadSafe() const;
+ bool threadSafe() const override;
//------------------------------------------------------------
// Returns the number of single indexable items in the workspace
- std::size_t size() const;
+ std::size_t size() const override;
// Get the blocksize, aka the number of bins in the histogram
- std::size_t blocksize() const;
+ std::size_t blocksize() const override;
- size_t getMemorySize() const;
+ size_t getMemorySize() const override;
// Get the number of histograms. aka the number of pixels or detectors.
- virtual std::size_t getNumberHistograms() const;
+ std::size_t getNumberHistograms() const override;
//------------------------------------------------------------
// Return the underlying ISpectrum ptr at the given workspace index.
- virtual Mantid::API::ISpectrum *getSpectrum(const size_t index);
+ Mantid::API::ISpectrum *getSpectrum(const size_t index) override;
// Return the underlying ISpectrum ptr (const version) at the given workspace
// index.
- virtual const Mantid::API::ISpectrum *getSpectrum(const size_t index) const;
+ const Mantid::API::ISpectrum *getSpectrum(const size_t index) const override;
//------------------------------------------------------------
- double getTofMin() const;
+ double getTofMin() const override;
- double getTofMax() const;
+ double getTofMax() const override;
- Mantid::Kernel::DateAndTime getPulseTimeMin() const;
+ Mantid::Kernel::DateAndTime getPulseTimeMin() const override;
- Mantid::Kernel::DateAndTime getPulseTimeMax() const;
+ Mantid::Kernel::DateAndTime getPulseTimeMax() const override;
- Mantid::Kernel::DateAndTime getTimeAtSampleMin(double tofOffset = 0) const;
+ Mantid::Kernel::DateAndTime
+ getTimeAtSampleMin(double tofOffset = 0) const override;
- Mantid::Kernel::DateAndTime getTimeAtSampleMax(double tofOffset = 0) const;
+ Mantid::Kernel::DateAndTime
+ getTimeAtSampleMax(double tofOffset = 0) const override;
double getEventXMin() const;
double getEventXMax() const;
@@ -102,36 +105,36 @@ public:
//------------------------------------------------------------
// Return the data X vector at a given workspace index
- MantidVec &dataX(const std::size_t);
+ MantidVec &dataX(const std::size_t) override;
// Return the data Y vector at a given workspace index
- MantidVec &dataY(const std::size_t);
+ MantidVec &dataY(const std::size_t) override;
// Return the data E vector at a given workspace index
- MantidVec &dataE(const std::size_t);
+ MantidVec &dataE(const std::size_t) override;
// Return the X data erro vector at a given workspace index
- MantidVec &dataDx(const std::size_t);
+ MantidVec &dataDx(const std::size_t) override;
// Return the const data X vector at a given workspace index
- const MantidVec &dataX(const std::size_t) const;
+ const MantidVec &dataX(const std::size_t) const override;
// Return the const data Y vector at a given workspace index
- const MantidVec &dataY(const std::size_t) const;
+ const MantidVec &dataY(const std::size_t) const override;
// Return the const data E vector at a given workspace index
- const MantidVec &dataE(const std::size_t) const;
+ const MantidVec &dataE(const std::size_t) const override;
// Return the const X data error vector at a given workspace index
- const MantidVec &dataDx(const std::size_t) const;
+ const MantidVec &dataDx(const std::size_t) const override;
// Get a pointer to the x data at the given workspace index
- Kernel::cow_ptr<MantidVec> refX(const std::size_t) const;
+ Kernel::cow_ptr<MantidVec> refX(const std::size_t) const override;
/// Generate a new histogram from specified event list at the given index.
void generateHistogram(const std::size_t index, const MantidVec &X,
MantidVec &Y, MantidVec &E,
- bool skipError = false) const;
+ bool skipError = false) const override;
/// Generate a new histogram from specified event list at the given index.
void generateHistogramPulseTime(const std::size_t index, const MantidVec &X,
@@ -150,7 +153,7 @@ public:
getEventList(const std::size_t workspace_index) const;
// Get an EventList pointer at the given workspace index number
- virtual EventList *getEventListPtr(const std::size_t workspace_index);
+ EventList *getEventListPtr(const std::size_t workspace_index) override;
// Get or add an EventList
EventList &getOrAddEventList(const std::size_t workspace_index);
@@ -167,21 +170,21 @@ public:
//------------------------------------------------------------
// The total number of events across all of the spectra.
- virtual std::size_t getNumberEvents() const;
+ std::size_t getNumberEvents() const override;
// Type of the events
- Mantid::API::EventType getEventType() const;
+ Mantid::API::EventType getEventType() const override;
// Change the event type
void switchEventType(const Mantid::API::EventType type);
// Returns true always - an EventWorkspace always represents histogramm-able
// data
- virtual bool isHistogramData() const;
+ bool isHistogramData() const override;
std::size_t MRUSize() const;
- void clearMRU() const;
+ void clearMRU() const override;
void clearData();
@@ -191,9 +194,9 @@ public:
void sortAll(EventSortType sortType, Mantid::API::Progress *prog) const;
void sortAllOld(EventSortType sortType, Mantid::API::Progress *prog) const;
- virtual void getIntegratedSpectra(std::vector<double> &out, const double minX,
- const double maxX,
- const bool entireRange) const;
+ void getIntegratedSpectra(std::vector<double> &out, const double minX,
+ const double maxX,
+ const bool entireRange) const override;
protected:
/// Protected copy constructor. May be used by childs for cloning.
@@ -202,7 +205,7 @@ protected:
EventWorkspace &operator=(const EventWorkspace &other);
private:
- virtual EventWorkspace *doClone() const { return new EventWorkspace(*this); }
+ EventWorkspace *doClone() const override { return new EventWorkspace(*this); }
/** A vector that holds the event list for each spectrum; the key is
* the workspace index, which is not necessarily the pixelid.
diff --git a/Framework/DataObjects/inc/MantidDataObjects/GroupingWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/GroupingWorkspace.h
index 968cf37b320bf308165fd0611cdba2eb643def67..36abdadf2237b1a0794c6fa3c31089b9aa82201e 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/GroupingWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/GroupingWorkspace.h
@@ -23,7 +23,7 @@ public:
GroupingWorkspace(Geometry::Instrument_const_sptr inst);
GroupingWorkspace();
GroupingWorkspace(size_t numvectors);
- ~GroupingWorkspace();
+ ~GroupingWorkspace() override;
/// Returns a clone of the workspace
std::unique_ptr<GroupingWorkspace> clone() const {
@@ -32,7 +32,7 @@ public:
/** Gets the name of the workspace type
@return Standard string name */
- virtual const std::string id() const { return "GroupingWorkspace"; }
+ const std::string id() const override { return "GroupingWorkspace"; }
void makeDetectorIDToGroupMap(std::map<detid_t, int> &detIDToGroup,
int64_t &ngroups) const;
@@ -47,7 +47,7 @@ protected:
GroupingWorkspace &operator=(const GroupingWorkspace &other);
private:
- virtual GroupingWorkspace *doClone() const {
+ GroupingWorkspace *doClone() const override {
return new GroupingWorkspace(*this);
}
};
diff --git a/Framework/DataObjects/inc/MantidDataObjects/Histogram1D.h b/Framework/DataObjects/inc/MantidDataObjects/Histogram1D.h
index 435eaab0d4f68d2c75bae123b883ad0356215458..2538eea3fdf7abc4b530387830bc190f19ed15d6 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/Histogram1D.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/Histogram1D.h
@@ -40,46 +40,46 @@ public:
Histogram1D();
Histogram1D(const Histogram1D &);
Histogram1D &operator=(const Histogram1D &);
- virtual ~Histogram1D();
+ ~Histogram1D() override;
/// Sets the data.
- void setData(const MantidVec &Y) { refY.access() = Y; };
+ void setData(const MantidVec &Y) override { refY.access() = Y; };
/// Sets the data and errors
- void setData(const MantidVec &Y, const MantidVec &E) {
+ void setData(const MantidVec &Y, const MantidVec &E) override {
refY.access() = Y;
refE.access() = E;
}
/// Sets the data.
- void setData(const MantidVecPtr &Y) { refY = Y; }
+ void setData(const MantidVecPtr &Y) override { refY = Y; }
/// Sets the data and errors
- void setData(const MantidVecPtr &Y, const MantidVecPtr &E) {
+ void setData(const MantidVecPtr &Y, const MantidVecPtr &E) override {
refY = Y;
refE = E;
}
/// Sets the data.
- void setData(const MantidVecPtr::ptr_type &Y) { refY = Y; }
+ void setData(const MantidVecPtr::ptr_type &Y) override { refY = Y; }
/// Sets the data and errors
void setData(const MantidVecPtr::ptr_type &Y,
- const MantidVecPtr::ptr_type &E) {
+ const MantidVecPtr::ptr_type &E) override {
refY = Y;
refE = E;
}
/// Zero the data (Y&E) in this spectrum
- void clearData();
+ void clearData() override;
// Get the array data
/// Returns the y data const
- virtual const MantidVec &dataY() const { return *refY; }
+ const MantidVec &dataY() const override { return *refY; }
/// Returns the error data const
- virtual const MantidVec &dataE() const { return *refE; }
+ const MantidVec &dataE() const override { return *refE; }
/// Returns the y data
- virtual MantidVec &dataY() { return refY.access(); }
+ MantidVec &dataY() override { return refY.access(); }
/// Returns the error data
- virtual MantidVec &dataE() { return refE.access(); }
+ MantidVec &dataE() override { return refE.access(); }
virtual std::size_t size() const { return refY->size(); } ///< get pseudo size
@@ -87,7 +87,7 @@ public:
bool isError() const { return refE->empty(); }
/// Gets the memory size of the histogram
- size_t getMemorySize() const {
+ size_t getMemorySize() const override {
return ((refX->size() + refY->size() + refE->size()) * sizeof(double));
}
};
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDBox.h b/Framework/DataObjects/inc/MantidDataObjects/MDBox.h
index c4cd76d7e5544ca572aca3224c15ec3304a4594b..bffd2744448d6ce29de5f70dbcd3da22fcd0155c 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDBox.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDBox.h
@@ -60,49 +60,49 @@ public:
MDBox(const MDBox<MDE, nd> &other, Mantid::API::BoxController *const otherBC);
- virtual ~MDBox();
+ ~MDBox() override;
// ----------------------------- ISaveable Methods
// ------------------------------------------------------
- virtual Kernel::ISaveable *getISaveable();
- virtual Kernel::ISaveable *getISaveable() const;
- virtual void setFileBacked(const uint64_t /*fileLocation*/,
+ Kernel::ISaveable *getISaveable() override;
+ Kernel::ISaveable *getISaveable() const override;
+ void setFileBacked(const uint64_t /*fileLocation*/,
const size_t /*fileSize*/,
- const bool /*markSaved*/);
- virtual void setFileBacked();
- virtual void clearFileBacked(bool loadDiskBackedData);
+ const bool /*markSaved*/) override;
+ void setFileBacked() override;
+ void clearFileBacked(bool loadDiskBackedData) override;
//-----------------------------------------------------------------------------------------------
- virtual void saveAt(API::IBoxControllerIO *const /* */,
- uint64_t /*position*/) const;
- virtual void loadAndAddFrom(API::IBoxControllerIO *const /* */,
- uint64_t /*position*/, size_t /* Size */);
- virtual void reserveMemoryForLoad(uint64_t /* Size */);
+ void saveAt(API::IBoxControllerIO *const /* */,
+ uint64_t /*position*/) const override;
+ void loadAndAddFrom(API::IBoxControllerIO *const /* */,
+ uint64_t /*position*/, size_t /* Size */) override;
+ void reserveMemoryForLoad(uint64_t /* Size */) override;
/**drop events data from memory but keep averages (and file-backed info) */
- void clearDataFromMemory();
+ void clearDataFromMemory() override;
/** */
- void clear();
+ void clear() override;
- uint64_t getNPoints() const;
- size_t getDataInMemorySize() const { return data.size(); }
- uint64_t getTotalDataSize() const { return getNPoints(); }
+ uint64_t getNPoints() const override;
+ size_t getDataInMemorySize() const override { return data.size(); }
+ uint64_t getTotalDataSize() const override { return getNPoints(); }
- size_t getNumDims() const;
- size_t getNumMDBoxes() const;
+ size_t getNumDims() const override;
+ size_t getNumMDBoxes() const override;
/// Get the # of children MDBoxBase'es (non-recursive)
- size_t getNumChildren() const { return 0; }
+ size_t getNumChildren() const override { return 0; }
// to avoid casting (which need also the number of dimensions) method say if
// Node is a box. if not, it is gridbox
- virtual bool isBox() const { return true; }
+ bool isBox() const override { return true; }
/// Return the indexth child MDBoxBase.
- API::IMDNode *getChild(size_t /*index*/) {
+ API::IMDNode *getChild(size_t /*index*/) override {
throw std::runtime_error("MDBox does not have children.");
}
/// Sets the children from a vector of children
void setChildren(const std::vector<API::IMDNode *> & /*boxes*/,
- const size_t /*indexStart*/, const size_t /*indexEnd*/) {
+ const size_t /*indexStart*/, const size_t /*indexEnd*/) override {
throw std::runtime_error("MDBox cannot have children.");
}
@@ -128,82 +128,82 @@ public:
const std::vector<MDE> &getEvents() const;
void releaseEvents();
- std::vector<MDE> *getEventsCopy();
+ std::vector<MDE> *getEventsCopy() override;
- virtual void getEventsData(std::vector<coord_t> &coordTable,
- size_t &nColumns) const;
- virtual void setEventsData(const std::vector<coord_t> &coordTable);
+ void getEventsData(std::vector<coord_t> &coordTable,
+ size_t &nColumns) const override;
+ void setEventsData(const std::vector<coord_t> &coordTable) override;
- virtual void addEvent(const MDE &Evnt);
- virtual void addEventUnsafe(const MDE &Evnt);
+ void addEvent(const MDE &Evnt) override;
+ void addEventUnsafe(const MDE &Evnt) override;
// add range of events
- virtual size_t addEvents(const std::vector<MDE> &events);
+ size_t addEvents(const std::vector<MDE> &events) override;
// unhide MDBoxBase methods
- virtual size_t addEventsUnsafe(const std::vector<MDE> &events);
+ size_t addEventsUnsafe(const std::vector<MDE> &events) override;
/*---------------> EVENTS from event data
* <-------------------------------------------------------------*/
- virtual void buildAndAddEvent(const signal_t Signal, const signal_t errorSq,
+ void buildAndAddEvent(const signal_t Signal, const signal_t errorSq,
const std::vector<coord_t> &point,
- uint16_t runIndex, uint32_t detectorId);
- virtual void buildAndAddEventUnsafe(const signal_t Signal,
+ uint16_t runIndex, uint32_t detectorId) override;
+ void buildAndAddEventUnsafe(const signal_t Signal,
const signal_t errorSq,
const std::vector<coord_t> &point,
- uint16_t runIndex, uint32_t detectorId);
- virtual size_t buildAndAddEvents(const std::vector<signal_t> &sigErrSq,
+ uint16_t runIndex, uint32_t detectorId) override;
+ size_t buildAndAddEvents(const std::vector<signal_t> &sigErrSq,
const std::vector<coord_t> &Coord,
const std::vector<uint16_t> &runIndex,
- const std::vector<uint32_t> &detectorId);
+ const std::vector<uint32_t> &detectorId) override;
//---------------------------------------------------------------------------------------------------------------------------------
- void centerpointBin(MDBin<MDE, nd> &bin, bool *fullyContained) const;
+ void centerpointBin(MDBin<MDE, nd> &bin, bool *fullyContained) const override;
void generalBin(MDBin<MDE, nd> &bin,
- Mantid::Geometry::MDImplicitFunction &function) const;
+ Mantid::Geometry::MDImplicitFunction &function) const override;
void splitAllIfNeeded(Mantid::Kernel::ThreadScheduler * /*ts*/ =
- NULL) { /* Do nothing with a box default. */
+ NULL) override { /* Do nothing with a box default. */
}
//---------------------------------------------------------------------------------------------------------------------------------
/** Recalculate signal and various averages dependent on signal and the signal
* coordinates */
- void refreshCache(Kernel::ThreadScheduler * /*ts*/ = NULL);
- void calculateCentroid(coord_t *centroid) const;
- void calculateCentroid(coord_t *centroid, const int runindex) const;
- coord_t *getCentroid() const;
+ void refreshCache(Kernel::ThreadScheduler * /*ts*/ = NULL) override;
+ void calculateCentroid(coord_t *centroid) const override;
+ void calculateCentroid(coord_t *centroid, const int runindex) const override;
+ coord_t *getCentroid() const override;
void calculateDimensionStats(MDDimensionStats *stats) const;
void integrateSphere(Mantid::API::CoordTransform &radiusTransform,
const coord_t radiusSquared, signal_t &signal,
- signal_t &errorSquared) const;
+ signal_t &errorSquared) const override;
void centroidSphere(Mantid::API::CoordTransform &radiusTransform,
const coord_t radiusSquared, coord_t *centroid,
- signal_t &signal) const;
+ signal_t &signal) const override;
void integrateCylinder(Mantid::API::CoordTransform &radiusTransform,
const coord_t radius, const coord_t length,
signal_t &signal, signal_t &errorSquared,
- std::vector<signal_t> &signal_fit) const;
+ std::vector<signal_t> &signal_fit) const override;
//------------------------------------------------------------------------------------------------------------------------------------
void getBoxes(std::vector<MDBoxBase<MDE, nd> *> &boxes, size_t /*maxDepth*/,
bool /*leafOnly*/);
void getBoxes(std::vector<API::IMDNode *> &boxes, size_t /*maxDepth*/,
- bool /*leafOnly*/);
+ bool /*leafOnly*/) override;
void getBoxes(std::vector<MDBoxBase<MDE, nd> *> &boxes, size_t maxDepth,
bool leafOnly, Mantid::Geometry::MDImplicitFunction *function);
void getBoxes(std::vector<API::IMDNode *> &boxes, size_t maxDepth,
- bool leafOnly, Mantid::Geometry::MDImplicitFunction *function);
+ bool leafOnly, Mantid::Geometry::MDImplicitFunction *function) override;
//------------------------------------------------------------------------------------------------------------------------------------
void transformDimensions(std::vector<double> &scaling,
- std::vector<double> &offset);
+ std::vector<double> &offset) override;
//------------------------------------------------------------------------------------------------------------------------------------
/* Getter to determine if masking is applied.
@return true if masking is applied. */
- virtual bool getIsMasked() const { return m_bIsMasked; }
+ bool getIsMasked() const override { return m_bIsMasked; }
/// Setter for masking the box
- void mask();
+ void mask() override;
/// Setter for unmasking the box
- void unmask();
+ void unmask() override;
protected:
// the pointer to the class, responsible for saving/restoring this class to
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDBoxBase.h b/Framework/DataObjects/inc/MantidDataObjects/MDBoxBase.h
index 985985c09c37d842b5ded8b01951e239bd3a92f5..225ed2a0080ba3d66bd4af3d57a24b53f1a4e365 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDBoxBase.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDBoxBase.h
@@ -57,32 +57,32 @@ public:
Mantid::API::BoxController *const otherBC);
/// Destructor
- virtual ~MDBoxBase() {}
+ ~MDBoxBase() override {}
///@return the type of the event this box contains
- virtual std::string getEventType() const { return MDE::getTypeName(); }
+ std::string getEventType() const override { return MDE::getTypeName(); }
///@return the length of the coordinates (in bytes), the events in the box
/// contain.
- virtual unsigned int getCoordType() const { return sizeof(coord_t); }
+ unsigned int getCoordType() const override { return sizeof(coord_t); }
///@return The special ID which specify location of this node in the chain of
/// ordered boxes (e.g. on a file)
- virtual size_t getID() const { return m_fileID; }
+ size_t getID() const override { return m_fileID; }
/// sets the special id, which specify the position of this node in the chain
/// linearly ordered nodes
- virtual void setID(const size_t &newID) { m_fileID = newID; }
+ void setID(const size_t &newID) override { m_fileID = newID; }
// -------------------------------- Parents/Children-Related
// -------------------------------------------
/// Return a pointer to the parent box
- void setParent(IMDNode *parent) { m_parent = parent; }
+ void setParent(IMDNode *parent) override { m_parent = parent; }
/// Return a pointer to the parent box
- IMDNode *getParent() { return m_parent; }
+ IMDNode *getParent() override { return m_parent; }
/// Return a pointer to the parent box (const)
- const IMDNode *getParent() const { return m_parent; }
+ const IMDNode *getParent() const override { return m_parent; }
/// Returns the lowest-level box at the given coordinates
- virtual const IMDNode *getBoxAtCoord(const coord_t * /*coords*/) {
+ const IMDNode *getBoxAtCoord(const coord_t * /*coords*/) override {
return this;
}
@@ -91,8 +91,8 @@ public:
/** The method to convert events in a box into a table of
* coodrinates/signal/errors casted into coord_t type
* Used to conver events into plain data array. Does nothing for GridBox */
- virtual void getEventsData(std::vector<coord_t> & /*coordTable*/,
- size_t &nColumns) const {
+ void getEventsData(std::vector<coord_t> & /*coordTable*/,
+ size_t &nColumns) const override {
nColumns = 0;
}
/** The method to convert the table of data into vector of events
@@ -100,7 +100,7 @@ public:
representation (by rows) into box events.
Does nothing for GridBox (may be temporary) -- can be combined with
build and add events */
- virtual void setEventsData(const std::vector<coord_t> & /*coordTable*/) {}
+ void setEventsData(const std::vector<coord_t> & /*coordTable*/) override {}
/// Return a copy of contained events
virtual std::vector<MDE> *getEventsCopy() = 0;
@@ -128,41 +128,40 @@ public:
Mantid::Geometry::MDImplicitFunction &function) const = 0;
/** Sphere (peak) integration */
- virtual void integrateSphere(Mantid::API::CoordTransform &radiusTransform,
- const coord_t radiusSquared, signal_t &signal,
- signal_t &errorSquared) const = 0;
+ void integrateSphere(Mantid::API::CoordTransform &radiusTransform,
+ const coord_t radiusSquared, signal_t &signal,
+ signal_t &errorSquared) const override = 0;
/** Find the centroid around a sphere */
- virtual void centroidSphere(Mantid::API::CoordTransform &radiusTransform,
- const coord_t radiusSquared, coord_t *centroid,
- signal_t &signal) const = 0;
+ void centroidSphere(Mantid::API::CoordTransform &radiusTransform,
+ const coord_t radiusSquared, coord_t *centroid,
+ signal_t &signal) const override = 0;
/** Cylinder (peak) integration */
- virtual void integrateCylinder(Mantid::API::CoordTransform &radiusTransform,
- const coord_t radius, const coord_t length,
- signal_t &signal, signal_t &errorSquared,
- std::vector<signal_t> &signal_fit) const = 0;
+ void integrateCylinder(Mantid::API::CoordTransform &radiusTransform,
+ const coord_t radius, const coord_t length,
+ signal_t &signal, signal_t &errorSquared,
+ std::vector<signal_t> &signal_fit) const override = 0;
// -------------------------------------------------------------------------------------------
/// @return the const box controller for this box.
- Mantid::API::BoxController *getBoxController() const {
+ Mantid::API::BoxController *getBoxController() const override {
return m_BoxController;
}
/// @return the box controller for this box.
- virtual Mantid::API::BoxController *getBoxController() {
+ Mantid::API::BoxController *getBoxController() override {
return m_BoxController;
}
// -------------------------------- Geometry/vertexes-Related
// -------------------------------------------
- virtual std::vector<Mantid::Kernel::VMD> getVertexes() const;
- virtual coord_t *getVertexesArray(size_t &numVertices) const;
- virtual coord_t *getVertexesArray(size_t &numVertices,
- const size_t outDimensions,
- const bool *maskDim) const;
- virtual void transformDimensions(std::vector<double> &scaling,
- std::vector<double> &offset);
+ std::vector<Mantid::Kernel::VMD> getVertexes() const override;
+ coord_t *getVertexesArray(size_t &numVertices) const override;
+ coord_t *getVertexesArray(size_t &numVertices, const size_t outDimensions,
+ const bool *maskDim) const override;
+ void transformDimensions(std::vector<double> &scaling,
+ std::vector<double> &offset) override;
//-----------------------------------------------------------------------------------------------
/** Set the extents of this box.
@@ -196,8 +195,8 @@ public:
//-----------------------------------------------------------------------------------------------
/** Get the extents for this box */
- virtual Mantid::Geometry::MDDimensionExtents<coord_t> &
- getExtents(size_t dim) {
+ Mantid::Geometry::MDDimensionExtents<coord_t> &
+ getExtents(size_t dim) override {
return extents[dim];
}
@@ -225,7 +224,7 @@ public:
* @param center :: bare array of size[nd] that will get set with the
* mid-point of each dimension.
*/
- virtual void getCenter(coord_t *const center) const {
+ void getCenter(coord_t *const center) const override {
for (size_t d = 0; d < nd; ++d)
center[d] = extents[d].getCentre();
}
@@ -234,7 +233,7 @@ public:
/** Compute the volume of the box by simply multiplying each dimension range.
* Call this after setExtents() is set for all dimensions.
* This is saved for getSignalNormalized() */
- inline void calcVolume() {
+ inline void calcVolume() override {
double volume(1);
for (size_t d = 0; d < nd; d++) {
volume *= double(extents[d].getSize());
@@ -247,17 +246,17 @@ public:
//-----------------------------------------------------------------------------------------------
/** Returns the integrated signal from all points within.
*/
- virtual signal_t getSignal() const { return m_signal; }
+ signal_t getSignal() const override { return m_signal; }
//-----------------------------------------------------------------------------------------------
/** Returns the integrated error from all points within.
*/
- virtual signal_t getError() const { return sqrt(m_errorSquared); }
+ signal_t getError() const override { return sqrt(m_errorSquared); }
//-----------------------------------------------------------------------------------------------
/** Returns the integrated error squared from all points within.
*/
- virtual signal_t getErrorSquared() const { return m_errorSquared; }
+ signal_t getErrorSquared() const override { return m_errorSquared; }
//-----------------------------------------------------------------------------------------------
/** Returns the total weight of all events within. Typically this is
@@ -270,14 +269,14 @@ public:
* testing)
* @param signal :: new Signal amount.
*/
- virtual void setSignal(const signal_t signal) { m_signal = signal; }
+ void setSignal(const signal_t signal) override { m_signal = signal; }
//-----------------------------------------------------------------------------------------------
/** Sets the integrated error squared from all points within (mostly used for
* testing)
* @param ErrorSquared :: new squared error.
*/
- virtual void setErrorSquared(const signal_t ErrorSquared) {
+ void setErrorSquared(const signal_t ErrorSquared) override {
m_errorSquared = ErrorSquared;
}
@@ -291,7 +290,7 @@ public:
/** Returns the integrated signal from all points within, normalized for the
* cell volume
*/
- virtual signal_t getSignalNormalized() const {
+ signal_t getSignalNormalized() const override {
return m_signal * m_inverseVolume;
}
@@ -307,7 +306,7 @@ public:
/** For testing, mostly: return the recursion depth of this box.
* 0 is the top-level box, 1 is one deeper, etc.
* @return split recursion depth*/
- uint32_t getDepth() const { return m_depth; }
+ uint32_t getDepth() const override { return m_depth; }
//-----------------------------------------------------------------------------------------------
/** For testing, mostly: set the recursion depth of this box. SHOULD NOT BE
@@ -321,12 +320,12 @@ public:
//-----------------------------------------------------------------------------------------------
/** Return the inverse of the volume of the cell */
- virtual coord_t getInverseVolume() const { return m_inverseVolume; }
+ coord_t getInverseVolume() const override { return m_inverseVolume; }
//-----------------------------------------------------------------------------------------------
/** Sets the inverse of the volume of the cell
* @param invVolume :: value to set. */
- void setInverseVolume(const coord_t invVolume) {
+ void setInverseVolume(const coord_t invVolume) override {
m_inverseVolume = invVolume;
}
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDBoxIterator.h b/Framework/DataObjects/inc/MantidDataObjects/MDBoxIterator.h
index fe6e414c2105a239ffa37208dfa5eebd2b8b9d29..a15a484ca40a29a3080201a1c396a7ebb3fbc3e9 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDBoxIterator.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDBoxIterator.h
@@ -30,61 +30,61 @@ public:
Mantid::Geometry::MDImplicitFunction *function = NULL);
MDBoxIterator(std::vector<API::IMDNode *> &boxes, size_t begin, size_t end);
void init(std::vector<API::IMDNode *> &boxes, size_t begin, size_t end);
- virtual ~MDBoxIterator();
+ ~MDBoxIterator() override;
/// Return a pointer to the current box pointed to by the iterator.
MDBoxBase<MDE, nd> *getBox() const { return (m_current); }
/// ------------ IMDIterator Methods ------------------------------
- size_t getDataSize() const;
+ size_t getDataSize() const override;
- bool valid() const;
+ bool valid() const override;
- void jumpTo(size_t index);
+ void jumpTo(size_t index) override;
- bool next();
+ bool next() override;
- bool next(size_t skip);
+ bool next(size_t skip) override;
- signal_t getNormalizedSignal() const;
+ signal_t getNormalizedSignal() const override;
- signal_t getNormalizedError() const;
+ signal_t getNormalizedError() const override;
- signal_t getSignal() const;
+ signal_t getSignal() const override;
- signal_t getError() const;
+ signal_t getError() const override;
coord_t *getVertexesArray(size_t &numVertices, const size_t outDimensions,
- const bool *maskDim) const;
+ const bool *maskDim) const override;
- coord_t *getVertexesArray(size_t &numVertices) const;
+ coord_t *getVertexesArray(size_t &numVertices) const override;
- Mantid::Kernel::VMD getCenter() const;
+ Mantid::Kernel::VMD getCenter() const override;
- size_t getNumEvents() const;
+ size_t getNumEvents() const override;
- uint16_t getInnerRunIndex(size_t index) const;
+ uint16_t getInnerRunIndex(size_t index) const override;
- int32_t getInnerDetectorID(size_t index) const;
+ int32_t getInnerDetectorID(size_t index) const override;
- coord_t getInnerPosition(size_t index, size_t dimension) const;
+ coord_t getInnerPosition(size_t index, size_t dimension) const override;
- signal_t getInnerSignal(size_t index) const;
+ signal_t getInnerSignal(size_t index) const override;
- signal_t getInnerError(size_t index) const;
+ signal_t getInnerError(size_t index) const override;
- bool getIsMasked() const;
+ bool getIsMasked() const override;
/// Getter for the position of the iterator.
size_t getPosition() const { return m_pos; }
- virtual std::vector<size_t> findNeighbourIndexes() const;
+ std::vector<size_t> findNeighbourIndexes() const override;
- virtual std::vector<size_t> findNeighbourIndexesFaceTouching() const;
+ std::vector<size_t> findNeighbourIndexesFaceTouching() const override;
- virtual size_t getLinearIndex() const;
+ size_t getLinearIndex() const override;
- virtual bool isWithinBounds(size_t index) const;
+ bool isWithinBounds(size_t index) const override;
private:
/// Common code run my a few of the constructors.
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDBoxSaveable.h b/Framework/DataObjects/inc/MantidDataObjects/MDBoxSaveable.h
index e8e75c3d3ed6f8b691939ca705b7ee8dccb80d26..c02ce3481f4a5091464527e4bc02543cfae59a4d 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDBoxSaveable.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDBoxSaveable.h
@@ -42,29 +42,29 @@ public:
MDBoxSaveable(API::IMDNode *const);
/// Save the data to the place, specified by the object
- virtual void save() const;
+ void save() const override;
/// Load the data which are not in memory yet and merge them with the data in
/// memory;
- virtual void load();
+ void load() override;
/// Method to flush the data to disk and ensure it is written.
- virtual void flushData() const;
+ void flushData() const override;
/// remove objects data from memory but keep all averages
- virtual void clearDataFromMemory() { m_MDNode->clearDataFromMemory(); }
+ void clearDataFromMemory() override { m_MDNode->clearDataFromMemory(); }
/// @return the amount of memory that the object takes up in the MRU.
- virtual uint64_t getTotalDataSize() const {
+ uint64_t getTotalDataSize() const override {
return m_MDNode->getTotalDataSize();
}
/**@return the size of the event vector. ! Note that this is NOT necessarily
the same as the number of points
(because it might be cached to disk) or the size on disk (because you might
have called AddEvents) */
- virtual size_t getDataMemorySize() const {
+ size_t getDataMemorySize() const override {
return m_MDNode->getDataInMemorySize();
}
- ~MDBoxSaveable() {}
+ ~MDBoxSaveable() override {}
private:
API::IMDNode *const m_MDNode;
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.h
index f6ba4709928de513bd3403985bcf6604ec9338e3..cdf200c45a22259f4b81c823781f858c351fb7e0 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.h
@@ -44,7 +44,7 @@ public:
Mantid::API::MDNormalization preferredNormalizationHisto =
Mantid::API::MDNormalization::VolumeNormalization);
- virtual ~MDEventWorkspace();
+ ~MDEventWorkspace() override;
/// Returns a clone of the workspace
std::unique_ptr<MDEventWorkspace> clone() const {
@@ -52,35 +52,35 @@ public:
}
/// Perform initialization after dimensions (and others) have been set.
- virtual void initialize();
+ void initialize() override;
- virtual const std::string id() const;
+ const std::string id() const override;
//------------------------ IMDWorkspace Methods
//-----------------------------------------
/** @returns the number of dimensions in this workspace */
- virtual size_t getNumDims() const;
+ size_t getNumDims() const override;
/** @returns the total number of points (events) in this workspace */
- virtual uint64_t getNPoints() const;
- virtual uint64_t getNEvents() const { return getNPoints(); }
+ uint64_t getNPoints() const override;
+ uint64_t getNEvents() const override { return getNPoints(); }
/// Creates a new iterator pointing to the first cell (box) in the workspace
- virtual std::vector<Mantid::API::IMDIterator *>
- createIterators(size_t suggestedNumCores = 1,
- Mantid::Geometry::MDImplicitFunction *function = NULL) const;
+ std::vector<Mantid::API::IMDIterator *> createIterators(
+ size_t suggestedNumCores = 1,
+ Mantid::Geometry::MDImplicitFunction *function = NULL) const override;
/// Returns the (normalized) signal at a given coordinates
- virtual signal_t
- getSignalAtCoord(const coord_t *coords,
- const Mantid::API::MDNormalization &normalization) const;
+ signal_t getSignalAtCoord(
+ const coord_t *coords,
+ const Mantid::API::MDNormalization &normalization) const override;
/// Returns the (normalized) signal at a given coordinates
// or 0 if masked
- virtual signal_t getSignalWithMaskAtCoord(
+ signal_t getSignalWithMaskAtCoord(
const coord_t *coords,
- const Mantid::API::MDNormalization &normalization) const;
+ const Mantid::API::MDNormalization &normalization) const override;
bool isInBounds(const coord_t *coords) const;
@@ -88,56 +88,59 @@ public:
getNormalizedSignal(const API::IMDNode *box,
const Mantid::API::MDNormalization &normalization) const;
- virtual void getLinePlot(const Mantid::Kernel::VMD &start,
- const Mantid::Kernel::VMD &end,
- API::MDNormalization normalize,
- std::vector<coord_t> &x, std::vector<signal_t> &y,
- std::vector<signal_t> &e) const;
+ void getLinePlot(const Mantid::Kernel::VMD &start,
+ const Mantid::Kernel::VMD &end,
+ API::MDNormalization normalize, std::vector<coord_t> &x,
+ std::vector<signal_t> &y,
+ std::vector<signal_t> &e) const override;
//------------------------ (END) IMDWorkspace Methods
//-----------------------------------------
/** @returns the number of bytes of memory used by the workspace. */
- virtual size_t getMemorySize() const;
+ size_t getMemorySize() const override;
//------------------------ IMDEventWorkspace Methods
//-----------------------------------------
/// Returns the BoxController used in this workspace
- Mantid::API::BoxController_sptr getBoxController() { return m_BoxController; }
+ Mantid::API::BoxController_sptr getBoxController() override {
+ return m_BoxController;
+ }
/// Returns the BoxController used in this workspace
- Mantid::API::BoxController_const_sptr getBoxController() const {
+ Mantid::API::BoxController_const_sptr getBoxController() const override {
return m_BoxController;
}
- virtual std::vector<std::string> getBoxControllerStats() const;
+ std::vector<std::string> getBoxControllerStats() const override;
/// @return true if the workspace is file-backed
- virtual bool isFileBacked() const { return m_BoxController->isFileBacked(); }
+ bool isFileBacked() const override { return m_BoxController->isFileBacked(); }
- std::vector<coord_t> estimateResolution() const;
+ std::vector<coord_t> estimateResolution() const override;
- virtual void splitAllIfNeeded(Kernel::ThreadScheduler *ts);
+ void splitAllIfNeeded(Kernel::ThreadScheduler *ts) override;
void splitTrackedBoxes(Kernel::ThreadScheduler *ts);
- virtual void splitBox();
+ void splitBox() override;
- virtual void refreshCache();
+ void refreshCache() override;
- std::string getEventTypeName() const;
+ std::string getEventTypeName() const override;
/// return the size (in bytes) of an event, this workspace contains
- size_t sizeofEvent() const { return sizeof(MDE); }
+ size_t sizeofEvent() const override { return sizeof(MDE); }
- virtual void setMinRecursionDepth(size_t minDepth);
+ void setMinRecursionDepth(size_t minDepth) override;
- Mantid::API::ITableWorkspace_sptr makeBoxTable(size_t start, size_t num);
+ Mantid::API::ITableWorkspace_sptr makeBoxTable(size_t start,
+ size_t num) override;
//------------------------ (END) IMDEventWorkspace Methods
//-----------------------------------------
- virtual void getBoxes(std::vector<API::IMDNode *> &boxes, size_t maxDepth,
- bool leafOnly) {
+ void getBoxes(std::vector<API::IMDNode *> &boxes, size_t maxDepth,
+ bool leafOnly) override {
this->getBox()->getBoxes(boxes, maxDepth, leafOnly);
}
@@ -146,7 +149,7 @@ public:
size_t addEvents(const std::vector<MDE> &events);
std::vector<Mantid::Geometry::MDDimensionExtents<coord_t>>
- getMinimumExtents(size_t depth = 2);
+ getMinimumExtents(size_t depth = 2) override;
/// Return true if the underlying box is a MDGridBox.
bool isGridBox() {
@@ -167,31 +170,33 @@ public:
}
/// Apply masking
- void setMDMasking(Mantid::Geometry::MDImplicitFunction *maskingRegion);
+ void
+ setMDMasking(Mantid::Geometry::MDImplicitFunction *maskingRegion) override;
/// Clear masking
- void clearMDMasking();
+ void clearMDMasking() override;
/// Get the coordinate system.
- Kernel::SpecialCoordinateSystem getSpecialCoordinateSystem() const;
+ Kernel::SpecialCoordinateSystem getSpecialCoordinateSystem() const override;
/// Set the coordinate system.
- void setCoordinateSystem(const Kernel::SpecialCoordinateSystem coordSystem);
+ void setCoordinateSystem(
+ const Kernel::SpecialCoordinateSystem coordSystem) override;
/// make the workspace file backed if it has not been already file backed;
virtual void setFileBacked(const std::string &fileName);
/// if workspace was file-backed, this should clear file-backed information
/// and close back-up files.
- virtual void clearFileBacked(bool LoadFileBackedData);
+ void clearFileBacked(bool LoadFileBackedData) override;
/// Preferred visual normalizaiton method for any histo workspaces created
/// from this.
- virtual void setDisplayNormalizationHisto(
- Mantid::API::MDNormalization preferredNormalizationHisto);
- virtual Mantid::API::MDNormalization displayNormalizationHisto() const;
+ void setDisplayNormalizationHisto(
+ Mantid::API::MDNormalization preferredNormalizationHisto) override;
+ Mantid::API::MDNormalization displayNormalizationHisto() const override;
/// Preferred visual normalization method.
- virtual void
- setDisplayNormalization(Mantid::API::MDNormalization preferredNormalization);
- virtual Mantid::API::MDNormalization displayNormalization() const;
+ void setDisplayNormalization(
+ Mantid::API::MDNormalization preferredNormalization) override;
+ Mantid::API::MDNormalization displayNormalization() const override;
protected:
/// Protected copy constructor. May be used by childs for cloning.
@@ -219,7 +224,7 @@ protected:
Mantid::API::MDNormalization m_displayNormalizationHisto;
private:
- virtual MDEventWorkspace *doClone() const {
+ MDEventWorkspace *doClone() const override {
return new MDEventWorkspace(*this);
}
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.h b/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.h
index 3eb0ad775850d47a9b8a6b0e9fa10efa5cfeb16d..a3a3014b04b4ebf9e8270f73d139972a3d3e5e3f 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDGridBox.h
@@ -50,130 +50,130 @@ public:
MDGridBox(const MDGridBox<MDE, nd> &box,
Mantid::API::BoxController *const otherBC);
- virtual ~MDGridBox();
+ ~MDGridBox() override;
// ----------------------------- ISaveable Methods
// ------------------------------------------------------
/**get object responsible for saving the box to a file.
*@return the const pointer to the object. The GridBox is not saveable at the
*moment so it is always NULL */
- virtual Kernel::ISaveable *getISaveable() { return NULL; }
+ Kernel::ISaveable *getISaveable() override { return NULL; }
/**get const object responsible for saving the box to a file.
*@return the const pointer the const object. The GridBox is not saveable at
*the moment so it is always NULL */
- virtual Kernel::ISaveable *getISaveable() const { return NULL; }
+ Kernel::ISaveable *getISaveable() const override { return NULL; }
/**Recursively make all underlaying boxes file-backed*/
- virtual void setFileBacked(const uint64_t /*fileLocation*/,
+ void setFileBacked(const uint64_t /*fileLocation*/,
const size_t /*fileSize*/,
- const bool /*markSaved*/);
- virtual void setFileBacked();
- virtual void clearFileBacked(bool loadDiskBackedData);
- void clear();
- void clearDataFromMemory() { /*it seems works on boxes only though recursive
+ const bool /*markSaved*/) override;
+ void setFileBacked() override;
+ void clearFileBacked(bool loadDiskBackedData) override;
+ void clear() override;
+ void clearDataFromMemory() override { /*it seems works on boxes only though recursive
clearing makes sence, not yet implemented*/
}
/**Save the box at specific disk position using the class, respoinsible for
* the file IO. */
- virtual void saveAt(API::IBoxControllerIO *const /* */,
- uint64_t /*position*/) const { /*Not saveable */
+ void saveAt(API::IBoxControllerIO *const /* */,
+ uint64_t /*position*/) const override { /*Not saveable */
}
/**Load the box data of specified size from the disk location provided using
* the class, respoinsible for the file IO. */
- virtual void loadAndAddFrom(API::IBoxControllerIO *const /* */,
+ void loadAndAddFrom(API::IBoxControllerIO *const /* */,
uint64_t /*position*/,
- size_t /* Size */) { /*Not directly loadable */
+ size_t /* Size */) override { /*Not directly loadable */
}
- virtual void
- reserveMemoryForLoad(uint64_t /* Size */) { /*Not directly loadable */
+ void
+ reserveMemoryForLoad(uint64_t /* Size */) override { /*Not directly loadable */
}
//-------------------------------------------------------------------------------------------------------
/** Uses the cached value of points stored in the grid box
* @return the total number of points (events) in this box (in memory and
* in file if present) */
- uint64_t getNPoints() const { return nPoints; }
+ uint64_t getNPoints() const override { return nPoints; }
/// @return the amount of memory that the object's data ocupy. Currently uses
/// cached value.
- virtual uint64_t getTotalDataSize() const { return nPoints; }
+ uint64_t getTotalDataSize() const override { return nPoints; }
/** @return the number of points (events) this box keeps in memory. May be
* different from total number of points for
* file based workspaces/boxes. Calculates recursively from child boxes */
- size_t getDataInMemorySize() const;
+ size_t getDataInMemorySize() const override;
- size_t getNumDims() const;
- size_t getNumMDBoxes() const;
- size_t getNumChildren() const;
+ size_t getNumDims() const override;
+ size_t getNumMDBoxes() const override;
+ size_t getNumChildren() const override;
/// to avoid casting (which need also the number of dimensions) method say if
/// Node is a box. if not, it is gridbox
- virtual bool isBox() const { return false; }
+ bool isBox() const override { return false; }
size_t getChildIndexFromID(size_t childId) const;
- API::IMDNode *getChild(size_t index);
+ API::IMDNode *getChild(size_t index) override;
void setChild(size_t index, MDGridBox<MDE, nd> *newChild);
void setChildren(const std::vector<API::IMDNode *> &boxes,
- const size_t indexStart, const size_t indexEnd);
+ const size_t indexStart, const size_t indexEnd) override;
void getBoxes(std::vector<API::IMDNode *> &boxes, size_t maxDepth,
- bool leafOnly);
+ bool leafOnly) override;
void getBoxes(std::vector<API::IMDNode *> &boxes, size_t maxDepth,
- bool leafOnly, Mantid::Geometry::MDImplicitFunction *function);
+ bool leafOnly, Mantid::Geometry::MDImplicitFunction *function) override;
- const API::IMDNode *getBoxAtCoord(const coord_t *coords);
+ const API::IMDNode *getBoxAtCoord(const coord_t *coords) override;
void transformDimensions(std::vector<double> &scaling,
- std::vector<double> &offset);
+ std::vector<double> &offset) override;
//----------------------------------------------------------------------------
- std::vector<MDE> *getEventsCopy();
+ std::vector<MDE> *getEventsCopy() override;
//----------------------------------------------------------------------------------------------------------------------
- void addEvent(const MDE &event);
- void addEventUnsafe(const MDE &event);
+ void addEvent(const MDE &event) override;
+ void addEventUnsafe(const MDE &event) override;
/*---------------> EVENTS from event data
* <-------------------------------------------------------------*/
- virtual void buildAndAddEvent(const signal_t Signal, const signal_t errorSq,
+ void buildAndAddEvent(const signal_t Signal, const signal_t errorSq,
const std::vector<coord_t> &point,
- uint16_t runIndex, uint32_t detectorId);
- virtual void buildAndAddEventUnsafe(const signal_t Signal,
+ uint16_t runIndex, uint32_t detectorId) override;
+ void buildAndAddEventUnsafe(const signal_t Signal,
const signal_t errorSq,
const std::vector<coord_t> &point,
- uint16_t runIndex, uint32_t detectorId);
- virtual size_t buildAndAddEvents(const std::vector<signal_t> &sigErrSq,
+ uint16_t runIndex, uint32_t detectorId) override;
+ size_t buildAndAddEvents(const std::vector<signal_t> &sigErrSq,
const std::vector<coord_t> &Coord,
const std::vector<uint16_t> &runIndex,
- const std::vector<uint32_t> &detectorId);
+ const std::vector<uint32_t> &detectorId) override;
//----------------------------------------------------------------------------------------------------------------------
- void centerpointBin(MDBin<MDE, nd> &bin, bool *fullyContained) const;
+ void centerpointBin(MDBin<MDE, nd> &bin, bool *fullyContained) const override;
void generalBin(MDBin<MDE, nd> & /*bin*/,
- Mantid::Geometry::MDImplicitFunction & /*function*/) const {}
+ Mantid::Geometry::MDImplicitFunction & /*function*/) const override {}
void integrateSphere(Mantid::API::CoordTransform &radiusTransform,
const coord_t radiusSquared, signal_t &signal,
- signal_t &errorSquared) const;
+ signal_t &errorSquared) const override;
void centroidSphere(Mantid::API::CoordTransform &radiusTransform,
const coord_t radiusSquared, coord_t *centroid,
- signal_t &signal) const;
+ signal_t &signal) const override;
void integrateCylinder(Mantid::API::CoordTransform &radiusTransform,
const coord_t radius, const coord_t length,
signal_t &signal, signal_t &errorSquared,
- std::vector<signal_t> &signal_fit) const;
+ std::vector<signal_t> &signal_fit) const override;
void splitContents(size_t index, Kernel::ThreadScheduler *ts = NULL);
- void splitAllIfNeeded(Kernel::ThreadScheduler *ts = NULL);
+ void splitAllIfNeeded(Kernel::ThreadScheduler *ts = NULL) override;
- void refreshCache(Kernel::ThreadScheduler *ts = NULL);
+ void refreshCache(Kernel::ThreadScheduler *ts = NULL) override;
- virtual bool getIsMasked() const;
+ bool getIsMasked() const override;
/// Setter for masking the box
- virtual void mask();
+ void mask() override;
/// Setter for unmasking the box
- virtual void unmask();
+ void unmask() override;
// ======================= Testing/Debugging Methods =================
/** For testing: get (a reference to) the vector of boxes */
std::vector<MDBoxBase<MDE, nd> *> &getBoxes() { return m_Children; }
@@ -181,21 +181,21 @@ public:
//-------------------------------------------------------------------------
/** The function used to satisfy IMDNode interface but the physical meaning is
* unclear */
- void calculateCentroid(coord_t * /*centroid*/) const {
+ void calculateCentroid(coord_t * /*centroid*/) const override {
throw(std::runtime_error("This function should not be called on MDGridBox "
"(as its meaning for MDbox is dubious too)"));
}
//-------------------------------------------------------------------------
/** The function used to satisfy IMDNode interface but the physical meaning is
* unclear */
- void calculateCentroid(coord_t * /*centroid*/, const int /*runindex*/) const {
+ void calculateCentroid(coord_t * /*centroid*/, const int /*runindex*/) const override {
throw(std::runtime_error("This function should not be called on MDGridBox "
"(as its meaning for MDbox is dubious too)"));
}
//-------------------------------------------------------------------------
/** The function used to satisfy IMDNode interface but the physical meaning is
* unclear */
- coord_t *getCentroid() const {
+ coord_t *getCentroid() const override {
throw(std::runtime_error("This function should not be called on MDGridBox "
"(as its meaning for MDbox is dubious too)"));
}
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspace.h
index fb0ecb77f4c2ff685390b0423c54755d38e48b4b..b9c5e792fbc103d67689d55916f4f4354042cb6a 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspace.h
@@ -52,7 +52,7 @@ public:
Mantid::API::MDNormalization displayNormalization =
Mantid::API::NoNormalization);
- virtual ~MDHistoWorkspace();
+ ~MDHistoWorkspace() override;
/// Returns a clone of the workspace
std::unique_ptr<MDHistoWorkspace> clone() const {
@@ -64,30 +64,30 @@ public:
void cacheValues();
- virtual const std::string id() const { return "MDHistoWorkspace"; }
+ const std::string id() const override { return "MDHistoWorkspace"; }
- virtual size_t getMemorySize() const;
+ size_t getMemorySize() const override;
/// Get the number of points (bins in this case) associated with the
/// workspace;
- uint64_t getNPoints() const { return m_length; }
+ uint64_t getNPoints() const override { return m_length; }
/// get number of contributed events
- uint64_t getNEvents() const;
- virtual std::vector<Mantid::API::IMDIterator *>
- createIterators(size_t suggestedNumCores = 1,
- Mantid::Geometry::MDImplicitFunction *function = NULL) const;
-
- virtual void getLinePlot(const Mantid::Kernel::VMD &start,
- const Mantid::Kernel::VMD &end,
- Mantid::API::MDNormalization normalize,
- std::vector<coord_t> &x, std::vector<signal_t> &y,
- std::vector<signal_t> &e) const;
-
- virtual void getLineData(const Mantid::Kernel::VMD &start,
- const Mantid::Kernel::VMD &end,
- Mantid::API::MDNormalization normalize,
- std::vector<coord_t> &x, std::vector<signal_t> &y,
- std::vector<signal_t> &e) const;
+ uint64_t getNEvents() const override;
+ std::vector<Mantid::API::IMDIterator *> createIterators(
+ size_t suggestedNumCores = 1,
+ Mantid::Geometry::MDImplicitFunction *function = NULL) const override;
+
+ void getLinePlot(const Mantid::Kernel::VMD &start,
+ const Mantid::Kernel::VMD &end,
+ Mantid::API::MDNormalization normalize,
+ std::vector<coord_t> &x, std::vector<signal_t> &y,
+ std::vector<signal_t> &e) const override;
+
+ void getLineData(const Mantid::Kernel::VMD &start,
+ const Mantid::Kernel::VMD &end,
+ Mantid::API::MDNormalization normalize,
+ std::vector<coord_t> &x, std::vector<signal_t> &y,
+ std::vector<signal_t> &e) const override;
void checkWorkspaceSize(const MDHistoWorkspace &other, std::string operation);
@@ -139,18 +139,18 @@ public:
const size_t *getIndexMultiplier() const { return indexMultiplier; }
/** @return the direct pointer to the signal array. For speed */
- signal_t *getSignalArray() const { return m_signals; }
+ signal_t *getSignalArray() const override { return m_signals; }
/** @return the inverse of volume of EACH cell in the workspace. For
* normalizing. */
- coord_t getInverseVolume() const { return m_inverseVolume; }
+ coord_t getInverseVolume() const override { return m_inverseVolume; }
/** @return the direct pointer to the error squared array. For speed */
- signal_t *getErrorSquaredArray() const { return m_errorsSquared; }
+ signal_t *getErrorSquaredArray() const override { return m_errorsSquared; }
/** @return the direct pointer to the array of the number of events. For speed
*/
- signal_t *getNumEventsArray() const { return m_numEvents; }
+ signal_t *getNumEventsArray() const override { return m_numEvents; }
/** @return the direct pointer to the array of mask bits (bool). For
* speed/testing */
@@ -161,37 +161,40 @@ public:
const coord_t *getBinWidths() const { return m_boxLength; }
/// Get the special coordinate system.
- virtual Kernel::SpecialCoordinateSystem getSpecialCoordinateSystem() const;
+ Kernel::SpecialCoordinateSystem getSpecialCoordinateSystem() const override;
/// Set the special coordinate system.
- void
- setCoordinateSystem(const Kernel::SpecialCoordinateSystem coordinateSystem);
+ void setCoordinateSystem(
+ const Kernel::SpecialCoordinateSystem coordinateSystem) override;
- void setTo(signal_t signal, signal_t errorSquared, signal_t numEvents);
+ void setTo(signal_t signal, signal_t errorSquared,
+ signal_t numEvents) override;
void applyImplicitFunction(Mantid::Geometry::MDImplicitFunction *function,
signal_t signal, signal_t errorSquared);
coord_t *getVertexesArray(size_t linearIndex, size_t &numVertices) const;
- Kernel::VMD getCenter(size_t linearIndex) const;
+ Kernel::VMD getCenter(size_t linearIndex) const override;
/// Returns the (normalized) signal at a given coordinates
- signal_t
- getSignalAtCoord(const coord_t *coords,
- const Mantid::API::MDNormalization &normalization) const;
+ signal_t getSignalAtCoord(
+ const coord_t *coords,
+ const Mantid::API::MDNormalization &normalization) const override;
/// Returns the (normalized) signal at a given coordinates
// or 0 if masked
- virtual signal_t getSignalWithMaskAtCoord(
+ signal_t getSignalWithMaskAtCoord(
const coord_t *coords,
- const Mantid::API::MDNormalization &normalization) const;
+ const Mantid::API::MDNormalization &normalization) const override;
/// Sets the signal at the specified index.
- void setSignalAt(size_t index, signal_t value) { m_signals[index] = value; }
+ void setSignalAt(size_t index, signal_t value) override {
+ m_signals[index] = value;
+ }
/// Sets the error (squared) at the specified index.
- void setErrorSquaredAt(size_t index, signal_t value) {
+ void setErrorSquaredAt(size_t index, signal_t value) override {
m_errorsSquared[index] = value;
}
@@ -205,19 +208,20 @@ public:
signal_t getNumEventsAt(size_t index) const { return m_numEvents[index]; }
/// Get the error of the signal at the specified index.
- signal_t getErrorAt(size_t index) const {
+ signal_t getErrorAt(size_t index) const override {
return std::sqrt(m_errorsSquared[index]);
}
/// Get the error at the specified index given in 4 dimensions (typically
/// X,Y,Z,t)
- signal_t getErrorAt(size_t index1, size_t index2) const {
+ signal_t getErrorAt(size_t index1, size_t index2) const override {
return std::sqrt(m_errorsSquared[index1 + indexMultiplier[0] * index2]);
}
/// Get the error at the specified index given in 4 dimensions (typically
/// X,Y,Z,t)
- signal_t getErrorAt(size_t index1, size_t index2, size_t index3) const {
+ signal_t getErrorAt(size_t index1, size_t index2,
+ size_t index3) const override {
return std::sqrt(m_errorsSquared[index1 + indexMultiplier[0] * index2 +
indexMultiplier[1] * index3]);
}
@@ -225,7 +229,7 @@ public:
/// Get the error at the specified index given in 4 dimensions (typically
/// X,Y,Z,t)
signal_t getErrorAt(size_t index1, size_t index2, size_t index3,
- size_t index4) const {
+ size_t index4) const override {
return std::sqrt(m_errorsSquared[index1 + indexMultiplier[0] * index2 +
indexMultiplier[1] * index3 +
indexMultiplier[2] * index4]);
@@ -237,17 +241,18 @@ public:
bool getIsMaskedAt(size_t index) const { return m_masks[index]; }
/// Get the signal at the specified index.
- signal_t getSignalAt(size_t index) const { return m_signals[index]; }
+ signal_t getSignalAt(size_t index) const override { return m_signals[index]; }
/// Get the signal at the specified index given in 4 dimensions (typically
/// X,Y,Z,t)
- signal_t getSignalAt(size_t index1, size_t index2) const {
+ signal_t getSignalAt(size_t index1, size_t index2) const override {
return m_signals[index1 + indexMultiplier[0] * index2];
}
/// Get the signal at the specified index given in 4 dimensions (typically
/// X,Y,Z,t)
- signal_t getSignalAt(size_t index1, size_t index2, size_t index3) const {
+ signal_t getSignalAt(size_t index1, size_t index2,
+ size_t index3) const override {
return m_signals[index1 + indexMultiplier[0] * index2 +
indexMultiplier[1] * index3];
}
@@ -255,26 +260,26 @@ public:
/// Get the signal at the specified index given in 4 dimensions (typically
/// X,Y,Z,t)
signal_t getSignalAt(size_t index1, size_t index2, size_t index3,
- size_t index4) const {
+ size_t index4) const override {
return m_signals[index1 + indexMultiplier[0] * index2 +
indexMultiplier[1] * index3 + indexMultiplier[2] * index4];
}
/// Get the signal at the specified index, normalized by cell volume
- signal_t getSignalNormalizedAt(size_t index) const {
+ signal_t getSignalNormalizedAt(size_t index) const override {
return m_signals[index] * m_inverseVolume;
}
/// Get the signal at the specified index given in 4 dimensions (typically
/// X,Y,Z,t), normalized by cell volume
- signal_t getSignalNormalizedAt(size_t index1, size_t index2) const {
+ signal_t getSignalNormalizedAt(size_t index1, size_t index2) const override {
return m_signals[index1 + indexMultiplier[0] * index2] * m_inverseVolume;
}
/// Get the signal at the specified index given in 4 dimensions (typically
/// X,Y,Z,t), normalized by cell volume
signal_t getSignalNormalizedAt(size_t index1, size_t index2,
- size_t index3) const {
+ size_t index3) const override {
return m_signals[index1 + indexMultiplier[0] * index2 +
indexMultiplier[1] * index3] *
m_inverseVolume;
@@ -283,7 +288,7 @@ public:
/// Get the signal at the specified index given in 4 dimensions (typically
/// X,Y,Z,t), normalized by cell volume
signal_t getSignalNormalizedAt(size_t index1, size_t index2, size_t index3,
- size_t index4) const {
+ size_t index4) const override {
return m_signals[index1 + indexMultiplier[0] * index2 +
indexMultiplier[1] * index3 +
indexMultiplier[2] * index4] *
@@ -292,34 +297,34 @@ public:
/// Get the error of the signal at the specified index, normalized by cell
/// volume
- signal_t getErrorNormalizedAt(size_t index) const {
+ signal_t getErrorNormalizedAt(size_t index) const override {
return std::sqrt(m_errorsSquared[index]) * m_inverseVolume;
}
/// Get the signal at the specified index given in 4 dimensions (typically
/// X,Y,Z,t), normalized by cell volume
- signal_t getErrorNormalizedAt(size_t index1, size_t index2) const {
+ signal_t getErrorNormalizedAt(size_t index1, size_t index2) const override {
return getErrorAt(index1, index2) * m_inverseVolume;
}
/// Get the signal at the specified index given in 4 dimensions (typically
/// X,Y,Z,t), normalized by cell volume
signal_t getErrorNormalizedAt(size_t index1, size_t index2,
- size_t index3) const {
+ size_t index3) const override {
return getErrorAt(index1, index2, index3) * m_inverseVolume;
}
/// Get the signal at the specified index given in 4 dimensions (typically
/// X,Y,Z,t), normalized by cell volume
signal_t getErrorNormalizedAt(size_t index1, size_t index2, size_t index3,
- size_t index4) const {
+ size_t index4) const override {
return getErrorAt(index1, index2, index3, index4) * m_inverseVolume;
}
//---------------------------------------------------------------------------------------------
/** @return a reference to the error (squared) at the linear index
* @param index :: linear index (see getLinearIndex). */
- signal_t &errorSquaredAt(size_t index) {
+ signal_t &errorSquaredAt(size_t index) override {
if (index < m_length)
return m_errorsSquared[index];
else
@@ -328,7 +333,7 @@ public:
/** @return a reference to the signal at the linear index
* @param index :: linear index (see getLinearIndex). */
- signal_t &signalAt(size_t index) {
+ signal_t &signalAt(size_t index) override {
if (index < m_length)
return m_signals[index];
else
@@ -336,20 +341,21 @@ public:
}
//---------------------------------------------------------------------------------------------
- size_t getLinearIndex(size_t index1, size_t index2) const {
+ size_t getLinearIndex(size_t index1, size_t index2) const override {
if (this->getNumDims() != 2)
throw std::runtime_error("Workspace does not have 2 dimensions!");
return index1 + indexMultiplier[0] * index2;
}
- size_t getLinearIndex(size_t index1, size_t index2, size_t index3) const {
+ size_t getLinearIndex(size_t index1, size_t index2,
+ size_t index3) const override {
if (this->getNumDims() != 3)
throw std::runtime_error("Workspace does not have 3 dimensions!");
return index1 + indexMultiplier[0] * index2 + indexMultiplier[1] * index3;
}
size_t getLinearIndex(size_t index1, size_t index2, size_t index3,
- size_t index4) const {
+ size_t index4) const override {
if (this->getNumDims() != 4)
throw std::runtime_error("Workspace does not have 4 dimensions!");
return index1 + indexMultiplier[0] * index2 + indexMultiplier[1] * index3 +
@@ -374,7 +380,7 @@ public:
* @param index :: linear index into array
* @return the signal (not normalized) at that index.
*/
- signal_t &operator[](const size_t &index) {
+ signal_t &operator[](const size_t &index)override {
if (index < m_length)
return m_signals[index];
else
@@ -387,12 +393,13 @@ public:
virtual std::vector<signal_t> getErrorDataVector() const;
/// Apply masking.
- void setMDMasking(Mantid::Geometry::MDImplicitFunction *maskingRegion);
+ void
+ setMDMasking(Mantid::Geometry::MDImplicitFunction *maskingRegion) override;
/// Apply masking.
void setMDMaskAt(const size_t &index, bool mask);
/// Clear masking.
- void clearMDMasking();
+ void clearMDMasking() override;
/// sum the array of contributing events m_numEvents array
uint64_t sumNContribEvents() const;
void updateSum() { m_nEventsContributed = sumNContribEvents(); }
@@ -401,16 +408,16 @@ public:
static size_t sizeOfElement();
/// Preferred visual normalization method.
- virtual Mantid::API::MDNormalization displayNormalization() const;
+ Mantid::API::MDNormalization displayNormalization() const override;
/// Preferred visual normalization method.
- virtual Mantid::API::MDNormalization displayNormalizationHisto() const;
+ Mantid::API::MDNormalization displayNormalizationHisto() const override;
- virtual void setDisplayNormalization(
- const Mantid::API::MDNormalization &preferredNormalization);
+ void setDisplayNormalization(
+ const Mantid::API::MDNormalization &preferredNormalization) override;
private:
- virtual MDHistoWorkspace *doClone() const {
+ MDHistoWorkspace *doClone() const override {
return new MDHistoWorkspace(*this);
}
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspaceIterator.h b/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspaceIterator.h
index e3aa76c7c983a16ac669a710f51dec8abe289db4..dce2a6b8d463a6006a1089124a725172a07f2c16 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspaceIterator.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspaceIterator.h
@@ -69,68 +69,67 @@ public:
const MDHistoWorkspace *workspace,
Mantid::Geometry::MDImplicitFunction *function = NULL,
size_t beginPos = 0, size_t endPos = size_t(-1));
- virtual ~MDHistoWorkspaceIterator();
+ ~MDHistoWorkspaceIterator() override;
void init(const MDHistoWorkspace *workspace,
Mantid::Geometry::MDImplicitFunction *function, size_t beginPos = 0,
size_t endPos = size_t(-1));
- virtual size_t getDataSize() const;
+ size_t getDataSize() const override;
- virtual bool valid() const;
+ bool valid() const override;
- virtual bool next();
+ bool next() override;
- virtual bool next(size_t skip);
+ bool next(size_t skip) override;
- virtual void jumpTo(size_t index);
+ void jumpTo(size_t index) override;
virtual coord_t jumpToNearest(const Mantid::Kernel::VMD &fromLocation);
- virtual signal_t getNormalizedSignal() const;
+ signal_t getNormalizedSignal() const override;
- virtual signal_t getNormalizedError() const;
+ signal_t getNormalizedError() const override;
- virtual signal_t getSignal() const;
+ signal_t getSignal() const override;
- virtual signal_t getError() const;
+ signal_t getError() const override;
- virtual coord_t *getVertexesArray(size_t &numVertices) const;
+ coord_t *getVertexesArray(size_t &numVertices) const override;
- virtual coord_t *getVertexesArray(size_t &numVertices,
- const size_t outDimensions,
- const bool *maskDim) const;
+ coord_t *getVertexesArray(size_t &numVertices, const size_t outDimensions,
+ const bool *maskDim) const override;
- virtual Mantid::Kernel::VMD getCenter() const;
+ Mantid::Kernel::VMD getCenter() const override;
- virtual size_t getNumEvents() const;
+ size_t getNumEvents() const override;
virtual signal_t getNumEventsFraction() const;
- virtual uint16_t getInnerRunIndex(size_t index) const;
+ uint16_t getInnerRunIndex(size_t index) const override;
- virtual int32_t getInnerDetectorID(size_t index) const;
+ int32_t getInnerDetectorID(size_t index) const override;
- virtual coord_t getInnerPosition(size_t index, size_t dimension) const;
+ coord_t getInnerPosition(size_t index, size_t dimension) const override;
- virtual signal_t getInnerSignal(size_t index) const;
+ signal_t getInnerSignal(size_t index) const override;
- virtual signal_t getInnerError(size_t index) const;
+ signal_t getInnerError(size_t index) const override;
- virtual bool getIsMasked() const;
+ bool getIsMasked() const override;
- virtual size_t getLinearIndex() const;
+ size_t getLinearIndex() const override;
- std::vector<size_t> findNeighbourIndexes() const;
+ std::vector<size_t> findNeighbourIndexes() const override;
- std::vector<size_t> findNeighbourIndexesFaceTouching() const;
+ std::vector<size_t> findNeighbourIndexesFaceTouching() const override;
std::vector<size_t> findNeighbourIndexesByWidth(const int &width) const;
std::vector<size_t>
findNeighbourIndexesByWidth(const std::vector<int> &widths) const;
- virtual bool isWithinBounds(size_t index) const;
+ bool isWithinBounds(size_t index) const override;
size_t permutationCacheSize() const;
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MaskWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/MaskWorkspace.h
index 1669d410c291fc4c35c8aa9533d92262f1a55d57..2874f97e8f642e83ebff964b612f77910cc77a03 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MaskWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MaskWorkspace.h
@@ -18,27 +18,28 @@ public:
MaskWorkspace(Mantid::Geometry::Instrument_const_sptr instrument,
const bool includeMonitors = false);
MaskWorkspace(const API::MatrixWorkspace_const_sptr parent);
- ~MaskWorkspace();
+ ~MaskWorkspace() override;
/// Returns a clone of the workspace
std::unique_ptr<MaskWorkspace> clone() const {
return std::unique_ptr<MaskWorkspace>(doClone());
}
- bool isMasked(const detid_t detectorID) const;
- bool isMasked(const std::set<detid_t> &detectorIDs) const;
+ bool isMasked(const detid_t detectorID) const override;
+ bool isMasked(const std::set<detid_t> &detectorIDs) const override;
bool isMaskedIndex(const std::size_t wkspIndex) const;
- void setMasked(const detid_t detectorID, const bool mask = true);
- void setMasked(const std::set<detid_t> &detectorIDs, const bool mask = true);
+ void setMasked(const detid_t detectorID, const bool mask = true) override;
+ void setMasked(const std::set<detid_t> &detectorIDs,
+ const bool mask = true) override;
void setMaskedIndex(const std::size_t wkspIndex, const bool mask = true);
- std::size_t getNumberMasked() const;
+ std::size_t getNumberMasked() const override;
std::set<detid_t> getMaskedDetectors() const;
std::set<std::size_t> getMaskedWkspIndices() const;
- virtual const std::string id() const;
+ const std::string id() const override;
/// Copy the set up from another workspace
- virtual void copyFrom(boost::shared_ptr<const SpecialWorkspace2D> sourcews);
+ void copyFrom(boost::shared_ptr<const SpecialWorkspace2D> sourcews) override;
protected:
/// Protected copy constructor. May be used by childs for cloning.
@@ -48,12 +49,12 @@ protected:
MaskWorkspace &operator=(const MaskWorkspace &other);
/// Return human-readable string
- virtual const std::string toString() const;
+ const std::string toString() const override;
private:
- virtual MaskWorkspace *doClone() const { return new MaskWorkspace(*this); }
+ MaskWorkspace *doClone() const override { return new MaskWorkspace(*this); }
- virtual IMaskWorkspace *doInterfaceClone() const { return doClone(); };
+ IMaskWorkspace *doInterfaceClone() const override { return doClone(); };
/// Clear original incorrect mask
void clearMask();
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MementoTableWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/MementoTableWorkspace.h
index 1c16ada485bb8a2427860d03149539bf13e39057..8e92a4bbdecd56ffcc01d7d1f0e7dd0ae0ceffe6 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MementoTableWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MementoTableWorkspace.h
@@ -38,7 +38,7 @@ class DLLExport MementoTableWorkspace : public TableWorkspace {
public:
static bool isMementoWorkspace(const Mantid::API::ITableWorkspace &candidate);
MementoTableWorkspace(int nRows = 0);
- ~MementoTableWorkspace();
+ ~MementoTableWorkspace() override;
/// Returns a clone of the workspace
std::unique_ptr<MementoTableWorkspace> clone() const {
@@ -53,7 +53,7 @@ protected:
MementoTableWorkspace &operator=(const MementoTableWorkspace &other);
private:
- virtual MementoTableWorkspace *doClone() const {
+ MementoTableWorkspace *doClone() const override {
return new MementoTableWorkspace(*this);
}
diff --git a/Framework/DataObjects/inc/MantidDataObjects/NoShape.h b/Framework/DataObjects/inc/MantidDataObjects/NoShape.h
index 157794a4fe3c02bf383ffb69addfccc9d8fe6ef5..e4e120e3bdf5df90241b4f7fdc0a9b855ced3214 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/NoShape.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/NoShape.h
@@ -36,19 +36,19 @@ public:
/// Constructor
NoShape();
/// Destructor
- virtual ~NoShape();
+ ~NoShape() override;
/// Serialize
- std::string toJSON() const;
+ std::string toJSON() const override;
/// Clone
- NoShape *clone() const;
+ NoShape *clone() const override;
/// Return the algorithn name
- std::string algorithmName() const;
+ std::string algorithmName() const override;
/// Return the algorithm version
- int algorithmVersion() const;
+ int algorithmVersion() const override;
/// Return the shape name
- std::string shapeName() const;
+ std::string shapeName() const override;
/// Get the coordinate frame
- Kernel::SpecialCoordinateSystem frame() const;
+ Kernel::SpecialCoordinateSystem frame() const override;
};
} // namespace DataObjects
diff --git a/Framework/DataObjects/inc/MantidDataObjects/OffsetsWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/OffsetsWorkspace.h
index d1c7dd96eec20b4acd2378c9577fd264525ce796..ecc55334f095b4f68f4299bb7c00ce0bee6990a5 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/OffsetsWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/OffsetsWorkspace.h
@@ -20,7 +20,7 @@ class DLLExport OffsetsWorkspace : public SpecialWorkspace2D {
public:
OffsetsWorkspace();
OffsetsWorkspace(Geometry::Instrument_const_sptr inst);
- ~OffsetsWorkspace();
+ ~OffsetsWorkspace() override;
/// Returns a clone of the workspace
std::unique_ptr<OffsetsWorkspace> clone() const {
@@ -29,7 +29,7 @@ public:
/** Gets the name of the workspace type
@return Standard string name */
- virtual const std::string id() const { return "OffsetsWorkspace"; }
+ const std::string id() const override { return "OffsetsWorkspace"; }
protected:
/// Protected copy constructor. May be used by childs for cloning.
@@ -38,7 +38,7 @@ protected:
OffsetsWorkspace &operator=(const OffsetsWorkspace &other);
private:
- virtual OffsetsWorkspace *doClone() const {
+ OffsetsWorkspace *doClone() const override {
return new OffsetsWorkspace(*this);
}
};
diff --git a/Framework/DataObjects/inc/MantidDataObjects/Peak.h b/Framework/DataObjects/inc/MantidDataObjects/Peak.h
index a84924fb62ad527efb5eba0823a4658db33b33f2..78a7d7931101e3c5e40e2109948f23c05d97cda0 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/Peak.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/Peak.h
@@ -47,85 +47,86 @@ public:
// Construct a peak from a reference to the interface
explicit Peak(const Geometry::IPeak &ipeak);
- virtual ~Peak();
+ ~Peak() override;
- void setDetectorID(int id);
- int getDetectorID() const;
+ void setDetectorID(int id) override;
+ int getDetectorID() const override;
void addContributingDetID(const int id);
void removeContributingDetector(const int id);
const std::set<int> &getContributingDetIDs() const;
- void setInstrument(Geometry::Instrument_const_sptr inst);
- Geometry::IDetector_const_sptr getDetector() const;
- Geometry::Instrument_const_sptr getInstrument() const;
+ void setInstrument(Geometry::Instrument_const_sptr inst) override;
+ Geometry::IDetector_const_sptr getDetector() const override;
+ Geometry::Instrument_const_sptr getInstrument() const override;
- bool findDetector();
+ bool findDetector() override;
- int getRunNumber() const;
- void setRunNumber(int m_RunNumber);
+ int getRunNumber() const override;
+ void setRunNumber(int m_RunNumber) override;
- double getMonitorCount() const;
- void setMonitorCount(double m_MonitorCount);
+ double getMonitorCount() const override;
+ void setMonitorCount(double m_MonitorCount) override;
- double getH() const;
- double getK() const;
- double getL() const;
- Mantid::Kernel::V3D getHKL() const;
- void setH(double m_H);
- void setK(double m_K);
- void setL(double m_L);
+ double getH() const override;
+ double getK() const override;
+ double getL() const override;
+ Mantid::Kernel::V3D getHKL() const override;
+ void setH(double m_H) override;
+ void setK(double m_K) override;
+ void setL(double m_L) override;
void setBankName(std::string m_BankName);
- void setHKL(double H, double K, double L);
- void setHKL(Mantid::Kernel::V3D HKL);
+ void setHKL(double H, double K, double L) override;
+ void setHKL(Mantid::Kernel::V3D HKL) override;
void resetHKL();
- Mantid::Kernel::V3D getQLabFrame() const;
- Mantid::Kernel::V3D getQSampleFrame() const;
- Mantid::Kernel::V3D getDetectorPosition() const;
- Mantid::Kernel::V3D getDetectorPositionNoCheck() const;
+ Mantid::Kernel::V3D getQLabFrame() const override;
+ Mantid::Kernel::V3D getQSampleFrame() const override;
+ Mantid::Kernel::V3D getDetectorPosition() const override;
+ Mantid::Kernel::V3D getDetectorPositionNoCheck() const override;
- void setQSampleFrame(
- Mantid::Kernel::V3D QSampleFrame,
- boost::optional<double> detectorDistance = boost::optional<double>());
- void setQLabFrame(
- Mantid::Kernel::V3D QLabFrame,
- boost::optional<double> detectorDistance = boost::optional<double>());
+ void setQSampleFrame(Mantid::Kernel::V3D QSampleFrame,
+ boost::optional<double> detectorDistance =
+ boost::optional<double>()) override;
+ void setQLabFrame(Mantid::Kernel::V3D QLabFrame,
+ boost::optional<double> detectorDistance =
+ boost::optional<double>()) override;
- void setWavelength(double wavelength);
- double getWavelength() const;
- double getScattering() const;
- double getDSpacing() const;
- double getTOF() const;
+ void setWavelength(double wavelength) override;
+ double getWavelength() const override;
+ double getScattering() const override;
+ double getDSpacing() const override;
+ double getTOF() const override;
- double getInitialEnergy() const;
- double getFinalEnergy() const;
- void setInitialEnergy(double m_InitialEnergy);
- void setFinalEnergy(double m_FinalEnergy);
+ double getInitialEnergy() const override;
+ double getFinalEnergy() const override;
+ void setInitialEnergy(double m_InitialEnergy) override;
+ void setFinalEnergy(double m_FinalEnergy) override;
- double getIntensity() const;
- double getSigmaIntensity() const;
+ double getIntensity() const override;
+ double getSigmaIntensity() const override;
- void setIntensity(double m_Intensity);
- void setSigmaIntensity(double m_SigmaIntensity);
+ void setIntensity(double m_Intensity) override;
+ void setSigmaIntensity(double m_SigmaIntensity) override;
- double getBinCount() const;
- void setBinCount(double m_BinCount);
+ double getBinCount() const override;
+ void setBinCount(double m_BinCount) override;
- Mantid::Kernel::Matrix<double> getGoniometerMatrix() const;
- void setGoniometerMatrix(Mantid::Kernel::Matrix<double> m_GoniometerMatrix);
+ Mantid::Kernel::Matrix<double> getGoniometerMatrix() const override;
+ void setGoniometerMatrix(
+ Mantid::Kernel::Matrix<double> m_GoniometerMatrix) override;
- std::string getBankName() const;
- int getRow() const;
- int getCol() const;
+ std::string getBankName() const override;
+ int getRow() const override;
+ int getCol() const override;
- Mantid::Kernel::V3D getDetPos() const;
- double getL1() const;
- double getL2() const;
+ Mantid::Kernel::V3D getDetPos() const override;
+ double getL1() const override;
+ double getL2() const override;
double getValueByColName(const std::string &name) const;
/// Get the peak shape.
- const Mantid::Geometry::PeakShape &getPeakShape() const;
+ const Mantid::Geometry::PeakShape &getPeakShape() const override;
/// Set the PeakShape
void setPeakShape(Mantid::Geometry::PeakShape *shape);
diff --git a/Framework/DataObjects/inc/MantidDataObjects/PeakColumn.h b/Framework/DataObjects/inc/MantidDataObjects/PeakColumn.h
index f7a53ec61d73277cdab5bafd028220103d7a87b3..01e005e6fbb0357794bd24ddcfa93d19ccd73fbf 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/PeakColumn.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/PeakColumn.h
@@ -23,50 +23,50 @@ class DLLExport PeakColumn : public Mantid::API::Column {
public:
/// Construct a column with a reference to the peaks list, a name & type
PeakColumn(std::vector<Peak> &peaks, const std::string &name);
- virtual ~PeakColumn();
+ ~PeakColumn() override;
/// Number of individual elements in the column.
- virtual size_t size() const { return m_peaks.size(); }
+ size_t size() const override { return m_peaks.size(); }
/// Returns typeid for the data in the column
- virtual const std::type_info &get_type_info() const;
+ const std::type_info &get_type_info() const override;
/// Returns typeid for the pointer type to the data element in the column
- virtual const std::type_info &get_pointer_type_info() const;
+ const std::type_info &get_pointer_type_info() const override;
- virtual bool getReadOnly() const;
+ bool getReadOnly() const override;
/// Prints
- virtual void print(size_t index, std::ostream &s) const;
+ void print(size_t index, std::ostream &s) const override;
- virtual void read(size_t index, const std::string &text);
+ void read(size_t index, const std::string &text) override;
/// Specialized type check
- virtual bool isBool() const;
+ bool isBool() const override;
/// Must return overall memory size taken by the column.
- virtual long int sizeOfData() const;
+ long int sizeOfData() const override;
/// Clone.
- virtual PeakColumn *clone() const;
+ PeakColumn *clone() const override;
/// Cast to double
- virtual double toDouble(size_t i) const;
+ double toDouble(size_t i) const override;
/// Assign from double
- virtual void fromDouble(size_t i, double value);
+ void fromDouble(size_t i, double value) override;
protected:
/// Sets the new column size.
- virtual void resize(size_t count);
+ void resize(size_t count) override;
/// Inserts an item.
- virtual void insert(size_t index);
+ void insert(size_t index) override;
/// Removes an item.
- virtual void remove(size_t index);
+ void remove(size_t index) override;
/// Pointer to a data element
- virtual void *void_pointer(size_t index);
+ void *void_pointer(size_t index) override;
/// Pointer to a data element
- virtual const void *void_pointer(size_t index) const;
+ const void *void_pointer(size_t index) const override;
private:
/// Reference to the peaks object saved in the PeaksWorkspace.
diff --git a/Framework/DataObjects/inc/MantidDataObjects/PeakNoShapeFactory.h b/Framework/DataObjects/inc/MantidDataObjects/PeakNoShapeFactory.h
index 6c5a8645f1c125f23622ff230eba6a090a10ccd9..abc03930b527c3d673692316a8ed2ab6730006ce 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/PeakNoShapeFactory.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/PeakNoShapeFactory.h
@@ -38,11 +38,12 @@ public:
// Constructor
PeakNoShapeFactory();
// Destructor
- virtual ~PeakNoShapeFactory();
+ ~PeakNoShapeFactory() override;
// Factory method
- Mantid::Geometry::PeakShape *create(const std::string &source) const;
+ Mantid::Geometry::PeakShape *create(const std::string &source) const override;
// Set successor. No shape will not delegate.
- void setSuccessor(boost::shared_ptr<const PeakShapeFactory> successorFactory);
+ void setSuccessor(
+ boost::shared_ptr<const PeakShapeFactory> successorFactory) override;
private:
};
diff --git a/Framework/DataObjects/inc/MantidDataObjects/PeakShapeBase.h b/Framework/DataObjects/inc/MantidDataObjects/PeakShapeBase.h
index 4ca2a6d79f837a2566b7daa5e1ffaeb6bb9dcf92..63db5c8f5dc4fde9657c6734a94709f84c657c06 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/PeakShapeBase.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/PeakShapeBase.h
@@ -45,13 +45,13 @@ public:
std::string algorithmName = std::string(),
int algorithmVersion = -1);
/// Destructor
- virtual ~PeakShapeBase();
+ ~PeakShapeBase() override;
/// Get the coordinate frame
- Kernel::SpecialCoordinateSystem frame() const;
+ Kernel::SpecialCoordinateSystem frame() const override;
/// Get the name of the algorithm used to make this shape
- std::string algorithmName() const;
+ std::string algorithmName() const override;
/// Get the version of the algorithm used to make this shape
- int algorithmVersion() const;
+ int algorithmVersion() const override;
/// Radius
virtual double radius() const = 0;
diff --git a/Framework/DataObjects/inc/MantidDataObjects/PeakShapeEllipsoid.h b/Framework/DataObjects/inc/MantidDataObjects/PeakShapeEllipsoid.h
index 51a859a48649613282325f4b5bef289a84eb8224..4a64df1090f5d05b208cba85df5bc3f4853ea913 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/PeakShapeEllipsoid.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/PeakShapeEllipsoid.h
@@ -49,7 +49,7 @@ public:
/// Equals operator
bool operator==(const PeakShapeEllipsoid &other) const;
/// Destructor
- virtual ~PeakShapeEllipsoid();
+ ~PeakShapeEllipsoid() override;
/// Get radii
std::vector<double> abcRadii() const;
/// Get background inner radii
@@ -63,14 +63,14 @@ public:
Kernel::Matrix<double> &invertedGoniometerMatrix) const;
/// PeakShape interface
- std::string toJSON() const;
+ std::string toJSON() const override;
/// Clone ellipsoid
- PeakShapeEllipsoid *clone() const;
+ PeakShapeEllipsoid *clone() const override;
/// Get the peak shape
- std::string shapeName() const;
+ std::string shapeName() const override;
/// PeakBase interface
- double radius() const;
+ double radius() const override;
static const std::string ellipsoidShapeName();
diff --git a/Framework/DataObjects/inc/MantidDataObjects/PeakShapeEllipsoidFactory.h b/Framework/DataObjects/inc/MantidDataObjects/PeakShapeEllipsoidFactory.h
index 2b8fe195b6c295a2d97db51dfde0f2cd7afd3dcf..52b161b67b653edcce2629202b3113089c820af0 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/PeakShapeEllipsoidFactory.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/PeakShapeEllipsoidFactory.h
@@ -33,12 +33,13 @@ namespace DataObjects {
class DLLExport PeakShapeEllipsoidFactory : public PeakShapeFactory {
public:
PeakShapeEllipsoidFactory();
- virtual ~PeakShapeEllipsoidFactory();
+ ~PeakShapeEllipsoidFactory() override;
// PeakShapeFactory interface
- Mantid::Geometry::PeakShape *create(const std::string &source) const;
- void setSuccessor(boost::shared_ptr<const PeakShapeFactory> successorFactory);
+ Mantid::Geometry::PeakShape *create(const std::string &source) const override;
+ void setSuccessor(
+ boost::shared_ptr<const PeakShapeFactory> successorFactory) override;
private:
/// Successor factory
diff --git a/Framework/DataObjects/inc/MantidDataObjects/PeakShapeSpherical.h b/Framework/DataObjects/inc/MantidDataObjects/PeakShapeSpherical.h
index 195100b94f17a1e48e6977e2eccce9dad0546eec..06e5beaa0a64de1320730346930b0fcfd79dc1ba 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/PeakShapeSpherical.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/PeakShapeSpherical.h
@@ -47,21 +47,21 @@ public:
std::string algorithmName = std::string(),
int algorithmVersion = -1);
/// Destructor
- virtual ~PeakShapeSpherical();
+ ~PeakShapeSpherical() override;
/// Copy constructor
PeakShapeSpherical(const PeakShapeSpherical &other);
/// Assignment operator
PeakShapeSpherical &operator=(const PeakShapeSpherical &other);
/// Serialization method
- virtual std::string toJSON() const;
+ std::string toJSON() const override;
/// Clone the peak shape
- virtual PeakShapeSpherical *clone() const;
+ PeakShapeSpherical *clone() const override;
/// Shape name
- std::string shapeName() const;
+ std::string shapeName() const override;
/// Equals operator
bool operator==(const PeakShapeSpherical &other) const;
/// Peak radius
- double radius() const;
+ double radius() const override;
/// Peak outer background radius
boost::optional<double> backgroundOuterRadius() const;
/// Peak inner background radius
diff --git a/Framework/DataObjects/inc/MantidDataObjects/PeakShapeSphericalFactory.h b/Framework/DataObjects/inc/MantidDataObjects/PeakShapeSphericalFactory.h
index 12e67400d7610e1685847816576b9a6b1f463f00..d5205824dc9ce7b8c1f9d37fc2f1318b96173c08 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/PeakShapeSphericalFactory.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/PeakShapeSphericalFactory.h
@@ -40,11 +40,11 @@ public:
/// Constructor
PeakShapeSphericalFactory();
/// Destructor
- virtual ~PeakShapeSphericalFactory();
+ ~PeakShapeSphericalFactory() override;
/// Make product
- Mantid::Geometry::PeakShape *create(const std::string &source) const;
+ Mantid::Geometry::PeakShape *create(const std::string &source) const override;
/// Set a successor should this factory be unsuitable
- void setSuccessor(PeakShapeFactory_const_sptr successorFactory);
+ void setSuccessor(PeakShapeFactory_const_sptr successorFactory) override;
private:
/// Successor factory
diff --git a/Framework/DataObjects/inc/MantidDataObjects/PeaksWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/PeaksWorkspace.h
index da3af0f3d9dc79340f482b3e603f062e2e5e2e5b..89944164141e26d3ecc9034d6fbbf199c63bb369 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/PeaksWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/PeaksWorkspace.h
@@ -63,7 +63,7 @@ namespace DataObjects {
*/
class DLLExport PeaksWorkspace : public Mantid::API::IPeaksWorkspace {
public:
- virtual const std::string id() const { return "PeaksWorkspace"; }
+ const std::string id() const override { return "PeaksWorkspace"; }
PeaksWorkspace();
@@ -77,16 +77,16 @@ public:
behaviour.
* Use mutableRun interface to change log values rather then this method.
**/
- API::LogManager_sptr logs();
+ API::LogManager_sptr logs() override;
/**Get constant access to shared pointer containing workspace porperties;
Copies logs into new LogManager variable
Meaningfull only for some multithereaded methods when a thread wants to
have its own copy of logs */
- API::LogManager_const_sptr getLogs() const {
+ API::LogManager_const_sptr getLogs() const override {
return API::LogManager_const_sptr(new API::LogManager(this->run()));
}
- virtual ~PeaksWorkspace();
+ ~PeaksWorkspace() override;
/// Returns a clone of the workspace
std::unique_ptr<PeaksWorkspace> clone() const {
@@ -97,63 +97,63 @@ public:
/** @return true because this type of the workspace needs custom sorting calls
*/
- virtual bool customSort() const { return true; }
+ bool customSort() const override { return true; }
- void sort(std::vector<std::pair<std::string, bool>> &criteria);
+ void sort(std::vector<std::pair<std::string, bool>> &criteria) override;
- int getNumberPeaks() const;
- std::string getConvention() const;
- void removePeak(int peakNum);
- void addPeak(const Geometry::IPeak &ipeak);
- Peak &getPeak(int peakNum);
- const Peak &getPeak(int peakNum) const;
+ int getNumberPeaks() const override;
+ std::string getConvention() const override;
+ void removePeak(int peakNum) override;
+ void addPeak(const Geometry::IPeak &ipeak) override;
+ Peak &getPeak(int peakNum) override;
+ const Peak &getPeak(int peakNum) const override;
Geometry::IPeak *createPeak(Kernel::V3D QFrame,
boost::optional<double> detectorDistance =
- boost::optional<double>()) const;
+ boost::optional<double>()) const override;
std::vector<std::pair<std::string, std::string>>
- peakInfo(Kernel::V3D qFrame, bool labCoords) const;
+ peakInfo(Kernel::V3D qFrame, bool labCoords) const override;
- Peak *createPeakHKL(Kernel::V3D HKL) const;
+ Peak *createPeakHKL(Kernel::V3D HKL) const override;
- int peakInfoNumber(Kernel::V3D qFrame, bool labCoords) const;
+ int peakInfoNumber(Kernel::V3D qFrame, bool labCoords) const override;
std::vector<Peak> &getPeaks();
const std::vector<Peak> &getPeaks() const;
- virtual bool hasIntegratedPeaks() const;
- virtual size_t getMemorySize() const;
+ bool hasIntegratedPeaks() const override;
+ size_t getMemorySize() const override;
/// Creates a new TableWorkspace giving the IDs of the detectors that
/// contribute to the
/// peaks within the workspace
- API::ITableWorkspace_sptr createDetectorTable() const;
+ API::ITableWorkspace_sptr createDetectorTable() const override;
/// Set the special coordinate system.
- virtual void
- setCoordinateSystem(const Kernel::SpecialCoordinateSystem coordinateSystem);
+ void setCoordinateSystem(
+ const Kernel::SpecialCoordinateSystem coordinateSystem) override;
/// Get the special coordinate system.
- Kernel::SpecialCoordinateSystem getSpecialCoordinateSystem() const;
+ Kernel::SpecialCoordinateSystem getSpecialCoordinateSystem() const override;
// ====================================== ITableWorkspace Methods
// ==================================
/// Number of columns in the workspace.
- virtual size_t columnCount() const {
+ size_t columnCount() const override {
return static_cast<int>(columns.size());
}
/// Number of rows in the workspace.
- virtual size_t rowCount() const { return getNumberPeaks(); }
+ size_t rowCount() const override { return getNumberPeaks(); }
/// Gets the shared pointer to a column by name.
- virtual boost::shared_ptr<Mantid::API::Column>
- getColumn(const std::string &name) {
+ boost::shared_ptr<Mantid::API::Column>
+ getColumn(const std::string &name) override {
return getColumn(getColumnIndex(name));
}
/// Gets the shared pointer to a column by name.
- virtual boost::shared_ptr<const Mantid::API::Column>
- getColumn(const std::string &name) const {
+ boost::shared_ptr<const Mantid::API::Column>
+ getColumn(const std::string &name) const override {
return getColumn(getColumnIndex(name));
}
@@ -161,21 +161,21 @@ public:
virtual size_t getColumnIndex(const std::string &name) const;
/// Gets the shared pointer to a column by index.
- virtual boost::shared_ptr<Mantid::API::Column> getColumn(size_t index);
+ boost::shared_ptr<Mantid::API::Column> getColumn(size_t index) override;
/// Gets the shared pointer to a column by index - return none-modifyable
/// column.
- API::Column_const_sptr getColumn(size_t index) const;
+ API::Column_const_sptr getColumn(size_t index) const override;
// ====================================== End ITableWorkspace Methods
// ==================================
//---------------------------------------------------------------------------------------------
/// Returns a vector of all column names.
- virtual std::vector<std::string> getColumnNames() const {
+ std::vector<std::string> getColumnNames() const override {
return this->columnNames;
}
/// This is always threadsafe
- virtual bool threadSafe() const { return true; }
+ bool threadSafe() const override { return true; }
// --- Nexus Methods ---
// Save to Nexus
@@ -188,7 +188,7 @@ protected:
PeaksWorkspace &operator=(const PeaksWorkspace &other);
private:
- virtual PeaksWorkspace *doClone() const { return new PeaksWorkspace(*this); }
+ PeaksWorkspace *doClone() const override { return new PeaksWorkspace(*this); }
/// Initialize the table structure
void initColumns();
@@ -199,73 +199,74 @@ private:
// ==================================
// ===== Methods that are not implemented (read-only table) ==========
- virtual API::Column_sptr addColumn(const std::string & /*type*/,
- const std::string & /*name*/) {
+ API::Column_sptr addColumn(const std::string & /*type*/,
+ const std::string & /*name*/) override {
throw Mantid::Kernel::Exception::NotImplementedError(
"PeaksWorkspace structure is read-only. Cannot add column.");
}
- virtual bool addColumns(const std::string & /*type*/,
- const std::string & /*name*/, size_t /*n*/) {
+ bool addColumns(const std::string & /*type*/, const std::string & /*name*/,
+ size_t /*n*/) override {
throw Mantid::Kernel::Exception::NotImplementedError(
"PeaksWorkspace structure is read-only. Cannot add columns.");
}
- virtual void removeColumn(const std::string & /*name*/) {
+ void removeColumn(const std::string & /*name*/) override {
throw Mantid::Kernel::Exception::NotImplementedError(
"PeaksWorkspace structure is read-only. Cannot remove column.");
}
- virtual void setRowCount(size_t /*count*/) {
+ void setRowCount(size_t /*count*/) override {
throw Mantid::Kernel::Exception::NotImplementedError(
"PeaksWorkspace structure is read-only. Cannot setRowCount");
}
- virtual size_t insertRow(size_t /*index*/) {
+ size_t insertRow(size_t /*index*/) override {
throw Mantid::Kernel::Exception::NotImplementedError(
"PeaksWorkspace structure is read-only. Cannot insertRow");
}
- virtual void removeRow(size_t /*index*/) {
+ void removeRow(size_t /*index*/) override {
throw Mantid::Kernel::Exception::NotImplementedError(
"PeaksWorkspace structure is read-only. Cannot removeRow.");
}
/// find method to get the index of integer cell value in a table workspace
- virtual void find(size_t /*value*/, size_t & /*row*/,
- const size_t & /*col*/) {
+ void find(size_t /*value*/, size_t & /*row*/,
+ const size_t & /*col*/) override {
throw Mantid::Kernel::Exception::NotImplementedError(
"PeaksWorkspace::find() not implemented.");
}
/// find method to get the index of double cell value in a table workspace
- virtual void find(double /*value*/, size_t & /*row*/,
- const size_t & /*col*/) {
+ void find(double /*value*/, size_t & /*row*/,
+ const size_t & /*col*/) override {
throw Mantid::Kernel::Exception::NotImplementedError(
"PeaksWorkspace::find() not implemented.");
}
/// find method to get the index of float cell value in a table workspace
- virtual void find(float /*value*/, size_t & /*row*/, const size_t & /*col*/) {
+ void find(float /*value*/, size_t & /*row*/,
+ const size_t & /*col*/) override {
throw Mantid::Kernel::Exception::NotImplementedError(
"PeaksWorkspace::find() not implemented.");
}
/// find method to get the index of API::Boolean value cell in a table
/// workspace
- virtual void find(API::Boolean /*value*/, size_t & /*row*/,
- const size_t & /*col*/) {
+ void find(API::Boolean /*value*/, size_t & /*row*/,
+ const size_t & /*col*/) override {
throw Mantid::Kernel::Exception::NotImplementedError(
"PeaksWorkspace::find() not implemented.");
}
/// find method to get the index of cellstd::string value in a table
/// workspace
- virtual void find(std::string /*value*/, size_t & /*row*/,
- const size_t & /*col*/) {
+ void find(std::string /*value*/, size_t & /*row*/,
+ const size_t & /*col*/) override {
throw Mantid::Kernel::Exception::NotImplementedError(
"PeaksWorkspace::find() not implemented.");
}
/// find method to get the index of Mantid::Kernel::V3D cell value in a table
/// workspace
- virtual void find(Mantid::Kernel::V3D /*value*/, size_t & /*row*/,
- const size_t & /*col*/) {
+ void find(Mantid::Kernel::V3D /*value*/, size_t & /*row*/,
+ const size_t & /*col*/) override {
throw Mantid::Kernel::Exception::NotImplementedError(
"PeaksWorkspace::find() not implemented.");
}
diff --git a/Framework/DataObjects/inc/MantidDataObjects/RebinnedOutput.h b/Framework/DataObjects/inc/MantidDataObjects/RebinnedOutput.h
index 6982530711d0c954cb901d17c63b5da1329a6d03..831fbffc7a857e6b115eaf6740ed15a1d4e917fa 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/RebinnedOutput.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/RebinnedOutput.h
@@ -43,7 +43,7 @@ public:
/// Class constructor.
RebinnedOutput();
/// Class destructor.
- virtual ~RebinnedOutput();
+ ~RebinnedOutput() override;
/// Returns a clone of the workspace
std::unique_ptr<RebinnedOutput> clone() const {
@@ -51,7 +51,7 @@ public:
}
/// Get the workspace ID.
- virtual const std::string id() const;
+ const std::string id() const override;
/// Returns the fractional area
virtual MantidVec &dataF(const std::size_t index);
@@ -75,14 +75,14 @@ protected:
RebinnedOutput &operator=(const RebinnedOutput &other);
/// Called by initialize() in MatrixWorkspace
- virtual void init(const std::size_t &NVectors, const std::size_t &XLength,
- const std::size_t &YLength);
+ void init(const std::size_t &NVectors, const std::size_t &XLength,
+ const std::size_t &YLength) override;
/// A vector that holds the 1D vectors for the fractional area.
std::vector<MantidVec> fracArea;
private:
- virtual RebinnedOutput *doClone() const { return new RebinnedOutput(*this); }
+ RebinnedOutput *doClone() const override { return new RebinnedOutput(*this); }
};
/// shared pointer to the RebinnedOutput class
diff --git a/Framework/DataObjects/inc/MantidDataObjects/SkippingPolicy.h b/Framework/DataObjects/inc/MantidDataObjects/SkippingPolicy.h
index 1d473a5b12460c26ceb3b339d7785d2628fd96ad..7e0f60f2407f740b57bb058932cb3ae362a325a9 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/SkippingPolicy.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/SkippingPolicy.h
@@ -53,8 +53,8 @@ public:
Keep going as long as the current iterator bin is masked.
@return True to keep going.
*/
- bool keepGoing() const { return m_iterator->getIsMasked(); };
- virtual ~SkipMaskedBins() {}
+ bool keepGoing() const override { return m_iterator->getIsMasked(); };
+ ~SkipMaskedBins() override {}
};
/// Policy that indicates no skipping should be applied.
@@ -64,8 +64,8 @@ public:
Always returns false to cancel skipping.
@return false to cancel continuation
*/
- bool keepGoing() const { return false; }
- virtual ~SkipNothing() {}
+ bool keepGoing() const override { return false; }
+ ~SkipNothing() override {}
};
typedef boost::scoped_ptr<SkippingPolicy> SkippingPolicy_scptr;
diff --git a/Framework/DataObjects/inc/MantidDataObjects/SpecialWorkspace2D.h b/Framework/DataObjects/inc/MantidDataObjects/SpecialWorkspace2D.h
index 95fd8b6781ff54771e99e1b08b7621f3e6ca9e9f..316fb9e2b6053746b30523a18969274cbbc92d82 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/SpecialWorkspace2D.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/SpecialWorkspace2D.h
@@ -29,7 +29,7 @@ public:
SpecialWorkspace2D(Geometry::Instrument_const_sptr inst,
const bool includeMonitors = false);
SpecialWorkspace2D(API::MatrixWorkspace_const_sptr parent);
- ~SpecialWorkspace2D();
+ ~SpecialWorkspace2D() override;
/// Returns a clone of the workspace
std::unique_ptr<SpecialWorkspace2D> clone() const {
@@ -38,7 +38,7 @@ public:
/** Gets the name of the workspace type
@return Standard string name */
- virtual const std::string id() const { return "SpecialWorkspace2D"; }
+ const std::string id() const override { return "SpecialWorkspace2D"; }
double getValue(const detid_t detectorID) const;
double getValue(const detid_t detectorID, const double defaultValue) const;
@@ -57,7 +57,7 @@ public:
virtual void copyFrom(boost::shared_ptr<const SpecialWorkspace2D> sourcews);
private:
- virtual SpecialWorkspace2D *doClone() const {
+ SpecialWorkspace2D *doClone() const override {
return new SpecialWorkspace2D(*this);
}
bool isCompatible(boost::shared_ptr<const SpecialWorkspace2D> ws);
@@ -68,11 +68,11 @@ protected:
/// Protected copy assignment operator. Assignment not implemented.
SpecialWorkspace2D &operator=(const SpecialWorkspace2D &other);
- virtual void init(const size_t &NVectors, const size_t &XLength,
- const size_t &YLength);
+ void init(const size_t &NVectors, const size_t &XLength,
+ const size_t &YLength) override;
/// Return human-readable string
- virtual const std::string toString() const;
+ const std::string toString() const override;
void binaryAND(boost::shared_ptr<const SpecialWorkspace2D> ws);
void binaryOR(boost::shared_ptr<const SpecialWorkspace2D> ws);
diff --git a/Framework/DataObjects/inc/MantidDataObjects/SplittersWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/SplittersWorkspace.h
index c606520d0173d7e6792e4a2c0009bd09cdac6f13..ca9373ec4c5138c4c54555fad585f2b8067b0707 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/SplittersWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/SplittersWorkspace.h
@@ -48,20 +48,20 @@ class DLLExport SplittersWorkspace : public DataObjects::TableWorkspace,
public API::ISplittersWorkspace {
public:
SplittersWorkspace();
- virtual ~SplittersWorkspace();
+ ~SplittersWorkspace() override;
/// Returns a clone of the workspace
std::unique_ptr<SplittersWorkspace> clone() const {
return std::unique_ptr<SplittersWorkspace>(doClone());
}
- void addSplitter(Kernel::SplittingInterval splitter);
+ void addSplitter(Kernel::SplittingInterval splitter) override;
- Kernel::SplittingInterval getSplitter(size_t index);
+ Kernel::SplittingInterval getSplitter(size_t index) override;
- size_t getNumberSplitters() const;
+ size_t getNumberSplitters() const override;
- bool removeSplitter(size_t);
+ bool removeSplitter(size_t) override;
protected:
/// Protected copy constructor. May be used by childs for cloning.
@@ -71,7 +71,7 @@ protected:
SplittersWorkspace &operator=(const SplittersWorkspace &other);
private:
- virtual SplittersWorkspace *doClone() const {
+ SplittersWorkspace *doClone() const override {
return new SplittersWorkspace(*this);
}
};
diff --git a/Framework/DataObjects/inc/MantidDataObjects/TableColumn.h b/Framework/DataObjects/inc/MantidDataObjects/TableColumn.h
index 9af63dc0fc4873c31c5ebb312245f9a44972892f..5de4f524257bdadd08257288d2efe6ff59f0994b 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/TableColumn.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/TableColumn.h
@@ -125,25 +125,29 @@ public:
// TableColumn();
/// Virtual destructor.
- virtual ~TableColumn() {}
+ ~TableColumn() override {}
/// Number of individual elements in the column.
- size_t size() const { return m_data.size(); }
+ size_t size() const override { return m_data.size(); }
/// Type id of the data in the column
- const std::type_info &get_type_info() const { return typeid(Type); }
+ const std::type_info &get_type_info() const override { return typeid(Type); }
/// Type id of the pointer to data in the column
- const std::type_info &get_pointer_type_info() const { return typeid(Type *); }
+ const std::type_info &get_pointer_type_info() const override {
+ return typeid(Type *);
+ }
/// Output to an ostream.
- void print(size_t index, std::ostream &s) const { s << m_data[index]; }
+ void print(size_t index, std::ostream &s) const override {
+ s << m_data[index];
+ }
/// Read in a string and set the value at the given index
- void read(size_t index, const std::string &text);
+ void read(size_t index, const std::string &text) override;
/// Type check
- bool isBool() const { return typeid(Type) == typeid(API::Boolean); }
+ bool isBool() const override { return typeid(Type) == typeid(API::Boolean); }
/// Memory used by the column
- long int sizeOfData() const {
+ long int sizeOfData() const override {
return static_cast<long int>(m_data.size() * sizeof(Type));
}
/// Clone
- virtual TableColumn *clone() const {
+ TableColumn *clone() const override {
TableColumn *temp = new TableColumn();
temp->m_data = this->m_data;
temp->setName(this->m_name);
@@ -158,7 +162,7 @@ public:
* is throw.
* @param i :: The index to an element.
*/
- virtual double toDouble(size_t i) const {
+ double toDouble(size_t i) const override {
typedef
typename boost::mpl::if_c<boost::is_convertible<double, Type>::value,
Type, InconvertibleToDoubleType>::type
@@ -175,7 +179,7 @@ public:
* @param i :: The index to an element.
* @param value: cast this value
*/
- virtual void fromDouble(size_t i, double value) {
+ void fromDouble(size_t i, double value) override {
typedef
typename boost::mpl::if_c<boost::is_convertible<double, Type>::value,
Type, InconvertibleToDoubleType>::type
@@ -193,7 +197,7 @@ public:
/// return a value casted to double; the users responsibility is to be sure,
/// that the casting is possible
- double operator[](size_t i) const {
+ double operator[](size_t i) const override {
try {
return boost::lexical_cast<double>(m_data[i]);
} catch (...) {
@@ -203,30 +207,32 @@ public:
/// Sort a vector of indices according to values in corresponding cells of
/// this column.
- virtual void
+ void
sortIndex(bool ascending, size_t start, size_t end,
std::vector<size_t> &indexVec,
- std::vector<std::pair<size_t, size_t>> &equalRanges) const;
+ std::vector<std::pair<size_t, size_t>> &equalRanges) const override;
/// Re-arrange values in this column according to indices in indexVec
- virtual void sortValues(const std::vector<size_t> &indexVec);
+ void sortValues(const std::vector<size_t> &indexVec) override;
protected:
/// Resize.
- void resize(size_t count) { m_data.resize(count); }
+ void resize(size_t count) override { m_data.resize(count); }
/// Inserts default value at position index.
- void insert(size_t index) {
+ void insert(size_t index) override {
if (index < m_data.size())
m_data.insert(m_data.begin() + index, Type());
else
m_data.push_back(Type());
}
/// Removes an item at index.
- void remove(size_t index) { m_data.erase(m_data.begin() + index); }
+ void remove(size_t index) override { m_data.erase(m_data.begin() + index); }
/// Returns a pointer to the data element.
- void *void_pointer(size_t index) { return &m_data.at(index); }
+ void *void_pointer(size_t index) override { return &m_data.at(index); }
/// Returns a pointer to the data element.
- const void *void_pointer(size_t index) const { return &m_data.at(index); }
+ const void *void_pointer(size_t index) const override {
+ return &m_data.at(index);
+ }
private:
/// Column data
diff --git a/Framework/DataObjects/inc/MantidDataObjects/TableWorkspace.h b/Framework/DataObjects/inc/MantidDataObjects/TableWorkspace.h
index 650bbeaa8a2b48fa36a767ff0c867c08e11c03b9..1689e64be716048583c1b5b57368f3a25eeafd28 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/TableWorkspace.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/TableWorkspace.h
@@ -81,37 +81,40 @@ public:
/// Constructor.
TableWorkspace(size_t nrows = 0);
/// Virtual destructor.
- virtual ~TableWorkspace();
+ ~TableWorkspace() override;
/// Returns a clone of the workspace
std::unique_ptr<TableWorkspace> clone() const {
return std::unique_ptr<TableWorkspace>(doClone());
}
/// Return the workspace typeID
- virtual const std::string id() const { return "TableWorkspace"; }
+ const std::string id() const override { return "TableWorkspace"; }
/// Get the footprint in memory in KB.
- virtual size_t getMemorySize() const;
+ size_t getMemorySize() const override;
/// Creates a new column.
- API::Column_sptr addColumn(const std::string &type, const std::string &name);
+ API::Column_sptr addColumn(const std::string &type,
+ const std::string &name) override;
/// Removes a column.
- void removeColumn(const std::string &name);
+ void removeColumn(const std::string &name) override;
/// Number of columns in the workspace.
- size_t columnCount() const { return static_cast<int>(m_columns.size()); }
+ size_t columnCount() const override {
+ return static_cast<int>(m_columns.size());
+ }
/// Gets the shared pointer to a column.
- API::Column_sptr getColumn(const std::string &name);
- API::Column_const_sptr getColumn(const std::string &name) const;
+ API::Column_sptr getColumn(const std::string &name) override;
+ API::Column_const_sptr getColumn(const std::string &name) const override;
/// Gets the shared pointer to a column.
- API::Column_sptr getColumn(size_t index);
+ API::Column_sptr getColumn(size_t index) override;
/// Gets the shared pointer to a column by index - return none-modifyable
/// column.
- API::Column_const_sptr getColumn(size_t index) const;
+ API::Column_const_sptr getColumn(size_t index) const override;
/// Returns a vector of all column names.
- std::vector<std::string> getColumnNames() const;
+ std::vector<std::string> getColumnNames() const override;
/// Number of rows in the workspace.
- size_t rowCount() const { return m_rowCount; }
+ size_t rowCount() const override { return m_rowCount; }
/**Get access to shared pointer containing workspace porperties */
- API::LogManager_sptr logs() { return m_LogManager; }
+ API::LogManager_sptr logs() override { return m_LogManager; }
/**Get constant access to shared pointer containing workspace porperties */
- API::LogManager_const_sptr getLogs() const { return m_LogManager; }
+ API::LogManager_const_sptr getLogs() const override { return m_LogManager; }
/** get access to column vecotor for index i.
*
@@ -210,12 +213,12 @@ public:
}
/// Resizes the workspace.
- void setRowCount(size_t count);
+ void setRowCount(size_t count) override;
/// Inserts a row before row pointed to by index and fills it with default
/// vales.
- size_t insertRow(size_t index);
+ size_t insertRow(size_t index) override;
/// Delets a row if it exists.
- void removeRow(size_t index);
+ void removeRow(size_t index) override;
/** This method finds the row and column index of an integer cell value in a
* table workspace
@@ -223,7 +226,7 @@ public:
* @param row row number of the value searched
* @param col column number of the value searched
*/
- virtual void find(size_t value, size_t &row, const size_t &col) {
+ void find(size_t value, size_t &row, const size_t &col) override {
findValue(value, row, col);
}
/** This method finds the row and column index of an string cell value in a
@@ -232,7 +235,7 @@ public:
* @param row row number of the value searched
* @param col column number of the value searched
*/
- virtual void find(std::string value, size_t &row, const size_t &col) {
+ void find(std::string value, size_t &row, const size_t &col) override {
findValue(value, row, col);
}
/** This method finds the row and column index of an float value in a table
@@ -241,7 +244,7 @@ public:
* @param row row number of the value searched
* @param col column number of the value searched
*/
- virtual void find(float value, size_t &row, const size_t &col) {
+ void find(float value, size_t &row, const size_t &col) override {
findValue(value, row, col);
}
/** This method finds the row and column index of an API::Bollean value in a
@@ -250,7 +253,7 @@ public:
* @param row row number of the value searched
* @param col column number of the value searched
*/
- virtual void find(API::Boolean value, size_t &row, const size_t &col) {
+ void find(API::Boolean value, size_t &row, const size_t &col) override {
findValue(value, row, col);
}
/** This method finds the row and column index of an double cell value in a
@@ -259,7 +262,7 @@ public:
* @param row row number of the value searched
* @param col column number of the value searched
*/
- virtual void find(double value, size_t &row, const size_t &col) {
+ void find(double value, size_t &row, const size_t &col) override {
findValue(value, row, col);
}
/** This method finds the row and column index of an Mantid::Kernel::V3D cell
@@ -268,7 +271,8 @@ public:
* @param row row number of the value searched
* @param col column number of the value searched
*/
- void find(Mantid::Kernel::V3D value, size_t &row, const size_t &col) {
+ void find(Mantid::Kernel::V3D value, size_t &row,
+ const size_t &col) override {
findValue(value, row, col);
}
/** Casts cells through converting their values to/from double without type
@@ -286,7 +290,7 @@ public:
}
/// Sort this table. @see ITableWorkspace::sort
- void sort(std::vector<std::pair<std::string, bool>> &criteria);
+ void sort(std::vector<std::pair<std::string, bool>> &criteria) override;
protected:
/// Protected copy constructor. May be used by childs for cloning.
@@ -295,7 +299,7 @@ protected:
TableWorkspace &operator=(const TableWorkspace &other);
private:
- virtual TableWorkspace *doClone() const { return new TableWorkspace(*this); }
+ TableWorkspace *doClone() const override { return new TableWorkspace(*this); }
/// template method to find a given value in a table.
template <typename Type>
diff --git a/Framework/DataObjects/inc/MantidDataObjects/VectorColumn.h b/Framework/DataObjects/inc/MantidDataObjects/VectorColumn.h
index 62b8c3ed62ac86043253ce669ab5efcb7e42696d..c9b43fea5af4e90b3a04f10eba249bf5f9c2398a 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/VectorColumn.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/VectorColumn.h
@@ -44,23 +44,23 @@ template <class Type> class DLLExport VectorColumn : public API::Column {
public:
VectorColumn() { m_type = typeName(); }
- virtual ~VectorColumn() {}
+ ~VectorColumn() override {}
/// Number of individual elements in the column
- virtual size_t size() const { return m_data.size(); }
+ size_t size() const override { return m_data.size(); }
/// Returns typeid for the data in the column
- virtual const std::type_info &get_type_info() const {
+ const std::type_info &get_type_info() const override {
return typeid(std::vector<Type>);
}
/// Returns typeid for the pointer type to the data element in the column
- virtual const std::type_info &get_pointer_type_info() const {
+ const std::type_info &get_pointer_type_info() const override {
return typeid(std::vector<Type> *);
}
/// Print specified item to the stream
- virtual void print(size_t index, std::ostream &s) const {
+ void print(size_t index, std::ostream &s) const override {
const std::vector<Type> &values = m_data.at(index);
auto it = values.begin();
@@ -77,7 +77,7 @@ public:
}
/// Set item from a string value
- virtual void read(size_t index, const std::string &text) {
+ void read(size_t index, const std::string &text) override {
std::vector<Type> newValues;
boost::char_separator<char> delim(",");
@@ -100,10 +100,10 @@ public:
}
/// Specialized type check
- virtual bool isBool() const { return false; }
+ bool isBool() const override { return false; }
/// Overall memory size taken by the column (bytes)
- virtual long int sizeOfData() const {
+ long int sizeOfData() const override {
long int size(0);
for (auto elemIt = m_data.begin(); elemIt != m_data.end(); ++elemIt) {
@@ -114,7 +114,7 @@ public:
}
/// Create another copy of the column
- virtual VectorColumn *clone() const {
+ VectorColumn *clone() const override {
VectorColumn *newColumn = new VectorColumn<Type>();
newColumn->m_data = m_data;
newColumn->setName(m_name);
@@ -123,13 +123,13 @@ public:
}
/// Cast to double
- virtual double toDouble(size_t i) const {
+ double toDouble(size_t i) const override {
UNUSED_ARG(i);
throw std::runtime_error("VectorColumn is not convertible to double.");
}
/// Assign from double
- virtual void fromDouble(size_t i, double value) {
+ void fromDouble(size_t i, double value) override {
UNUSED_ARG(i);
UNUSED_ARG(value);
throw std::runtime_error("VectorColumn is not assignable from double.");
@@ -137,22 +137,22 @@ public:
protected:
/// Sets the new column size.
- virtual void resize(size_t count) { m_data.resize(count); }
+ void resize(size_t count) override { m_data.resize(count); }
/// Inserts an item.
- virtual void insert(size_t index) {
+ void insert(size_t index) override {
// Insert empty vector at the given position
m_data.insert(m_data.begin() + index, std::vector<Type>());
}
/// Removes an item.
- virtual void remove(size_t index) { m_data.erase(m_data.begin() + index); }
+ void remove(size_t index) override { m_data.erase(m_data.begin() + index); }
/// Pointer to a data element
- virtual void *void_pointer(size_t index) { return &m_data.at(index); }
+ void *void_pointer(size_t index) override { return &m_data.at(index); }
/// Pointer to a data element
- virtual const void *void_pointer(size_t index) const {
+ const void *void_pointer(size_t index) const override {
return &m_data.at(index);
}
diff --git a/Framework/DataObjects/inc/MantidDataObjects/Workspace2D.h b/Framework/DataObjects/inc/MantidDataObjects/Workspace2D.h
index 679a808fbac419072ae61a49c38677b0ef081958..457440fb76476f3b90cd28426156871714e30249 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/Workspace2D.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/Workspace2D.h
@@ -47,10 +47,10 @@ public:
Gets the name of the workspace type
@return Standard string name
*/
- virtual const std::string id() const { return "Workspace2D"; }
+ const std::string id() const override { return "Workspace2D"; }
Workspace2D();
- virtual ~Workspace2D();
+ ~Workspace2D() override;
/// Returns a clone of the workspace
std::unique_ptr<Workspace2D> clone() const {
@@ -58,23 +58,23 @@ public:
}
/// Returns the histogram number
- std::size_t getNumberHistograms() const;
+ std::size_t getNumberHistograms() const override;
// section required for iteration
- virtual std::size_t size() const;
- virtual std::size_t blocksize() const;
+ std::size_t size() const override;
+ std::size_t blocksize() const override;
/// Return the underlying ISpectrum ptr at the given workspace index.
- virtual Mantid::API::ISpectrum *getSpectrum(const size_t index);
+ Mantid::API::ISpectrum *getSpectrum(const size_t index) override;
/// Return the underlying ISpectrum ptr (const version) at the given workspace
/// index.
- virtual const Mantid::API::ISpectrum *getSpectrum(const size_t index) const;
+ const Mantid::API::ISpectrum *getSpectrum(const size_t index) const override;
/// Generate a new histogram by rebinning the existing histogram.
void generateHistogram(const std::size_t index, const MantidVec &X,
MantidVec &Y, MantidVec &E,
- bool skipError = false) const;
+ bool skipError = false) const override;
/** sets the monitorWorkspace indexlist
@param mList :: a vector holding the monitor workspace indexes
@@ -83,10 +83,10 @@ public:
/// Copy the data (Y's) from an image to this workspace.
void setImageY(const API::MantidImage &image, size_t start = 0,
- bool parallelExecution = true);
+ bool parallelExecution = true) override;
/// Copy the data from an image to this workspace's errors.
void setImageE(const API::MantidImage &image, size_t start = 0,
- bool parallelExecution = true);
+ bool parallelExecution = true) override;
/// Copy the data from an image to this workspace's (Y's) and errors.
void setImageYAndE(const API::MantidImage &imageY,
const API::MantidImage &imageE, size_t start = 0,
@@ -100,8 +100,8 @@ protected:
Workspace2D &operator=(const Workspace2D &other);
/// Called by initialize()
- virtual void init(const std::size_t &NVectors, const std::size_t &XLength,
- const std::size_t &YLength);
+ void init(const std::size_t &NVectors, const std::size_t &XLength,
+ const std::size_t &YLength) override;
/// The number of vectors in the workspace
std::size_t m_noVectors;
@@ -113,7 +113,7 @@ protected:
std::vector<Mantid::API::ISpectrum *> data;
private:
- virtual Workspace2D *doClone() const { return new Workspace2D(*this); }
+ Workspace2D *doClone() const override { return new Workspace2D(*this); }
virtual std::size_t getHistogramNumberHelper() const;
};
diff --git a/Framework/DataObjects/inc/MantidDataObjects/WorkspaceSingleValue.h b/Framework/DataObjects/inc/MantidDataObjects/WorkspaceSingleValue.h
index c1108a48da663c41a71afa04a5b68b9b0b14e1c1..863bd7973c5e84b03eee01e2c3582492f59f3444 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/WorkspaceSingleValue.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/WorkspaceSingleValue.h
@@ -39,11 +39,11 @@ class DLLExport WorkspaceSingleValue : public API::MatrixWorkspace {
public:
/** Gets the name of the workspace type
* @return Standard string name */
- virtual const std::string id() const { return "WorkspaceSingleValue"; }
+ const std::string id() const override { return "WorkspaceSingleValue"; }
WorkspaceSingleValue(double value = 0.0, double error = 0.0);
- virtual ~WorkspaceSingleValue();
+ ~WorkspaceSingleValue() override;
/// Returns a clone of the workspace
std::unique_ptr<WorkspaceSingleValue> clone() const {
@@ -51,28 +51,28 @@ public:
}
/// Returns the number of single indexable items in the workspace
- virtual std::size_t size() const { return 1; }
+ std::size_t size() const override { return 1; }
/// Returns the size of each block of data returned by the dataX accessors
- virtual std::size_t blocksize() const { return 1; }
+ std::size_t blocksize() const override { return 1; }
/// @return the number of histograms (spectra)
- std::size_t getNumberHistograms() const { return 1; }
+ std::size_t getNumberHistograms() const override { return 1; }
//------------------------------------------------------------
// Return the underlying ISpectrum ptr at the given workspace index.
- virtual Mantid::API::ISpectrum *getSpectrum(const size_t index);
+ Mantid::API::ISpectrum *getSpectrum(const size_t index) override;
// Return the underlying ISpectrum ptr (const version) at the given workspace
// index.
- virtual const Mantid::API::ISpectrum *getSpectrum(const size_t index) const;
+ const Mantid::API::ISpectrum *getSpectrum(const size_t index) const override;
void generateHistogram(const std::size_t index, const MantidVec &X,
MantidVec &Y, MantidVec &E,
- bool skipError = false) const;
+ bool skipError = false) const override;
/// Returns the number of dimensions, 0 in this case.
- virtual size_t getNumDims() const;
+ size_t getNumDims() const override;
protected:
/// Protected copy constructor. May be used by childs for cloning.
@@ -81,13 +81,13 @@ protected:
WorkspaceSingleValue &operator=(const WorkspaceSingleValue &other);
private:
- virtual WorkspaceSingleValue *doClone() const {
+ WorkspaceSingleValue *doClone() const override {
return new WorkspaceSingleValue(*this);
}
// allocates space in a new workspace - does nothing in this case
- virtual void init(const std::size_t &NVectors, const std::size_t &XLength,
- const std::size_t &YLength);
+ void init(const std::size_t &NVectors, const std::size_t &XLength,
+ const std::size_t &YLength) override;
/// Instance of Histogram1D that holds the "spectrum" (AKA the single value);
Histogram1D data;
diff --git a/Framework/DataObjects/src/EventWorkspace.cpp b/Framework/DataObjects/src/EventWorkspace.cpp
index db4e1f80c9521401bc6bda7720a84e3d348eb393..a2595e6419ba05c85182d37f57df6e81fdcc0dba 100644
--- a/Framework/DataObjects/src/EventWorkspace.cpp
+++ b/Framework/DataObjects/src/EventWorkspace.cpp
@@ -820,7 +820,7 @@ public:
}
// Execute the sort as specified.
- void run() {
+ void run() override {
if (!m_WS)
return;
for (size_t wi = m_wiStart; wi < m_wiStop; wi++) {
diff --git a/Framework/Geometry/inc/MantidGeometry/ComponentParser.h b/Framework/Geometry/inc/MantidGeometry/ComponentParser.h
index c7d10bd37cd2b386e31b91ae5bc4332b0e29c3cb..5e59dec67fe6b43b4c3bf8a9f69cc2e95927ed8f 100644
--- a/Framework/Geometry/inc/MantidGeometry/ComponentParser.h
+++ b/Framework/Geometry/inc/MantidGeometry/ComponentParser.h
@@ -40,19 +40,19 @@ namespace Geometry {
class DLLExport ComponentParser : public Poco::XML::ContentHandler {
public:
ComponentParser();
- ~ComponentParser();
+ ~ComponentParser() override;
/// Signals start of element
void startElement(const Poco::XML::XMLString &,
const Poco::XML::XMLString &localName,
const Poco::XML::XMLString &,
- const Poco::XML::Attributes &attr);
+ const Poco::XML::Attributes &attr) override;
/// Signals end of element
void endElement(const Poco::XML::XMLString &,
const Poco::XML::XMLString &localName,
- const Poco::XML::XMLString &);
+ const Poco::XML::XMLString &) override;
- void characters(const Poco::XML::XMLChar[], int, int);
+ void characters(const Poco::XML::XMLChar[], int, int) override;
Component *getComponent();
@@ -61,17 +61,19 @@ public:
// These functions must be present as they are abstract in the base class.
// They are not used them here.
/// Signals start of XML document
- void startDocument() {} ///<Not used
- void setDocumentLocator(const Poco::XML::Locator *) {} ///< Not used
- void endDocument() {} ///< Not used
- void ignorableWhitespace(const Poco::XML::XMLChar[], int, int) {
+ void startDocument() override {} ///<Not used
+ void setDocumentLocator(const Poco::XML::Locator *) override {} ///< Not used
+ void endDocument() override {} ///< Not used
+ void ignorableWhitespace(const Poco::XML::XMLChar[], int, int) override {
} ///< Not used
void processingInstruction(const Poco::XML::XMLString &,
- const Poco::XML::XMLString &) {} ///< Not used
+ const Poco::XML::XMLString &) override {
+ } ///< Not used
void startPrefixMapping(const Poco::XML::XMLString &,
- const Poco::XML::XMLString &) {} ///< Not used
- void endPrefixMapping(const Poco::XML::XMLString &) {} ///< Not used
- void skippedEntity(const Poco::XML::XMLString &) {} ///< Not used
+ const Poco::XML::XMLString &) override {
+ } ///< Not used
+ void endPrefixMapping(const Poco::XML::XMLString &) override {} ///< Not used
+ void skippedEntity(const Poco::XML::XMLString &) override {} ///< Not used
private:
/// The components currently being built up.
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/BasicHKLFilters.h b/Framework/Geometry/inc/MantidGeometry/Crystal/BasicHKLFilters.h
index 8081a3ebe33d623b95637c87a4995dfab5e02f74..ce99a4759ef6c91fc1cc5375220d056f3e80a9e0 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/BasicHKLFilters.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/BasicHKLFilters.h
@@ -90,8 +90,8 @@ public:
HKLFilterDRange(const UnitCell &cell, double dMin);
HKLFilterDRange(const UnitCell &cell, double dMin, double dMax);
- std::string getDescription() const;
- bool isAllowed(const Kernel::V3D &hkl) const;
+ std::string getDescription() const override;
+ bool isAllowed(const Kernel::V3D &hkl) const override;
private:
void checkProperDRangeValues();
@@ -111,8 +111,8 @@ class MANTID_GEOMETRY_DLL HKLFilterSpaceGroup : public HKLFilter {
public:
HKLFilterSpaceGroup(const SpaceGroup_const_sptr &spaceGroup);
- std::string getDescription() const;
- bool isAllowed(const Kernel::V3D &hkl) const;
+ std::string getDescription() const override;
+ bool isAllowed(const Kernel::V3D &hkl) const override;
protected:
SpaceGroup_const_sptr m_spaceGroup;
@@ -131,8 +131,8 @@ public:
HKLFilterStructureFactor(const StructureFactorCalculator_sptr &calculator,
double fSquaredMin = 1.0e-6);
- std::string getDescription() const;
- bool isAllowed(const Kernel::V3D &hkl) const;
+ std::string getDescription() const override;
+ bool isAllowed(const Kernel::V3D &hkl) const override;
protected:
StructureFactorCalculator_sptr m_calculator;
@@ -149,8 +149,8 @@ class MANTID_GEOMETRY_DLL HKLFilterCentering : public HKLFilter {
public:
HKLFilterCentering(const ReflectionCondition_sptr ¢ering);
- std::string getDescription() const;
- bool isAllowed(const Kernel::V3D &hkl) const;
+ std::string getDescription() const override;
+ bool isAllowed(const Kernel::V3D &hkl) const override;
protected:
ReflectionCondition_sptr m_centering;
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScatterer.h b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScatterer.h
index c87a838f4cd5efd0c6a59e54b8e9b4c603282725..0fd5bf1e167989dcf9d32d2f28f768d8c748db19 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScatterer.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScatterer.h
@@ -68,7 +68,7 @@ typedef boost::shared_ptr<BraggScatterer> BraggScatterer_sptr;
class MANTID_GEOMETRY_DLL BraggScatterer : public Kernel::PropertyManager {
public:
BraggScatterer();
- virtual ~BraggScatterer() {}
+ ~BraggScatterer() override {}
void initialize();
bool isInitialized();
@@ -85,7 +85,7 @@ public:
protected:
/// Base implementation does nothing, can be re-implemented by subclasses.
- void afterPropertySet(const std::string &) {}
+ void afterPropertySet(const std::string &) override {}
/// Base implementation does nothing - for implementing classes only.
virtual void declareProperties() {}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.h b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.h
index abd137481536e20b60610d266e22fc81be6f754a..fefe6c7bd1ae0dd7f587c5ca137fc2aeb1d0b79a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererInCrystalStructure.h
@@ -46,13 +46,13 @@ class MANTID_GEOMETRY_DLL BraggScattererInCrystalStructure
: public BraggScatterer {
public:
BraggScattererInCrystalStructure();
- virtual ~BraggScattererInCrystalStructure() {}
+ ~BraggScattererInCrystalStructure() override {}
Kernel::V3D getPosition() const;
UnitCell getCell() const;
protected:
- virtual void afterPropertySet(const std::string &propertyName);
+ void afterPropertySet(const std::string &propertyName) override;
/// This method should be re-implemented by subclasses for additional
/// parameter processing.
@@ -65,7 +65,7 @@ protected:
virtual void setPosition(const Kernel::V3D &position);
virtual void setCell(const UnitCell &cell);
- virtual void declareProperties();
+ void declareProperties() override;
Kernel::V3D getPositionFromString(const std::string &positionString) const;
@@ -86,8 +86,8 @@ typedef boost::shared_ptr<BraggScattererInCrystalStructure>
class MANTID_GEOMETRY_DLL UnitCellStringValidator
: public Kernel::TypedValidator<std::string> {
protected:
- Kernel::IValidator_sptr clone() const;
- virtual std::string checkValidity(const std::string &unitCellString) const;
+ Kernel::IValidator_sptr clone() const override;
+ std::string checkValidity(const std::string &unitCellString) const override;
};
MANTID_GEOMETRY_DLL std::vector<std::string>
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h
index ce3610842e5c939fde96cf7e5d733fe14956f442..9f621989c801c134eeee4f7b6fca4c26709616ea 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h
@@ -57,7 +57,7 @@ public:
enum CenteringType { P, I, A, B, C, F, Robv, Rrev };
CenteringGroup(const std::string ¢eringSymbol);
- virtual ~CenteringGroup() {}
+ ~CenteringGroup() override {}
CenteringType getType() const;
std::string getSymbol() const;
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/CompositeBraggScatterer.h b/Framework/Geometry/inc/MantidGeometry/Crystal/CompositeBraggScatterer.h
index 58ced2a99a06a94d745b7f0419097c77530ebfde..345fa5ca44dc020db5fb5b056afd995b72d463e4 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/CompositeBraggScatterer.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/CompositeBraggScatterer.h
@@ -64,14 +64,14 @@ typedef boost::shared_ptr<CompositeBraggScatterer> CompositeBraggScatterer_sptr;
class MANTID_GEOMETRY_DLL CompositeBraggScatterer : public BraggScatterer {
public:
CompositeBraggScatterer();
- virtual ~CompositeBraggScatterer() {}
+ ~CompositeBraggScatterer() override {}
static CompositeBraggScatterer_sptr create();
static CompositeBraggScatterer_sptr
create(const std::vector<BraggScatterer_sptr> &scatterers);
- std::string name() const { return "CompositeBraggScatterer"; }
- BraggScatterer_sptr clone() const;
+ std::string name() const override { return "CompositeBraggScatterer"; }
+ BraggScatterer_sptr clone() const override;
virtual void addScatterer(const BraggScatterer_sptr &scatterer);
void setScatterers(const std::vector<BraggScatterer_sptr> &scatterers);
@@ -80,10 +80,11 @@ public:
void removeScatterer(size_t i);
void removeAllScatterers();
- StructureFactor calculateStructureFactor(const Kernel::V3D &hkl) const;
+ StructureFactor
+ calculateStructureFactor(const Kernel::V3D &hkl) const override;
protected:
- void afterPropertySet(const std::string &propertyName);
+ void afterPropertySet(const std::string &propertyName) override;
void propagateProperty(const std::string &propertyName);
void propagatePropertyToScatterer(BraggScatterer_sptr &scatterer,
const std::string &propertyName,
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/ConcretePeakTransformFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/ConcretePeakTransformFactory.h
index bc19f069997c470bfd11c7ddfac630867655ee19..0cfc615232cec388c7f69dafe282c39124c444e1 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/ConcretePeakTransformFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/ConcretePeakTransformFactory.h
@@ -24,21 +24,21 @@ public:
@param xPlotLabel : X-axis plot label
@param yPlotLabel : Y-axis plot label
*/
- virtual PeakTransform_sptr
+ PeakTransform_sptr
createTransform(const std::string &xPlotLabel,
- const std::string &yPlotLabel) const {
+ const std::string &yPlotLabel) const override {
return boost::make_shared<PeakTransformProduct>(xPlotLabel, yPlotLabel);
}
/**
Overriden Factory Method.
*/
- virtual PeakTransform_sptr createDefaultTransform() const {
+ PeakTransform_sptr createDefaultTransform() const override {
return boost::make_shared<PeakTransformProduct>();
}
/// Destructor
- virtual ~ConcretePeakTransformFactory() {}
+ ~ConcretePeakTransformFactory() override {}
};
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/CyclicGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/CyclicGroup.h
index da968d3410c27b01f68f3ff10347c09fa6e92bfd..4ed7414aabfddc85a65281eb7d9ea47f7ecbf674 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/CyclicGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/CyclicGroup.h
@@ -83,7 +83,7 @@ class MANTID_GEOMETRY_DLL CyclicGroup : public Group {
public:
CyclicGroup(const std::string &symmetryOperationString);
CyclicGroup(const SymmetryOperation &symmetryOperation);
- virtual ~CyclicGroup() {}
+ ~CyclicGroup() override {}
protected:
std::vector<SymmetryOperation>
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilter.h b/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilter.h
index ca812aebdefeb7fdaa31219407f718d6becdfa2b..e0e72bb49584ee45cc1f241c4198f3027aa24c3a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilter.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilter.h
@@ -94,7 +94,7 @@ typedef boost::shared_ptr<const HKLFilter> HKLFilter_const_sptr;
class MANTID_GEOMETRY_DLL HKLFilterUnaryLogicOperation : public HKLFilter {
public:
HKLFilterUnaryLogicOperation(const HKLFilter_const_sptr &filter);
- ~HKLFilterUnaryLogicOperation() {}
+ ~HKLFilterUnaryLogicOperation() override {}
/// Returns the operand of the function.
const HKLFilter_const_sptr &getOperand() const { return m_operand; }
@@ -110,10 +110,10 @@ public:
/// null pointer.
HKLFilterNot(const HKLFilter_const_sptr &filter)
: HKLFilterUnaryLogicOperation(filter) {}
- ~HKLFilterNot() {}
+ ~HKLFilterNot() override {}
- std::string getDescription() const;
- bool isAllowed(const Kernel::V3D &hkl) const;
+ std::string getDescription() const override;
+ bool isAllowed(const Kernel::V3D &hkl) const override;
};
/// Base class for binary logic operations for HKLFilter.
@@ -121,7 +121,7 @@ class MANTID_GEOMETRY_DLL HKLFilterBinaryLogicOperation : public HKLFilter {
public:
HKLFilterBinaryLogicOperation(const HKLFilter_const_sptr &lhs,
const HKLFilter_const_sptr &rhs);
- virtual ~HKLFilterBinaryLogicOperation() {}
+ ~HKLFilterBinaryLogicOperation() override {}
/// Returns the left-hand side operand of the operation.
const HKLFilter_const_sptr &getLHS() const { return m_lhs; }
@@ -141,10 +141,10 @@ public:
/// the operands is null.
HKLFilterAnd(const HKLFilter_const_sptr &lhs, const HKLFilter_const_sptr &rhs)
: HKLFilterBinaryLogicOperation(lhs, rhs) {}
- ~HKLFilterAnd() {}
+ ~HKLFilterAnd() override {}
- std::string getDescription() const;
- bool isAllowed(const Kernel::V3D &hkl) const;
+ std::string getDescription() const override;
+ bool isAllowed(const Kernel::V3D &hkl) const override;
};
/// Logical "Or"-operation for HKLFilter.
@@ -154,10 +154,10 @@ public:
/// the operands is null.
HKLFilterOr(const HKLFilter_const_sptr &lhs, const HKLFilter_const_sptr &rhs)
: HKLFilterBinaryLogicOperation(lhs, rhs) {}
- ~HKLFilterOr() {}
+ ~HKLFilterOr() override {}
- std::string getDescription() const;
- bool isAllowed(const Kernel::V3D &hkl) const;
+ std::string getDescription() const override;
+ bool isAllowed(const Kernel::V3D &hkl) const override;
};
MANTID_GEOMETRY_DLL const HKLFilter_const_sptr
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilterWavelength.h b/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilterWavelength.h
index 7f02f5b72b149915dfe82ac3bc7caf0feac36a99..79edc6e094f602805203f985e43b883f297dbac1 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilterWavelength.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/HKLFilterWavelength.h
@@ -42,10 +42,10 @@ class MANTID_GEOMETRY_DLL HKLFilterWavelength : public HKLFilter {
public:
HKLFilterWavelength(const Kernel::DblMatrix &ub, double lambdaMin,
double lambdaMax);
- virtual ~HKLFilterWavelength() {}
+ ~HKLFilterWavelength() override {}
- std::string getDescription() const;
- bool isAllowed(const Kernel::V3D &hkl) const;
+ std::string getDescription() const override;
+ bool isAllowed(const Kernel::V3D &hkl) const override;
protected:
void checkProperLambdaRangeValues() const;
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h b/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h
index 24dd9e30aa59263162745d0d4a7bd426855025c1..b2bad25163d24aac398fbfaaf0921e3994f54257 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/IsotropicAtomBraggScatterer.h
@@ -95,10 +95,10 @@ class MANTID_GEOMETRY_DLL IsotropicAtomBraggScatterer
: public BraggScattererInCrystalStructure {
public:
IsotropicAtomBraggScatterer();
- virtual ~IsotropicAtomBraggScatterer() {}
+ ~IsotropicAtomBraggScatterer() override {}
- std::string name() const { return "IsotropicAtomBraggScatterer"; }
- BraggScatterer_sptr clone() const;
+ std::string name() const override { return "IsotropicAtomBraggScatterer"; }
+ BraggScatterer_sptr clone() const override;
std::string getElement() const;
PhysicalConstants::NeutronAtom getNeutronAtom() const;
@@ -106,13 +106,14 @@ public:
double getOccupancy() const;
double getU() const;
- StructureFactor calculateStructureFactor(const Kernel::V3D &hkl) const;
+ StructureFactor
+ calculateStructureFactor(const Kernel::V3D &hkl) const override;
protected:
void setElement(const std::string &element);
- void declareScattererProperties();
- void afterScattererPropertySet(const std::string &propertyName);
+ void declareScattererProperties() override;
+ void afterScattererPropertySet(const std::string &propertyName) override;
double getDebyeWallerFactor(const Kernel::V3D &hkl) const;
double getScatteringLength() const;
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/NiggliCell.h b/Framework/Geometry/inc/MantidGeometry/Crystal/NiggliCell.h
index 144726ddacf43dc1134647db3334f7d373303e0c..054855fb6d99f24703feb0693d0ad35714359a97 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/NiggliCell.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/NiggliCell.h
@@ -54,7 +54,7 @@ public:
NiggliCell(const UnitCell *uc,
const Kernel::DblMatrix &Umatrix = Kernel::DblMatrix(3, 3, true));
// Destructor
- virtual ~NiggliCell();
+ ~NiggliCell() override;
// Access private variables
/// Check if a,b,c cell has angles satifying Niggli condition within epsilon
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/OrientedLattice.h b/Framework/Geometry/inc/MantidGeometry/Crystal/OrientedLattice.h
index 4ad9d3aa67e3be62215b7f9a1f266015ce98ca04..7c5199e1bf8c9a3a6da9ad16ec262a278c3e35cf 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/OrientedLattice.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/OrientedLattice.h
@@ -59,7 +59,7 @@ public:
const Kernel::DblMatrix &Umatrix = Kernel::DblMatrix(3, 3,
true));
// Destructor
- virtual ~OrientedLattice();
+ ~OrientedLattice() override;
// Access private variables
const Kernel::DblMatrix &getU() const;
@@ -93,7 +93,7 @@ private:
Kernel::DblMatrix UB;
/** Make recalculateFromGstar private. */
- void recalculateFromGstar(const Kernel::DblMatrix &NewGstar) {
+ void recalculateFromGstar(const Kernel::DblMatrix &NewGstar) override {
UnitCell::recalculateFromGstar(NewGstar);
}
};
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformHKL.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformHKL.h
index 5159c6611b80441d3218746258425afa1f116166..3103089e2f6a6cec01e1baecb381ab6538bfbc27 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformHKL.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformHKL.h
@@ -20,19 +20,20 @@ public:
PeakTransformHKL(const std::string &xPlotLabel,
const std::string &yPlotLabel);
/// Destructor
- virtual ~PeakTransformHKL();
+ ~PeakTransformHKL() override;
/// Copy Constructor
PeakTransformHKL(const PeakTransformHKL &other);
/// Assigmentent
PeakTransformHKL &operator=(const PeakTransformHKL &other);
/// Virtual constructor
- PeakTransform_sptr clone() const;
+ PeakTransform_sptr clone() const override;
/// Transform peak.
- Mantid::Kernel::V3D transformPeak(const Mantid::Geometry::IPeak &peak) const;
+ Mantid::Kernel::V3D
+ transformPeak(const Mantid::Geometry::IPeak &peak) const override;
/// Getter for a friendly name to describe the transform type.
- virtual std::string getFriendlyName() const { return name(); }
+ std::string getFriendlyName() const override { return name(); }
/// Getter for the special coordinate representation of this transform type.
- Mantid::Kernel::SpecialCoordinateSystem getCoordinateSystem() const;
+ Mantid::Kernel::SpecialCoordinateSystem getCoordinateSystem() const override;
};
/// Typedef a factory for type of PeaksTransform.
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h
index 21a9787635c9566b95d071693c123146e4034a26..315b60893f021844cf6eec5f9b4160c1f23ba19a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQLab.h
@@ -20,19 +20,20 @@ public:
PeakTransformQLab(const std::string &xPlotLabel,
const std::string &yPlotLabel);
/// Destructor
- virtual ~PeakTransformQLab();
+ ~PeakTransformQLab() override;
/// Copy constructor
PeakTransformQLab(const PeakTransformQLab &other);
/// Assigment
PeakTransformQLab &operator=(const PeakTransformQLab &other);
/// Virtual constructor
- PeakTransform_sptr clone() const;
+ PeakTransform_sptr clone() const override;
/// Transform peak.
- Mantid::Kernel::V3D transformPeak(const Mantid::Geometry::IPeak &peak) const;
+ Mantid::Kernel::V3D
+ transformPeak(const Mantid::Geometry::IPeak &peak) const override;
/// Get the transform friendly name.
- virtual std::string getFriendlyName() const { return name(); }
+ std::string getFriendlyName() const override { return name(); }
/// Getter for the special coordinate representation of this transform type.
- Mantid::Kernel::SpecialCoordinateSystem getCoordinateSystem() const;
+ Mantid::Kernel::SpecialCoordinateSystem getCoordinateSystem() const override;
};
/// Typedef a factory for type of PeaksTransform.
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h
index cba38af82249906ee3a21e8a6fd675f24524e69f..2fd66e32c25c3e11e317bc9f62fedc7586c5d547 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PeakTransformQSample.h
@@ -21,19 +21,20 @@ public:
PeakTransformQSample(const std::string &xPlotLabel,
const std::string &yPlotLabel);
/// Destructor
- virtual ~PeakTransformQSample();
+ ~PeakTransformQSample() override;
/// Copy constructor
PeakTransformQSample(const PeakTransformQSample &other);
/// Assigment
PeakTransformQSample &operator=(const PeakTransformQSample &other);
/// Virtual constructor
- PeakTransform_sptr clone() const;
+ PeakTransform_sptr clone() const override;
/// Transform peak.
- Mantid::Kernel::V3D transformPeak(const Mantid::Geometry::IPeak &peak) const;
+ Mantid::Kernel::V3D
+ transformPeak(const Mantid::Geometry::IPeak &peak) const override;
/// Getter for the transform name.
- virtual std::string getFriendlyName() const { return name(); }
+ std::string getFriendlyName() const override { return name(); }
/// Getter for the special coordinate representation of this transform type.
- Mantid::Kernel::SpecialCoordinateSystem getCoordinateSystem() const;
+ Mantid::Kernel::SpecialCoordinateSystem getCoordinateSystem() const override;
};
/// Typedef a factory for type of PeaksTransform.
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
index 1ea7c50bfa05776468d2750c2cfcac894f0b616c..e2609986aecd8a859fdb9dfa2f08f28529eb4364 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroup.h
@@ -50,7 +50,7 @@ public:
PointGroup(const PointGroup &other);
PointGroup &operator=(const PointGroup &other);
- virtual ~PointGroup() {}
+ ~PointGroup() override {}
/// Name of the point group
std::string getName() const { return m_name; }
/// Hermann-Mauguin symbol
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/ProductOfCyclicGroups.h b/Framework/Geometry/inc/MantidGeometry/Crystal/ProductOfCyclicGroups.h
index 4a7b49fc2e9387af3d1165afe09f57bbe1aa729d..f8609ce57caa9afb5642f27931bc445857bf8643 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/ProductOfCyclicGroups.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/ProductOfCyclicGroups.h
@@ -64,7 +64,7 @@ class MANTID_GEOMETRY_DLL ProductOfCyclicGroups : public Group {
public:
ProductOfCyclicGroups(const std::string &generators);
ProductOfCyclicGroups(const std::vector<Group_const_sptr> &factorGroups);
- virtual ~ProductOfCyclicGroups() {}
+ ~ProductOfCyclicGroups() override {}
protected:
Group_const_sptr getGeneratedGroup(const std::string &generators) const;
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h b/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h
index 89f1c607d46c28127665c1a6d6812880e11f11d2..94050cc2eb3abd94485f91d11dd3bb12c350222c 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/ReflectionCondition.h
@@ -38,11 +38,11 @@ class MANTID_GEOMETRY_DLL ReflectionConditionPrimitive
: public ReflectionCondition {
public:
/// Name of the reflection condition
- virtual std::string getName() { return "Primitive"; }
+ std::string getName() override { return "Primitive"; }
/// Symbol of the associated lattice centering.
- virtual std::string getSymbol() { return "P"; }
+ std::string getSymbol() override { return "P"; }
/// Return true if the hkl is allowed.
- virtual bool isAllowed(int /*h*/, int /*k*/, int /*l*/) { return true; }
+ bool isAllowed(int /*h*/, int /*k*/, int /*l*/) override { return true; }
};
//------------------------------------------------------------------------
@@ -51,11 +51,11 @@ class MANTID_GEOMETRY_DLL ReflectionConditionCFaceCentred
: public ReflectionCondition {
public:
/// Name of the reflection condition
- virtual std::string getName() { return "C-face centred"; }
+ std::string getName() override { return "C-face centred"; }
/// Symbol of the associated lattice centering.
- virtual std::string getSymbol() { return "C"; }
+ std::string getSymbol() override { return "C"; }
/// Return true if the hkl is allowed.
- virtual bool isAllowed(int h, int k, int /*l*/) {
+ bool isAllowed(int h, int k, int /*l*/) override {
return (((h + k) % 2) == 0);
}
};
@@ -66,11 +66,11 @@ class MANTID_GEOMETRY_DLL ReflectionConditionAFaceCentred
: public ReflectionCondition {
public:
/// Name of the reflection condition
- virtual std::string getName() { return "A-face centred"; }
+ std::string getName() override { return "A-face centred"; }
/// Symbol of the associated lattice centering.
- virtual std::string getSymbol() { return "A"; }
+ std::string getSymbol() override { return "A"; }
/// Return true if the hkl is allowed.
- virtual bool isAllowed(int /*h*/, int k, int l) {
+ bool isAllowed(int /*h*/, int k, int l) override {
return (((k + l) % 2) == 0);
}
};
@@ -81,11 +81,11 @@ class MANTID_GEOMETRY_DLL ReflectionConditionBFaceCentred
: public ReflectionCondition {
public:
/// Name of the reflection condition
- virtual std::string getName() { return "B-face centred"; }
+ std::string getName() override { return "B-face centred"; }
/// Symbol of the associated lattice centering.
- virtual std::string getSymbol() { return "B"; }
+ std::string getSymbol() override { return "B"; }
/// Return true if the hkl is allowed.
- virtual bool isAllowed(int h, int /*k*/, int l) {
+ bool isAllowed(int h, int /*k*/, int l) override {
return (((h + l) % 2) == 0);
}
};
@@ -96,11 +96,13 @@ class MANTID_GEOMETRY_DLL ReflectionConditionBodyCentred
: public ReflectionCondition {
public:
/// Name of the reflection condition
- virtual std::string getName() { return "Body centred"; }
+ std::string getName() override { return "Body centred"; }
/// Symbol of the associated lattice centering.
- virtual std::string getSymbol() { return "I"; }
+ std::string getSymbol() override { return "I"; }
/// Return true if the hkl is allowed.
- virtual bool isAllowed(int h, int k, int l) { return ((h + k + l) % 2) == 0; }
+ bool isAllowed(int h, int k, int l) override {
+ return ((h + k + l) % 2) == 0;
+ }
};
//------------------------------------------------------------------------
@@ -109,11 +111,11 @@ class MANTID_GEOMETRY_DLL ReflectionConditionAllFaceCentred
: public ReflectionCondition {
public:
/// Name of the reflection condition
- virtual std::string getName() { return "All-face centred"; }
+ std::string getName() override { return "All-face centred"; }
/// Symbol of the associated lattice centering.
- virtual std::string getSymbol() { return "F"; }
+ std::string getSymbol() override { return "F"; }
/// Return true if the hkl is allowed.
- virtual bool isAllowed(int h, int k, int l) {
+ bool isAllowed(int h, int k, int l) override {
return (
((((h + k) % 2) == 0) && (((h + l) % 2) == 0) && (((k + l) % 2) == 0)) |
((h % 2 == 0) && (k % 2 == 0) && (l % 2 == 0)) ||
@@ -127,11 +129,11 @@ class MANTID_GEOMETRY_DLL ReflectionConditionRhombohedrallyObverse
: public ReflectionCondition {
public:
/// Name of the reflection condition
- virtual std::string getName() { return "Rhombohedrally centred, obverse"; }
+ std::string getName() override { return "Rhombohedrally centred, obverse"; }
/// Symbol of the associated lattice centering.
- virtual std::string getSymbol() { return "Robv"; }
+ std::string getSymbol() override { return "Robv"; }
/// Return true if the hkl is allowed.
- virtual bool isAllowed(int h, int k, int l) {
+ bool isAllowed(int h, int k, int l) override {
return (((-h + k + l) % 3) == 0);
}
};
@@ -142,11 +144,11 @@ class MANTID_GEOMETRY_DLL ReflectionConditionRhombohedrallyReverse
: public ReflectionCondition {
public:
/// Name of the reflection condition
- virtual std::string getName() { return "Rhombohedrally centred, reverse"; }
+ std::string getName() override { return "Rhombohedrally centred, reverse"; }
/// Symbol of the associated lattice centering.
- virtual std::string getSymbol() { return "Rrev"; }
+ std::string getSymbol() override { return "Rrev"; }
/// Return true if the hkl is allowed.
- virtual bool isAllowed(int h, int k, int l) {
+ bool isAllowed(int h, int k, int l) override {
return (((h - k + l) % 3) == 0);
}
};
@@ -157,11 +159,11 @@ class MANTID_GEOMETRY_DLL ReflectionConditionHexagonallyReverse
: public ReflectionCondition {
public:
/// Name of the reflection condition
- virtual std::string getName() { return "Hexagonally centred, reverse"; }
+ std::string getName() override { return "Hexagonally centred, reverse"; }
/// Symbol of the associated lattice centering.
- virtual std::string getSymbol() { return "H"; }
+ std::string getSymbol() override { return "H"; }
/// Return true if the hkl is allowed.
- virtual bool isAllowed(int h, int k, int /*l*/) {
+ bool isAllowed(int h, int k, int /*l*/) override {
return (((h - k) % 3) == 0);
}
};
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.h
index d24aaf35325e8182612654396f8bca6b56f2bd40..3d380794fc42cecaaad9bdb42b7bd875ce47316b 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroup.h
@@ -64,7 +64,7 @@ public:
SpaceGroup(const SpaceGroup &other);
SpaceGroup &operator=(const SpaceGroup &other);
- virtual ~SpaceGroup() {}
+ ~SpaceGroup() override {}
size_t number() const;
std::string hmSymbol() const;
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
index 7200992421310789355bf772bdc745df2e710b83..6e31dc52138886ca775ee8da909734a9e45e93c2 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
@@ -71,10 +71,10 @@ class MANTID_GEOMETRY_DLL AlgorithmicSpaceGroupGenerator
public:
AlgorithmicSpaceGroupGenerator(size_t number, const std::string &hmSymbol,
const std::string &generatorInformation);
- virtual ~AlgorithmicSpaceGroupGenerator() {}
+ ~AlgorithmicSpaceGroupGenerator() override {}
protected:
- Group_const_sptr generateGroup() const;
+ Group_const_sptr generateGroup() const override;
std::string getCenteringSymbol() const;
};
@@ -85,10 +85,10 @@ class MANTID_GEOMETRY_DLL TransformationSpaceGroupGenerator
public:
TransformationSpaceGroupGenerator(size_t number, const std::string &hmSymbol,
const std::string &generatorInformation);
- virtual ~TransformationSpaceGroupGenerator() {}
+ ~TransformationSpaceGroupGenerator() override {}
protected:
- Group_const_sptr generateGroup() const;
+ Group_const_sptr generateGroup() const override;
virtual SpaceGroup_const_sptr getBaseSpaceGroup() const;
void setBaseAndTransformation(const std::string &generatorInformation);
@@ -104,10 +104,10 @@ class MANTID_GEOMETRY_DLL TabulatedSpaceGroupGenerator
public:
TabulatedSpaceGroupGenerator(size_t number, const std::string &hmSymbol,
const std::string &generatorInformation);
- virtual ~TabulatedSpaceGroupGenerator() {}
+ ~TabulatedSpaceGroupGenerator() override {}
protected:
- Group_const_sptr generateGroup() const;
+ Group_const_sptr generateGroup() const override;
};
/**
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.h b/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.h
index 5cfed836be0c671fee66916460800dcfc735911f..f248c8308bf21b66cead67a7b5b5491eb09879e0 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/StructureFactorCalculatorSummation.h
@@ -42,12 +42,13 @@ class MANTID_GEOMETRY_DLL StructureFactorCalculatorSummation
: public StructureFactorCalculator {
public:
StructureFactorCalculatorSummation();
- virtual ~StructureFactorCalculatorSummation() {}
+ ~StructureFactorCalculatorSummation() override {}
- StructureFactor getF(const Kernel::V3D &hkl) const;
+ StructureFactor getF(const Kernel::V3D &hkl) const override;
protected:
- void crystalStructureSetHook(const CrystalStructure &crystalStructure);
+ void
+ crystalStructureSetHook(const CrystalStructure &crystalStructure) override;
void updateUnitCellScatterers(const CrystalStructure &crystalStructure);
std::string getV3DasString(const Kernel::V3D &point) const;
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.h
index 571b895e336e9db98751747b2fab84aca117d1a4..dc6d5e39dad15965bc600f3ce65337889f1702c4 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElement.h
@@ -75,9 +75,9 @@ typedef boost::shared_ptr<SymmetryElement> SymmetryElement_sptr;
class MANTID_GEOMETRY_DLL SymmetryElementIdentity : public SymmetryElement {
public:
SymmetryElementIdentity();
- ~SymmetryElementIdentity() {}
+ ~SymmetryElementIdentity() override {}
- SymmetryElement_sptr clone() const;
+ SymmetryElement_sptr clone() const override;
};
typedef boost::shared_ptr<SymmetryElementIdentity> SymmetryElementIdentity_sptr;
@@ -91,9 +91,9 @@ typedef boost::shared_ptr<SymmetryElementIdentity> SymmetryElementIdentity_sptr;
class MANTID_GEOMETRY_DLL SymmetryElementInversion : public SymmetryElement {
public:
SymmetryElementInversion(const V3R &inversionPoint = V3R(0, 0, 0));
- ~SymmetryElementInversion() {}
+ ~SymmetryElementInversion() override {}
- SymmetryElement_sptr clone() const;
+ SymmetryElement_sptr clone() const override;
/// Returns the internally stored inversion point.
V3R getInversionPoint() const { return m_inversionPoint; }
@@ -114,12 +114,12 @@ typedef boost::shared_ptr<SymmetryElementInversion>
class MANTID_GEOMETRY_DLL SymmetryElementTranslation : public SymmetryElement {
public:
SymmetryElementTranslation(const V3R &translation);
- ~SymmetryElementTranslation() {}
+ ~SymmetryElementTranslation() override {}
/// Returns the internally stored translation vector.
V3R getTranslation() const { return m_translation; }
- SymmetryElement_sptr clone() const;
+ SymmetryElement_sptr clone() const override;
protected:
V3R m_translation;
@@ -137,7 +137,7 @@ typedef boost::shared_ptr<SymmetryElementTranslation>
*/
class MANTID_GEOMETRY_DLL SymmetryElementWithAxis : public SymmetryElement {
public:
- ~SymmetryElementWithAxis() {}
+ ~SymmetryElementWithAxis() override {}
/// Returns the internally stored axis.
V3R getAxis() const { return m_axis; }
@@ -178,9 +178,9 @@ public:
SymmetryElementRotation(const std::string &symbol, const V3R &axis,
const V3R &translation = V3R(0, 0, 0),
const RotationSense &rotationSense = Positive);
- ~SymmetryElementRotation() {}
+ ~SymmetryElementRotation() override {}
- SymmetryElement_sptr clone() const;
+ SymmetryElement_sptr clone() const override;
/// Returns the internally stored rotation sense.
RotationSense getRotationSense() const { return m_rotationSense; }
@@ -205,9 +205,9 @@ class MANTID_GEOMETRY_DLL SymmetryElementMirror
public:
SymmetryElementMirror(const std::string &symbol, const V3R &axis,
const V3R &translation = V3R(0, 0, 0));
- ~SymmetryElementMirror() {}
+ ~SymmetryElementMirror() override {}
- SymmetryElement_sptr clone() const;
+ SymmetryElement_sptr clone() const override;
};
typedef boost::shared_ptr<SymmetryElementMirror> SymmetryElementMirror_sptr;
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
index 208a828b75bcac4a11b9fc6ea29283dbe6f893a6..172642a9dff47403d8292ce2480724f18a74095a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
@@ -52,11 +52,11 @@ class MANTID_GEOMETRY_DLL SymmetryElementIdentityGenerator
: public AbstractSymmetryElementGenerator {
public:
SymmetryElementIdentityGenerator() {}
- ~SymmetryElementIdentityGenerator() {}
+ ~SymmetryElementIdentityGenerator() override {}
SymmetryElement_sptr
- generateElement(const SymmetryOperation &operation) const;
- bool canProcess(const SymmetryOperation &operation) const;
+ generateElement(const SymmetryOperation &operation) const override;
+ bool canProcess(const SymmetryOperation &operation) const override;
};
/** @class SymmetryElementTranslationGenerator
@@ -68,11 +68,11 @@ class MANTID_GEOMETRY_DLL SymmetryElementTranslationGenerator
: public AbstractSymmetryElementGenerator {
public:
SymmetryElementTranslationGenerator() {}
- ~SymmetryElementTranslationGenerator() {}
+ ~SymmetryElementTranslationGenerator() override {}
SymmetryElement_sptr
- generateElement(const SymmetryOperation &operation) const;
- bool canProcess(const SymmetryOperation &operation) const;
+ generateElement(const SymmetryOperation &operation) const override;
+ bool canProcess(const SymmetryOperation &operation) const override;
};
/** @class SymmetryElementInversionGenerator
@@ -84,11 +84,11 @@ class MANTID_GEOMETRY_DLL SymmetryElementInversionGenerator
: public AbstractSymmetryElementGenerator {
public:
SymmetryElementInversionGenerator() {}
- ~SymmetryElementInversionGenerator() {}
+ ~SymmetryElementInversionGenerator() override {}
SymmetryElement_sptr
- generateElement(const SymmetryOperation &operation) const;
- bool canProcess(const SymmetryOperation &operation) const;
+ generateElement(const SymmetryOperation &operation) const override;
+ bool canProcess(const SymmetryOperation &operation) const override;
};
MANTID_GEOMETRY_DLL gsl_matrix *getGSLMatrix(const Kernel::IntMatrix &matrix);
@@ -111,7 +111,7 @@ MANTID_GEOMETRY_DLL gsl_matrix *getGSLIdentityMatrix(size_t rows, size_t cols);
class MANTID_GEOMETRY_DLL SymmetryElementWithAxisGenerator
: public AbstractSymmetryElementGenerator {
public:
- ~SymmetryElementWithAxisGenerator() {}
+ ~SymmetryElementWithAxisGenerator() override {}
protected:
V3R determineTranslation(const SymmetryOperation &operation) const;
@@ -132,18 +132,19 @@ class MANTID_GEOMETRY_DLL SymmetryElementRotationGenerator
: public SymmetryElementWithAxisGenerator {
public:
SymmetryElementRotationGenerator() {}
- ~SymmetryElementRotationGenerator() {}
+ ~SymmetryElementRotationGenerator() override {}
SymmetryElement_sptr
- generateElement(const SymmetryOperation &operation) const;
- bool canProcess(const SymmetryOperation &operation) const;
+ generateElement(const SymmetryOperation &operation) const override;
+ bool canProcess(const SymmetryOperation &operation) const override;
protected:
SymmetryElementRotation::RotationSense
determineRotationSense(const SymmetryOperation &operation,
const V3R &rotationAxis) const;
- std::string determineSymbol(const SymmetryOperation &operation) const;
+ std::string
+ determineSymbol(const SymmetryOperation &operation) const override;
};
/** @class SymmetryElementMirrorGenerator
@@ -159,14 +160,15 @@ class MANTID_GEOMETRY_DLL SymmetryElementMirrorGenerator
: public SymmetryElementWithAxisGenerator {
public:
SymmetryElementMirrorGenerator() {}
- ~SymmetryElementMirrorGenerator() {}
+ ~SymmetryElementMirrorGenerator() override {}
SymmetryElement_sptr
- generateElement(const SymmetryOperation &operation) const;
- bool canProcess(const SymmetryOperation &operation) const;
+ generateElement(const SymmetryOperation &operation) const override;
+ bool canProcess(const SymmetryOperation &operation) const override;
protected:
- std::string determineSymbol(const SymmetryOperation &operation) const;
+ std::string
+ determineSymbol(const SymmetryOperation &operation) const override;
static std::map<V3R, std::string> g_glideSymbolMap;
};
diff --git a/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h b/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h
index 94bdf49cb91f4f124ca47f88f6879043b254f4e1..78cce65c83d32a6b37906840c3d95540b8fb6e3a 100644
--- a/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h
+++ b/Framework/Geometry/inc/MantidGeometry/ICompAssembly.h
@@ -46,11 +46,11 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class MANTID_GEOMETRY_DLL ICompAssembly : public virtual IComponent {
public:
/// String description of the type of component
- virtual std::string type() const { return "ICompAssembly"; }
+ std::string type() const override { return "ICompAssembly"; }
- virtual ~ICompAssembly() {}
+ ~ICompAssembly() override {}
/// Make a clone of the present component
- virtual IComponent *clone() const = 0;
+ IComponent *clone() const override = 0;
/// Return the number of elements in the assembly
virtual int nelements() const = 0;
/// Add a component to the assembly
diff --git a/Framework/Geometry/inc/MantidGeometry/IDetector.h b/Framework/Geometry/inc/MantidGeometry/IDetector.h
index 724317bd04dbae71070f8edce0cad90baefff5ed..a265d5225b749c95bc9da070cd5141f813cb3dae 100644
--- a/Framework/Geometry/inc/MantidGeometry/IDetector.h
+++ b/Framework/Geometry/inc/MantidGeometry/IDetector.h
@@ -71,7 +71,7 @@ public:
* @param comp :: The component to give the distance to
* @return The distance
*/
- virtual double getDistance(const IComponent &comp) const = 0;
+ double getDistance(const IComponent &comp) const override = 0;
/** Gives the angle of this detector object with respect to an axis
* @param observer :: The point to calculate the angle relative to (typically
@@ -112,7 +112,7 @@ public:
/// (Empty) Constructor
IDetector() {}
/// Virtual destructor
- virtual ~IDetector() {}
+ ~IDetector() override {}
};
/// Shared pointer to IDetector
diff --git a/Framework/Geometry/inc/MantidGeometry/IObjComponent.h b/Framework/Geometry/inc/MantidGeometry/IObjComponent.h
index ef10037da16e559a2a2963e0926b32b0874ee84e..3971f79abdf633e448a7ef20cba867b11d086c63 100644
--- a/Framework/Geometry/inc/MantidGeometry/IObjComponent.h
+++ b/Framework/Geometry/inc/MantidGeometry/IObjComponent.h
@@ -54,7 +54,7 @@ class GeometryHandler;
class MANTID_GEOMETRY_DLL IObjComponent : public virtual IComponent {
public:
/// type string
- virtual std::string type() const { return "IObjComponent"; }
+ std::string type() const override { return "IObjComponent"; }
IObjComponent();
@@ -62,12 +62,12 @@ public:
// Looking to get rid of the first of these constructors in due course (and
// probably add others)
- virtual ~IObjComponent();
+ ~IObjComponent() override;
/** Virtual Copy Constructor
* @returns A pointer to a copy of the input ObjComponent
*/
- virtual IComponent *clone() const = 0;
+ IComponent *clone() const override = 0;
/// Does the point given lie within this object component?
virtual bool isValid(const Kernel::V3D &point) const = 0;
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument.h b/Framework/Geometry/inc/MantidGeometry/Instrument.h
index 4b00f5007805d7465432d85de2c205d128363c15..f0bbcd65be25d1f9165a790ee875fc1c3f26ee7e 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument.h
@@ -63,7 +63,7 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class MANTID_GEOMETRY_DLL Instrument : public CompAssembly {
public:
/// String description of the type of component
- virtual std::string type() const { return "Instrument"; }
+ std::string type() const override { return "Instrument"; }
Instrument(const boost::shared_ptr<const Instrument> instr,
boost::shared_ptr<ParameterMap> map);
@@ -71,9 +71,9 @@ public:
Instrument(const std::string &name);
Instrument(const Instrument &);
/// Virtual destructor
- virtual ~Instrument();
+ ~Instrument() override;
- Instrument *clone() const;
+ Instrument *clone() const override;
IComponent_const_sptr getSource() const;
IObjComponent_const_sptr getChopperPoint(const size_t index = 0) const;
@@ -147,7 +147,7 @@ public:
size_t numMonitors() const;
/// Get the bounding box for this component and store it in the given argument
- void getBoundingBox(BoundingBox &boundingBox) const;
+ void getBoundingBox(BoundingBox &boundingBox) const override;
/// Get pointers to plottable components
boost::shared_ptr<const std::vector<IObjComponent_const_sptr>>
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h b/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h
index 5c6224a8d6c64037ab5ba1e8c1ba7d2b6d0c0d10..84ade0f5cb92816a0f847d6bd72daf6d5b34ddb7 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/CompAssembly.h
@@ -53,7 +53,7 @@ protected:
public:
/// String description of the type of component
- virtual std::string type() const { return "CompAssembly"; }
+ std::string type() const override { return "CompAssembly"; }
//! Empty constructor
CompAssembly();
/// Constructor for parametrized version
@@ -62,50 +62,51 @@ public:
CompAssembly(const std::string &, IComponent *reference = 0);
//! Copy constructor
CompAssembly(const CompAssembly &);
- virtual ~CompAssembly();
+ ~CompAssembly() override;
//! Make a clone of the present component
- virtual IComponent *clone() const;
+ IComponent *clone() const override;
//! Return the number of elements in the assembly
- int nelements() const;
+ int nelements() const override;
//! Add a component to the assembly
- int add(IComponent *);
+ int add(IComponent *) override;
//! Add a copy (clone) of a component
void addChildren(IComponent *comp);
- int addCopy(IComponent *);
+ int addCopy(IComponent *) override;
//! Add a copy (clone) of a component and rename it
- int addCopy(IComponent *, const std::string &);
+ int addCopy(IComponent *, const std::string &) override;
/// Remove a component from the assembly
int remove(IComponent *);
//! Get a pointer to the ith component within the assembly. Easier to use than
//[] when you have a pointer
- boost::shared_ptr<IComponent> getChild(const int i) const;
+ boost::shared_ptr<IComponent> getChild(const int i) const override;
//! Returns a vector of all children contained.
void getChildren(std::vector<IComponent_const_sptr> &outVector,
- bool recursive) const;
+ bool recursive) const override;
//! Get a pointer to the ith component in the assembly
- boost::shared_ptr<IComponent> operator[](int i) const;
+ boost::shared_ptr<IComponent> operator[](int i) const override;
/// Returns a pointer to the first component of assembly encountered with the
/// given name
- virtual boost::shared_ptr<const IComponent>
- getComponentByName(const std::string &cname, int nlevels = 0) const;
+ boost::shared_ptr<const IComponent>
+ getComponentByName(const std::string &cname, int nlevels = 0) const override;
- Kernel::V3D getPos() const;
+ Kernel::V3D getPos() const override;
- const Kernel::Quat getRotation() const;
+ const Kernel::Quat getRotation() const override;
/// Get the bounding box for this component and store it in the given argument
- virtual void getBoundingBox(BoundingBox &boundingBox) const;
+ void getBoundingBox(BoundingBox &boundingBox) const override;
//! Print information about all children
- void printChildren(std::ostream &) const;
- void printTree(std::ostream &) const;
+ void printChildren(std::ostream &) const override;
+ void printTree(std::ostream &) const override;
/** Test the intersection of the ray with the children of the component
* assembly, for InstrumentRayTracer */
- virtual void testIntersectionWithChildren(
- Track &testRay, std::deque<IComponent_const_sptr> &searchQueue) const;
+ void testIntersectionWithChildren(
+ Track &testRay,
+ std::deque<IComponent_const_sptr> &searchQueue) const override;
private:
/// Private copy assignment operator
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/Component.h b/Framework/Geometry/inc/MantidGeometry/Instrument/Component.h
index 25bbfd4bf3112bafca736cd7ad2ee83dae926b7f..b07f896a0f5c59f96dcfce1b46d0e3c219f25341 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/Component.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/Component.h
@@ -90,77 +90,78 @@ public:
const Kernel::Quat &rotation, IComponent *parent = 0);
/// destructor
- ~Component();
+ ~Component() override;
- IComponent *clone() const;
+ IComponent *clone() const override;
//! Returns the ComponentID - a unique identifier of the component.
- ComponentID getComponentID() const;
+ ComponentID getComponentID() const override;
//! Returns const pointer to base component if this component is parametrized
// or pointer to itself if not. Currently is the same as getComponentID bar
// const cast;
- IComponent const *getBaseComponent() const;
+ IComponent const *getBaseComponent() const override;
//! Assign a parent IComponent. Previous parent link is lost
- void setParent(IComponent *);
+ void setParent(IComponent *) override;
//! Return a pointer to the current parent. as shared pointer
- boost::shared_ptr<const IComponent> getParent() const;
+ boost::shared_ptr<const IComponent> getParent() const override;
//! Return an array of all ancestors
- std::vector<boost::shared_ptr<const IComponent>> getAncestors() const;
+ std::vector<boost::shared_ptr<const IComponent>>
+ getAncestors() const override;
bool isParentNamed(const std::string &expectedName, int maxDepth = -1) const;
//! Set the IComponent name
- void setName(const std::string &);
+ void setName(const std::string &) override;
//! Get the IComponent name
- std::string getName() const;
+ std::string getName() const override;
//! Get the full pathname
- std::string getFullName() const;
+ std::string getFullName() const override;
//! Set the IComponent position, x, y, z respective to parent (if present)
// otherwise absolute
- void setPos(double, double, double);
- void setPos(const Kernel::V3D &);
+ void setPos(double, double, double) override;
+ void setPos(const Kernel::V3D &) override;
//! Set the orientation Kernel::Quaternion relative to parent (if present)
// otherwise absolute
- void setRot(const Kernel::Quat &);
+ void setRot(const Kernel::Quat &) override;
//! Translate the IComponent (vector form). This is relative to parent if
// present.
- void translate(const Kernel::V3D &);
+ void translate(const Kernel::V3D &) override;
//! Translate the IComponent (x,y,z form). This is relative to parent if
// present.
- void translate(double, double, double);
+ void translate(double, double, double) override;
//! Rotate the IComponent. This is relative to parent.
- void rotate(const Kernel::Quat &);
+ void rotate(const Kernel::Quat &) override;
//! Rotate the IComponent by an angle in degrees with respect to an axis.
- void rotate(double, const Kernel::V3D &);
+ void rotate(double, const Kernel::V3D &) override;
//! Get the position relative to the parent IComponent (absolute if no parent)
- virtual const Kernel::V3D getRelativePos() const;
+ const Kernel::V3D getRelativePos() const override;
//! Get the position of the IComponent. Tree structure is traverse through the
// parent chain
- virtual Kernel::V3D getPos() const;
+ Kernel::V3D getPos() const override;
//! Get the relative Orientation
- const Kernel::Quat &getRelativeRot() const;
+ const Kernel::Quat &getRelativeRot() const override;
//! Get the absolute orientation of the IComponent
- virtual const Kernel::Quat getRotation() const;
+ const Kernel::Quat getRotation() const override;
//! Get the distance to another IComponent
- double getDistance(const IComponent &) const;
+ double getDistance(const IComponent &) const override;
/// Get the bounding box for this component and store it in the given argument
- virtual void getBoundingBox(BoundingBox &boundingBox) const;
+ void getBoundingBox(BoundingBox &boundingBox) const override;
/** @name ParameterMap access */
//@{
@@ -168,13 +169,13 @@ public:
// resort to
// one for each type, luckily there won't be too many
/// Return the parameter names
- virtual std::set<std::string> getParameterNames(bool recursive = true) const;
+ std::set<std::string> getParameterNames(bool recursive = true) const override;
/// return the parameter names and the component they are from
- virtual std::map<std::string, ComponentID>
- getParameterNamesByComponent() const;
+ std::map<std::string, ComponentID>
+ getParameterNamesByComponent() const override;
/// Returns a boolean indicating if the component has the named parameter
- virtual bool hasParameter(const std::string &name,
- bool recursive = true) const;
+ bool hasParameter(const std::string &name,
+ bool recursive = true) const override;
/**
* Get a parameter defined as a double
@@ -184,7 +185,7 @@ public:
* @returns A list of values
*/
std::vector<double> getNumberParameter(const std::string &pname,
- bool recursive = true) const {
+ bool recursive = true) const override {
return getParameter<double>(pname, recursive);
}
@@ -196,7 +197,7 @@ public:
* @returns A list of values
*/
std::vector<int> getIntParameter(const std::string &pname,
- bool recursive = true) const {
+ bool recursive = true) const override {
return getParameter<int>(pname, recursive);
}
@@ -210,7 +211,7 @@ public:
* is not found
*/
std::string getParameterType(const std::string &pname,
- bool recursive = true) const {
+ bool recursive = true) const override {
Parameter_sptr param = Parameter_sptr(); // Null shared pointer
if (recursive) {
param = m_map->getRecursive(this, pname);
@@ -245,7 +246,7 @@ public:
* @returns A list of values
*/
std::vector<bool> getBoolParameter(const std::string &pname,
- bool recursive = true) const {
+ bool recursive = true) const override {
return getParameter<bool>(pname, recursive);
}
@@ -256,8 +257,9 @@ public:
* components
* @returns A list of values
*/
- std::vector<Kernel::V3D> getPositionParameter(const std::string &pname,
- bool recursive = true) const {
+ std::vector<Kernel::V3D>
+ getPositionParameter(const std::string &pname,
+ bool recursive = true) const override {
return getParameter<Kernel::V3D>(pname, recursive);
}
@@ -268,8 +270,9 @@ public:
* components
* @returns A list of values
*/
- std::vector<Kernel::Quat> getRotationParameter(const std::string &pname,
- bool recursive = true) const {
+ std::vector<Kernel::Quat>
+ getRotationParameter(const std::string &pname,
+ bool recursive = true) const override {
return getParameter<Kernel::Quat>(pname, recursive);
}
@@ -280,14 +283,15 @@ public:
* components
* @returns A list of values
*/
- std::vector<std::string> getStringParameter(const std::string &pname,
- bool recursive = true) const {
+ std::vector<std::string>
+ getStringParameter(const std::string &pname,
+ bool recursive = true) const override {
return getParameter<std::string>(pname, recursive);
}
//@}
std::string getParameterAsString(const std::string &pname,
- bool recursive = true) const {
+ bool recursive = true) const override {
std::string retVal = "";
if (m_map) {
retVal = m_map->getString(this, pname, recursive);
@@ -295,22 +299,22 @@ public:
return retVal;
}
- void printSelf(std::ostream &) const;
+ void printSelf(std::ostream &) const override;
/// Returns the address of the base component
const IComponent *base() const { return m_base; }
/// Returns the ScaleFactor
- virtual Kernel::V3D getScaleFactor() const;
+ Kernel::V3D getScaleFactor() const override;
/** Returns the bare pointer to the IComponent parent */
- const IComponent *getBareParent() const { return m_parent; }
+ const IComponent *getBareParent() const override { return m_parent; }
virtual void readXMLAttributes(const Poco::XML::Attributes &attr);
virtual void writeXML(Poco::XML::XMLWriter &writer) const;
virtual void appendXML(std::ostream &xmlStream) const;
- bool isParametrized() const;
+ bool isParametrized() const override;
protected:
/// Parent component in the tree
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/Detector.h b/Framework/Geometry/inc/MantidGeometry/Instrument/Detector.h
index fe25bd17b89807e5d75b511ea9f13f2b1a371fb1..be24cd7d6bc8f6d3df778044448fbfaa662cff91 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/Detector.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/Detector.h
@@ -46,41 +46,41 @@ class MANTID_GEOMETRY_DLL Detector : public virtual IDetector,
public ObjComponent {
public:
/// A string representation of the component type
- virtual std::string type() const { return "DetectorComponent"; }
+ std::string type() const override { return "DetectorComponent"; }
/// Constructor for parametrized version
Detector(const Detector *base, const ParameterMap *map);
Detector(const std::string &name, int id, IComponent *parent);
Detector(const std::string &name, int it, boost::shared_ptr<Object> shape,
IComponent *parent);
- virtual ~Detector();
+ ~Detector() override;
// functions inherited from IObjectComponent
- virtual Component *clone() const { return new Detector(*this); }
+ Component *clone() const override { return new Detector(*this); }
// IDetector methods
- detid_t getID() const;
- std::size_t nDets() const {
+ detid_t getID() const override;
+ std::size_t nDets() const override {
return 1;
} ///< A Detector object represents a single physical detector
- double getDistance(const IComponent &comp) const;
+ double getDistance(const IComponent &comp) const override;
double getTwoTheta(const Kernel::V3D &observer,
- const Kernel::V3D &axis) const;
+ const Kernel::V3D &axis) const override;
double getSignedTwoTheta(const Kernel::V3D &observer, const Kernel::V3D &axis,
- const Kernel::V3D &instrumentUp) const;
- double getPhi() const;
- double getPhiOffset(const double &offset) const;
- bool isMasked() const;
- bool isMonitor() const;
+ const Kernel::V3D &instrumentUp) const override;
+ double getPhi() const override;
+ double getPhiOffset(const double &offset) const override;
+ bool isMasked() const override;
+ bool isMonitor() const override;
// end IDetector methods
void markAsMonitor(const bool flag = true);
/** returns the detector's topology, namely, the meaning of the detector's
angular measurements.
It is different in cartesian and cylindrical (surrounding the beam)
coordinate system */
- det_topology getTopology(Kernel::V3D ¢er) const;
+ det_topology getTopology(Kernel::V3D ¢er) const override;
/// Return the relative position to the parent
- virtual const Kernel::V3D getRelativePos() const {
+ const Kernel::V3D getRelativePos() const override {
return ObjComponent::getRelativePos();
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
index 57b40a365d9463c0084275a9a72aae74c8dc1123..aff2e348c5a9d861435a44c39be2e64777492663 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
@@ -49,31 +49,31 @@ public:
DetectorGroup();
DetectorGroup(const std::vector<IDetector_const_sptr> &dets,
bool warnAboutMasked = false);
- virtual ~DetectorGroup();
+ ~DetectorGroup() override;
void addDetector(IDetector_const_sptr det, bool &warn);
// IDetector methods
- detid_t getID() const;
- std::size_t nDets() const;
- Kernel::V3D getPos() const;
- double getDistance(const IComponent &comp) const;
+ detid_t getID() const override;
+ std::size_t nDets() const override;
+ Kernel::V3D getPos() const override;
+ double getDistance(const IComponent &comp) const override;
double getTwoTheta(const Kernel::V3D &observer,
- const Kernel::V3D &axis) const;
+ const Kernel::V3D &axis) const override;
double getSignedTwoTheta(const Kernel::V3D &observer, const Kernel::V3D &axis,
- const Kernel::V3D &instrumentUp) const;
- double getPhi() const;
- double getPhiOffset(const double &offset) const;
- double solidAngle(const Kernel::V3D &observer) const;
- bool isParametrized() const;
- bool isMasked() const;
- bool isMonitor() const;
- bool isValid(const Kernel::V3D &point) const;
- virtual bool isOnSide(const Kernel::V3D &point) const;
+ const Kernel::V3D &instrumentUp) const override;
+ double getPhi() const override;
+ double getPhiOffset(const double &offset) const override;
+ double solidAngle(const Kernel::V3D &observer) const override;
+ bool isParametrized() const override;
+ bool isMasked() const override;
+ bool isMonitor() const override;
+ bool isValid(const Kernel::V3D &point) const override;
+ bool isOnSide(const Kernel::V3D &point) const override;
/// Try to find a point that lies within (or on) the object
- int getPointInObject(Kernel::V3D &point) const;
+ int getPointInObject(Kernel::V3D &point) const override;
/// Get the bounding box for this component and store it in the given argument
- virtual void getBoundingBox(BoundingBox &boundingBox) const;
+ void getBoundingBox(BoundingBox &boundingBox) const override;
/// What detectors are contained in the group?
std::vector<detid_t> getDetectorIDs() const;
@@ -86,16 +86,17 @@ public:
// resort to
// one for each type, luckily there won't be too many
/// Return the parameter names
- virtual std::set<std::string> getParameterNames(bool recursive = true) const;
+ std::set<std::string> getParameterNames(bool recursive = true) const override;
/// return the parameter names and the component they are from
- virtual std::map<std::string, ComponentID>
- getParameterNamesByComponent() const;
+ std::map<std::string, ComponentID>
+ getParameterNamesByComponent() const override;
/// Returns a boolean indicating whether the parameter exists or not
- bool hasParameter(const std::string &name, bool recursive = true) const;
+ bool hasParameter(const std::string &name,
+ bool recursive = true) const override;
// Hack used untill Geomertry can not exprot different types parematers
// properly
std::string getParameterType(const std::string &name,
- bool recursive = true) const;
+ bool recursive = true) const override;
/**
* Get a parameter defined as a double
* @param pname :: The name of the parameter
@@ -104,7 +105,7 @@ public:
* @returns A list of size 0 as this is not a parameterized component
*/
std::vector<double> getNumberParameter(const std::string &pname,
- bool recursive = true) const;
+ bool recursive = true) const override;
/**
* Get a parameter defined as a Kernel::V3D
* @param pname :: The name of the parameter
@@ -112,8 +113,9 @@ public:
* components
* @returns A list of size 0 as this is not a parameterized component
*/
- std::vector<Kernel::V3D> getPositionParameter(const std::string &pname,
- bool recursive = true) const;
+ std::vector<Kernel::V3D>
+ getPositionParameter(const std::string &pname,
+ bool recursive = true) const override;
/**
* Get a parameter defined as a Kernel::Quaternion
* @param pname :: The name of the parameter
@@ -121,8 +123,9 @@ public:
* components
* @returns A list of size 0 as this is not a parameterized component
*/
- std::vector<Kernel::Quat> getRotationParameter(const std::string &pname,
- bool recursive = true) const;
+ std::vector<Kernel::Quat>
+ getRotationParameter(const std::string &pname,
+ bool recursive = true) const override;
/**
* Get a parameter defined as a string
@@ -131,8 +134,9 @@ public:
* components
* @returns A list of size 0 as this is not a parameterized component
*/
- std::vector<std::string> getStringParameter(const std::string &pname,
- bool recursive = true) const;
+ std::vector<std::string>
+ getStringParameter(const std::string &pname,
+ bool recursive = true) const override;
/**
* Get a parameter defined as an integer
@@ -142,7 +146,7 @@ public:
* @returns A list of size 0 as this is not a parameterized component
*/
std::vector<int> getIntParameter(const std::string &pname,
- bool recursive = true) const;
+ bool recursive = true) const override;
/**
* Get a parameter defined as an integer
@@ -152,7 +156,7 @@ public:
* @returns A list of size 0 as this is not a parameterized component
*/
std::vector<bool> getBoolParameter(const std::string &pname,
- bool recursive = true) const;
+ bool recursive = true) const override;
/**
* Get a string representation of a parameter
@@ -162,12 +166,12 @@ public:
* @returns A empty string as this is not a parameterized component
*/
std::string getParameterAsString(const std::string &pname,
- bool recursive = true) const;
+ bool recursive = true) const override;
/** returns the detector's group topology if it has been calculated before or
invokes the procedure of
calculating such topology if it was not */
- det_topology getTopology(Kernel::V3D ¢er) const;
+ det_topology getTopology(Kernel::V3D ¢er) const override;
/// Return separator for list of names of detectors
std::string getNameSeparator() const { return ";"; }
@@ -175,7 +179,7 @@ public:
the logic behind getComponentID overload, so CopyInstrumentParameters will
fail on
grouped instrument but it is something TO DO: */
- virtual IComponent const *getBaseComponent() const {
+ IComponent const *getBaseComponent() const override {
return const_cast<const DetectorGroup *>(this);
}
@@ -198,53 +202,54 @@ protected:
mutable Kernel::V3D groupCentre;
// functions inherited from IComponent
- Component *clone() const { return NULL; }
- ComponentID getComponentID(void) const { return NULL; }
- boost::shared_ptr<const IComponent> getParent() const {
+ Component *clone() const override { return NULL; }
+ ComponentID getComponentID(void) const override { return NULL; }
+ boost::shared_ptr<const IComponent> getParent() const override {
return boost::shared_ptr<const IComponent>();
}
- virtual const IComponent *getBareParent() const { return NULL; }
- std::vector<boost::shared_ptr<const IComponent>> getAncestors() const {
+ const IComponent *getBareParent() const override { return NULL; }
+ std::vector<boost::shared_ptr<const IComponent>>
+ getAncestors() const override {
return std::vector<boost::shared_ptr<const IComponent>>();
}
- std::string getName() const;
- std::string getFullName() const;
- void setParent(IComponent *) {}
- void setName(const std::string &) {}
+ std::string getName() const override;
+ std::string getFullName() const override;
+ void setParent(IComponent *) override {}
+ void setName(const std::string &) override {}
- void setPos(double, double, double) {}
- void setPos(const Kernel::V3D &) {}
- void setRot(const Kernel::Quat &) {}
+ void setPos(double, double, double) override {}
+ void setPos(const Kernel::V3D &) override {}
+ void setRot(const Kernel::Quat &) override {}
void copyRot(const IComponent &) {}
- int interceptSurface(Track &) const { return -10; }
- void translate(const Kernel::V3D &) {}
- void translate(double, double, double) {}
- void rotate(const Kernel::Quat &) {}
- void rotate(double, const Kernel::V3D &) {}
- const Kernel::V3D getRelativePos() const {
+ int interceptSurface(Track &) const override { return -10; }
+ void translate(const Kernel::V3D &) override {}
+ void translate(double, double, double) override {}
+ void rotate(const Kernel::Quat &) override {}
+ void rotate(double, const Kernel::V3D &) override {}
+ const Kernel::V3D getRelativePos() const override {
throw std::runtime_error("Cannot call getRelativePos on a DetectorGroup");
}
- const Kernel::Quat &getRelativeRot() const {
+ const Kernel::Quat &getRelativeRot() const override {
throw std::runtime_error("Cannot call getRelativeRot on a DetectorGroup");
}
- const Kernel::Quat getRotation() const { return Kernel::Quat(); }
- void printSelf(std::ostream &) const {}
+ const Kernel::Quat getRotation() const override { return Kernel::Quat(); }
+ void printSelf(std::ostream &) const override {}
// functions inherited from IObjComponent
void getBoundingBox(double &, double &, double &, double &, double &,
double &) const {};
- void draw() const {};
- void drawObject() const {};
- void initDraw() const {};
+ void draw() const override{};
+ void drawObject() const override{};
+ void initDraw() const override{};
/// Returns the shape of the Object
- const boost::shared_ptr<const Object> shape() const {
+ const boost::shared_ptr<const Object> shape() const override {
return boost::shared_ptr<const Object>();
}
/// Returns the material of the Object
- const boost::shared_ptr<const Kernel::Material> material() const {
+ const boost::shared_ptr<const Kernel::Material> material() const override {
return boost::shared_ptr<const Kernel::Material>();
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h b/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h
index e44f6b07c75fbc5af71835ccb37c790fa85cbb6c..e3101cfd727659d6c54cfa3109beb5e3e0048a78 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/IDFObject.h
@@ -68,14 +68,14 @@ private:
class DLLExport IDFObject : public AbstractIDFObject {
public:
IDFObject(const std::string &fileName);
- virtual const Poco::Path getParentDirectory() const;
- virtual const Poco::Path &getFileFullPath() const;
- virtual const std::string &getFileFullPathStr() const;
- virtual std::string getFileNameOnly() const;
- virtual std::string getExtension() const;
- virtual std::string getMangledName() const;
- virtual bool exists() const;
- virtual ~IDFObject();
+ const Poco::Path getParentDirectory() const override;
+ const Poco::Path &getFileFullPath() const override;
+ const std::string &getFileFullPathStr() const override;
+ std::string getFileNameOnly() const override;
+ std::string getExtension() const override;
+ std::string getMangledName() const override;
+ bool exists() const override;
+ ~IDFObject() override;
private:
IDFObject(const IDFObject &);
@@ -96,22 +96,22 @@ private:
public:
NullIDFObject() : m_emptyResponse("") {}
- virtual const Poco::Path getParentDirectory() const {
+ const Poco::Path getParentDirectory() const override {
throw std::runtime_error("Not implemented on NullIDFObject");
}
- virtual const Poco::Path &getFileFullPath() const {
+ const Poco::Path &getFileFullPath() const override {
throw std::runtime_error("Not implemented on NullIDFObject");
}
- virtual const std::string &getFileFullPathStr() const {
+ const std::string &getFileFullPathStr() const override {
return m_emptyResponse;
}
- virtual std::string getFileNameOnly() const { return m_emptyResponse; }
- virtual std::string getExtension() const { return m_emptyResponse; }
- virtual std::string getMangledName() const {
+ std::string getFileNameOnly() const override { return m_emptyResponse; }
+ std::string getExtension() const override { return m_emptyResponse; }
+ std::string getMangledName() const override {
throw std::runtime_error("Not implemented on NullIDFObject");
}
- virtual bool exists() const { return false; }
- virtual ~NullIDFObject(){};
+ bool exists() const override { return false; }
+ ~NullIDFObject() override{};
};
typedef boost::shared_ptr<AbstractIDFObject> IDFObject_sptr;
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighbours.h b/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighbours.h
index aefd39961e03aa108360c4c2778b3d93a50d712e..fe7d9d4998e88b3bba29f2eaac812ecb98feeab8 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighbours.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighbours.h
@@ -64,14 +64,15 @@ public:
bool ignoreMasked = true);
/// Default (empty) destructor
- virtual ~NearestNeighbours(){};
+ ~NearestNeighbours() override{};
// Neighbouring spectra by radius
std::map<specid_t, Mantid::Kernel::V3D>
- neighboursInRadius(specid_t spectrum, double radius = 0.0) const;
+ neighboursInRadius(specid_t spectrum, double radius = 0.0) const override;
// Neighbouring spectra by
- std::map<specid_t, Mantid::Kernel::V3D> neighbours(specid_t spectrum) const;
+ std::map<specid_t, Mantid::Kernel::V3D>
+ neighbours(specid_t spectrum) const override;
protected:
/// Get the spectra associated with all in the instrument
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighboursFactory.h b/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighboursFactory.h
index 4c967a733c75e124c91ff958e3f263534be885d5..74428d9eb47358c3337b10a25cd00ed84e896e13 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighboursFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/NearestNeighboursFactory.h
@@ -41,14 +41,14 @@ public:
/// Factory Method
NearestNeighbours *create(boost::shared_ptr<const Instrument> instrument,
const ISpectrumDetectorMapping &spectraMap,
- bool ignoreMasked = false);
+ bool ignoreMasked = false) override;
/// Factory Method
NearestNeighbours *create(int numberOfNeighbours,
boost::shared_ptr<const Instrument> instrument,
const ISpectrumDetectorMapping &spectraMap,
- bool ignoreMasked = false);
+ bool ignoreMasked = false) override;
/// Destructor
- virtual ~NearestNeighboursFactory();
+ ~NearestNeighboursFactory() override;
};
} // namespace Geometry
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h
index 1e38a5830af4f657d44615b0fcf0fa4954469f67..8a2d74912a2464590993eace38e82fdf808f47e4 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ObjCompAssembly.h
@@ -50,7 +50,7 @@ class MANTID_GEOMETRY_DLL ObjCompAssembly : public virtual ICompAssembly,
const_comp_it; ///< Const iterator type
public:
/// String description of the type of component
- virtual std::string type() const { return "ObjCompAssembly"; }
+ std::string type() const override { return "ObjCompAssembly"; }
//! Empty constructor
// ObjCompAssembly();
@@ -60,37 +60,37 @@ public:
ObjCompAssembly(const std::string &, IComponent *reference = 0);
//! Copy constructor
ObjCompAssembly(const ObjCompAssembly &);
- virtual ~ObjCompAssembly();
+ ~ObjCompAssembly() override;
//! Make a clone of the present component
- virtual IComponent *clone() const;
+ IComponent *clone() const override;
//! Return the number of elements in the assembly
- int nelements() const;
+ int nelements() const override;
//! Add a component to the assembly
- int add(IComponent *);
+ int add(IComponent *) override;
//! Add a copy (clone) of a component
- int addCopy(IComponent *);
+ int addCopy(IComponent *) override;
//! Add a copy (clone) of a component and rename it
- int addCopy(IComponent *, const std::string &);
+ int addCopy(IComponent *, const std::string &) override;
//! Get a pointer to the ith component within the assembly. Easier to use than
//[] when you have a pointer
- boost::shared_ptr<IComponent> getChild(const int i) const {
+ boost::shared_ptr<IComponent> getChild(const int i) const override {
return (*this)[i];
}
//! Get all children
void getChildren(std::vector<IComponent_const_sptr> &outVector,
- bool recursive) const;
+ bool recursive) const override;
//! Returns a pointer to the first component of assembly encountered with the
// given name
- virtual boost::shared_ptr<const IComponent>
- getComponentByName(const std::string &cname, int nlevels = 0) const;
+ boost::shared_ptr<const IComponent>
+ getComponentByName(const std::string &cname, int nlevels = 0) const override;
//! Get a pointer to the ith component in the assembly
- boost::shared_ptr<IComponent> operator[](int i) const;
+ boost::shared_ptr<IComponent> operator[](int i) const override;
//! Print information about all children
- void printChildren(std::ostream &) const;
- void printTree(std::ostream &) const;
+ void printChildren(std::ostream &) const override;
+ void printTree(std::ostream &) const override;
- const Kernel::Quat getRotation() const;
- Kernel::V3D getPos() const;
+ const Kernel::Quat getRotation() const override;
+ Kernel::V3D getPos() const override;
//! Set the outline of the assembly
boost::shared_ptr<Object> createOutline();
@@ -98,9 +98,9 @@ public:
/** Test the intersection of the ray with the children of the component
* assembly */
- virtual void testIntersectionWithChildren(
+ void testIntersectionWithChildren(
Track & /*testRay*/,
- std::deque<IComponent_const_sptr> & /*searchQueue*/) const;
+ std::deque<IComponent_const_sptr> & /*searchQueue*/) const override;
private:
/// Private copy assignment operator
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ObjComponent.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ObjComponent.h
index 50c12709fac81dfcf8892c7a281bc8026c2c1118..bde9d99adc13812a2328a55a1bf0fafc803d2144 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ObjComponent.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ObjComponent.h
@@ -55,7 +55,7 @@ class MANTID_GEOMETRY_DLL ObjComponent : public virtual IObjComponent,
public Component {
public:
/// type string
- virtual std::string type() const { return "PhysicalComponent"; }
+ std::string type() const override { return "PhysicalComponent"; }
/// Constructor for parametrized component
ObjComponent(const IComponent *base, const ParameterMap *map);
@@ -65,22 +65,22 @@ public:
explicit ObjComponent(
const std::string &name, Object_const_sptr shape, IComponent *parent = 0,
Kernel::Material_sptr material = Kernel::Material_sptr());
- virtual ~ObjComponent();
+ ~ObjComponent() override;
/** Virtual Copy Constructor
* @returns A pointer to a copy of the input ObjComponent
*/
- virtual IComponent *clone() const { return new ObjComponent(*this); }
+ IComponent *clone() const override { return new ObjComponent(*this); }
- bool isValid(const Kernel::V3D &point) const;
- bool isOnSide(const Kernel::V3D &point) const;
- int interceptSurface(Track &track) const;
- double solidAngle(const Kernel::V3D &observer) const;
+ bool isValid(const Kernel::V3D &point) const override;
+ bool isOnSide(const Kernel::V3D &point) const override;
+ int interceptSurface(Track &track) const override;
+ double solidAngle(const Kernel::V3D &observer) const override;
///@todo This should go in favour of just the class related one.
void boundingBox(double &xmax, double &ymax, double &zmax, double &xmin,
double &ymin, double &zmin) const;
/// get bounding box, which may or may not be axis aligned;
- void getBoundingBox(BoundingBox &absoluteBB) const;
+ void getBoundingBox(BoundingBox &absoluteBB) const override;
/// get Height (Y-dimension) value for component
virtual double getHeight() const;
/// get Width (X-dimension) value for component
@@ -88,18 +88,18 @@ public:
/// get Depth (Z-dimension) value for component
virtual double getDepth() const;
- int getPointInObject(Kernel::V3D &point) const;
+ int getPointInObject(Kernel::V3D &point) const override;
// Rendering member functions
- void draw() const;
- void drawObject() const;
- void initDraw() const;
+ void draw() const override;
+ void drawObject() const override;
+ void initDraw() const override;
/// Return the shape of the component
- const Object_const_sptr shape() const;
+ const Object_const_sptr shape() const override;
/// Set a new shape on the component
void setShape(Object_const_sptr newShape);
/// Return the material this component is made from
- const Kernel::Material_const_sptr material() const;
+ const Kernel::Material_const_sptr material() const override;
protected:
/// The physical geometry representation
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h b/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
index 07507db27149091f2bd2c808f04481512ae8c077..3735d59242326c8040adf312279f9f77fa03dbed 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
@@ -136,16 +136,16 @@ private:
template <class Type> class DLLExport ParameterType : public Parameter {
public:
/// Returns the value of the property as a string
- std::string asString() const;
+ std::string asString() const override;
/// Set the value of the property via a string
- void fromString(const std::string &value);
+ void fromString(const std::string &value) override;
/// Returns the value of the parameter
inline const Type &value() const { return m_value; }
/// Get the value of the parameter
inline const Type &operator()() const { return m_value; }
- Parameter *clone() const { return new ParameterType(*this); }
+ Parameter *clone() const override { return new ParameterType(*this); }
private:
friend class ParameterMap;
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h b/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h
index f3178268c890168d99917335c238d6c98c673a61..1e7fbdeba6d4eb6209fdba84b968a6d32f7c07a7 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetector.h
@@ -49,7 +49,7 @@ class MANTID_GEOMETRY_DLL RectangularDetector : public CompAssembly,
public:
/// String description of the type of component
- virtual std::string type() const { return "RectangularDetector"; }
+ std::string type() const override { return "RectangularDetector"; }
//! Empty constructor
RectangularDetector();
@@ -67,9 +67,9 @@ public:
// //! Copy constructor
// RectangularDetector(const RectangularDetector&);
- virtual ~RectangularDetector();
+ ~RectangularDetector() override;
//! Make a clone of the present component
- virtual IComponent *clone() const;
+ IComponent *clone() const override;
boost::shared_ptr<Detector> getAtXY(const int X, const int Y) const;
@@ -104,8 +104,8 @@ public:
int minDetectorID();
/// maximum detector id
int maxDetectorID();
- virtual boost::shared_ptr<const IComponent>
- getComponentByName(const std::string &cname, int nlevels = 0) const;
+ boost::shared_ptr<const IComponent>
+ getComponentByName(const std::string &cname, int nlevels = 0) const override;
// This should inherit the getBoundingBox implementation from CompAssembly
// but
@@ -113,44 +113,45 @@ public:
// that here
using CompAssembly::getBoundingBox;
- virtual void testIntersectionWithChildren(
- Track &testRay, std::deque<IComponent_const_sptr> &searchQueue) const;
+ void testIntersectionWithChildren(
+ Track &testRay,
+ std::deque<IComponent_const_sptr> &searchQueue) const override;
// ------------ IObjComponent methods ----------------
/// Does the point given lie within this object component?
- bool isValid(const Kernel::V3D &point) const;
+ bool isValid(const Kernel::V3D &point) const override;
/// Does the point given lie on the surface of this object component?
- bool isOnSide(const Kernel::V3D &point) const;
+ bool isOnSide(const Kernel::V3D &point) const override;
/// Checks whether the track given will pass through this Component.
- int interceptSurface(Track &track) const;
+ int interceptSurface(Track &track) const override;
/// Finds the approximate solid angle covered by the component when viewed
/// from the point given
- double solidAngle(const Kernel::V3D &observer) const;
+ double solidAngle(const Kernel::V3D &observer) const override;
/// Retrieve the cached bounding box
- void getBoundingBox(BoundingBox &assemblyBox) const;
+ void getBoundingBox(BoundingBox &assemblyBox) const override;
/// Try to find a point that lies within (or on) the object
- int getPointInObject(Kernel::V3D &point) const;
+ int getPointInObject(Kernel::V3D &point) const override;
// Rendering member functions
/// Draws the objcomponent.
- void draw() const;
+ void draw() const override;
/// Draws the Object.
- void drawObject() const;
+ void drawObject() const override;
/// Initializes the ObjComponent for rendering, this function should be called
/// before rendering.
- void initDraw() const;
+ void initDraw() const override;
/// Returns the shape of the Object
- const boost::shared_ptr<const Object> shape() const;
+ const boost::shared_ptr<const Object> shape() const override;
/// Returns the material of the detector
- const boost::shared_ptr<const Kernel::Material> material() const {
+ const boost::shared_ptr<const Kernel::Material> material() const override {
return boost::shared_ptr<const Kernel::Material>();
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetectorPixel.h b/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetectorPixel.h
index 293ca40c4510ca56825cedf75c0043a4436d9168..43180aea621a173cde7364cba543a2fbdeb82e0c 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetectorPixel.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/RectangularDetectorPixel.h
@@ -47,7 +47,7 @@ class DLLExport RectangularDetectorPixel : public Detector {
public:
/// A string representation of the component type
- virtual std::string type() const { return "RectangularDetectorPixel"; }
+ std::string type() const override { return "RectangularDetectorPixel"; }
/// Constructor for parametrized version
RectangularDetectorPixel(const RectangularDetectorPixel *base,
@@ -57,9 +57,9 @@ public:
RectangularDetector *panel, size_t row, size_t col);
RectangularDetectorPixel();
- virtual ~RectangularDetectorPixel();
+ ~RectangularDetectorPixel() override;
- virtual const Kernel::V3D getRelativePos() const;
+ const Kernel::V3D getRelativePos() const override;
protected:
/// RectangularDetector that is the parent of this pixel.
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
index 891b8f60337efd6fd45d095cd9d2a09584a5bb9b..d4647ff9a33a1172de014dedf26f4ffc69e20433 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/CompositeImplicitFunction.h
@@ -48,18 +48,18 @@ class DLLExport CompositeImplicitFunction
: public Mantid::Geometry::MDImplicitFunction {
public:
//---------------------------------- Override base-class methods---
- virtual bool isPointContained(const coord_t *coords);
- virtual bool isPointContained(const std::vector<coord_t> &coords);
+ bool isPointContained(const coord_t *coords) override;
+ bool isPointContained(const std::vector<coord_t> &coords) override;
// Unhide base class methods (avoids Intel compiler warning)
using MDImplicitFunction::isPointContained;
//-----------------------------------------------------------------
CompositeImplicitFunction();
- virtual ~CompositeImplicitFunction();
+ ~CompositeImplicitFunction() override;
bool
addFunction(Mantid::Geometry::MDImplicitFunction_sptr constituentFunction);
- std::string getName() const;
- std::string toXMLString() const;
+ std::string getName() const override;
+ std::string toXMLString() const override;
int getNFunctions() const;
static std::string functionName() { return "CompositeImplicitFunction"; }
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/GeneralFrame.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/GeneralFrame.h
index 524988a3bf3a412786bb62c18c12edcd1cab17f5..a1350713986c281e1332c12a51e6e5167b9e7c3d 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/GeneralFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/GeneralFrame.h
@@ -42,16 +42,16 @@ public:
GeneralFrame(const std::string &frameName, const Kernel::UnitLabel &unit);
GeneralFrame(const std::string &frameName,
std::unique_ptr<Mantid::Kernel::MDUnit> unit);
- virtual ~GeneralFrame();
- Kernel::UnitLabel getUnitLabel() const;
- const Kernel::MDUnit &getMDUnit() const;
- bool canConvertTo(const Kernel::MDUnit &otherUnit) const;
- bool isQ() const;
- bool isSameType(const MDFrame &frame) const;
- std::string name() const;
- virtual GeneralFrame *clone() const;
+ ~GeneralFrame() override;
+ Kernel::UnitLabel getUnitLabel() const override;
+ const Kernel::MDUnit &getMDUnit() const override;
+ bool canConvertTo(const Kernel::MDUnit &otherUnit) const override;
+ bool isQ() const override;
+ bool isSameType(const MDFrame &frame) const override;
+ std::string name() const override;
+ GeneralFrame *clone() const override;
Mantid::Kernel::SpecialCoordinateSystem
- equivalientSpecialCoordinateSystem() const;
+ equivalientSpecialCoordinateSystem() const override;
private:
/// Label unit
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h
index 38eb4bf26c4c367bf4168d366017fd1dfa6ff2a3..cdf914c4df3210d351824f5a67a01136e7c827b7 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h
@@ -40,19 +40,19 @@ public:
HKL &operator=(const HKL &other);
HKL(std::unique_ptr<Kernel::MDUnit> &unit);
HKL(Kernel::MDUnit *unit);
- virtual ~HKL();
+ ~HKL() override;
static const std::string HKLName;
// MDFrame interface
- Kernel::UnitLabel getUnitLabel() const;
- const Kernel::MDUnit &getMDUnit() const;
- bool canConvertTo(const Kernel::MDUnit &otherUnit) const;
- bool isQ() const;
- bool isSameType(const MDFrame &frame) const;
- std::string name() const;
- HKL *clone() const;
+ Kernel::UnitLabel getUnitLabel() const override;
+ const Kernel::MDUnit &getMDUnit() const override;
+ bool canConvertTo(const Kernel::MDUnit &otherUnit) const override;
+ bool isQ() const override;
+ bool isSameType(const MDFrame &frame) const override;
+ std::string name() const override;
+ HKL *clone() const override;
Mantid::Kernel::SpecialCoordinateSystem
- equivalientSpecialCoordinateSystem() const;
+ equivalientSpecialCoordinateSystem() const override;
private:
std::unique_ptr<Kernel::MDUnit> m_unit;
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDBoxImplicitFunction.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDBoxImplicitFunction.h
index 4005c03e84d525c8259dca98f278549b06d53d8d..74eaf0cc75a162348d97288bb9a65e4cb7dba21e 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDBoxImplicitFunction.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDBoxImplicitFunction.h
@@ -53,7 +53,7 @@ public:
fraction(const std::vector<boost::tuple<Mantid::coord_t, Mantid::coord_t>> &
extents) const;
- virtual ~MDBoxImplicitFunction();
+ ~MDBoxImplicitFunction() override;
private:
void construct(const Mantid::Kernel::VMD &min,
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
index d39e786edbe6a90181c8f8014388e78dcdba2b6c..f7069972a738769e131fe43a0b8fa6601d317ca8 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrameFactory.h
@@ -53,7 +53,7 @@ class MANTID_GEOMETRY_DLL MDFrameFactory
: public Kernel::ChainableFactory<MDFrameFactory, MDFrame,
MDFrameArgument> {
public:
- virtual ~MDFrameFactory() {}
+ ~MDFrameFactory() override {}
};
/// Helper typedef
@@ -66,46 +66,46 @@ typedef std::unique_ptr<MDFrameFactory> MDFrameFactory_uptr;
/// GeneralFrameFactory derived MDFrameFactory type
class MANTID_GEOMETRY_DLL GeneralFrameFactory : public MDFrameFactory {
private:
- GeneralFrame *createRaw(const MDFrameArgument &argument) const;
+ GeneralFrame *createRaw(const MDFrameArgument &argument) const override;
public:
- bool canInterpret(const MDFrameArgument &) const;
+ bool canInterpret(const MDFrameArgument &) const override;
};
/// QLabFrameFactory derived MDFrameFactory type
class MANTID_GEOMETRY_DLL QLabFrameFactory : public MDFrameFactory {
private:
- QLab *createRaw(const MDFrameArgument &argument) const;
+ QLab *createRaw(const MDFrameArgument &argument) const override;
public:
- bool canInterpret(const MDFrameArgument &argument) const;
+ bool canInterpret(const MDFrameArgument &argument) const override;
};
/// QSampleFrameFactory derived MDFrameFactory type
class MANTID_GEOMETRY_DLL QSampleFrameFactory : public MDFrameFactory {
private:
- QSample *createRaw(const MDFrameArgument &argument) const;
+ QSample *createRaw(const MDFrameArgument &argument) const override;
public:
- bool canInterpret(const MDFrameArgument &argument) const;
+ bool canInterpret(const MDFrameArgument &argument) const override;
};
/// HKLFrame derived MDFrameFactory type
class MANTID_GEOMETRY_DLL HKLFrameFactory : public MDFrameFactory {
private:
- HKL *createRaw(const MDFrameArgument &argument) const;
+ HKL *createRaw(const MDFrameArgument &argument) const override;
public:
- bool canInterpret(const MDFrameArgument &argument) const;
+ bool canInterpret(const MDFrameArgument &argument) const override;
};
/// Unknown Frame derived MDFrameFactory type
class MANTID_GEOMETRY_DLL UnknownFrameFactory : public MDFrameFactory {
private:
- UnknownFrame *createRaw(const MDFrameArgument &argument) const;
+ UnknownFrame *createRaw(const MDFrameArgument &argument) const override;
public:
- bool canInterpret(const MDFrameArgument &argument) const;
+ bool canInterpret(const MDFrameArgument &argument) const override;
};
/// Make a complete factory chain
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
index 142d12d8920f2cfa053836c04219dd2c9b5e039e..490cf5e6f1b9178d8cd5797ddf106e591fdfb1f9 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDHistoDimension.h
@@ -52,21 +52,21 @@ public:
m_binWidth(other->getBinWidth()) {}
/// Destructor
- virtual ~MDHistoDimension() {}
+ ~MDHistoDimension() override {}
/// Return the name of the dimension as can be displayed along the axis
- virtual std::string getName() const { return m_name; }
+ std::string getName() const override { return m_name; }
/// Return the md frame
- const MDFrame &getMDFrame() const { return *m_frame; }
+ const MDFrame &getMDFrame() const override { return *m_frame; }
/// Return the units of the dimension as a string
- virtual const Kernel::UnitLabel getUnits() const {
+ const Kernel::UnitLabel getUnits() const override {
return m_frame->getUnitLabel();
}
/// Returns the unit
- virtual const Kernel::MDUnit &getMDUnits() const {
+ const Kernel::MDUnit &getMDUnits() const override {
return m_frame->getMDUnit();
}
@@ -74,35 +74,35 @@ public:
* A dimension can be usually found by its ID and various
* various method exist to manipulate set of dimensions by their names.
*/
- virtual std::string getDimensionId() const { return m_dimensionId; }
+ std::string getDimensionId() const override { return m_dimensionId; }
/// Returns the maximum extent of this dimension
- virtual coord_t getMaximum() const { return m_max; }
+ coord_t getMaximum() const override { return m_max; }
/// Returns the minimum extent of this dimension
- virtual coord_t getMinimum() const { return m_min; }
+ coord_t getMinimum() const override { return m_min; }
/// number of bins dimension have (an integrated has one). A axis directed
/// along dimension would have getNBins+1 axis points.
- virtual size_t getNBins() const { return m_numBins; }
+ size_t getNBins() const override { return m_numBins; }
/// Dimensions must be xml serializable.
- virtual std::string toXMLString() const;
+ std::string toXMLString() const override;
/// Get coordinate for index;
- virtual coord_t getX(size_t index) const {
+ coord_t getX(size_t index) const override {
return static_cast<coord_t>(index) * m_binWidth + m_min;
}
/// Return the width of one bin.
- coord_t getBinWidth() const { return m_binWidth; }
+ coord_t getBinWidth() const override { return m_binWidth; }
/** Change the extents and number of bins
* @param nBins :: number of bins
* @param min :: extents minimum
* @param max :: extents maximum
*/
- void setRange(size_t nBins, coord_t min, coord_t max) {
+ void setRange(size_t nBins, coord_t min, coord_t max) override {
if (max < min) {
throw std::invalid_argument("Error making MDHistoDimension. Cannot have "
"dimension with min > max");
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDPlaneImplicitFunction.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDPlaneImplicitFunction.h
index 5bc6fb27e1d4f21c34e062304fd748bcccdff59c..f29120b23afb436db32fc959b9a008b61a97a843 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDPlaneImplicitFunction.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDPlaneImplicitFunction.h
@@ -44,15 +44,15 @@ public:
MDPlaneImplicitFunction(const size_t nd, const double *normal,
const double *point);
/// Class destructor.
- virtual ~MDPlaneImplicitFunction();
+ ~MDPlaneImplicitFunction() override;
/// Overriding the addPlane for check
void addPlane(const MDPlane &plane);
/// @return the MDPlaneImplicitFunction type name.
- virtual std::string getName() const;
+ std::string getName() const override;
/// @return the XML representation of the MDPlaneImplicitFunction
- virtual std::string toXMLString() const;
+ std::string toXMLString() const override;
private:
/// Set defaults to origin if not used.
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/NullImplicitFunction.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/NullImplicitFunction.h
index da73e8c21d9894c249e20f34d828a2ac398e2669..772f7916196446a2f84c8c05eb27ef1cf4f894ff 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/NullImplicitFunction.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/NullImplicitFunction.h
@@ -45,12 +45,12 @@ class DLLExport NullImplicitFunction
: public Mantid::Geometry::MDImplicitFunction {
public:
NullImplicitFunction();
- virtual ~NullImplicitFunction();
- virtual std::string getName() const;
- virtual std::string toXMLString() const;
+ ~NullImplicitFunction() override;
+ std::string getName() const override;
+ std::string toXMLString() const override;
//----------------------MDImplicit function methods ------------
- virtual bool isPointContained(const coord_t *) { return true; }
- virtual bool isPointContained(const std::vector<coord_t> &) { return true; }
+ bool isPointContained(const coord_t *) override { return true; }
+ bool isPointContained(const std::vector<coord_t> &) override { return true; }
// Unhide base class methods (avoids Intel compiler warning)
using MDImplicitFunction::isPointContained;
//---------------------------------------------------------------
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h
index c21b349d84dfa9078ba8df85d80dca9d20e5f86e..5eedd13d7678a94578bd0ef175703cba0d9778a3 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h
@@ -37,16 +37,16 @@ namespace Geometry {
class MANTID_GEOMETRY_DLL QLab : public MDFrame {
public:
QLab();
- virtual ~QLab();
- Mantid::Kernel::UnitLabel getUnitLabel() const;
- const Mantid::Kernel::MDUnit &getMDUnit() const;
- bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const;
- bool isQ() const;
- bool isSameType(const MDFrame &frame) const;
- virtual std::string name() const;
- QLab *clone() const;
+ ~QLab() override;
+ Mantid::Kernel::UnitLabel getUnitLabel() const override;
+ const Mantid::Kernel::MDUnit &getMDUnit() const override;
+ bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const override;
+ bool isQ() const override;
+ bool isSameType(const MDFrame &frame) const override;
+ std::string name() const override;
+ QLab *clone() const override;
Mantid::Kernel::SpecialCoordinateSystem
- equivalientSpecialCoordinateSystem() const;
+ equivalientSpecialCoordinateSystem() const override;
// Type name
static const std::string QLabName;
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h
index 5f932b3eb2e98891669c01c88a8d4ff61fe3fc83..9070821361c711f922471d03d3e8d7ea0a765a59 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h
@@ -38,16 +38,16 @@ class MANTID_GEOMETRY_DLL QSample : public MDFrame {
public:
static const std::string QSampleName;
QSample();
- virtual ~QSample();
- Kernel::UnitLabel getUnitLabel() const;
- const Kernel::MDUnit &getMDUnit() const;
- bool canConvertTo(const Kernel::MDUnit &otherUnit) const;
- bool isQ() const;
- bool isSameType(const MDFrame &frame) const;
- std::string name() const;
- QSample *clone() const;
+ ~QSample() override;
+ Kernel::UnitLabel getUnitLabel() const override;
+ const Kernel::MDUnit &getMDUnit() const override;
+ bool canConvertTo(const Kernel::MDUnit &otherUnit) const override;
+ bool isQ() const override;
+ bool isSameType(const MDFrame &frame) const override;
+ std::string name() const override;
+ QSample *clone() const override;
Mantid::Kernel::SpecialCoordinateSystem
- equivalientSpecialCoordinateSystem() const;
+ equivalientSpecialCoordinateSystem() const override;
private:
/// immutable unit for qlab.
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
index 691537e4f07e2bba6a4479895d0fad1596016a21..8f3e51359bb9ad7458ec9027912193c0c7cec9b1 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
@@ -38,16 +38,16 @@ class MANTID_GEOMETRY_DLL UnknownFrame : public MDFrame {
public:
UnknownFrame(std::unique_ptr<Kernel::MDUnit> unit);
UnknownFrame(const Kernel::UnitLabel &unit);
- virtual ~UnknownFrame();
- std::string name() const;
- bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const;
- bool isQ() const;
- bool isSameType(const MDFrame &frame) const;
- Mantid::Kernel::UnitLabel getUnitLabel() const;
- const Mantid::Kernel::MDUnit &getMDUnit() const;
+ ~UnknownFrame() override;
+ std::string name() const override;
+ bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const override;
+ bool isQ() const override;
+ bool isSameType(const MDFrame &frame) const override;
+ Mantid::Kernel::UnitLabel getUnitLabel() const override;
+ const Mantid::Kernel::MDUnit &getMDUnit() const override;
Mantid::Kernel::SpecialCoordinateSystem
- equivalientSpecialCoordinateSystem() const;
- UnknownFrame *clone() const;
+ equivalientSpecialCoordinateSystem() const override;
+ UnknownFrame *clone() const override;
// Type name
static const std::string UnknownFrameName;
diff --git a/Framework/Geometry/inc/MantidGeometry/Math/Quadrilateral.h b/Framework/Geometry/inc/MantidGeometry/Math/Quadrilateral.h
index fa6e963d631196376ec12d6a050e73f4237173c1..4956e93a90192e88bec9ffec9c30bbbb59aad5ac 100644
--- a/Framework/Geometry/inc/MantidGeometry/Math/Quadrilateral.h
+++ b/Framework/Geometry/inc/MantidGeometry/Math/Quadrilateral.h
@@ -50,29 +50,29 @@ public:
Quadrilateral &operator=(const Quadrilateral &rhs);
/// Index access.
- virtual const Kernel::V2D &operator[](const size_t index) const;
+ const Kernel::V2D &operator[](const size_t index) const override;
/// Bounds-checked index access
- virtual const Kernel::V2D &at(const size_t index) const;
+ const Kernel::V2D &at(const size_t index) const override;
/// Return the number of vertices
- virtual size_t npoints() const { return 4; }
+ size_t npoints() const override { return 4; }
/// Is a point inside this polygon
- virtual bool contains(const Kernel::V2D &point) const;
+ bool contains(const Kernel::V2D &point) const override;
/// Is a the given polygon completely encosed by this one
- virtual bool contains(const ConvexPolygon &poly) const;
+ bool contains(const ConvexPolygon &poly) const override;
/// Compute the area of the polygon using triangulation
- virtual double area() const;
+ double area() const override;
/// Compute the 'determinant' of the points
- virtual double determinant() const;
+ double determinant() const override;
/// Return the lowest X value in the polygon
- virtual double minX() const;
+ double minX() const override;
/// Return the max X value in the polygon
- virtual double maxX() const;
+ double maxX() const override;
/// Return the lowest Y value in the polygon
- virtual double minY() const;
+ double minY() const override;
/// Return the max Y value in the polygon
- virtual double maxY() const;
+ double maxY() const override;
/// Return a new Polygon based on the current Quadrilateral
- virtual ConvexPolygon toPoly() const;
+ ConvexPolygon toPoly() const override;
/// Shifts the vertexes in a clockwise manner
virtual void shiftVertexesClockwise();
diff --git a/Framework/Geometry/inc/MantidGeometry/Objects/Rules.h b/Framework/Geometry/inc/MantidGeometry/Objects/Rules.h
index 1608c554ade64c6c1fcc4e070b282b523b46e07a..bba46407ac3b1ba0858c88df3b0d4163bd4984c3 100644
--- a/Framework/Geometry/inc/MantidGeometry/Objects/Rules.h
+++ b/Framework/Geometry/inc/MantidGeometry/Objects/Rules.h
@@ -135,7 +135,8 @@ class MANTID_GEOMETRY_DLL Intersection : public Rule {
private:
std::unique_ptr<Rule> A; ///< Rule 1
std::unique_ptr<Rule> B; ///< Rule 2
- Intersection *doClone() const; ///< Makes a copy of the whole downward tree
+ Intersection *
+ doClone() const override; ///< Makes a copy of the whole downward tree
protected:
Intersection(const Intersection &);
Intersection &operator=(const Intersection &);
@@ -146,30 +147,32 @@ public:
explicit Intersection(Rule *, std::unique_ptr<Rule>, std::unique_ptr<Rule>);
std::unique_ptr<Intersection>
clone() const; ///< Makes a copy of the whole downward tree
- virtual std::string className() const {
+ std::string className() const override {
return "Intersection";
} ///< Returns class name as string
- Rule *leaf(const int ipt = 0) const {
+ Rule *leaf(const int ipt = 0) const override {
return ipt ? B.get() : A.get();
} ///< selects leaf component
- void setLeaves(std::unique_ptr<Rule>, std::unique_ptr<Rule>); ///< set leaves
- void setLeaf(std::unique_ptr<Rule> nR, const int side = 0); ///< set one leaf.
- int findLeaf(const Rule *) const;
- Rule *findKey(const int KeyN);
- int isComplementary() const;
-
- int type() const { return 1; } // effective name
- std::string display() const;
- std::string displayAddress() const;
-
- bool isValid(const Kernel::V3D &) const;
- bool isValid(const std::map<int, int> &) const;
- int simplify(); ///< apply general intersection simplification
+ void setLeaves(std::unique_ptr<Rule>,
+ std::unique_ptr<Rule>) override; ///< set leaves
+ void setLeaf(std::unique_ptr<Rule> nR,
+ const int side = 0) override; ///< set one leaf.
+ int findLeaf(const Rule *) const override;
+ Rule *findKey(const int KeyN) override;
+ int isComplementary() const override;
+
+ int type() const override { return 1; } // effective name
+ std::string display() const override;
+ std::string displayAddress() const override;
+
+ bool isValid(const Kernel::V3D &) const override;
+ bool isValid(const std::map<int, int> &) const override;
+ int simplify() override; ///< apply general intersection simplification
void getBoundingBox(double &xmax, double &ymax, double &zmax, double &xmin,
- double &ymin, double &zmin); /// bounding box
+ double &ymin, double &zmin) override; /// bounding box
#ifdef ENABLE_OPENCASCADE
- virtual TopoDS_Shape analyze();
+ TopoDS_Shape analyze() override;
#endif
};
@@ -189,7 +192,7 @@ class MANTID_GEOMETRY_DLL Union : public Rule {
private:
std::unique_ptr<Rule> A; ///< Leaf rule A
std::unique_ptr<Rule> B; ///< Leaf rule B
- Union *doClone() const;
+ Union *doClone() const override;
protected:
Union(const Union &);
@@ -201,30 +204,31 @@ public:
explicit Union(Rule *, std::unique_ptr<Rule>, std::unique_ptr<Rule>);
std::unique_ptr<Union> clone() const;
- virtual std::string className() const {
+ std::string className() const override {
return "Union";
} ///< Returns class name as string
- Rule *leaf(const int ipt = 0) const {
+ Rule *leaf(const int ipt = 0) const override {
return ipt ? B.get() : A.get();
} ///< Select a leaf component
- void setLeaves(std::unique_ptr<Rule>, std::unique_ptr<Rule>); ///< set leaves
- void setLeaf(std::unique_ptr<Rule>, const int side = 0);
- int findLeaf(const Rule *) const;
- Rule *findKey(const int KeyN);
-
- int isComplementary() const;
- int type() const { return -1; } ///< effective name
-
- bool isValid(const Kernel::V3D &) const;
- bool isValid(const std::map<int, int> &) const;
- std::string display() const;
- std::string displayAddress() const;
- int simplify(); ///< apply general intersection simplification
+ void setLeaves(std::unique_ptr<Rule>,
+ std::unique_ptr<Rule>) override; ///< set leaves
+ void setLeaf(std::unique_ptr<Rule>, const int side = 0) override;
+ int findLeaf(const Rule *) const override;
+ Rule *findKey(const int KeyN) override;
+
+ int isComplementary() const override;
+ int type() const override { return -1; } ///< effective name
+
+ bool isValid(const Kernel::V3D &) const override;
+ bool isValid(const std::map<int, int> &) const override;
+ std::string display() const override;
+ std::string displayAddress() const override;
+ int simplify() override; ///< apply general intersection simplification
void getBoundingBox(double &xmax, double &ymax, double &zmax, double &xmin,
- double &ymin, double &zmin); /// bounding box
+ double &ymin, double &zmin) override; /// bounding box
#ifdef ENABLE_OPENCASCADE
- virtual TopoDS_Shape analyze();
+ TopoDS_Shape analyze() override;
#endif
};
@@ -243,39 +247,39 @@ be calculated
class MANTID_GEOMETRY_DLL SurfPoint : public Rule {
private:
boost::shared_ptr<Surface> m_key; ///< Actual Surface Base Object
- SurfPoint *doClone() const;
+ SurfPoint *doClone() const override;
int keyN; ///< Key Number (identifer)
int sign; ///< +/- in Object unit
public:
SurfPoint();
- virtual std::string className() const {
+ std::string className() const override {
return "SurfPoint";
} ///< Returns class name as string
std::unique_ptr<SurfPoint> clone() const;
- Rule *leaf(const int = 0) const { return 0; } ///< No Leaves
- void setLeaves(std::unique_ptr<Rule>, std::unique_ptr<Rule>);
- void setLeaf(std::unique_ptr<Rule>, const int = 0);
- int findLeaf(const Rule *) const;
- Rule *findKey(const int KeyNum);
+ Rule *leaf(const int = 0) const override { return 0; } ///< No Leaves
+ void setLeaves(std::unique_ptr<Rule>, std::unique_ptr<Rule>) override;
+ void setLeaf(std::unique_ptr<Rule>, const int = 0) override;
+ int findLeaf(const Rule *) const override;
+ Rule *findKey(const int KeyNum) override;
- int type() const { return 0; } ///< Effective name
+ int type() const override { return 0; } ///< Effective name
void setKeyN(const int Ky); ///< set keyNumber
void setKey(const boost::shared_ptr<Surface> &key);
- bool isValid(const Kernel::V3D &) const;
- bool isValid(const std::map<int, int> &) const;
+ bool isValid(const Kernel::V3D &) const override;
+ bool isValid(const std::map<int, int> &) const override;
int getSign() const { return sign; } ///< Get Sign
int getKeyN() const { return keyN; } ///< Get Key
- int simplify();
+ int simplify() override;
Surface *getKey() const { return m_key.get(); } ///< Get Surface Ptr
- std::string display() const;
- std::string displayAddress() const;
+ std::string display() const override;
+ std::string displayAddress() const override;
void getBoundingBox(double &xmax, double &ymax, double &zmax, double &xmin,
- double &ymin, double &zmin); /// bounding box
+ double &ymin, double &zmin) override; /// bounding box
#ifdef ENABLE_OPENCASCADE
- virtual TopoDS_Shape analyze();
+ TopoDS_Shape analyze() override;
#endif
};
@@ -295,7 +299,7 @@ class MANTID_GEOMETRY_DLL CompObj : public Rule {
private:
int objN; ///< Object number
Object *key; ///< Object Pointer
- CompObj *doClone() const;
+ CompObj *doClone() const override;
protected:
CompObj(const CompObj &);
@@ -304,33 +308,35 @@ protected:
public:
CompObj();
std::unique_ptr<CompObj> clone() const;
- virtual std::string className() const {
+ std::string className() const override {
return "CompObj";
} ///< Returns class name as string
- void setLeaves(std::unique_ptr<Rule>, std::unique_ptr<Rule>);
- void setLeaf(std::unique_ptr<Rule>, const int = 0);
- int findLeaf(const Rule *) const;
- Rule *findKey(const int i);
+ void setLeaves(std::unique_ptr<Rule>, std::unique_ptr<Rule>) override;
+ void setLeaf(std::unique_ptr<Rule>, const int = 0) override;
+ int findLeaf(const Rule *) const override;
+ Rule *findKey(const int i) override;
- int type() const { return 0; } ///< Is it a branched object
- int isComplementary() const { return 1; } ///< Always returns true (1)
+ int type() const override { return 0; } ///< Is it a branched object
+ int isComplementary() const override {
+ return 1;
+ } ///< Always returns true (1)
void setObjN(const int Ky); ///< set object Number
void setObj(Object *); ///< Set a Object state
- bool isValid(const Kernel::V3D &) const;
- bool isValid(const std::map<int, int> &) const;
+ bool isValid(const Kernel::V3D &) const override;
+ bool isValid(const std::map<int, int> &) const override;
/// Get object number of component
int getObjN() const { return objN; }
- int simplify();
+ int simplify() override;
Object *getObj() const { return key; } ///< Get Object Ptr
- std::string display() const;
- std::string displayAddress() const;
+ std::string display() const override;
+ std::string displayAddress() const override;
void getBoundingBox(double &xmax, double &ymax, double &zmax, double &xmin,
- double &ymin, double &zmin); /// bounding box
+ double &ymin, double &zmin) override; /// bounding box
#ifdef ENABLE_OPENCASCADE
- virtual TopoDS_Shape analyze();
+ TopoDS_Shape analyze() override;
#endif
};
@@ -349,7 +355,7 @@ Care must be taken to avoid a cyclic loop
class MANTID_GEOMETRY_DLL CompGrp : public Rule {
private:
std::unique_ptr<Rule> A; ///< The rule
- CompGrp *doClone() const;
+ CompGrp *doClone() const override;
protected:
CompGrp(const CompGrp &);
@@ -359,29 +365,33 @@ public:
CompGrp();
explicit CompGrp(Rule *, std::unique_ptr<Rule>);
std::unique_ptr<CompGrp> clone() const;
- virtual std::string className() const {
+ std::string className() const override {
return "CompGrp";
} ///< Returns class name as string
- Rule *leaf(const int) const { return A.get(); } ///< selects leaf component
- void setLeaves(std::unique_ptr<Rule>, std::unique_ptr<Rule>);
- void setLeaf(std::unique_ptr<Rule> nR, const int side = 0);
- int findLeaf(const Rule *) const;
- Rule *findKey(const int i);
-
- int type() const { return 0; } ///< Is it a branched object
- int isComplementary() const { return 1; } ///< Always returns true (1)
-
- bool isValid(const Kernel::V3D &) const;
- bool isValid(const std::map<int, int> &) const;
- int simplify();
-
- std::string display() const;
- std::string displayAddress() const;
+ Rule *leaf(const int) const override {
+ return A.get();
+ } ///< selects leaf component
+ void setLeaves(std::unique_ptr<Rule>, std::unique_ptr<Rule>) override;
+ void setLeaf(std::unique_ptr<Rule> nR, const int side = 0) override;
+ int findLeaf(const Rule *) const override;
+ Rule *findKey(const int i) override;
+
+ int type() const override { return 0; } ///< Is it a branched object
+ int isComplementary() const override {
+ return 1;
+ } ///< Always returns true (1)
+
+ bool isValid(const Kernel::V3D &) const override;
+ bool isValid(const std::map<int, int> &) const override;
+ int simplify() override;
+
+ std::string display() const override;
+ std::string displayAddress() const override;
void getBoundingBox(double &xmax, double &ymax, double &zmax, double &xmin,
- double &ymin, double &zmin); /// bounding box
+ double &ymin, double &zmin) override; /// bounding box
#ifdef ENABLE_OPENCASCADE
- virtual TopoDS_Shape analyze();
+ TopoDS_Shape analyze() override;
#endif
};
@@ -399,7 +409,7 @@ but can be true/false/unknown.
class MANTID_GEOMETRY_DLL BoolValue : public Rule {
private:
int status; ///< Three values 0 False : 1 True : -1 doesn't matter
- BoolValue *doClone() const;
+ BoolValue *doClone() const override;
protected:
BoolValue(const BoolValue &);
@@ -408,34 +418,34 @@ protected:
public:
BoolValue();
std::unique_ptr<BoolValue> clone() const;
- virtual std::string className() const {
+ std::string className() const override {
return "BoolValue";
} ///< Returns class name as string
- Rule *leaf(const int = 0) const { return 0; } ///< No leaves
- void setLeaves(std::unique_ptr<Rule>, std::unique_ptr<Rule>);
- void setLeaf(std::unique_ptr<Rule>, const int = 0);
- int findLeaf(const Rule *) const;
- Rule *findKey(const int) { return 0; }
+ Rule *leaf(const int = 0) const override { return 0; } ///< No leaves
+ void setLeaves(std::unique_ptr<Rule>, std::unique_ptr<Rule>) override;
+ void setLeaf(std::unique_ptr<Rule>, const int = 0) override;
+ int findLeaf(const Rule *) const override;
+ Rule *findKey(const int) override { return 0; }
- int type() const { return 0; } // effective name
+ int type() const override { return 0; } // effective name
///< write val into status, if in valid range
void setStatus(int val) {
if (val == 0 || val == 1 || val == -1)
status = val;
}
- bool isValid(const Kernel::V3D &) const;
+ bool isValid(const Kernel::V3D &) const override;
bool isValid(const std::map<int, int> &)
- const; ///< isValue :: Based on a surface status map
- int simplify();
+ const override; ///< isValue :: Based on a surface status map
+ int simplify() override;
- std::string display() const;
- std::string displayAddress() const;
+ std::string display() const override;
+ std::string displayAddress() const override;
void getBoundingBox(double &xmax, double &ymax, double &zmax, double &xmin,
- double &ymin, double &zmin); /// bounding box
+ double &ymin, double &zmin) override; /// bounding box
#ifdef ENABLE_OPENCASCADE
- TopoDS_Shape analyze();
+ TopoDS_Shape analyze() override;
#endif
};
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/BitmapGeometryHandler.h b/Framework/Geometry/inc/MantidGeometry/Rendering/BitmapGeometryHandler.h
index deda783ffaba852c8e77fea0c336761da48d5b4b..0581e8d2cd2708a9a2e2d03897073e87e13b531d 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/BitmapGeometryHandler.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/BitmapGeometryHandler.h
@@ -54,7 +54,7 @@ class MANTID_GEOMETRY_DLL BitmapGeometryHandler : public GeometryHandler {
private:
static Kernel::Logger &PLog; ///< The official logger
- boost::shared_ptr<GeometryHandler> clone() const;
+ boost::shared_ptr<GeometryHandler> clone() const override;
/// The RectangularDetector object being plotted.
RectangularDetector *m_rectDet;
@@ -68,31 +68,31 @@ public:
// BitmapGeometryHandler(boost::shared_ptr<Object> obj);
// ///<Constructor
// BitmapGeometryHandler(Object *obj); ///<Constructor
- virtual ~BitmapGeometryHandler();
- virtual BitmapGeometryHandler *
- createInstance(IObjComponent *); ///< Create an instance of concrete geometry
+ ~BitmapGeometryHandler() override;
+ BitmapGeometryHandler *createInstance(
+ IObjComponent *) override; ///< Create an instance of concrete geometry
/// handler for ObjComponent
- virtual BitmapGeometryHandler *createInstance(boost::shared_ptr<
- Object>); ///< Create an instance of concrete geometry handler for Object
- virtual GeometryHandler *createInstance(
- Object *); ///< Create an instance of concrete geometry handler for Object
- virtual void Triangulate(); ///< Triangulate the Object
- virtual void Render(); ///< Render Object or ObjComponent
- virtual void
- Initialize(); ///< Prepare/Initialize Object/ObjComponent to be rendered
+ BitmapGeometryHandler *createInstance(boost::shared_ptr<Object>)
+ override; ///< Create an instance of concrete geometry handler for Object
+ GeometryHandler *createInstance(Object *)
+ override; ///< Create an instance of concrete geometry handler for Object
+ void Triangulate() override; ///< Triangulate the Object
+ void Render() override; ///< Render Object or ObjComponent
+ void Initialize()
+ override; ///< Prepare/Initialize Object/ObjComponent to be rendered
/// Returns true if the shape can be triangulated
- virtual bool canTriangulate() { return false; }
+ bool canTriangulate() override { return false; }
/// get the number of triangles
- virtual int NumberOfTriangles() { return 0; }
+ int NumberOfTriangles() override { return 0; }
/// get the number of points or vertices
- virtual int NumberOfPoints() { return 0; }
+ int NumberOfPoints() override { return 0; }
/// Extract the vertices of the triangles
- virtual double *getTriangleVertices() { return NULL; }
+ double *getTriangleVertices() override { return NULL; }
/// Extract the Faces of the triangles
- virtual int *getTriangleFaces() { return NULL; }
+ int *getTriangleFaces() override { return NULL; }
/// Sets the geometry cache using the triangulation information provided
- virtual void setGeometryCache(int noPts, int noFaces, double *pts,
- int *faces) {
+ void setGeometryCache(int noPts, int noFaces, double *pts,
+ int *faces) override {
(void)noPts;
(void)noFaces;
(void)pts;
@@ -100,8 +100,8 @@ public:
};
/// return the actual type and points of one of the "standard" objects,
/// cuboid/cone/cyl/sphere
- virtual void GetObjectGeom(int &mytype, std::vector<Kernel::V3D> &vectors,
- double &myradius, double &myheight) {
+ void GetObjectGeom(int &mytype, std::vector<Kernel::V3D> &vectors,
+ double &myradius, double &myheight) override {
(void)mytype;
(void)vectors;
(void)myradius;
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryHandler.h b/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryHandler.h
index d6a7c804fed3458659ca249ddbe03d1b19514022..f8aa353ce586ee56ead28794136698851ca5710b 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryHandler.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryHandler.h
@@ -59,22 +59,23 @@ public:
CacheGeometryHandler(IObjComponent *obj); ///< Constructor
CacheGeometryHandler(boost::shared_ptr<Object> obj); ///< Constructor
CacheGeometryHandler(Object *obj); ///< Constructor
- boost::shared_ptr<GeometryHandler> clone() const;
- ~CacheGeometryHandler(); ///< Destructor
- GeometryHandler *createInstance(IObjComponent *comp);
- GeometryHandler *createInstance(boost::shared_ptr<Object> obj);
- GeometryHandler *createInstance(Object *obj);
-
- void Triangulate();
- void Render();
- void Initialize();
- bool canTriangulate() { return true; }
- int NumberOfTriangles();
- int NumberOfPoints();
- double *getTriangleVertices();
- int *getTriangleFaces();
+ boost::shared_ptr<GeometryHandler> clone() const override;
+ ~CacheGeometryHandler() override; ///< Destructor
+ GeometryHandler *createInstance(IObjComponent *comp) override;
+ GeometryHandler *createInstance(boost::shared_ptr<Object> obj) override;
+ GeometryHandler *createInstance(Object *obj) override;
+
+ void Triangulate() override;
+ void Render() override;
+ void Initialize() override;
+ bool canTriangulate() override { return true; }
+ int NumberOfTriangles() override;
+ int NumberOfPoints() override;
+ double *getTriangleVertices() override;
+ int *getTriangleFaces() override;
/// Sets the geometry cache using the triangulation information provided
- void setGeometryCache(int noPts, int noFaces, double *pts, int *faces);
+ void setGeometryCache(int noPts, int noFaces, double *pts,
+ int *faces) override;
};
} // NAMESPACE Geometry
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryHandler.h b/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryHandler.h
index b552dd8e7678a7b8cd83a98fd6655ffa8fb4497e..ce4542d5122320ca10a4f598f35ff76ad841c2dc 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryHandler.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryHandler.h
@@ -75,11 +75,11 @@ public:
GluGeometryHandler(IObjComponent *obj); ///< Constructor
GluGeometryHandler(boost::shared_ptr<Object> obj); ///< Constructor
GluGeometryHandler(Object *obj); ///< Constructor
- boost::shared_ptr<GeometryHandler> clone() const;
- ~GluGeometryHandler(); ///< Destructor
- GeometryHandler *createInstance(IObjComponent *comp);
- GeometryHandler *createInstance(boost::shared_ptr<Object> obj);
- GeometryHandler *createInstance(Object *);
+ boost::shared_ptr<GeometryHandler> clone() const override;
+ ~GluGeometryHandler() override; ///< Destructor
+ GeometryHandler *createInstance(IObjComponent *comp) override;
+ GeometryHandler *createInstance(boost::shared_ptr<Object> obj) override;
+ GeometryHandler *createInstance(Object *) override;
/// sets the geometry handler for a cuboid
void setCuboid(Kernel::V3D, Kernel::V3D, Kernel::V3D, Kernel::V3D);
/// sets the geometry handler for a cone
@@ -90,11 +90,11 @@ public:
void setCone(Kernel::V3D, Kernel::V3D, double, double);
/// sets the geometry handler for a segmented cylinder
void setSegmentedCylinder(Kernel::V3D, Kernel::V3D, double, double);
- void Triangulate();
- void Render();
- void Initialize();
+ void Triangulate() override;
+ void Render() override;
+ void Initialize() override;
void GetObjectGeom(int &mytype, std::vector<Kernel::V3D> &vectors,
- double &myradius, double &myheight);
+ double &myradius, double &myheight) override;
};
} // NAMESPACE Geometry
diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryHandler.h b/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryHandler.h
index 5d4012ff964f554c9eb969aafb52c319be023fbf..b524fe8f1a4849913718da711083d27644ee3a43 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryHandler.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryHandler.h
@@ -59,24 +59,24 @@ public:
OCGeometryHandler(boost::shared_ptr<Object> obj); ///< Constructor
OCGeometryHandler(Object *obj); ///< Constructor
boost::shared_ptr<GeometryHandler>
- clone() const; ///< Virtual copy constructor
- ~OCGeometryHandler(); ///< Destructor
- GeometryHandler *createInstance(IObjComponent *comp);
- GeometryHandler *createInstance(boost::shared_ptr<Object> obj);
- GeometryHandler *createInstance(Object *);
- void Triangulate();
- void Render();
- void Initialize();
+ clone() const override; ///< Virtual copy constructor
+ ~OCGeometryHandler() override; ///< Destructor
+ GeometryHandler *createInstance(IObjComponent *comp) override;
+ GeometryHandler *createInstance(boost::shared_ptr<Object> obj) override;
+ GeometryHandler *createInstance(Object *) override;
+ void Triangulate() override;
+ void Render() override;
+ void Initialize() override;
/// Returns true if the shape can be triangulated
- bool canTriangulate() { return true; }
+ bool canTriangulate() override { return true; }
/// get the number of Triangles
- int NumberOfTriangles();
+ int NumberOfTriangles() override;
/// get the number of points or vertices
- int NumberOfPoints();
+ int NumberOfPoints() override;
/// Extract the vertices of the triangles
- double *getTriangleVertices();
+ double *getTriangleVertices() override;
/// Extract the Faces of the triangles
- int *getTriangleFaces();
+ int *getTriangleFaces() override;
};
} // NAMESPACE Geometry
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Cone.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Cone.h
index dd5bc1c7bf89a831e51265ee31eaeacf0c930e4d..b6bb7ee97ba8c563e04e788c7e2529a1ddda5455 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Cone.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Cone.h
@@ -47,9 +47,9 @@ private:
double alpha; ///< Angle (degrees)
double cangle; ///< Cos(angle)
- void rotate(const Kernel::Matrix<double> &);
- void displace(const Kernel::V3D &);
- Cone *doClone() const;
+ void rotate(const Kernel::Matrix<double> &) override;
+ void displace(const Kernel::V3D &) override;
+ Cone *doClone() const override;
protected:
Cone(const Cone &);
@@ -57,18 +57,18 @@ protected:
public:
/// Public identifer
- virtual std::string className() const { return "Cone"; }
+ std::string className() const override { return "Cone"; }
Cone();
std::unique_ptr<Cone> clone() const;
int operator==(const Cone &) const;
/// Calculate if the point R is within the cone (return -1) or outside (return
/// 1)
- int side(const Kernel::V3D &R) const;
+ int side(const Kernel::V3D &R) const override;
/// Calculate if the point R is on the cone(1=on the surface, 0=not)
- int onSurface(const Kernel::V3D &R) const;
+ int onSurface(const Kernel::V3D &R) const override;
/// Accept visitor for line calculation
- virtual void acceptVisitor(BaseVisit &A) const { A.Accept(*this); }
+ void acceptVisitor(BaseVisit &A) const override { A.Accept(*this); }
/// Return centre point
Kernel::V3D getCentre() const { return Centre; }
@@ -77,10 +77,10 @@ public:
/// Edge Angle
double getCosAngle() const { return cangle; }
/// This method returns the distance of the point from the cone
- double distance(const Kernel::V3D &) const;
+ double distance(const Kernel::V3D &) const override;
/// This method sets the cone surface using the input string in MCNPx format
- int setSurface(const std::string &);
+ int setSurface(const std::string &) override;
/// This method sets the centre of the cone
void setCentre(const Kernel::V3D &);
/// This method sets the cone normal
@@ -91,20 +91,20 @@ public:
/// MCNPX format
void setTanAngle(double const);
/// This method generates the quadratic equation for cone
- void setBaseEqn();
+ void setBaseEqn() override;
/// This method will write the cone equation in MCNP geometry format
- void write(std::ostream &) const;
+ void write(std::ostream &) const override;
/// This will get the bounding box for the cone
void getBoundingBox(double &xmax, double &ymax, double &zmax, double &xmin,
- double &ymin, double &zmin);
+ double &ymin, double &zmin) override;
/// The number of slices to approximate a cone
static int g_nslices;
/// The number of stacks to approximate a cone
static int g_nstacks;
#ifdef ENABLE_OPENCASCADE
- virtual TopoDS_Shape createShape();
+ TopoDS_Shape createShape() override;
#endif
};
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Cylinder.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Cylinder.h
index 32b3c748b06a880670f46b9c1dced217760e38e3..a18eca045dfdc5ae0f5aa7ca0070b43b63ac0526 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Cylinder.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Cylinder.h
@@ -53,10 +53,10 @@ private:
std::size_t Nvec; ///< Normal vector is x,y or z :: (1-3) (0 if general)
double Radius; ///< Radius of cylinder
- void rotate(const Kernel::Matrix<double> &);
- void displace(const Kernel::V3D &);
+ void rotate(const Kernel::Matrix<double> &) override;
+ void displace(const Kernel::V3D &) override;
void setNvec(); ///< check to obtain orientation
- Cylinder *doClone() const;
+ Cylinder *doClone() const override;
protected:
Cylinder(const Cylinder &);
@@ -64,21 +64,21 @@ protected:
public:
/// Public identifer
- virtual std::string className() const { return "Cylinder"; }
+ std::string className() const override { return "Cylinder"; }
Cylinder();
std::unique_ptr<Cylinder> clone() const;
// Visit acceptor
- virtual void acceptVisitor(BaseVisit &A) const { A.Accept(*this); }
+ void acceptVisitor(BaseVisit &A) const override { A.Accept(*this); }
virtual double lineIntersect(const Kernel::V3D &, const Kernel::V3D &) const;
- int side(const Kernel::V3D &) const;
- int onSurface(const Kernel::V3D &) const;
- double distance(const Kernel::V3D &) const;
+ int side(const Kernel::V3D &) const override;
+ int onSurface(const Kernel::V3D &) const override;
+ double distance(const Kernel::V3D &) const override;
- int setSurface(const std::string &);
+ int setSurface(const std::string &) override;
void setCentre(const Kernel::V3D &);
void setNorm(const Kernel::V3D &);
Kernel::V3D getCentre() const { return Centre; } ///< Return centre point
@@ -89,19 +89,19 @@ public:
Radius = r;
setBaseEqn();
}
- void setBaseEqn();
+ void setBaseEqn() override;
- void write(std::ostream &) const;
- void print() const;
+ void write(std::ostream &) const override;
+ void print() const override;
void getBoundingBox(double &xmax, double &ymax, double &zmax, double &xmin,
- double &ymin, double &zmin);
+ double &ymin, double &zmin) override;
/// The number of slices to approximate a cylinder
static int g_nslices;
/// The number of stacks to approximate a cylinder
static int g_nstacks;
#ifdef ENABLE_OPENCASCADE
- virtual TopoDS_Shape createShape();
+ TopoDS_Shape createShape() override;
#endif
};
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/General.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/General.h
index 3893a44b5a87a0559412804389236d9bdf786ebd..a9f764ad31b18e590caaf8babcad573d810c44a1 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/General.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/General.h
@@ -42,7 +42,7 @@ namespace Geometry {
class MANTID_GEOMETRY_DLL General : public Quadratic {
private:
- General *doClone() const;
+ General *doClone() const override;
protected:
General(const General &);
@@ -52,10 +52,10 @@ public:
General();
std::unique_ptr<General> clone() const;
- int setSurface(const std::string &);
- void setBaseEqn();
+ int setSurface(const std::string &) override;
+ void setBaseEqn() override;
void getBoundingBox(double &xmax, double &ymax, double &zmax, double &xmin,
- double &ymin, double &zmin);
+ double &ymin, double &zmin) override;
};
} // NAMESPACE Geometry
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/LineIntersectVisit.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/LineIntersectVisit.h
index 51f461a5d25e8050381d459254d2b1d98616b072..dc77ef6181bb0acb5f6c678fe255575f4fd76537 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/LineIntersectVisit.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/LineIntersectVisit.h
@@ -61,15 +61,15 @@ private:
public:
LineIntersectVisit(const Kernel::V3D &, const Kernel::V3D &);
/// Destructor
- virtual ~LineIntersectVisit() {}
+ ~LineIntersectVisit() override {}
- void Accept(const Surface &);
+ void Accept(const Surface &) override;
void Accept(const Quadratic &);
- void Accept(const Plane &);
- void Accept(const Sphere &);
- void Accept(const Cone &);
- void Accept(const Cylinder &);
- void Accept(const General &);
+ void Accept(const Plane &) override;
+ void Accept(const Sphere &) override;
+ void Accept(const Cone &) override;
+ void Accept(const Cylinder &) override;
+ void Accept(const General &) override;
// Accessor
/// Get the distance
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Plane.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Plane.h
index 60c2793ebb3e4ce9d62a4a35a02f6fb51e69c814..32cc0e8c5315f6e3c5ba69c0bc706fb5f39f1a53 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Plane.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Plane.h
@@ -53,7 +53,7 @@ private:
double Dist; ///< Distance
std::size_t planeType() const; ///< are we alined on an axis
- Plane *doClone() const;
+ Plane *doClone() const override;
protected:
Plane(const Plane &);
@@ -61,42 +61,43 @@ protected:
public:
/// Effective typename
- virtual std::string className() const { return "Plane"; }
+ std::string className() const override { return "Plane"; }
Plane();
std::unique_ptr<Plane> clone() const;
- virtual void acceptVisitor(BaseVisit &A) const { A.Accept(*this); }
+ void acceptVisitor(BaseVisit &A) const override { A.Accept(*this); }
int setPlane(const Kernel::V3D &, const Kernel::V3D &);
// int setPlane(const std::string&);
- int side(const Kernel::V3D &) const;
- int onSurface(const Kernel::V3D &) const;
+ int side(const Kernel::V3D &) const override;
+ int onSurface(const Kernel::V3D &) const override;
// stuff for finding intersections etc.
double dotProd(const Plane &) const; ///< returns normal dot product
Kernel::V3D crossProd(const Plane &) const; ///< returns normal cross product
- double distance(const Kernel::V3D &) const; ///< distance from a point
+ double
+ distance(const Kernel::V3D &) const override; ///< distance from a point
double getDistance() const { return Dist; } ///< Distance from origin
const Kernel::V3D &getNormal() const {
return NormV;
} ///< Normal to plane (+ve surface)
- void rotate(const Kernel::Matrix<double> &);
- void displace(const Kernel::V3D &);
+ void rotate(const Kernel::Matrix<double> &) override;
+ void displace(const Kernel::V3D &) override;
- int setSurface(const std::string &);
- void print() const;
- void write(std::ostream &) const; ///< Write in MCNPX form
+ int setSurface(const std::string &) override;
+ void print() const override;
+ void write(std::ostream &) const override; ///< Write in MCNPX form
- void setBaseEqn(); ///< set up to be eqn based
+ void setBaseEqn() override; ///< set up to be eqn based
int LineIntersectionWithPlane(Kernel::V3D startpt, Kernel::V3D endpt,
Kernel::V3D &output);
void getBoundingBox(double &xmax, double &ymax, double &zmax, double &xmin,
- double &ymin, double &zmin);
+ double &ymin, double &zmin) override;
#ifdef ENABLE_OPENCASCADE
- virtual TopoDS_Shape createShape();
+ TopoDS_Shape createShape() override;
#endif
};
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Quadratic.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Quadratic.h
index 977456c60c10072066ef5368fa51856d0f55707d..e93f36e61bd1e7d9350fef0595f892a00f9a9d9b 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Quadratic.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Quadratic.h
@@ -24,7 +24,7 @@ Holds a basic surface with equation form
class MANTID_GEOMETRY_DLL Quadratic : public Surface {
private:
void matrixForm(Kernel::Matrix<double> &, Kernel::V3D &, double &) const;
- Quadratic *doClone() const = 0;
+ Quadratic *doClone() const override = 0;
protected:
std::vector<double> BaseEqn; ///< Base equation (as a 10 point vector)
@@ -38,32 +38,32 @@ public:
std::unique_ptr<Quadratic> clone() const;
/// Accept visitor for line calculation
- virtual void acceptVisitor(BaseVisit &A) const { A.Accept(*this); }
+ void acceptVisitor(BaseVisit &A) const override { A.Accept(*this); }
/// Effective typeid
- virtual std::string className() const { return "Quadratic"; }
+ std::string className() const override { return "Quadratic"; }
const std::vector<double> ©BaseEqn() const {
return BaseEqn;
} ///< access BaseEquation vector
- virtual int side(const Kernel::V3D &) const;
+ int side(const Kernel::V3D &) const override;
virtual void setBaseEqn() = 0; ///< Abstract set baseEqn
double eqnValue(const Kernel::V3D &) const;
- virtual int
- onSurface(const Kernel::V3D &) const; ///< is point valid on surface
- virtual double distance(const Kernel::V3D &)
- const; ///< distance between point and surface (approx)
- virtual Kernel::V3D
- surfaceNormal(const Kernel::V3D &) const; ///< Normal at surface
+ int onSurface(
+ const Kernel::V3D &) const override; ///< is point valid on surface
+ double distance(const Kernel::V3D &)
+ const override; ///< distance between point and surface (approx)
+ Kernel::V3D
+ surfaceNormal(const Kernel::V3D &) const override; ///< Normal at surface
- virtual void displace(const Kernel::V3D &);
- virtual void rotate(const Kernel::Matrix<double> &);
+ void displace(const Kernel::V3D &) override;
+ void rotate(const Kernel::Matrix<double> &) override;
- virtual void write(std::ostream &) const;
- virtual void print() const;
+ void write(std::ostream &) const override;
+ void print() const override;
};
} // NAMESPACE Geometry
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Sphere.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Sphere.h
index f363f7302a3b96f2aa329319bb29010d77edb72c..6d78865c60614ae68d8ad9e6df258c902ed6a1e6 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Sphere.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Sphere.h
@@ -45,11 +45,11 @@ class MANTID_GEOMETRY_DLL Sphere : public Quadratic {
private:
Kernel::V3D Centre; ///< Point for centre
double Radius; ///< Radius of sphere
- void rotate(const Kernel::Matrix<double> &);
- void displace(const Kernel::V3D &);
+ void rotate(const Kernel::Matrix<double> &) override;
+ void displace(const Kernel::V3D &) override;
/// Compute the distance from the centre of the sphere to the given point
double centreToPoint(const Kernel::V3D &pt) const;
- Sphere *doClone() const;
+ Sphere *doClone() const override;
protected:
Sphere(const Sphere &);
@@ -59,18 +59,18 @@ public:
Sphere();
std::unique_ptr<Sphere> clone() const;
/// Effective typename
- virtual std::string className() const { return "Sphere"; }
+ std::string className() const override { return "Sphere"; }
// Visit acceptor
- virtual void acceptVisitor(BaseVisit &A) const { A.Accept(*this); }
+ void acceptVisitor(BaseVisit &A) const override { A.Accept(*this); }
/// Set the sphere defination by input string in MCNP format
- int setSurface(const std::string &);
+ int setSurface(const std::string &) override;
/// Checks the given input point to be inside, outside or on the surface of
/// sphere
- int side(const Kernel::V3D &) const;
+ int side(const Kernel::V3D &) const override;
/// Checks whether the give input point is on the surface
- int onSurface(const Kernel::V3D &) const;
+ int onSurface(const Kernel::V3D &) const override;
/// Gets the distance from the sphere to the input point
- double distance(const Kernel::V3D &) const;
+ double distance(const Kernel::V3D &) const override;
/// Setter for centre of sphere
void setCentre(const Kernel::V3D &);
/// Get Centre
@@ -83,18 +83,18 @@ public:
setBaseEqn();
}
/// Generates the quadratic equation.
- void setBaseEqn();
+ void setBaseEqn() override;
/// Writes the sphere equatation in MCNP format
- void write(std::ostream &) const;
+ void write(std::ostream &) const override;
void getBoundingBox(double &xmax, double &ymax, double &zmax, double &xmin,
- double &ymin, double &zmin);
+ double &ymin, double &zmin) override;
/// The number of slices to approximate a sphere
static int g_nslices;
/// The number of stacks to approximate a sphere
static int g_nstacks;
#ifdef ENABLE_OPENCASCADE
- virtual TopoDS_Shape createShape();
+ TopoDS_Shape createShape() override;
#endif
};
diff --git a/Framework/Geometry/inc/MantidGeometry/Surfaces/Torus.h b/Framework/Geometry/inc/MantidGeometry/Surfaces/Torus.h
index cea5f95b03f80ff08a061f62e6ba53dd17a6c640..da4bacaae8e342887b0c30ea81a468bc17df3a73 100644
--- a/Framework/Geometry/inc/MantidGeometry/Surfaces/Torus.h
+++ b/Framework/Geometry/inc/MantidGeometry/Surfaces/Torus.h
@@ -48,9 +48,9 @@ private:
double Dradius; ///< Inner radius
double Displacement; ///< Displacement
- void rotate(const Kernel::Matrix<double> &);
- void displace(const Kernel::V3D &);
- Torus *doClone() const;
+ void rotate(const Kernel::Matrix<double> &) override;
+ void displace(const Kernel::V3D &) override;
+ Torus *doClone() const override;
protected:
Torus(const Torus &);
@@ -58,25 +58,25 @@ protected:
public:
/// Public identifier
- virtual std::string className() const { return "Torus"; }
+ std::string className() const override { return "Torus"; }
Torus();
std::unique_ptr<Torus> clone() const;
int operator==(const Torus &) const;
/// Accept visitor for line calculation
- virtual void acceptVisitor(BaseVisit &A) const { A.Accept(*this); }
+ void acceptVisitor(BaseVisit &A) const override { A.Accept(*this); }
- int setSurface(const std::string &Pstr);
- int side(const Kernel::V3D &R) const;
- int onSurface(const Kernel::V3D &R) const;
- double distance(const Kernel::V3D &Pt) const;
+ int setSurface(const std::string &Pstr) override;
+ int side(const Kernel::V3D &R) const override;
+ int onSurface(const Kernel::V3D &R) const override;
+ double distance(const Kernel::V3D &Pt) const override;
/// Return centre point
Kernel::V3D getCentre() const { return Centre; }
/// Central normal
Kernel::V3D getNormal() const { return Normal; }
- Kernel::V3D surfaceNormal(const Kernel::V3D &Pt) const;
+ Kernel::V3D surfaceNormal(const Kernel::V3D &Pt) const override;
void setCentre(const Kernel::V3D &A);
void setNorm(const Kernel::V3D &A);
@@ -90,11 +90,11 @@ public:
/// TODO:
void setTubeRadius(double dist);
- void write(std::ostream &OX) const;
+ void write(std::ostream &OX) const override;
void getBoundingBox(double &xmax, double &ymax, double &zmax, double &xmin,
- double &ymin, double &zmin);
+ double &ymin, double &zmin) override;
#ifdef ENABLE_OPENCASCADE
- virtual TopoDS_Shape createShape();
+ TopoDS_Shape createShape() override;
#endif
};
diff --git a/Framework/ICat/inc/MantidICat/CatalogDownloadDataFiles.h b/Framework/ICat/inc/MantidICat/CatalogDownloadDataFiles.h
index 74590aa37f4d281ddd5c4a18441a6384fc754a2d..f26e863bc9cdc5298db0689297b89721e41c7f70 100644
--- a/Framework/ICat/inc/MantidICat/CatalogDownloadDataFiles.h
+++ b/Framework/ICat/inc/MantidICat/CatalogDownloadDataFiles.h
@@ -50,18 +50,20 @@ public:
/// Constructor
CatalogDownloadDataFiles() : API::Algorithm(), m_prog(0.0) {}
/// Destructor
- ~CatalogDownloadDataFiles() {}
+ ~CatalogDownloadDataFiles() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CatalogDownloadDataFiles"; }
+ const std::string name() const override { return "CatalogDownloadDataFiles"; }
/// Summary of algorithms purpose.
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Downloads datafiles from the archives based on the ID of a "
"datafile.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Catalog"; }
+ const std::string category() const override {
+ return "DataHandling\\Catalog";
+ }
/** This method is used for unit testing purpose.
* as the Poco::Net library httpget throws an exception when the nd server n/w
@@ -76,9 +78,9 @@ public:
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
/// True if the extension of the file is a datafile.
bool isDataFile(const std::string &fileName);
/// Saves the downloaded file to disc
diff --git a/Framework/ICat/inc/MantidICat/CatalogGetDataFiles.h b/Framework/ICat/inc/MantidICat/CatalogGetDataFiles.h
index 8fc4d484ba2c1f1107af0354ed4b51a5cc2ef189..c84de8a944c62e77e508ceef05f0879d378eaeb1 100644
--- a/Framework/ICat/inc/MantidICat/CatalogGetDataFiles.h
+++ b/Framework/ICat/inc/MantidICat/CatalogGetDataFiles.h
@@ -47,24 +47,26 @@ public:
/// Constructor
CatalogGetDataFiles() : API::Algorithm() {}
/// Destructor
- ~CatalogGetDataFiles() {}
+ ~CatalogGetDataFiles() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CatalogGetDataFiles"; }
+ const std::string name() const override { return "CatalogGetDataFiles"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Obtains information of the datafiles associated to a specific "
"investigation.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Catalog"; }
+ const std::string category() const override {
+ return "DataHandling\\Catalog";
+ }
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/ICat/inc/MantidICat/CatalogGetDataSets.h b/Framework/ICat/inc/MantidICat/CatalogGetDataSets.h
index 081591d0a8877dd27e754edfe3c40039c6725461..db6a954318596e7138ac7e92fa79ccfe58c7b9e2 100644
--- a/Framework/ICat/inc/MantidICat/CatalogGetDataSets.h
+++ b/Framework/ICat/inc/MantidICat/CatalogGetDataSets.h
@@ -47,24 +47,26 @@ public:
/// constructor for CatalogGetDataSets
CatalogGetDataSets() : API::Algorithm() {}
/// destructor for CatalogGetDataSets
- ~CatalogGetDataSets() {}
+ ~CatalogGetDataSets() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CatalogGetDataSets"; }
+ const std::string name() const override { return "CatalogGetDataSets"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Obtains information of the datasets associated to a specific "
"investigation.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Catalog"; }
+ const std::string category() const override {
+ return "DataHandling\\Catalog";
+ }
private:
/// Overwrites Algorithm init method.
- void init();
+ void init() override;
/// Overwrites Algorithm exec method
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/ICat/inc/MantidICat/CatalogKeepAlive.h b/Framework/ICat/inc/MantidICat/CatalogKeepAlive.h
index aefd88cddd69135738c52b7399a72fd510c1be30..5e042ba5b5ae08a2e1b43e6b223119a3dc5dcfd7 100644
--- a/Framework/ICat/inc/MantidICat/CatalogKeepAlive.h
+++ b/Framework/ICat/inc/MantidICat/CatalogKeepAlive.h
@@ -45,22 +45,24 @@ public:
/// constructor
CatalogKeepAlive() : API::Algorithm() {}
/// Algorithm's name for identification.
- virtual const std::string name() const { return "CatalogKeepAlive"; }
+ const std::string name() const override { return "CatalogKeepAlive"; }
/// Summary of algorithms purpose.
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Refreshes the current session to the maximum amount provided by "
"the catalog API.";
}
/// Algorithm's version for identification.
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification.
- virtual const std::string category() const { return "DataHandling\\Catalog"; }
+ const std::string category() const override {
+ return "DataHandling\\Catalog";
+ }
private:
/// Override algorithm initialisation method.
- void init();
+ void init() override;
/// Override algorithm execute method.
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/ICat/inc/MantidICat/CatalogListInstruments.h b/Framework/ICat/inc/MantidICat/CatalogListInstruments.h
index e6ca4d1a376389e8bdd1d5dac8263f3418cea58a..8a2e97ed3528e1a459a6e907fc7cad24ff0b1181 100644
--- a/Framework/ICat/inc/MantidICat/CatalogListInstruments.h
+++ b/Framework/ICat/inc/MantidICat/CatalogListInstruments.h
@@ -38,24 +38,26 @@ public:
/// constructor
CatalogListInstruments() : API::Algorithm() {}
/// destructor
- ~CatalogListInstruments() {}
+ ~CatalogListInstruments() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CatalogListInstruments"; }
+ const std::string name() const override { return "CatalogListInstruments"; }
/// Summary of algorithms purpose.
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Lists the name of instruments from all catalogs or a specific "
"catalog based on session information.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Catalog"; }
+ const std::string category() const override {
+ return "DataHandling\\Catalog";
+ }
private:
/// Overwrites Algorithm init method.
- void init();
+ void init() override;
/// Overwrites Algorithm exec method
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/ICat/inc/MantidICat/CatalogListInvestigationTypes.h b/Framework/ICat/inc/MantidICat/CatalogListInvestigationTypes.h
index 92c6e4cf7653d6da749656a5a88995e7bd1e7eef..52099cee6752106bc870c4c295691f53502f0ce2 100644
--- a/Framework/ICat/inc/MantidICat/CatalogListInvestigationTypes.h
+++ b/Framework/ICat/inc/MantidICat/CatalogListInvestigationTypes.h
@@ -39,25 +39,27 @@ public:
/// constructor
CatalogListInvestigationTypes() : API::Algorithm() {}
/// destructor
- ~CatalogListInvestigationTypes() {}
+ ~CatalogListInvestigationTypes() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const {
+ const std::string name() const override {
return "CatalogListInvestigationTypes";
}
/// Summary of algorithms purpose.
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Obtains a list of investigation types for active catalogs.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Catalog"; }
+ const std::string category() const override {
+ return "DataHandling\\Catalog";
+ }
private:
/// Overwrites Algorithm init method.
- void init();
+ void init() override;
/// Overwrites Algorithm exec method
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/ICat/inc/MantidICat/CatalogLogin.h b/Framework/ICat/inc/MantidICat/CatalogLogin.h
index fc0c40c07f27822e932bc6c60bfbc8809e5e84e9..f18ab9298d44e6097c46b36f76b732a5c0178182 100644
--- a/Framework/ICat/inc/MantidICat/CatalogLogin.h
+++ b/Framework/ICat/inc/MantidICat/CatalogLogin.h
@@ -45,23 +45,25 @@ public:
/// constructor
CatalogLogin() : API::Algorithm() {}
/// Destructor
- ~CatalogLogin() {}
+ ~CatalogLogin() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CatalogLogin"; }
+ const std::string name() const override { return "CatalogLogin"; }
/// Summary of algorithms purpose.
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Authenticates credentials against a given catalog.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Catalog"; }
+ const std::string category() const override {
+ return "DataHandling\\Catalog";
+ }
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/ICat/inc/MantidICat/CatalogLogout.h b/Framework/ICat/inc/MantidICat/CatalogLogout.h
index 16eb28eeba3eb311ec8263b8b05998fc2e4617fa..c79808c0b3dbeae3b6c994328b14d7e41158469e 100644
--- a/Framework/ICat/inc/MantidICat/CatalogLogout.h
+++ b/Framework/ICat/inc/MantidICat/CatalogLogout.h
@@ -41,22 +41,24 @@ public:
/// Constructor
CatalogLogout() : API::Algorithm() {}
/// Destructor
- ~CatalogLogout() {}
+ ~CatalogLogout() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CatalogLogout"; }
+ const std::string name() const override { return "CatalogLogout"; }
/// Summary of algorithms purpose.
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Logs out all catalogs, or a specific catalog using the session "
"information provided.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Catalog"; }
+ const std::string category() const override {
+ return "DataHandling\\Catalog";
+ }
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
}
}
diff --git a/Framework/ICat/inc/MantidICat/CatalogMyDataSearch.h b/Framework/ICat/inc/MantidICat/CatalogMyDataSearch.h
index e5aba93869515099df2580488d5f01266c96c568..fb3c806dfe2c5193f61eb26430b73f50e66590f5 100644
--- a/Framework/ICat/inc/MantidICat/CatalogMyDataSearch.h
+++ b/Framework/ICat/inc/MantidICat/CatalogMyDataSearch.h
@@ -47,24 +47,26 @@ public:
/// constructor
CatalogMyDataSearch() : API::Algorithm() {}
/// destructor
- ~CatalogMyDataSearch() {}
+ ~CatalogMyDataSearch() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CatalogMyDataSearch"; }
+ const std::string name() const override { return "CatalogMyDataSearch"; }
/// Summary of algorithms purpose.
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Obtains the user's investigations for all active catalogs and "
"stores them into a workspace.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Catalog"; }
+ const std::string category() const override {
+ return "DataHandling\\Catalog";
+ }
private:
/// Overwrites Algorithm init method.
- void init();
+ void init() override;
/// Overwrites Algorithm exec method
- void exec();
+ void exec() override;
};
}
}
diff --git a/Framework/ICat/inc/MantidICat/CatalogPublish.h b/Framework/ICat/inc/MantidICat/CatalogPublish.h
index 3f981250b946e0d322d130f31f3bb13ceaf5c25b..b98865b41caaac3a6e0172c26a14797377cf21c1 100644
--- a/Framework/ICat/inc/MantidICat/CatalogPublish.h
+++ b/Framework/ICat/inc/MantidICat/CatalogPublish.h
@@ -49,28 +49,30 @@ public:
/// constructor
CatalogPublish() : API::Algorithm() {}
/// Destructor
- ~CatalogPublish() {}
+ ~CatalogPublish() override {}
/// Algorithm's name for identification.
- virtual const std::string name() const { return "CatalogPublish"; }
+ const std::string name() const override { return "CatalogPublish"; }
/// Summary of algorithms purpose.
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Allows the user to publish datafiles or workspaces to the "
"information catalog.";
}
/// Algorithm's version for identification.
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification.
- virtual const std::string category() const { return "DataHandling\\Catalog"; }
+ const std::string category() const override {
+ return "DataHandling\\Catalog";
+ }
private:
/// Override algorithm initialisation method.
- void init();
+ void init() override;
/// Override algorithm execute method.
- void exec();
+ void exec() override;
/// Stream the contents of a file to a given URL.
void publish(std::istream &fileContents, const std::string &uploadURL);
/// We want "SaveNexus" to take care of checking groups. Not this algorithm.
- bool checkGroups() { return false; }
+ bool checkGroups() override { return false; }
/// True if the extension of the file is a datafile.
bool isDataFile(const std::string &filePath);
/// Saves the workspace as a nexus file to the user's default directory.
diff --git a/Framework/ICat/inc/MantidICat/CatalogSearch.h b/Framework/ICat/inc/MantidICat/CatalogSearch.h
index 6f113c32088b20619e5319801f3a76f945c3136e..9e235f557f24013037c11c718870749def9d41cf 100644
--- a/Framework/ICat/inc/MantidICat/CatalogSearch.h
+++ b/Framework/ICat/inc/MantidICat/CatalogSearch.h
@@ -59,23 +59,25 @@ public:
/// constructor
CatalogSearch() : API::Algorithm() {}
/// destructor
- ~CatalogSearch() {}
+ ~CatalogSearch() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "CatalogSearch"; }
+ const std::string name() const override { return "CatalogSearch"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Searches all active catalogs using the provided input parameters.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "DataHandling\\Catalog"; }
+ const std::string category() const override {
+ return "DataHandling\\Catalog";
+ }
private:
/// Overwrites Algorithm init method.
- void init();
+ void init() override;
/// Overwrites Algorithm exec method
- void exec();
+ void exec() override;
/// Get all inputs for the algorithm
void getInputProperties(CatalogSearchParam ¶ms);
/// Parse the run-range input field, split it into start and end run, and set
diff --git a/Framework/ICat/inc/MantidICat/ICat4/GSoapGenerated/ICat4ICATPortBindingProxy.h b/Framework/ICat/inc/MantidICat/ICat4/GSoapGenerated/ICat4ICATPortBindingProxy.h
index 401e43b5366192f06d905ae3bb2e6d6bebf5fd0d..bbb5ef8e62881d49cd21c187577b1b07fe777028 100644
--- a/Framework/ICat/inc/MantidICat/ICat4/GSoapGenerated/ICat4ICATPortBindingProxy.h
+++ b/Framework/ICat/inc/MantidICat/ICat4/GSoapGenerated/ICat4ICATPortBindingProxy.h
@@ -31,7 +31,7 @@ public:
/// Constructor with engine input and output mode control
ICATPortBindingProxy(soap_mode imode, soap_mode omode);
/// Destructor frees deserialized data
- virtual ~ICATPortBindingProxy();
+ ~ICATPortBindingProxy() override;
/// Initializer used by constructors
virtual void ICATPortBindingProxy_init(soap_mode imode, soap_mode omode);
/// Delete all deserialized data (with soap_destroy and soap_end)
diff --git a/Framework/ICat/inc/MantidICat/ICat4/GSoapGenerated/ICat4Stub.h b/Framework/ICat/inc/MantidICat/ICat4/GSoapGenerated/ICat4Stub.h
index 2486f879fdc21dd32dae35ed5b70ebd24a59193f..cba2e1e1367ad343a77205d85709d9cae7dd34de 100644
--- a/Framework/ICat/inc/MantidICat/ICat4/GSoapGenerated/ICat4Stub.h
+++ b/Framework/ICat/inc/MantidICat/ICat4/GSoapGenerated/ICat4Stub.h
@@ -131,17 +131,17 @@ public:
bool __item;
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 10;
} /* = unique id SOAP_TYPE_ICat4_xsd__boolean */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
xsd__boolean() { xsd__boolean::soap_default(NULL); }
- virtual ~xsd__boolean() {}
+ ~xsd__boolean() override {}
};
#endif
@@ -153,17 +153,17 @@ public:
time_t __item;
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 12;
} /* = unique id SOAP_TYPE_ICat4_xsd__dateTime */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
xsd__dateTime() { xsd__dateTime::soap_default(NULL); }
- virtual ~xsd__dateTime() {}
+ ~xsd__dateTime() override {}
};
#endif
@@ -175,17 +175,17 @@ public:
double __item;
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 14;
} /* = unique id SOAP_TYPE_ICat4_xsd__double */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
xsd__double() { xsd__double::soap_default(NULL); }
- virtual ~xsd__double() {}
+ ~xsd__double() override {}
};
#endif
@@ -197,17 +197,17 @@ public:
int __item;
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 16;
} /* = unique id SOAP_TYPE_ICat4_xsd__int */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
xsd__int() { xsd__int::soap_default(NULL); }
- virtual ~xsd__int() {}
+ ~xsd__int() override {}
};
#endif
@@ -219,17 +219,17 @@ public:
LONG64 __item;
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 17;
} /* = unique id SOAP_TYPE_ICat4_xsd__long */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
xsd__long() { xsd__long::soap_default(NULL); }
- virtual ~xsd__long() {}
+ ~xsd__long() override {}
};
#endif
@@ -245,17 +245,17 @@ public:
std::string __item;
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 19;
} /* = unique id SOAP_TYPE_ICat4_xsd__string */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
xsd__string() { xsd__string::soap_default(NULL); }
- virtual ~xsd__string() {}
+ ~xsd__string() override {}
};
#endif
@@ -267,17 +267,17 @@ public:
enum ns1__icatExceptionType __item;
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 114;
} /* = unique id SOAP_TYPE_ICat4_ns1__icatExceptionType_ */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__icatExceptionType_() { ns1__icatExceptionType_::soap_default(NULL); }
- virtual ~ns1__icatExceptionType_() {}
+ ~ns1__icatExceptionType_() override {}
};
#endif
@@ -289,17 +289,17 @@ public:
enum ns1__studyStatus __item;
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 116;
} /* = unique id SOAP_TYPE_ICat4_ns1__studyStatus_ */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__studyStatus_() { ns1__studyStatus_::soap_default(NULL); }
- virtual ~ns1__studyStatus_() {}
+ ~ns1__studyStatus_() override {}
};
#endif
@@ -311,17 +311,17 @@ public:
enum ns1__parameterValueType __item;
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 118;
} /* = unique id SOAP_TYPE_ICat4_ns1__parameterValueType_ */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__parameterValueType_() { ns1__parameterValueType_::soap_default(NULL); }
- virtual ~ns1__parameterValueType_() {}
+ ~ns1__parameterValueType_() override {}
};
#endif
@@ -333,17 +333,17 @@ public:
enum ns1__relType __item;
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 120;
} /* = unique id SOAP_TYPE_ICat4_ns1__relType_ */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__relType_() { ns1__relType_::soap_default(NULL); }
- virtual ~ns1__relType_() {}
+ ~ns1__relType_() override {}
};
#endif
@@ -355,17 +355,17 @@ public:
enum ns1__accessType __item;
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 122;
} /* = unique id SOAP_TYPE_ICat4_ns1__accessType_ */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__accessType_() { ns1__accessType_::soap_default(NULL); }
- virtual ~ns1__accessType_() {}
+ ~ns1__accessType_() override {}
};
#endif
@@ -376,17 +376,17 @@ class SOAP_CMAC ns1__luceneClear : public xsd__anyType {
public:
std::string *sessionId; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 21;
} /* = unique id SOAP_TYPE_ICat4_ns1__luceneClear */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__luceneClear() { ns1__luceneClear::soap_default(NULL); }
- virtual ~ns1__luceneClear() {}
+ ~ns1__luceneClear() override {}
};
#endif
@@ -395,17 +395,17 @@ public:
/* Primitive ns1:luceneClearResponse schema type: */
class SOAP_CMAC ns1__luceneClearResponse : public xsd__anyType {
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 22;
} /* = unique id SOAP_TYPE_ICat4_ns1__luceneClearResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__luceneClearResponse() { ns1__luceneClearResponse::soap_default(NULL); }
- virtual ~ns1__luceneClearResponse() {}
+ ~ns1__luceneClearResponse() override {}
};
#endif
@@ -419,17 +419,17 @@ public:
enum ns1__icatExceptionType *
type; /* optional element of type ns1:icatExceptionType */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 23;
} /* = unique id SOAP_TYPE_ICat4_ns1__IcatException */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__IcatException() { ns1__IcatException::soap_default(NULL); }
- virtual ~ns1__IcatException() {}
+ ~ns1__IcatException() override {}
};
#endif
@@ -442,17 +442,17 @@ public:
std::vector<class ns1__entityBaseBean *>
beans; /* optional element of type ns1:entityBaseBean */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 24;
} /* = unique id SOAP_TYPE_ICat4_ns1__createMany */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__createMany() { ns1__createMany::soap_default(NULL); }
- virtual ~ns1__createMany() {}
+ ~ns1__createMany() override {}
};
#endif
@@ -467,17 +467,17 @@ public:
LONG64 *id; /* optional element of type xsd:long */
std::string *modId; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 25;
} /* = unique id SOAP_TYPE_ICat4_ns1__entityBaseBean */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__entityBaseBean() { ns1__entityBaseBean::soap_default(NULL); }
- virtual ~ns1__entityBaseBean() {}
+ ~ns1__entityBaseBean() override {}
};
#endif
@@ -493,17 +493,17 @@ public:
xsd:long
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 26;
} /* = unique id SOAP_TYPE_ICat4_ns1__createManyResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__createManyResponse() { ns1__createManyResponse::soap_default(NULL); }
- virtual ~ns1__createManyResponse() {}
+ ~ns1__createManyResponse() override {}
};
#endif
@@ -515,17 +515,17 @@ public:
std::string *sessionId; /* optional element of type xsd:string */
ns1__entityBaseBean *bean; /* optional element of type ns1:entityBaseBean */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 27;
} /* = unique id SOAP_TYPE_ICat4_ns1__create */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__create() { ns1__create::soap_default(NULL); }
- virtual ~ns1__create() {}
+ ~ns1__create() override {}
};
#endif
@@ -541,17 +541,17 @@ public:
xsd:long
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 28;
} /* = unique id SOAP_TYPE_ICat4_ns1__createResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__createResponse() { ns1__createResponse::soap_default(NULL); }
- virtual ~ns1__createResponse() {}
+ ~ns1__createResponse() override {}
};
#endif
@@ -562,17 +562,17 @@ class SOAP_CMAC ns1__getProperties : public xsd__anyType {
public:
std::string *sessionId; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 29;
} /* = unique id SOAP_TYPE_ICat4_ns1__getProperties */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__getProperties() { ns1__getProperties::soap_default(NULL); }
- virtual ~ns1__getProperties() {}
+ ~ns1__getProperties() override {}
};
#endif
@@ -588,19 +588,19 @@ public:
xsd:string
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 30;
} /* = unique id SOAP_TYPE_ICat4_ns1__getPropertiesResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__getPropertiesResponse() {
ns1__getPropertiesResponse::soap_default(NULL);
}
- virtual ~ns1__getPropertiesResponse() {}
+ ~ns1__getPropertiesResponse() override {}
};
#endif
@@ -614,17 +614,17 @@ public:
int maxCount; /* required element of type xsd:int */
std::string *entityName; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 31;
} /* = unique id SOAP_TYPE_ICat4_ns1__luceneSearch */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__luceneSearch() { ns1__luceneSearch::soap_default(NULL); }
- virtual ~ns1__luceneSearch() {}
+ ~ns1__luceneSearch() override {}
};
#endif
@@ -640,17 +640,17 @@ public:
xsd:string
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 32;
} /* = unique id SOAP_TYPE_ICat4_ns1__luceneSearchResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__luceneSearchResponse() { ns1__luceneSearchResponse::soap_default(NULL); }
- virtual ~ns1__luceneSearchResponse() {}
+ ~ns1__luceneSearchResponse() override {}
};
#endif
@@ -662,17 +662,17 @@ public:
std::string *sessionId; /* optional element of type xsd:string */
std::string *entityName; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 33;
} /* = unique id SOAP_TYPE_ICat4_ns1__lucenePopulate */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__lucenePopulate() { ns1__lucenePopulate::soap_default(NULL); }
- virtual ~ns1__lucenePopulate() {}
+ ~ns1__lucenePopulate() override {}
};
#endif
@@ -681,19 +681,19 @@ public:
/* Primitive ns1:lucenePopulateResponse schema type: */
class SOAP_CMAC ns1__lucenePopulateResponse : public xsd__anyType {
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 34;
} /* = unique id SOAP_TYPE_ICat4_ns1__lucenePopulateResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__lucenePopulateResponse() {
ns1__lucenePopulateResponse::soap_default(NULL);
}
- virtual ~ns1__lucenePopulateResponse() {}
+ ~ns1__lucenePopulateResponse() override {}
};
#endif
@@ -706,17 +706,17 @@ public:
std::string *query; /* optional element of type xsd:string */
LONG64 primaryKey; /* required element of type xsd:long */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 35;
} /* = unique id SOAP_TYPE_ICat4_ns1__get */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__get() { ns1__get::soap_default(NULL); }
- virtual ~ns1__get() {}
+ ~ns1__get() override {}
};
#endif
@@ -732,17 +732,17 @@ public:
ns1:entityBaseBean
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 36;
} /* = unique id SOAP_TYPE_ICat4_ns1__getResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__getResponse() { ns1__getResponse::soap_default(NULL); }
- virtual ~ns1__getResponse() {}
+ ~ns1__getResponse() override {}
};
#endif
@@ -751,17 +751,17 @@ public:
/* Primitive ns1:getEntityNames schema type: */
class SOAP_CMAC ns1__getEntityNames : public xsd__anyType {
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 37;
} /* = unique id SOAP_TYPE_ICat4_ns1__getEntityNames */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__getEntityNames() { ns1__getEntityNames::soap_default(NULL); }
- virtual ~ns1__getEntityNames() {}
+ ~ns1__getEntityNames() override {}
};
#endif
@@ -777,19 +777,19 @@ public:
xsd:string
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 38;
} /* = unique id SOAP_TYPE_ICat4_ns1__getEntityNamesResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__getEntityNamesResponse() {
ns1__getEntityNamesResponse::soap_default(NULL);
}
- virtual ~ns1__getEntityNamesResponse() {}
+ ~ns1__getEntityNamesResponse() override {}
};
#endif
@@ -798,17 +798,17 @@ public:
/* Primitive ns1:getApiVersion schema type: */
class SOAP_CMAC ns1__getApiVersion : public xsd__anyType {
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 39;
} /* = unique id SOAP_TYPE_ICat4_ns1__getApiVersion */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__getApiVersion() { ns1__getApiVersion::soap_default(NULL); }
- virtual ~ns1__getApiVersion() {}
+ ~ns1__getApiVersion() override {}
};
#endif
@@ -824,19 +824,19 @@ public:
xsd:string
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 40;
} /* = unique id SOAP_TYPE_ICat4_ns1__getApiVersionResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__getApiVersionResponse() {
ns1__getApiVersionResponse::soap_default(NULL);
}
- virtual ~ns1__getApiVersionResponse() {}
+ ~ns1__getApiVersionResponse() override {}
};
#endif
@@ -847,17 +847,17 @@ class SOAP_CMAC ns1__luceneGetPopulating : public xsd__anyType {
public:
std::string *sessionId; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 41;
} /* = unique id SOAP_TYPE_ICat4_ns1__luceneGetPopulating */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__luceneGetPopulating() { ns1__luceneGetPopulating::soap_default(NULL); }
- virtual ~ns1__luceneGetPopulating() {}
+ ~ns1__luceneGetPopulating() override {}
};
#endif
@@ -873,19 +873,19 @@ public:
xsd:string
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 42;
} /* = unique id SOAP_TYPE_ICat4_ns1__luceneGetPopulatingResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__luceneGetPopulatingResponse() {
ns1__luceneGetPopulatingResponse::soap_default(NULL);
}
- virtual ~ns1__luceneGetPopulatingResponse() {}
+ ~ns1__luceneGetPopulatingResponse() override {}
};
#endif
@@ -897,17 +897,17 @@ public:
std::string *sessionId; /* optional element of type xsd:string */
ns1__entityBaseBean *bean; /* optional element of type ns1:entityBaseBean */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 43;
} /* = unique id SOAP_TYPE_ICat4_ns1__update */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__update() { ns1__update::soap_default(NULL); }
- virtual ~ns1__update() {}
+ ~ns1__update() override {}
};
#endif
@@ -916,17 +916,17 @@ public:
/* Primitive ns1:updateResponse schema type: */
class SOAP_CMAC ns1__updateResponse : public xsd__anyType {
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 44;
} /* = unique id SOAP_TYPE_ICat4_ns1__updateResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__updateResponse() { ns1__updateResponse::soap_default(NULL); }
- virtual ~ns1__updateResponse() {}
+ ~ns1__updateResponse() override {}
};
#endif
@@ -939,17 +939,17 @@ public:
std::vector<ns1__entityBaseBean *>
beans; /* optional element of type ns1:entityBaseBean */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 45;
} /* = unique id SOAP_TYPE_ICat4_ns1__deleteMany */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__deleteMany() { ns1__deleteMany::soap_default(NULL); }
- virtual ~ns1__deleteMany() {}
+ ~ns1__deleteMany() override {}
};
#endif
@@ -958,17 +958,17 @@ public:
/* Primitive ns1:deleteManyResponse schema type: */
class SOAP_CMAC ns1__deleteManyResponse : public xsd__anyType {
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 46;
} /* = unique id SOAP_TYPE_ICat4_ns1__deleteManyResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__deleteManyResponse() { ns1__deleteManyResponse::soap_default(NULL); }
- virtual ~ns1__deleteManyResponse() {}
+ ~ns1__deleteManyResponse() override {}
};
#endif
@@ -979,17 +979,17 @@ class SOAP_CMAC ns1__getUserName : public xsd__anyType {
public:
std::string *sessionId; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 47;
} /* = unique id SOAP_TYPE_ICat4_ns1__getUserName */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__getUserName() { ns1__getUserName::soap_default(NULL); }
- virtual ~ns1__getUserName() {}
+ ~ns1__getUserName() override {}
};
#endif
@@ -1005,17 +1005,17 @@ public:
xsd:string
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 48;
} /* = unique id SOAP_TYPE_ICat4_ns1__getUserNameResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__getUserNameResponse() { ns1__getUserNameResponse::soap_default(NULL); }
- virtual ~ns1__getUserNameResponse() {}
+ ~ns1__getUserNameResponse() override {}
};
#endif
@@ -1026,17 +1026,17 @@ class SOAP_CMAC ns1__refresh : public xsd__anyType {
public:
std::string *sessionId; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 49;
} /* = unique id SOAP_TYPE_ICat4_ns1__refresh */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__refresh() { ns1__refresh::soap_default(NULL); }
- virtual ~ns1__refresh() {}
+ ~ns1__refresh() override {}
};
#endif
@@ -1045,17 +1045,17 @@ public:
/* Primitive ns1:refreshResponse schema type: */
class SOAP_CMAC ns1__refreshResponse : public xsd__anyType {
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 50;
} /* = unique id SOAP_TYPE_ICat4_ns1__refreshResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__refreshResponse() { ns1__refreshResponse::soap_default(NULL); }
- virtual ~ns1__refreshResponse() {}
+ ~ns1__refreshResponse() override {}
};
#endif
@@ -1114,17 +1114,17 @@ public:
_ns1__login_credentials
credentials; /* required element of type ns1:login-credentials */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 51;
} /* = unique id SOAP_TYPE_ICat4_ns1__login */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__login() { ns1__login::soap_default(NULL); }
- virtual ~ns1__login() {}
+ ~ns1__login() override {}
};
#endif
@@ -1140,17 +1140,17 @@ public:
xsd:string
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 52;
} /* = unique id SOAP_TYPE_ICat4_ns1__loginResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__loginResponse() { ns1__loginResponse::soap_default(NULL); }
- virtual ~ns1__loginResponse() {}
+ ~ns1__loginResponse() override {}
};
#endif
@@ -1210,17 +1210,17 @@ public:
class ns1__log *arg32; /* optional element of type ns1:log */
class ns1__publicStep *arg33; /* optional element of type ns1:publicStep */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 53;
} /* = unique id SOAP_TYPE_ICat4_ns1__dummy */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__dummy() { ns1__dummy::soap_default(NULL); }
- virtual ~ns1__dummy() {}
+ ~ns1__dummy() override {}
};
#endif
@@ -1229,17 +1229,17 @@ public:
/* Primitive ns1:dummyResponse schema type: */
class SOAP_CMAC ns1__dummyResponse : public xsd__anyType {
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 93;
} /* = unique id SOAP_TYPE_ICat4_ns1__dummyResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__dummyResponse() { ns1__dummyResponse::soap_default(NULL); }
- virtual ~ns1__dummyResponse() {}
+ ~ns1__dummyResponse() override {}
};
#endif
@@ -1250,17 +1250,17 @@ class SOAP_CMAC ns1__getEntityInfo : public xsd__anyType {
public:
std::string *beanName; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 94;
} /* = unique id SOAP_TYPE_ICat4_ns1__getEntityInfo */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__getEntityInfo() { ns1__getEntityInfo::soap_default(NULL); }
- virtual ~ns1__getEntityInfo() {}
+ ~ns1__getEntityInfo() override {}
};
#endif
@@ -1276,19 +1276,19 @@ public:
ns1:entityInfo
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 95;
} /* = unique id SOAP_TYPE_ICat4_ns1__getEntityInfoResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__getEntityInfoResponse() {
ns1__getEntityInfoResponse::soap_default(NULL);
}
- virtual ~ns1__getEntityInfoResponse() {}
+ ~ns1__getEntityInfoResponse() override {}
};
#endif
@@ -1303,17 +1303,17 @@ public:
std::vector<class ns1__entityField *>
fields; /* optional element of type ns1:entityField */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 96;
} /* = unique id SOAP_TYPE_ICat4_ns1__entityInfo */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__entityInfo() { ns1__entityInfo::soap_default(NULL); }
- virtual ~ns1__entityInfo() {}
+ ~ns1__entityInfo() override {}
};
#endif
@@ -1324,17 +1324,17 @@ class SOAP_CMAC ns1__constraint : public xsd__anyType {
public:
std::vector<std::string> fieldNames; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 97;
} /* = unique id SOAP_TYPE_ICat4_ns1__constraint */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__constraint() { ns1__constraint::soap_default(NULL); }
- virtual ~ns1__constraint() {}
+ ~ns1__constraint() override {}
};
#endif
@@ -1350,17 +1350,17 @@ public:
int *stringLength; /* optional element of type xsd:int */
std::string *type; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 98;
} /* = unique id SOAP_TYPE_ICat4_ns1__entityField */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__entityField() { ns1__entityField::soap_default(NULL); }
- virtual ~ns1__entityField() {}
+ ~ns1__entityField() override {}
};
#endif
@@ -1371,17 +1371,17 @@ class SOAP_CMAC ns1__luceneCommit : public xsd__anyType {
public:
std::string *sessionId; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 99;
} /* = unique id SOAP_TYPE_ICat4_ns1__luceneCommit */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__luceneCommit() { ns1__luceneCommit::soap_default(NULL); }
- virtual ~ns1__luceneCommit() {}
+ ~ns1__luceneCommit() override {}
};
#endif
@@ -1390,17 +1390,17 @@ public:
/* Primitive ns1:luceneCommitResponse schema type: */
class SOAP_CMAC ns1__luceneCommitResponse : public xsd__anyType {
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 100;
} /* = unique id SOAP_TYPE_ICat4_ns1__luceneCommitResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__luceneCommitResponse() { ns1__luceneCommitResponse::soap_default(NULL); }
- virtual ~ns1__luceneCommitResponse() {}
+ ~ns1__luceneCommitResponse() override {}
};
#endif
@@ -1414,17 +1414,17 @@ public:
int maxCount; /* required element of type xsd:int */
std::string *entityName; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 101;
} /* = unique id SOAP_TYPE_ICat4_ns1__searchText */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__searchText() { ns1__searchText::soap_default(NULL); }
- virtual ~ns1__searchText() {}
+ ~ns1__searchText() override {}
};
#endif
@@ -1440,17 +1440,17 @@ public:
xsd:anyType
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 102;
} /* = unique id SOAP_TYPE_ICat4_ns1__searchTextResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__searchTextResponse() { ns1__searchTextResponse::soap_default(NULL); }
- virtual ~ns1__searchTextResponse() {}
+ ~ns1__searchTextResponse() override {}
};
#endif
@@ -1462,17 +1462,17 @@ public:
std::string *sessionId; /* optional element of type xsd:string */
ns1__entityBaseBean *bean; /* optional element of type ns1:entityBaseBean */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 103;
} /* = unique id SOAP_TYPE_ICat4_ns1__delete */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__delete() { ns1__delete::soap_default(NULL); }
- virtual ~ns1__delete() {}
+ ~ns1__delete() override {}
};
#endif
@@ -1481,17 +1481,17 @@ public:
/* Primitive ns1:deleteResponse schema type: */
class SOAP_CMAC ns1__deleteResponse : public xsd__anyType {
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 104;
} /* = unique id SOAP_TYPE_ICat4_ns1__deleteResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__deleteResponse() { ns1__deleteResponse::soap_default(NULL); }
- virtual ~ns1__deleteResponse() {}
+ ~ns1__deleteResponse() override {}
};
#endif
@@ -1505,17 +1505,17 @@ public:
enum ns1__accessType *
accessType; /* optional element of type ns1:accessType */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 105;
} /* = unique id SOAP_TYPE_ICat4_ns1__isAccessAllowed */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__isAccessAllowed() { ns1__isAccessAllowed::soap_default(NULL); }
- virtual ~ns1__isAccessAllowed() {}
+ ~ns1__isAccessAllowed() override {}
};
#endif
@@ -1531,19 +1531,19 @@ public:
xsd:boolean
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 106;
} /* = unique id SOAP_TYPE_ICat4_ns1__isAccessAllowedResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__isAccessAllowedResponse() {
ns1__isAccessAllowedResponse::soap_default(NULL);
}
- virtual ~ns1__isAccessAllowedResponse() {}
+ ~ns1__isAccessAllowedResponse() override {}
};
#endif
@@ -1555,17 +1555,17 @@ public:
std::string *sessionId; /* optional element of type xsd:string */
std::string *query; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 107;
} /* = unique id SOAP_TYPE_ICat4_ns1__search */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__search() { ns1__search::soap_default(NULL); }
- virtual ~ns1__search() {}
+ ~ns1__search() override {}
};
#endif
@@ -1581,17 +1581,17 @@ public:
xsd:anyType
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 108;
} /* = unique id SOAP_TYPE_ICat4_ns1__searchResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__searchResponse() { ns1__searchResponse::soap_default(NULL); }
- virtual ~ns1__searchResponse() {}
+ ~ns1__searchResponse() override {}
};
#endif
@@ -1602,17 +1602,17 @@ class SOAP_CMAC ns1__logout : public xsd__anyType {
public:
std::string *sessionId; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 109;
} /* = unique id SOAP_TYPE_ICat4_ns1__logout */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__logout() { ns1__logout::soap_default(NULL); }
- virtual ~ns1__logout() {}
+ ~ns1__logout() override {}
};
#endif
@@ -1621,17 +1621,17 @@ public:
/* Primitive ns1:logoutResponse schema type: */
class SOAP_CMAC ns1__logoutResponse : public xsd__anyType {
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 110;
} /* = unique id SOAP_TYPE_ICat4_ns1__logoutResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__logoutResponse() { ns1__logoutResponse::soap_default(NULL); }
- virtual ~ns1__logoutResponse() {}
+ ~ns1__logoutResponse() override {}
};
#endif
@@ -1642,17 +1642,17 @@ class SOAP_CMAC ns1__getRemainingMinutes : public xsd__anyType {
public:
std::string *sessionId; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 111;
} /* = unique id SOAP_TYPE_ICat4_ns1__getRemainingMinutes */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__getRemainingMinutes() { ns1__getRemainingMinutes::soap_default(NULL); }
- virtual ~ns1__getRemainingMinutes() {}
+ ~ns1__getRemainingMinutes() override {}
};
#endif
@@ -1668,19 +1668,19 @@ public:
xsd:double
*/
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 112;
} /* = unique id SOAP_TYPE_ICat4_ns1__getRemainingMinutesResponse */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__getRemainingMinutesResponse() {
ns1__getRemainingMinutesResponse::soap_default(NULL);
}
- virtual ~ns1__getRemainingMinutesResponse() {}
+ ~ns1__getRemainingMinutesResponse() override {}
};
#endif
@@ -1710,17 +1710,17 @@ public:
std::vector<ns1__relatedDatafile *>
sourceDatafiles; /* optional element of type ns1:relatedDatafile */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 54;
} /* = unique id SOAP_TYPE_ICat4_ns1__datafile */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__datafile() { ns1__datafile::soap_default(NULL); }
- virtual ~ns1__datafile() {}
+ ~ns1__datafile() override {}
};
#endif
@@ -1733,19 +1733,19 @@ public:
dataCollection; /* optional element of type ns1:dataCollection */
ns1__datafile *datafile; /* optional element of type ns1:datafile */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 55;
} /* = unique id SOAP_TYPE_ICat4_ns1__dataCollectionDatafile */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__dataCollectionDatafile() {
ns1__dataCollectionDatafile::soap_default(NULL);
}
- virtual ~ns1__dataCollectionDatafile() {}
+ ~ns1__dataCollectionDatafile() override {}
};
#endif
@@ -1763,19 +1763,19 @@ public:
std::vector<ns1__job *> jobsAsInput; /* optional element of type ns1:job */
std::vector<ns1__job *> jobsAsOutput; /* optional element of type ns1:job */
std::vector<ns1__dataCollectionParameter *>
- parameters; /* optional element of type ns1:dataCollectionParameter */
-public:
- virtual int soap_type() const {
- return 56;
- } /* = unique id SOAP_TYPE_ICat4_ns1__dataCollection */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ parameters; /* optional element of type ns1:dataCollectionParameter */
+public:
+ int soap_type() const override {
+ return 56;
+ } /* = unique id SOAP_TYPE_ICat4_ns1__dataCollection */
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__dataCollection() { ns1__dataCollection::soap_default(NULL); }
- virtual ~ns1__dataCollection() {}
+ ~ns1__dataCollection() override {}
};
#endif
@@ -1788,19 +1788,19 @@ public:
dataCollection; /* optional element of type ns1:dataCollection */
ns1__dataset *dataset; /* optional element of type ns1:dataset */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 57;
} /* = unique id SOAP_TYPE_ICat4_ns1__dataCollectionDataset */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__dataCollectionDataset() {
ns1__dataCollectionDataset::soap_default(NULL);
}
- virtual ~ns1__dataCollectionDataset() {}
+ ~ns1__dataCollectionDataset() override {}
};
#endif
@@ -1828,17 +1828,17 @@ public:
time_t *startDate; /* optional element of type xsd:dateTime */
ns1__datasetType *type; /* optional element of type ns1:datasetType */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 58;
} /* = unique id SOAP_TYPE_ICat4_ns1__dataset */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__dataset() { ns1__dataset::soap_default(NULL); }
- virtual ~ns1__dataset() {}
+ ~ns1__dataset() override {}
};
#endif
@@ -1876,17 +1876,17 @@ public:
type; /* optional element of type ns1:investigationType */
std::string *visitId; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 59;
} /* = unique id SOAP_TYPE_ICat4_ns1__investigation */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__investigation() { ns1__investigation::soap_default(NULL); }
- virtual ~ns1__investigation() {}
+ ~ns1__investigation() override {}
};
#endif
@@ -1919,17 +1919,17 @@ public:
sampleTypes; /* optional element of type ns1:sampleType */
std::string *url; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 60;
} /* = unique id SOAP_TYPE_ICat4_ns1__facility */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__facility() { ns1__facility::soap_default(NULL); }
- virtual ~ns1__facility() {}
+ ~ns1__facility() override {}
};
#endif
@@ -1943,17 +1943,17 @@ public:
std::string *name; /* optional element of type xsd:string */
std::string *version; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 61;
} /* = unique id SOAP_TYPE_ICat4_ns1__application */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__application() { ns1__application::soap_default(NULL); }
- virtual ~ns1__application() {}
+ ~ns1__application() override {}
};
#endif
@@ -1969,17 +1969,17 @@ public:
ns1__dataCollection *
outputDataCollection; /* optional element of type ns1:dataCollection */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 62;
} /* = unique id SOAP_TYPE_ICat4_ns1__job */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__job() { ns1__job::soap_default(NULL); }
- virtual ~ns1__job() {}
+ ~ns1__job() override {}
};
#endif
@@ -1996,17 +1996,17 @@ public:
std::string *type; /* optional element of type xsd:string */
std::string *version; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 63;
} /* = unique id SOAP_TYPE_ICat4_ns1__datafileFormat */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__datafileFormat() { ns1__datafileFormat::soap_default(NULL); }
- virtual ~ns1__datafileFormat() {}
+ ~ns1__datafileFormat() override {}
};
#endif
@@ -2021,17 +2021,17 @@ public:
ns1__facility *facility; /* optional element of type ns1:facility */
std::string *name; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 64;
} /* = unique id SOAP_TYPE_ICat4_ns1__datasetType */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__datasetType() { ns1__datasetType::soap_default(NULL); }
- virtual ~ns1__datasetType() {}
+ ~ns1__datasetType() override {}
};
#endif
@@ -2046,17 +2046,17 @@ public:
std::string *name; /* optional element of type xsd:string */
time_t *startDate; /* optional element of type xsd:dateTime */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 65;
} /* = unique id SOAP_TYPE_ICat4_ns1__facilityCycle */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__facilityCycle() { ns1__facilityCycle::soap_default(NULL); }
- virtual ~ns1__facilityCycle() {}
+ ~ns1__facilityCycle() override {}
};
#endif
@@ -2078,17 +2078,17 @@ public:
std::string *type; /* optional element of type xsd:string */
std::string *url; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 66;
} /* = unique id SOAP_TYPE_ICat4_ns1__instrument */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__instrument() { ns1__instrument::soap_default(NULL); }
- virtual ~ns1__instrument() {}
+ ~ns1__instrument() override {}
};
#endif
@@ -2100,17 +2100,17 @@ public:
ns1__instrument *instrument; /* optional element of type ns1:instrument */
ns1__user *user; /* optional element of type ns1:user */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 67;
} /* = unique id SOAP_TYPE_ICat4_ns1__instrumentScientist */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__instrumentScientist() { ns1__instrumentScientist::soap_default(NULL); }
- virtual ~ns1__instrumentScientist() {}
+ ~ns1__instrumentScientist() override {}
};
#endif
@@ -2130,17 +2130,17 @@ public:
std::vector<ns1__userGroup *>
userGroups; /* optional element of type ns1:userGroup */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 68;
} /* = unique id SOAP_TYPE_ICat4_ns1__user */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__user() { ns1__user::soap_default(NULL); }
- virtual ~ns1__user() {}
+ ~ns1__user() override {}
};
#endif
@@ -2154,17 +2154,17 @@ public:
std::string *role; /* optional element of type xsd:string */
ns1__user *user; /* optional element of type ns1:user */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 69;
} /* = unique id SOAP_TYPE_ICat4_ns1__investigationUser */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__investigationUser() { ns1__investigationUser::soap_default(NULL); }
- virtual ~ns1__investigationUser() {}
+ ~ns1__investigationUser() override {}
};
#endif
@@ -2181,17 +2181,17 @@ public:
studyInvestigations; /* optional element of type ns1:studyInvestigation */
ns1__user *user; /* optional element of type ns1:user */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 70;
} /* = unique id SOAP_TYPE_ICat4_ns1__study */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__study() { ns1__study::soap_default(NULL); }
- virtual ~ns1__study() {}
+ ~ns1__study() override {}
};
#endif
@@ -2204,17 +2204,17 @@ public:
investigation; /* optional element of type ns1:investigation */
ns1__study *study; /* optional element of type ns1:study */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 71;
} /* = unique id SOAP_TYPE_ICat4_ns1__studyInvestigation */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__studyInvestigation() { ns1__studyInvestigation::soap_default(NULL); }
- virtual ~ns1__studyInvestigation() {}
+ ~ns1__studyInvestigation() override {}
};
#endif
@@ -2226,17 +2226,17 @@ public:
ns1__grouping *grouping; /* optional element of type ns1:grouping */
ns1__user *user; /* optional element of type ns1:user */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 72;
} /* = unique id SOAP_TYPE_ICat4_ns1__userGroup */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__userGroup() { ns1__userGroup::soap_default(NULL); }
- virtual ~ns1__userGroup() {}
+ ~ns1__userGroup() override {}
};
#endif
@@ -2250,17 +2250,17 @@ public:
std::vector<ns1__userGroup *>
userGroups; /* optional element of type ns1:userGroup */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 73;
} /* = unique id SOAP_TYPE_ICat4_ns1__grouping */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__grouping() { ns1__grouping::soap_default(NULL); }
- virtual ~ns1__grouping() {}
+ ~ns1__grouping() override {}
};
#endif
@@ -2273,17 +2273,17 @@ public:
ns1__grouping *grouping; /* optional element of type ns1:grouping */
std::string *what; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 74;
} /* = unique id SOAP_TYPE_ICat4_ns1__rule */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__rule() { ns1__rule::soap_default(NULL); }
- virtual ~ns1__rule() {}
+ ~ns1__rule() override {}
};
#endif
@@ -2296,19 +2296,19 @@ public:
ns1__investigation *
investigation; /* optional element of type ns1:investigation */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 75;
} /* = unique id SOAP_TYPE_ICat4_ns1__investigationInstrument */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__investigationInstrument() {
ns1__investigationInstrument::soap_default(NULL);
}
- virtual ~ns1__investigationInstrument() {}
+ ~ns1__investigationInstrument() override {}
};
#endif
@@ -2323,17 +2323,17 @@ public:
investigations; /* optional element of type ns1:investigation */
std::string *name; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 76;
} /* = unique id SOAP_TYPE_ICat4_ns1__investigationType */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__investigationType() { ns1__investigationType::soap_default(NULL); }
- virtual ~ns1__investigationType() {}
+ ~ns1__investigationType() override {}
};
#endif
@@ -2374,17 +2374,17 @@ public:
valueType; /* optional element of type ns1:parameterValueType */
bool verified; /* required element of type xsd:boolean */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 77;
} /* = unique id SOAP_TYPE_ICat4_ns1__parameterType */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__parameterType() { ns1__parameterType::soap_default(NULL); }
- virtual ~ns1__parameterType() {}
+ ~ns1__parameterType() override {}
};
#endif
@@ -2401,17 +2401,17 @@ public:
std::string *stringValue; /* optional element of type xsd:string */
ns1__parameterType *type; /* optional element of type ns1:parameterType */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 79;
} /* = unique id SOAP_TYPE_ICat4_ns1__parameter */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__parameter() { ns1__parameter::soap_default(NULL); }
- virtual ~ns1__parameter() {}
+ ~ns1__parameter() override {}
};
#endif
@@ -2423,19 +2423,19 @@ public:
ns1__parameterType *type; /* optional element of type ns1:parameterType */
std::string *value; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 83;
} /* = unique id SOAP_TYPE_ICat4_ns1__permissibleStringValue */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__permissibleStringValue() {
ns1__permissibleStringValue::soap_default(NULL);
}
- virtual ~ns1__permissibleStringValue() {}
+ ~ns1__permissibleStringValue() override {}
};
#endif
@@ -2453,17 +2453,17 @@ public:
parameters; /* optional element of type ns1:sampleParameter */
ns1__sampleType *type; /* optional element of type ns1:sampleType */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 85;
} /* = unique id SOAP_TYPE_ICat4_ns1__sample */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__sample() { ns1__sample::soap_default(NULL); }
- virtual ~ns1__sample() {}
+ ~ns1__sample() override {}
};
#endif
@@ -2478,17 +2478,17 @@ public:
std::string *safetyInformation; /* optional element of type xsd:string */
std::vector<ns1__sample *> samples; /* optional element of type ns1:sample */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 86;
} /* = unique id SOAP_TYPE_ICat4_ns1__sampleType */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__sampleType() { ns1__sampleType::soap_default(NULL); }
- virtual ~ns1__sampleType() {}
+ ~ns1__sampleType() override {}
};
#endif
@@ -2501,17 +2501,17 @@ public:
investigation; /* optional element of type ns1:investigation */
std::string *name; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 87;
} /* = unique id SOAP_TYPE_ICat4_ns1__keyword */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__keyword() { ns1__keyword::soap_default(NULL); }
- virtual ~ns1__keyword() {}
+ ~ns1__keyword() override {}
};
#endif
@@ -2528,17 +2528,17 @@ public:
std::string *repositoryId; /* optional element of type xsd:string */
std::string *url; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 88;
} /* = unique id SOAP_TYPE_ICat4_ns1__publication */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__publication() { ns1__publication::soap_default(NULL); }
- virtual ~ns1__publication() {}
+ ~ns1__publication() override {}
};
#endif
@@ -2553,17 +2553,17 @@ public:
investigation; /* optional element of type ns1:investigation */
time_t *startDate; /* optional element of type xsd:dateTime */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 89;
} /* = unique id SOAP_TYPE_ICat4_ns1__shift */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__shift() { ns1__shift::soap_default(NULL); }
- virtual ~ns1__shift() {}
+ ~ns1__shift() override {}
};
#endif
@@ -2576,17 +2576,17 @@ public:
std::string *relation; /* optional element of type xsd:string */
ns1__datafile *sourceDatafile; /* optional element of type ns1:datafile */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 90;
} /* = unique id SOAP_TYPE_ICat4_ns1__relatedDatafile */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__relatedDatafile() { ns1__relatedDatafile::soap_default(NULL); }
- virtual ~ns1__relatedDatafile() {}
+ ~ns1__relatedDatafile() override {}
};
#endif
@@ -2601,17 +2601,17 @@ public:
std::string *operation; /* optional element of type xsd:string */
std::string *query; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 91;
} /* = unique id SOAP_TYPE_ICat4_ns1__log */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__log() { ns1__log::soap_default(NULL); }
- virtual ~ns1__log() {}
+ ~ns1__log() override {}
};
#endif
@@ -2623,17 +2623,17 @@ public:
std::string *field; /* optional element of type xsd:string */
std::string *origin; /* optional element of type xsd:string */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 92;
} /* = unique id SOAP_TYPE_ICat4_ns1__publicStep */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__publicStep() { ns1__publicStep::soap_default(NULL); }
- virtual ~ns1__publicStep() {}
+ ~ns1__publicStep() override {}
};
#endif
@@ -2645,19 +2645,19 @@ public:
ns1__dataCollection *
dataCollection; /* optional element of type ns1:dataCollection */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 78;
} /* = unique id SOAP_TYPE_ICat4_ns1__dataCollectionParameter */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__dataCollectionParameter() {
ns1__dataCollectionParameter::soap_default(NULL);
}
- virtual ~ns1__dataCollectionParameter() {}
+ ~ns1__dataCollectionParameter() override {}
};
#endif
@@ -2668,17 +2668,17 @@ class SOAP_CMAC ns1__datafileParameter : public ns1__parameter {
public:
ns1__datafile *datafile; /* optional element of type ns1:datafile */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 80;
} /* = unique id SOAP_TYPE_ICat4_ns1__datafileParameter */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__datafileParameter() { ns1__datafileParameter::soap_default(NULL); }
- virtual ~ns1__datafileParameter() {}
+ ~ns1__datafileParameter() override {}
};
#endif
@@ -2689,17 +2689,17 @@ class SOAP_CMAC ns1__datasetParameter : public ns1__parameter {
public:
ns1__dataset *dataset; /* optional element of type ns1:dataset */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 81;
} /* = unique id SOAP_TYPE_ICat4_ns1__datasetParameter */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__datasetParameter() { ns1__datasetParameter::soap_default(NULL); }
- virtual ~ns1__datasetParameter() {}
+ ~ns1__datasetParameter() override {}
};
#endif
@@ -2711,19 +2711,19 @@ public:
ns1__investigation *
investigation; /* optional element of type ns1:investigation */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 82;
} /* = unique id SOAP_TYPE_ICat4_ns1__investigationParameter */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__investigationParameter() {
ns1__investigationParameter::soap_default(NULL);
}
- virtual ~ns1__investigationParameter() {}
+ ~ns1__investigationParameter() override {}
};
#endif
@@ -2734,17 +2734,17 @@ class SOAP_CMAC ns1__sampleParameter : public ns1__parameter {
public:
ns1__sample *sample; /* optional element of type ns1:sample */
public:
- virtual int soap_type() const {
+ int soap_type() const override {
return 84;
} /* = unique id SOAP_TYPE_ICat4_ns1__sampleParameter */
- virtual void soap_default(struct soap *);
- virtual void soap_serialize(struct soap *) const;
- virtual int soap_put(struct soap *, const char *, const char *) const;
- virtual int soap_out(struct soap *, const char *, int, const char *) const;
- virtual void *soap_get(struct soap *, const char *, const char *);
- virtual void *soap_in(struct soap *, const char *, const char *);
+ void soap_default(struct soap *) override;
+ void soap_serialize(struct soap *) const override;
+ int soap_put(struct soap *, const char *, const char *) const override;
+ int soap_out(struct soap *, const char *, int, const char *) const override;
+ void *soap_get(struct soap *, const char *, const char *) override;
+ void *soap_in(struct soap *, const char *, const char *) override;
ns1__sampleParameter() { ns1__sampleParameter::soap_default(NULL); }
- virtual ~ns1__sampleParameter() {}
+ ~ns1__sampleParameter() override {}
};
#endif
diff --git a/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h b/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h
index f1ba709cbc0cb6d2f6f5d8fab70321f5431572a6..fdaf07ecf7bd47cd1eb2abf7a86a8d9857bd0497 100644
--- a/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h
+++ b/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h
@@ -40,44 +40,44 @@ public:
/// Constructor
ICat4Catalog();
/// Log the user into the catalog system.
- virtual API::CatalogSession_sptr login(const std::string &username,
- const std::string &password,
- const std::string &endpoint,
- const std::string &facility);
+ API::CatalogSession_sptr login(const std::string &username,
+ const std::string &password,
+ const std::string &endpoint,
+ const std::string &facility) override;
/// Log the user out of the catalog system.
- virtual void logout();
+ void logout() override;
/// Search the catalog for data.
- virtual void search(const CatalogSearchParam &inputs,
- Mantid::API::ITableWorkspace_sptr &outputws,
- const int &offset, const int &limit);
+ void search(const CatalogSearchParam &inputs,
+ Mantid::API::ITableWorkspace_sptr &outputws, const int &offset,
+ const int &limit) override;
/// Obtain the number of results returned by the search method.
- virtual int64_t getNumberOfSearchResults(const CatalogSearchParam &inputs);
+ int64_t getNumberOfSearchResults(const CatalogSearchParam &inputs) override;
/// Show the logged in user's investigations search results.
- virtual void myData(Mantid::API::ITableWorkspace_sptr &outputws);
+ void myData(Mantid::API::ITableWorkspace_sptr &outputws) override;
/// Get datasets.
- virtual void getDataSets(const std::string &investigationId,
- Mantid::API::ITableWorkspace_sptr &outputws);
+ void getDataSets(const std::string &investigationId,
+ Mantid::API::ITableWorkspace_sptr &outputws) override;
/// Get datafiles
- virtual void getDataFiles(const std::string &investigationId,
- Mantid::API::ITableWorkspace_sptr &outputws);
+ void getDataFiles(const std::string &investigationId,
+ Mantid::API::ITableWorkspace_sptr &outputws) override;
/// Get instruments list
- virtual void listInstruments(std::vector<std::string> &instruments);
+ void listInstruments(std::vector<std::string> &instruments) override;
/// Get investigationtypes list
- virtual void listInvestigationTypes(std::vector<std::string> &invstTypes);
+ void listInvestigationTypes(std::vector<std::string> &invstTypes) override;
/// Get the file location string(s) from archive.
- virtual const std::string getFileLocation(const long long &fileID);
+ const std::string getFileLocation(const long long &fileID) override;
/// Get the url(s) based on the fileID.
- virtual const std::string getDownloadURL(const long long &fileID);
+ const std::string getDownloadURL(const long long &fileID) override;
/// get URL of where to PUT (publish) files.
- virtual const std::string
+ const std::string
getUploadURL(const std::string &investigationID,
const std::string &createFileName,
- const std::string &dataFileDescription);
+ const std::string &dataFileDescription) override;
/// Obtains the investigations that the user can publish to and saves related
/// information to a workspace.
- virtual API::ITableWorkspace_sptr getPublishInvestigations();
+ API::ITableWorkspace_sptr getPublishInvestigations() override;
/// Keep current session alive
- virtual void keepAlive();
+ void keepAlive() override;
private:
// Ensures human friendly error messages are provided to the user.
diff --git a/Framework/ISISLiveData/inc/MantidISISLiveData/FakeISISEventDAE.h b/Framework/ISISLiveData/inc/MantidISISLiveData/FakeISISEventDAE.h
index 1ee9bb01aba07b69cc0c047b15aaf39005d427fc..370def50ced9dddf92045f4710828a75327ec172 100644
--- a/Framework/ISISLiveData/inc/MantidISISLiveData/FakeISISEventDAE.h
+++ b/Framework/ISISLiveData/inc/MantidISISLiveData/FakeISISEventDAE.h
@@ -43,25 +43,25 @@ namespace ISISLiveData {
class FakeISISEventDAE : public API::Algorithm {
public:
FakeISISEventDAE();
- virtual ~FakeISISEventDAE();
+ ~FakeISISEventDAE() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FakeISISEventDAE"; }
+ const std::string name() const override { return "FakeISISEventDAE"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\DataAcquisition";
}
/// Algorithm's summary
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Simulates ISIS event DAE.";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Poco TCP server
Poco::Net::TCPServer *m_server;
/// Mutex
diff --git a/Framework/ISISLiveData/src/FakeISISEventDAE.cpp b/Framework/ISISLiveData/src/FakeISISEventDAE.cpp
index 86db7c4a32636f26df5e52cadb4fb021d4f698cd..19c52db65b19ef17f53272e2836aa63f83703788 100644
--- a/Framework/ISISLiveData/src/FakeISISEventDAE.cpp
+++ b/Framework/ISISLiveData/src/FakeISISEventDAE.cpp
@@ -49,7 +49,7 @@ public:
sendInitialSetup();
}
/// Destructor.
- ~TestServerConnection() {}
+ ~TestServerConnection() override {}
/// Sends an OK message when there is nothing to send or an error occured
void sendOK() {
std::string comm = "OK";
@@ -67,7 +67,7 @@ public:
/**
* Main method that sends out the data.
*/
- void run() {
+ void run() override {
Kernel::MersenneTwister tof(0, 10000.0, 20000.0);
Kernel::MersenneTwister spec(1234, 0.0, static_cast<double>(m_nSpectra));
Kernel::MersenneTwister period(0, 0.0, static_cast<double>(m_nPeriods));
@@ -141,7 +141,7 @@ public:
* @param socket :: The socket.
*/
Poco::Net::TCPServerConnection *
- createConnection(const Poco::Net::StreamSocket &socket) {
+ createConnection(const Poco::Net::StreamSocket &socket) override {
return new TestServerConnection(socket, m_nPeriods, m_nSpectra, m_Rate,
m_nEvents, m_prog);
}
diff --git a/Framework/Kernel/inc/MantidKernel/ANN/ANN.h b/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
index 30d66ac44a7fda27459bfd92bfa513a01d9fc04a..71ab4039d2c0a18ab00071df5aebbcf98dca19a1 100644
--- a/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
+++ b/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
@@ -591,34 +591,34 @@ public:
int n, // number of points
int dd); // dimension
- ~ANNbruteForce(); // destructor
-
- void annkSearch( // approx k near neighbor search
- ANNpoint q, // query point
- int k, // number of near neighbors to return
- ANNidxArray nn_idx, // nearest neighbor array (modified)
- ANNdistArray dd, // dist to near neighbors (modified)
- double eps = 0.0); // error bound
-
- int annkFRSearch( // approx fixed-radius kNN search
- ANNpoint q, // query point
- ANNdist sqRad, // squared radius
- int k = 0, // number of near neighbors to return
- ANNidxArray nn_idx = NULL, // nearest neighbor array (modified)
- ANNdistArray dd = NULL, // dist to near neighbors (modified)
- double eps = 0.0); // error bound
-
- int theDim() // return dimension of space
+ ~ANNbruteForce() override; // destructor
+
+ void annkSearch( // approx k near neighbor search
+ ANNpoint q, // query point
+ int k, // number of near neighbors to return
+ ANNidxArray nn_idx, // nearest neighbor array (modified)
+ ANNdistArray dd, // dist to near neighbors (modified)
+ double eps = 0.0) override; // error bound
+
+ int annkFRSearch( // approx fixed-radius kNN search
+ ANNpoint q, // query point
+ ANNdist sqRad, // squared radius
+ int k = 0, // number of near neighbors to return
+ ANNidxArray nn_idx = NULL, // nearest neighbor array (modified)
+ ANNdistArray dd = NULL, // dist to near neighbors (modified)
+ double eps = 0.0) override; // error bound
+
+ int theDim() override // return dimension of space
{
return dim;
}
- int nPoints() // return number of points
+ int nPoints() override // return number of points
{
return n_pts;
}
- ANNpointArray thePoints() // return pointer to points
+ ANNpointArray thePoints() override // return pointer to points
{
return pts;
}
@@ -803,14 +803,14 @@ public:
ANNkd_tree( // build from dump file
std::istream &in); // input stream for dump file
- ~ANNkd_tree(); // tree destructor
+ ~ANNkd_tree() override; // tree destructor
- void annkSearch( // approx k near neighbor search
- ANNpoint q, // query point
- int k, // number of near neighbors to return
- ANNidxArray nn_idx, // nearest neighbor array (modified)
- ANNdistArray dd, // dist to near neighbors (modified)
- double eps = 0.0); // error bound
+ void annkSearch( // approx k near neighbor search
+ ANNpoint q, // query point
+ int k, // number of near neighbors to return
+ ANNidxArray nn_idx, // nearest neighbor array (modified)
+ ANNdistArray dd, // dist to near neighbors (modified)
+ double eps = 0.0) override; // error bound
void annkPriSearch( // priority k near neighbor search
ANNpoint q, // query point
@@ -819,25 +819,25 @@ public:
ANNdistArray dd, // dist to near neighbors (modified)
double eps = 0.0); // error bound
- int annkFRSearch( // approx fixed-radius kNN search
- ANNpoint q, // the query point
- ANNdist sqRad, // squared radius of query ball
- int k, // number of neighbors to return
- ANNidxArray nn_idx = NULL, // nearest neighbor array (modified)
- ANNdistArray dd = NULL, // dist to near neighbors (modified)
- double eps = 0.0); // error bound
+ int annkFRSearch( // approx fixed-radius kNN search
+ ANNpoint q, // the query point
+ ANNdist sqRad, // squared radius of query ball
+ int k, // number of neighbors to return
+ ANNidxArray nn_idx = NULL, // nearest neighbor array (modified)
+ ANNdistArray dd = NULL, // dist to near neighbors (modified)
+ double eps = 0.0) override; // error bound
- int theDim() // return dimension of space
+ int theDim() override // return dimension of space
{
return dim;
}
- int nPoints() // return number of points
+ int nPoints() override // return number of points
{
return n_pts;
}
- ANNpointArray thePoints() // return pointer to points
+ ANNpointArray thePoints() override // return pointer to points
{
return pts;
}
diff --git a/Framework/Kernel/inc/MantidKernel/ArrayBoundedValidator.h b/Framework/Kernel/inc/MantidKernel/ArrayBoundedValidator.h
index 8dc7a6202c5952a2991a10fcda9916ddb5427b26..3dc5a0886f84fdd8ccfad3f9f01376c8e0fe60a7 100644
--- a/Framework/Kernel/inc/MantidKernel/ArrayBoundedValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/ArrayBoundedValidator.h
@@ -45,9 +45,9 @@ public:
ArrayBoundedValidator(const ArrayBoundedValidator<TYPE> &abv);
ArrayBoundedValidator(const TYPE lowerBound, const TYPE upperBound);
ArrayBoundedValidator(BoundedValidator<TYPE> &bv);
- virtual ~ArrayBoundedValidator();
+ ~ArrayBoundedValidator() override;
/// Clone the current state
- IValidator_sptr clone() const;
+ IValidator_sptr clone() const override;
/// Return the object that checks the bounds
boost::shared_ptr<BoundedValidator<TYPE>> getValidator() const;
@@ -70,7 +70,7 @@ public:
void clearUpper();
private:
- std::string checkValidity(const std::vector<TYPE> &value) const;
+ std::string checkValidity(const std::vector<TYPE> &value) const override;
/// The object used to do the actual validation
boost::shared_ptr<BoundedValidator<TYPE>> boundVal;
diff --git a/Framework/Kernel/inc/MantidKernel/ArrayLengthValidator.h b/Framework/Kernel/inc/MantidKernel/ArrayLengthValidator.h
index 71c0cf6a9eacf26192304e33236250df192b3775..f6e3cc2d5399c35e206a6f1330bb51dc88020be8 100644
--- a/Framework/Kernel/inc/MantidKernel/ArrayLengthValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/ArrayLengthValidator.h
@@ -37,9 +37,9 @@ public:
ArrayLengthValidator();
ArrayLengthValidator(const size_t len);
ArrayLengthValidator(const size_t lenmin, const size_t lenmax);
- virtual ~ArrayLengthValidator();
+ ~ArrayLengthValidator() override;
- IValidator_sptr clone() const;
+ IValidator_sptr clone() const override;
/// Return if it has a length
bool hasLength() const;
@@ -67,7 +67,7 @@ public:
void clearLengthMax();
private:
- std::string checkValidity(const std::vector<TYPE> &value) const;
+ std::string checkValidity(const std::vector<TYPE> &value) const override;
/// private variable containing the size of the array
size_t m_arraySize;
/// private variable, true if size is set, false if not
diff --git a/Framework/Kernel/inc/MantidKernel/ArrayProperty.h b/Framework/Kernel/inc/MantidKernel/ArrayProperty.h
index 00925093a7f803229f197caa0b86ffff958b28b6..bff9c755bf729b67f5c3ef8fb2f1b78f78676b3e 100644
--- a/Framework/Kernel/inc/MantidKernel/ArrayProperty.h
+++ b/Framework/Kernel/inc/MantidKernel/ArrayProperty.h
@@ -105,10 +105,12 @@ public:
: PropertyWithValue<std::vector<T>>(right) {}
/// 'Virtual copy constructor'
- ArrayProperty<T> *clone() const { return new ArrayProperty<T>(*this); }
+ ArrayProperty<T> *clone() const override {
+ return new ArrayProperty<T>(*this);
+ }
/// Virtual destructor
- virtual ~ArrayProperty() {}
+ ~ArrayProperty() override {}
// Unhide the base class assignment operator
using PropertyWithValue<std::vector<T>>::operator=;
@@ -116,7 +118,7 @@ public:
/** Returns the values stored in the ArrayProperty
* @return The stored values as a comma-separated list
*/
- std::string value() const {
+ std::string value() const override {
// Implemented this method for documentation reasons. Just calls base class
// method.
return PropertyWithValue<std::vector<T>>::value();
@@ -127,7 +129,7 @@ public:
* comma-separated list
* @return True if the assignment was successful
*/
- std::string setValue(const std::string &value) {
+ std::string setValue(const std::string &value) override {
// Implemented this method for documentation reasons. Just calls base class
// method.
return PropertyWithValue<std::vector<T>>::setValue(value);
diff --git a/Framework/Kernel/inc/MantidKernel/BoundedValidator.h b/Framework/Kernel/inc/MantidKernel/BoundedValidator.h
index bc6044c5541879c5141392fe50686b25a0ea53d1..684790dbe75f727dc8fdcc39c2e900e3f8d5e38c 100644
--- a/Framework/Kernel/inc/MantidKernel/BoundedValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/BoundedValidator.h
@@ -61,7 +61,7 @@ public:
m_lowerBound(lowerBound), m_upperBound(upperBound) {}
/// Destructor
- virtual ~BoundedValidator() {}
+ ~BoundedValidator() override {}
/// Return if it has a lower bound
bool hasLower() const { return m_hasLowerBound; }
@@ -122,7 +122,7 @@ public:
}
/// Clone the current state
- IValidator_sptr clone() const {
+ IValidator_sptr clone() const override {
return boost::make_shared<BoundedValidator>(*this);
}
@@ -148,7 +148,7 @@ private:
* @returns An error message to display to users or an empty string on no
*error
*/
- std::string checkValidity(const TYPE &value) const {
+ std::string checkValidity(const TYPE &value) const override {
// declare a class that can do conversions to string
std::ostringstream error;
// load in the "no error" condition
diff --git a/Framework/Kernel/inc/MantidKernel/CatalogInfo.h b/Framework/Kernel/inc/MantidKernel/CatalogInfo.h
index d541b294ed7ec651cd9d00b4165a4b619df1f3ff..ad77381df6436da9e08db0a8ab7fe5038c681a98 100644
--- a/Framework/Kernel/inc/MantidKernel/CatalogInfo.h
+++ b/Framework/Kernel/inc/MantidKernel/CatalogInfo.h
@@ -51,21 +51,21 @@ public:
/// Copy constructor
CatalogInfo(const CatalogInfo &other);
/// Obtain catalog name from the facility file.
- const std::string catalogName() const;
+ const std::string catalogName() const override;
/// Obtain soap end point from the facility file.
- const std::string soapEndPoint() const;
+ const std::string soapEndPoint() const override;
/// Obtain the external download URL.
- const std::string externalDownloadURL() const;
+ const std::string externalDownloadURL() const override;
/// Obtain the regex prefix from the facility file.
- const std::string catalogPrefix() const;
+ const std::string catalogPrefix() const override;
/// Obtain Windows prefix from the facility file.
- const std::string windowsPrefix() const;
+ const std::string windowsPrefix() const override;
/// Obtain Macintosh prefix from facility file.
- virtual const std::string macPrefix() const;
+ const std::string macPrefix() const override;
/// Obtain Linux prefix from facility file.
- const std::string linuxPrefix() const;
+ const std::string linuxPrefix() const override;
/// Clone
- virtual CatalogInfo *clone() const;
+ CatalogInfo *clone() const override;
private:
/// Obtain the attribute from a given element tag and attribute name.
diff --git a/Framework/Kernel/inc/MantidKernel/ChainableFactory.h b/Framework/Kernel/inc/MantidKernel/ChainableFactory.h
index ed41e6304f021ad473df52e5679f672d5e967e39..e224149b67223f89bd4e980c6683675b66609412 100644
--- a/Framework/Kernel/inc/MantidKernel/ChainableFactory.h
+++ b/Framework/Kernel/inc/MantidKernel/ChainableFactory.h
@@ -36,7 +36,7 @@ template <typename Factory, typename Product, typename Argument>
class DLLExport ChainableFactory : public Chainable<Factory> {
public:
/// Destructor
- virtual ~ChainableFactory() {}
+ ~ChainableFactory() override {}
/**
* Factory method wrapper. Wraps results in smart pointer.
diff --git a/Framework/Kernel/inc/MantidKernel/CompositeValidator.h b/Framework/Kernel/inc/MantidKernel/CompositeValidator.h
index b6a49bf1a50b0e40fdb46c7fbc27a2d38947dfca..c14d9d2e461818568e94d56436a4ee881b93be00 100644
--- a/Framework/Kernel/inc/MantidKernel/CompositeValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/CompositeValidator.h
@@ -40,14 +40,14 @@ public:
/// Default constructor
CompositeValidator();
/// Destructor
- ~CompositeValidator();
+ ~CompositeValidator() override;
/// Gets the type of the validator
std::string getType() const { return "composite"; }
/// Return the instersection of allowed values from children
- std::vector<std::string> allowedValues() const;
+ std::vector<std::string> allowedValues() const override;
/// Clones this and the children into a new Validator
- IValidator_sptr clone() const;
+ IValidator_sptr clone() const override;
/// Adds a validator to the group of validators to check
void add(IValidator_sptr child);
/// Add a validator based on a template type. Useful for validators that need
@@ -64,7 +64,7 @@ private:
/// Private Copy constructor: NO DIRECT COPY ALLOWED
CompositeValidator(const CompositeValidator &);
/// Verify the value with the child validators
- std::string check(const boost::any &value) const;
+ std::string check(const boost::any &value) const override;
/// A container for the child validators
std::list<IValidator_sptr> m_children;
};
diff --git a/Framework/Kernel/inc/MantidKernel/DateTimeValidator.h b/Framework/Kernel/inc/MantidKernel/DateTimeValidator.h
index 63b07945f74badffcde5db0364de799974d9e924..4ddab340f070bf5fc4c46d4a644858bbdb242c7c 100644
--- a/Framework/Kernel/inc/MantidKernel/DateTimeValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/DateTimeValidator.h
@@ -35,13 +35,13 @@ public:
DateTimeValidator();
/// Clone the current state
- IValidator_sptr clone() const;
+ IValidator_sptr clone() const override;
void allowEmpty(const bool &);
private:
/// Checks the value is valid
- std::string checkValidity(const std::string &value) const;
+ std::string checkValidity(const std::string &value) const override;
/// Allows for an empty string to be accepted as input
bool m_allowedEmpty;
diff --git a/Framework/Kernel/inc/MantidKernel/DateValidator.h b/Framework/Kernel/inc/MantidKernel/DateValidator.h
index 4ce0b3e1ae0c2500d1749e4fb9f509d3c03fd76c..c2737c9ae8996e33adc4709fde869793bd0dd249 100644
--- a/Framework/Kernel/inc/MantidKernel/DateValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/DateValidator.h
@@ -41,13 +41,13 @@ public:
/// Default constructor
DateValidator();
/// Destructor
- virtual ~DateValidator();
+ ~DateValidator() override;
/// Clone the current state
- IValidator_sptr clone() const;
+ IValidator_sptr clone() const override;
private:
/// Checks the value is valid
- std::string checkValidity(const std::string &value) const;
+ std::string checkValidity(const std::string &value) const override;
};
}
}
diff --git a/Framework/Kernel/inc/MantidKernel/DirectoryValidator.h b/Framework/Kernel/inc/MantidKernel/DirectoryValidator.h
index 5bac70afe7a88a80ceb66282aa67af85393d7083..644979a0009f7ffdcb9ee1fd2dba8aba70b319d7 100644
--- a/Framework/Kernel/inc/MantidKernel/DirectoryValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/DirectoryValidator.h
@@ -41,12 +41,12 @@ namespace Kernel {
class MANTID_KERNEL_DLL DirectoryValidator : public FileValidator {
public:
explicit DirectoryValidator(bool testDirectoryExists = true);
- virtual ~DirectoryValidator();
- virtual std::vector<std::string> allowedValues() const;
- IValidator_sptr clone() const;
+ ~DirectoryValidator() override;
+ std::vector<std::string> allowedValues() const override;
+ IValidator_sptr clone() const override;
private:
- virtual std::string checkValidity(const std::string &value) const;
+ std::string checkValidity(const std::string &value) const override;
};
} // namespace Kernel
diff --git a/Framework/Kernel/inc/MantidKernel/EnabledWhenProperty.h b/Framework/Kernel/inc/MantidKernel/EnabledWhenProperty.h
index 191cdb19c258ca71f15aadbd0884055248bdeb53..b607ebaa2add5ea8ebc6a6cee94860e4e9faf60b 100644
--- a/Framework/Kernel/inc/MantidKernel/EnabledWhenProperty.h
+++ b/Framework/Kernel/inc/MantidKernel/EnabledWhenProperty.h
@@ -80,7 +80,7 @@ public:
std::string value = "");
/// Destructor
- virtual ~EnabledWhenProperty();
+ ~EnabledWhenProperty() override;
//--------------------------------------------------------------------------------------------
/** Does the validator fulfill the criterion based on the
@@ -93,16 +93,16 @@ public:
//--------------------------------------------------------------------------------------------
/// Return true/false based on whether the other property satisfies the
/// criterion
- virtual bool isEnabled(const IPropertyManager *algo) const;
+ bool isEnabled(const IPropertyManager *algo) const override;
//--------------------------------------------------------------------------------------------
/// Return true always
- virtual bool isVisible(const IPropertyManager *) const;
+ bool isVisible(const IPropertyManager *) const override;
/// does nothing in this case and put here to satisfy the interface.
void modify_allowed_values(Property *const);
//--------------------------------------------------------------------------------------------
/// Make a copy of the present type of validator
- virtual IPropertySettings *clone();
+ IPropertySettings *clone() override;
protected:
/// Name of the OTHER property that we will check.
diff --git a/Framework/Kernel/inc/MantidKernel/Exception.h b/Framework/Kernel/inc/MantidKernel/Exception.h
index f3f0c8d63a64cf7156636b697d79df3efd6aff28..3594f22dd0badc869fcbffa8aae65e1fe7b9ccce 100644
--- a/Framework/Kernel/inc/MantidKernel/Exception.h
+++ b/Framework/Kernel/inc/MantidKernel/Exception.h
@@ -123,9 +123,9 @@ public:
/// Assignment operator
FileError &operator=(const FileError &A);
/// Destructor
- ~FileError() throw() {}
+ ~FileError() throw() override {}
- const char *what() const throw();
+ const char *what() const throw() override;
};
/// Records the filename, the description of failure and the line on which it
@@ -151,9 +151,9 @@ public:
/// Assignment operator
ParseError &operator=(const ParseError &A);
/// Destructor
- ~ParseError() throw() {}
+ ~ParseError() throw() override {}
- const char *what() const throw();
+ const char *what() const throw() override;
};
/// Marks code as not implemented yet.
@@ -164,9 +164,9 @@ public:
/// Assignment operator
NotImplementedError &operator=(const NotImplementedError &A);
/// Destructor
- ~NotImplementedError() throw() {}
+ ~NotImplementedError() throw() override {}
- const char *what() const throw();
+ const char *what() const throw() override;
};
/// Exception for when an item is not found in a collection.
@@ -186,9 +186,9 @@ public:
/// Assignment operator
NotFoundError &operator=(const NotFoundError &A);
/// Destructor
- ~NotFoundError() throw() {}
+ ~NotFoundError() throw() override {}
- const char *what() const throw();
+ const char *what() const throw() override;
};
/// Exception for when an item is already in a collection.
@@ -205,9 +205,9 @@ public:
/// Assignment operator
ExistsError &operator=(const ExistsError &A);
/// Destructor
- ~ExistsError() throw() {}
+ ~ExistsError() throw() override {}
- const char *what() const throw();
+ const char *what() const throw() override;
};
/**
@@ -245,9 +245,9 @@ public:
/// Assignment operator
AbsObjMethod &operator=(const AbsObjMethod &A);
/// Destructor
- ~AbsObjMethod() throw() {}
+ ~AbsObjMethod() throw() override {}
- const char *what() const throw();
+ const char *what() const throw() override;
};
/// Exception for errors associated with the instrument definition.
@@ -266,9 +266,9 @@ public:
/// Assignment operator
InstrumentDefinitionError &operator=(const InstrumentDefinitionError &A);
/// Destructor
- ~InstrumentDefinitionError() throw() {}
+ ~InstrumentDefinitionError() throw() override {}
- const char *what() const throw();
+ const char *what() const throw() override;
};
/**
@@ -288,9 +288,9 @@ public:
/// Assignment operator
OpenGLError &operator=(const OpenGLError &A);
/// Destructor
- ~OpenGLError() throw() {}
+ ~OpenGLError() throw() override {}
- const char *what() const throw();
+ const char *what() const throw() override;
};
/**
\class MisMatch
@@ -309,10 +309,10 @@ public:
MisMatch(const T &, const T &, const std::string &);
MisMatch(const MisMatch<T> &A);
MisMatch<T> &operator=(const MisMatch<T> &rhs);
- ~MisMatch() throw() {}
+ ~MisMatch() throw() override {}
/// Overloaded reporting method
- const char *what() const throw();
+ const char *what() const throw() override;
};
/**
@@ -332,10 +332,10 @@ public:
IndexError(const size_t V, const size_t B, const std::string &Place);
IndexError(const IndexError &A);
IndexError &operator=(const IndexError &A);
- ~IndexError() throw() {}
+ ~IndexError() throw() override {}
/// Overloaded reporting method
- const char *what() const throw();
+ const char *what() const throw() override;
};
/** Exception thrown when an attempt is made to dereference a null pointer
@@ -351,12 +351,12 @@ private:
public:
NullPointerException(const std::string &place, const std::string &objectName);
NullPointerException(const NullPointerException &);
- ~NullPointerException() throw() {}
+ ~NullPointerException() throw() override {}
NullPointerException &operator=(const NullPointerException &);
/// Overloaded reporting method
- const char *what() const throw();
+ const char *what() const throw() override;
};
/** Exception thrown when error occurs accessing an internet resource
@@ -373,12 +373,12 @@ private:
public:
InternetError(const std::string &message, const int &errorCode = 0);
InternetError(const InternetError &);
- ~InternetError() throw() {}
+ ~InternetError() throw() override {}
InternetError &operator=(const InternetError &);
/// Overloaded reporting method
- const char *what() const throw();
+ const char *what() const throw() override;
const int &errorCode() const;
};
diff --git a/Framework/Kernel/inc/MantidKernel/FileValidator.h b/Framework/Kernel/inc/MantidKernel/FileValidator.h
index c74d68d99836898bd7ac0e358d8bea59592e1831..f977a861dd97c75cce438a85983b0e5ee706d46b 100644
--- a/Framework/Kernel/inc/MantidKernel/FileValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/FileValidator.h
@@ -43,9 +43,9 @@ public:
explicit FileValidator(
const std::vector<std::string> &extensions = std::vector<std::string>(),
bool testFileExists = true, bool testCanWrite = false);
- virtual ~FileValidator();
- virtual std::vector<std::string> allowedValues() const;
- IValidator_sptr clone() const;
+ ~FileValidator() override;
+ std::vector<std::string> allowedValues() const override;
+ IValidator_sptr clone() const override;
protected:
/// The list of permitted extensions
@@ -56,7 +56,7 @@ protected:
bool m_testCanWrite;
private:
- virtual std::string checkValidity(const std::string &value) const;
+ std::string checkValidity(const std::string &value) const override;
bool endswith(const std::string &value) const;
};
diff --git a/Framework/Kernel/inc/MantidKernel/FilterChannel.h b/Framework/Kernel/inc/MantidKernel/FilterChannel.h
index f34793bd031d0d922181676d896f6bfd2d970ed8..37e8649f280f48374c7c7b326e651927940f5a97 100644
--- a/Framework/Kernel/inc/MantidKernel/FilterChannel.h
+++ b/Framework/Kernel/inc/MantidKernel/FilterChannel.h
@@ -52,7 +52,7 @@ public:
FilterChannel();
/// destructor
- ~FilterChannel();
+ ~FilterChannel() override;
/// Attaches a channel, which may not be null.
void addChannel(Channel *pChannel);
@@ -69,13 +69,13 @@ public:
unsigned int getPriority() const { return _priority; }
/// Sends the given Message to the attached channel.
- void log(const Message &msg);
+ void log(const Message &msg) override;
/// Sets or changes a configuration property.
- void setProperty(const std::string &name, const std::string &value);
+ void setProperty(const std::string &name, const std::string &value) override;
/// Removes all channels.
- void close();
+ void close() override;
protected:
private:
diff --git a/Framework/Kernel/inc/MantidKernel/FilteredTimeSeriesProperty.h b/Framework/Kernel/inc/MantidKernel/FilteredTimeSeriesProperty.h
index 6c4d23a45cabb514d3d0a1be448335ad9f62965b..74ac84b4b3dce7368245faf70bcb6ac019381bf6 100644
--- a/Framework/Kernel/inc/MantidKernel/FilteredTimeSeriesProperty.h
+++ b/Framework/Kernel/inc/MantidKernel/FilteredTimeSeriesProperty.h
@@ -43,7 +43,7 @@ public:
const TimeSeriesProperty<bool> &filterProp,
const bool transferOwnserhip = false);
/// Destructor
- ~FilteredTimeSeriesProperty();
+ ~FilteredTimeSeriesProperty() override;
/// Access the unfiltered log
const TimeSeriesProperty<HeldType> *unfiltered() const;
diff --git a/Framework/Kernel/inc/MantidKernel/FunctionTask.h b/Framework/Kernel/inc/MantidKernel/FunctionTask.h
index bf58b33a771fdf0d78162a077510660e0b2c696f..8acbb8c326d4415886f26782ce6b681590e38069 100644
--- a/Framework/Kernel/inc/MantidKernel/FunctionTask.h
+++ b/Framework/Kernel/inc/MantidKernel/FunctionTask.h
@@ -60,7 +60,7 @@ public:
//---------------------------------------------------------------------------------------------
/** Main method that performs the work for the task. */
- virtual void run() {
+ void run() override {
if (m_voidFunc != NULL)
m_voidFunc();
else
diff --git a/Framework/Kernel/inc/MantidKernel/Instantiator.h b/Framework/Kernel/inc/MantidKernel/Instantiator.h
index bd4b0384bc820f324ae837ec220dca8798dbafa9..25071a9eefad080291bc9fb9cdfd2cb51b01e532 100644
--- a/Framework/Kernel/inc/MantidKernel/Instantiator.h
+++ b/Framework/Kernel/inc/MantidKernel/Instantiator.h
@@ -75,12 +75,12 @@ public:
Instantiator() {}
/// Destroys the Instantiator.
- virtual ~Instantiator() {}
+ ~Instantiator() override {}
/** Creates an instance of a concrete subclass of Base.
* @return A pointer to the base type
*/
- boost::shared_ptr<Base> createInstance() const {
+ boost::shared_ptr<Base> createInstance() const override {
boost::shared_ptr<Base> ptr(new C);
return ptr;
}
@@ -89,7 +89,7 @@ public:
* a boost shared_ptr.
* @return A bare pointer to the base type
*/
- virtual Base *createUnwrappedInstance() const {
+ Base *createUnwrappedInstance() const override {
return static_cast<Base *>(new C);
}
};
diff --git a/Framework/Kernel/inc/MantidKernel/ListValidator.h b/Framework/Kernel/inc/MantidKernel/ListValidator.h
index 57e9585b0de930b1fa2e8f187ce47dfa2d51ebd4..dae06ff2adb93696175364e101c541288676d046 100644
--- a/Framework/Kernel/inc/MantidKernel/ListValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/ListValidator.h
@@ -73,16 +73,16 @@ public:
}
}
/// Destructor
- virtual ~ListValidator(){};
+ ~ListValidator() override{};
/// Clone the validator
- IValidator_sptr clone() const {
+ IValidator_sptr clone() const override {
return boost::make_shared<ListValidator<TYPE>>(*this);
}
/**
* Returns the set of allowed values currently defined
* @returns A set of allowed values that this validator will currently allow
*/
- std::vector<std::string> allowedValues() const {
+ std::vector<std::string> allowedValues() const override {
/// The interface requires strings
std::vector<std::string> allowedStrings;
allowedStrings.reserve(m_allowedValues.size());
@@ -110,7 +110,7 @@ public:
* @param alias :: An alias string.
* @return :: Allowed value or throw if alias is unknown.
*/
- std::string getValueForAlias(const std::string &alias) const {
+ std::string getValueForAlias(const std::string &alias) const override {
auto aliasIt = m_aliases.find(alias);
if (aliasIt == m_aliases.end()) {
throw std::invalid_argument("Unknown alias found " + alias);
@@ -124,7 +124,7 @@ protected:
* @return "" if the value is on the list, or "The value is not in the list
* of allowed values"
*/
- std::string checkValidity(const TYPE &value) const {
+ std::string checkValidity(const TYPE &value) const override {
if (m_allowedValues.end() !=
std::find(m_allowedValues.begin(), m_allowedValues.end(), value)) {
return "";
diff --git a/Framework/Kernel/inc/MantidKernel/MDUnit.h b/Framework/Kernel/inc/MantidKernel/MDUnit.h
index 7d339496728af1362694c34683bd7bc16937fd16..bc31d83883654b2df61e311d79e7264e22195dd9 100644
--- a/Framework/Kernel/inc/MantidKernel/MDUnit.h
+++ b/Framework/Kernel/inc/MantidKernel/MDUnit.h
@@ -47,8 +47,8 @@ public:
/// QUnit base
class DLLExport QUnit : public MDUnit {
public:
- virtual ~QUnit();
- bool isQUnit() const;
+ ~QUnit() override;
+ bool isQUnit() const override;
};
/// Dimensionless RLU
@@ -56,10 +56,10 @@ class DLLExport ReciprocalLatticeUnit : public QUnit {
public:
ReciprocalLatticeUnit();
ReciprocalLatticeUnit(const UnitLabel &unitLabel);
- UnitLabel getUnitLabel() const;
- bool canConvertTo(const MDUnit &other) const;
- ReciprocalLatticeUnit *clone() const;
- virtual ~ReciprocalLatticeUnit();
+ UnitLabel getUnitLabel() const override;
+ bool canConvertTo(const MDUnit &other) const override;
+ ReciprocalLatticeUnit *clone() const override;
+ ~ReciprocalLatticeUnit() override;
private:
bool isSpecialRLUUnitLabel() const;
@@ -69,10 +69,10 @@ private:
/// Inverse Angstroms unit
class DLLExport InverseAngstromsUnit : public QUnit {
public:
- UnitLabel getUnitLabel() const;
- bool canConvertTo(const MDUnit &other) const;
- InverseAngstromsUnit *clone() const;
- virtual ~InverseAngstromsUnit();
+ UnitLabel getUnitLabel() const override;
+ bool canConvertTo(const MDUnit &other) const override;
+ InverseAngstromsUnit *clone() const override;
+ ~InverseAngstromsUnit() override;
};
class DLLExport LabelUnit : public MDUnit {
@@ -81,11 +81,11 @@ private:
public:
LabelUnit(const UnitLabel &unitLabel);
- UnitLabel getUnitLabel() const;
- bool canConvertTo(const MDUnit &other) const;
- bool isQUnit() const;
- virtual ~LabelUnit();
- LabelUnit *clone() const;
+ UnitLabel getUnitLabel() const override;
+ bool canConvertTo(const MDUnit &other) const override;
+ bool isQUnit() const override;
+ ~LabelUnit() override;
+ LabelUnit *clone() const override;
};
typedef std::unique_ptr<MDUnit> MDUnit_uptr;
diff --git a/Framework/Kernel/inc/MantidKernel/MDUnitFactory.h b/Framework/Kernel/inc/MantidKernel/MDUnitFactory.h
index c8f785ee69009164e141ed5e6c0f8d5c0a20b92c..a058d76410a8ac02a1cd5ae0966175dab6bd552e 100644
--- a/Framework/Kernel/inc/MantidKernel/MDUnitFactory.h
+++ b/Framework/Kernel/inc/MantidKernel/MDUnitFactory.h
@@ -39,14 +39,14 @@ class MANTID_KERNEL_DLL MDUnitFactory
public:
/// Destructor
- virtual ~MDUnitFactory() {}
+ ~MDUnitFactory() override {}
private:
/// Create the product
- virtual MDUnit *createRaw(const std::string &unitString) const = 0;
+ MDUnit *createRaw(const std::string &unitString) const override = 0;
/// Indicate an ability to intepret the string
- virtual bool canInterpret(const std::string &unitString) const = 0;
+ bool canInterpret(const std::string &unitString) const override = 0;
};
//-----------------------------------------------------------------------
@@ -54,18 +54,19 @@ private:
//-----------------------------------------------------------------------
class MANTID_KERNEL_DLL LabelUnitFactory : public MDUnitFactory {
- LabelUnit *createRaw(const std::string &unitString) const;
- bool canInterpret(const std::string &unitString) const;
+ LabelUnit *createRaw(const std::string &unitString) const override;
+ bool canInterpret(const std::string &unitString) const override;
};
class MANTID_KERNEL_DLL InverseAngstromsUnitFactory : public MDUnitFactory {
- InverseAngstromsUnit *createRaw(const std::string &unitString) const;
- bool canInterpret(const std::string &unitString) const;
+ InverseAngstromsUnit *createRaw(const std::string &unitString) const override;
+ bool canInterpret(const std::string &unitString) const override;
};
class MANTID_KERNEL_DLL ReciprocalLatticeUnitFactory : public MDUnitFactory {
- ReciprocalLatticeUnit *createRaw(const std::string &unitString) const;
- bool canInterpret(const std::string &unitString) const;
+ ReciprocalLatticeUnit *
+ createRaw(const std::string &unitString) const override;
+ bool canInterpret(const std::string &unitString) const override;
};
typedef std::unique_ptr<MDUnitFactory> MDUnitFactory_uptr;
diff --git a/Framework/Kernel/inc/MantidKernel/MandatoryValidator.h b/Framework/Kernel/inc/MantidKernel/MandatoryValidator.h
index bc4af1774ba5c27a533ac8ab9b09fda1f8e0f52f..9032eb815e4a6067f9bc185fc3a5ef304d06554f 100644
--- a/Framework/Kernel/inc/MantidKernel/MandatoryValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/MandatoryValidator.h
@@ -63,7 +63,7 @@ template <typename T> struct IsEmpty {
template <typename TYPE>
class DLLExport MandatoryValidator : public TypedValidator<TYPE> {
public:
- IValidator_sptr clone() const {
+ IValidator_sptr clone() const override {
return boost::make_shared<MandatoryValidator>();
}
@@ -73,7 +73,7 @@ private:
* @param value :: the string to test
* @return "A value must be entered for this parameter" if empty or ""
*/
- std::string checkValidity(const TYPE &value) const {
+ std::string checkValidity(const TYPE &value) const override {
if (Detail::IsEmpty<TYPE>::check(value))
return "A value must be entered for this parameter";
else
diff --git a/Framework/Kernel/inc/MantidKernel/MaskedProperty.h b/Framework/Kernel/inc/MantidKernel/MaskedProperty.h
index d122220688daea5a22bb551e4e8b9ca764147f05..79c15d52e0934dc70c7a252c01a85350a711c390 100644
--- a/Framework/Kernel/inc/MantidKernel/MaskedProperty.h
+++ b/Framework/Kernel/inc/MantidKernel/MaskedProperty.h
@@ -52,10 +52,10 @@ public:
MaskedProperty(const std::string &name, const TYPE &defaultvalue,
const unsigned int direction);
/// "virtual" copy constructor
- MaskedProperty *clone() const;
+ MaskedProperty *clone() const override;
/// Mask out the out the value in the history
- virtual const Kernel::PropertyHistory createHistory() const;
+ const Kernel::PropertyHistory createHistory() const override;
/** This method returns the masked property value
*/
diff --git a/Framework/Kernel/inc/MantidKernel/Math/Optimization/SLSQPMinimizer.h b/Framework/Kernel/inc/MantidKernel/Math/Optimization/SLSQPMinimizer.h
index 193b623fcfc47c2c9441db272c47cac7889e7317..516f62f20ee2d3da34aadf1f204a6426be3489d5 100644
--- a/Framework/Kernel/inc/MantidKernel/Math/Optimization/SLSQPMinimizer.h
+++ b/Framework/Kernel/inc/MantidKernel/Math/Optimization/SLSQPMinimizer.h
@@ -140,7 +140,9 @@ private:
template <typename T> class TypeHolder : public BaseHolder {
public:
TypeHolder(const T &func) : func(func) {}
- double eval(const std::vector<double> &x) const { return func.eval(x); }
+ double eval(const std::vector<double> &x) const override {
+ return func.eval(x);
+ }
/// The actual function supplied by the user
T func;
};
diff --git a/Framework/Kernel/inc/MantidKernel/MatrixProperty.h b/Framework/Kernel/inc/MantidKernel/MatrixProperty.h
index 96494391688d71713f58f14ad26db98783863b6c..3dc44a7a1e27143edb21fad46f49fd177861a6ff 100644
--- a/Framework/Kernel/inc/MantidKernel/MatrixProperty.h
+++ b/Framework/Kernel/inc/MantidKernel/MatrixProperty.h
@@ -47,12 +47,14 @@ public:
// Unhide base class members (at minimum, avoids Intel compiler warning)
using PropertyWithValue<HeldType>::operator=;
/// 'Virtual copy constructor'
- inline MatrixProperty *clone() const { return new MatrixProperty(*this); }
+ inline MatrixProperty *clone() const override {
+ return new MatrixProperty(*this);
+ }
/// Destructor
- ~MatrixProperty();
+ ~MatrixProperty() override;
/// Add the value of another property. Doesn't make sense here.
- virtual MatrixProperty &operator+=(Kernel::Property const *) {
+ MatrixProperty &operator+=(Kernel::Property const *) override {
throw Exception::NotImplementedError(
"+= operator is not implemented for MatrixProperty.");
return *this;
diff --git a/Framework/Kernel/inc/MantidKernel/MersenneTwister.h b/Framework/Kernel/inc/MantidKernel/MersenneTwister.h
index 5764a762678e9237d57737596836aef70c02042b..d59375fda3b25759e8b87a407f91fca83ec43d67 100644
--- a/Framework/Kernel/inc/MantidKernel/MersenneTwister.h
+++ b/Framework/Kernel/inc/MantidKernel/MersenneTwister.h
@@ -63,21 +63,21 @@ public:
/// Construct the generator with an initial seed and range.
MersenneTwister(const size_t seedValue, const double start, const double end);
/// Destructor
- ~MersenneTwister();
+ ~MersenneTwister() override;
/// Set the random number seed
- virtual void setSeed(const size_t seed);
+ void setSeed(const size_t seed) override;
/// Sets the range of the subsequent calls to next
- virtual void setRange(const double start, const double end);
+ void setRange(const double start, const double end) override;
/// Generate the next random number in the sequence within the given range,
/// (default=[0.0,1.0]).
- virtual double nextValue();
+ double nextValue() override;
/// Resets the generator
- virtual void restart();
+ void restart() override;
/// Saves the current state of the generator
- virtual void save();
+ void save() override;
/// Restores the generator to the last saved point, or the beginning if
/// nothing has been saved
- virtual void restore();
+ void restore() override;
private:
DISABLE_DEFAULT_CONSTRUCT(MersenneTwister)
diff --git a/Framework/Kernel/inc/MantidKernel/MultiFileValidator.h b/Framework/Kernel/inc/MantidKernel/MultiFileValidator.h
index 066edf1fbc62e5915b44475b08e81c6c6ba642b6..8c2ec83e2f0d5fd986f1e744e872278bb80220ff 100644
--- a/Framework/Kernel/inc/MantidKernel/MultiFileValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/MultiFileValidator.h
@@ -48,12 +48,12 @@ public:
MultiFileValidator();
MultiFileValidator(const MultiFileValidator &mfv);
explicit MultiFileValidator(const std::vector<std::string> &extensions);
- virtual ~MultiFileValidator();
+ ~MultiFileValidator() override;
- IValidator_sptr clone() const;
+ IValidator_sptr clone() const override;
/// Returns the set of allowed extensions.
- virtual std::vector<std::string> allowedValues() const;
+ std::vector<std::string> allowedValues() const override;
protected:
/// FileValidator instance used for validating multiple files.
@@ -61,8 +61,8 @@ protected:
private:
/// Returns an error if at least one of the files is not valid, else "".
- virtual std::string
- checkValidity(const std::vector<std::vector<std::string>> &values) const;
+ std::string checkValidity(
+ const std::vector<std::vector<std::string>> &values) const override;
};
} // namespace Kernel
diff --git a/Framework/Kernel/inc/MantidKernel/NDPseudoRandomNumberGenerator.h b/Framework/Kernel/inc/MantidKernel/NDPseudoRandomNumberGenerator.h
index f3597ba11379bb2467a92f256204d623e6cd1518..9d8d1b2fb55801457cecea36853fcbaf9cb2f8d8 100644
--- a/Framework/Kernel/inc/MantidKernel/NDPseudoRandomNumberGenerator.h
+++ b/Framework/Kernel/inc/MantidKernel/NDPseudoRandomNumberGenerator.h
@@ -55,14 +55,14 @@ public:
/// Set the random number seed
void setSeed(const size_t seedValue);
/// Generates the next ND point
- void generateNextPoint();
+ void generateNextPoint() override;
/// Resets the generator
- void restart();
+ void restart() override;
/// Saves the current state of the generator
- void save();
+ void save() override;
/// Restores the generator to the last saved point, or the beginning if
/// nothing has been saved
- void restore();
+ void restore() override;
private:
DISABLE_DEFAULT_CONSTRUCT(NDPseudoRandomNumberGenerator)
diff --git a/Framework/Kernel/inc/MantidKernel/NullValidator.h b/Framework/Kernel/inc/MantidKernel/NullValidator.h
index 9715a48b41f3f255ef6871cbd94b7966e46d12c6..723da24032df2b996eeee0bba3974520c3aa2ef5 100644
--- a/Framework/Kernel/inc/MantidKernel/NullValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/NullValidator.h
@@ -38,7 +38,7 @@ namespace Kernel {
*/
class DLLExport NullValidator : public IValidator {
public:
- IValidator_sptr clone() const {
+ IValidator_sptr clone() const override {
return boost::make_shared<NullValidator>(*this);
}
@@ -46,7 +46,7 @@ private:
/** Always returns valid, that is ""
* @returns an empty string
*/
- std::string check(const boost::any &) const { return ""; }
+ std::string check(const boost::any &) const override { return ""; }
};
} // namespace Kernel
diff --git a/Framework/Kernel/inc/MantidKernel/ProgressText.h b/Framework/Kernel/inc/MantidKernel/ProgressText.h
index 6183a64d2c0b14f22a0f8dc594434f6341fe986a..85dc95aa1111f3952806fa99021656ad9ca25ef7 100644
--- a/Framework/Kernel/inc/MantidKernel/ProgressText.h
+++ b/Framework/Kernel/inc/MantidKernel/ProgressText.h
@@ -21,9 +21,9 @@ public:
ProgressText(double start = 0.0, double end = 1.0, int nsteps = 100,
bool newLines = true);
- ~ProgressText();
+ ~ProgressText() override;
- virtual void doReport(const std::string &msg = "");
+ void doReport(const std::string &msg = "") override;
// virtual void report(int i,const std::string& msg = "");
// virtual void reportIncrement(int inc, const std::string& msg = "");
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyManager.h b/Framework/Kernel/inc/MantidKernel/PropertyManager.h
index 8b9811629bb2fcb0537b8063a99201164d7c76bb..9a3893fdb3ddffe0dd3727e166d1d6068bdacee4 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyManager.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyManager.h
@@ -63,60 +63,63 @@ public:
PropertyManager &operator+=(const PropertyManager &rhs);
void filterByTime(const Kernel::DateAndTime &start,
- const Kernel::DateAndTime &stop);
+ const Kernel::DateAndTime &stop) override;
void splitByTime(std::vector<SplittingInterval> &splitter,
- std::vector<PropertyManager *> outputs) const;
- void filterByProperty(const TimeSeriesProperty<bool> &filter);
+ std::vector<PropertyManager *> outputs) const override;
+ void filterByProperty(const TimeSeriesProperty<bool> &filter) override;
- virtual ~PropertyManager();
+ ~PropertyManager() override;
// Function to declare properties (i.e. store them)
- void declareProperty(Property *p, const std::string &doc = "");
+ void declareProperty(Property *p, const std::string &doc = "") override;
// Sets all the declared properties from
- void setProperties(
- const std::string &propertiesJson,
- const std::set<std::string> &ignoreProperties = std::set<std::string>());
+ void setProperties(const std::string &propertiesJson,
+ const std::set<std::string> &ignoreProperties =
+ std::set<std::string>()) override;
void setProperties(const std::string &propertiesJson,
IPropertyManager *targetPropertyManager,
const std::set<std::string> &ignoreProperties);
- void setProperties(
- const ::Json::Value &jsonValue,
- const std::set<std::string> &ignoreProperties = std::set<std::string>());
+ void setProperties(const ::Json::Value &jsonValue,
+ const std::set<std::string> &ignoreProperties =
+ std::set<std::string>()) override;
void setProperties(
const ::Json::Value &jsonValue, IPropertyManager *targetPropertyManager,
const std::set<std::string> &ignoreProperties = std::set<std::string>());
- void setPropertiesWithSimpleString(
- const std::string &propertiesString,
- const std::set<std::string> &ignoreProperties = std::set<std::string>());
- void setPropertyValue(const std::string &name, const std::string &value);
- void setPropertyOrdinal(const int &index, const std::string &value);
-
- bool existsProperty(const std::string &name) const;
- bool validateProperties() const;
- size_t propertyCount() const;
- std::string getPropertyValue(const std::string &name) const;
- const std::vector<Property *> &getProperties() const;
+ void
+ setPropertiesWithSimpleString(const std::string &propertiesString,
+ const std::set<std::string> &ignoreProperties =
+ std::set<std::string>()) override;
+ void setPropertyValue(const std::string &name,
+ const std::string &value) override;
+ void setPropertyOrdinal(const int &index, const std::string &value) override;
+
+ bool existsProperty(const std::string &name) const override;
+ bool validateProperties() const override;
+ size_t propertyCount() const override;
+ std::string getPropertyValue(const std::string &name) const override;
+ const std::vector<Property *> &getProperties() const override;
/// removes the property from properties map
- void removeProperty(const std::string &name, const bool delproperty = true);
+ void removeProperty(const std::string &name,
+ const bool delproperty = true) override;
/// Clears the whole property map
- void clear();
+ void clear() override;
/// Get the value of a property
- TypedValue getProperty(const std::string &name) const;
+ TypedValue getProperty(const std::string &name) const override;
/// Return the property manager serialized as a string.
- virtual std::string asString(bool withDefaultValues = false) const;
+ std::string asString(bool withDefaultValues = false) const override;
/// Return the property manager serialized as a json object.
- virtual ::Json::Value asJson(bool withDefaultValues = false) const;
+ ::Json::Value asJson(bool withDefaultValues = false) const override;
protected:
using IPropertyManager::declareProperty;
friend class PropertyManagerOwner;
- Property *getPointerToProperty(const std::string &name) const;
- Property *getPointerToPropertyOrdinal(const int &index) const;
+ Property *getPointerToProperty(const std::string &name) const override;
+ Property *getPointerToPropertyOrdinal(const int &index) const override;
Property *getPointerToPropertyOrNull(const std::string &name) const;
private:
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h b/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h
index df1a9d3efd682acdfe8eb4381ed8255112ee968c..e926017973cfad4c52d06973940b84f2c986b67f 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyManagerOwner.h
@@ -52,78 +52,81 @@ public:
PropertyManagerOwner();
PropertyManagerOwner(const PropertyManagerOwner &);
PropertyManagerOwner &operator=(const PropertyManagerOwner &);
- virtual ~PropertyManagerOwner() {}
+ ~PropertyManagerOwner() override {}
// Function to declare properties (i.e. store them)
- void declareProperty(Property *p, const std::string &doc = "");
+ void declareProperty(Property *p, const std::string &doc = "") override;
using IPropertyManager::declareProperty;
// Sets all the declared properties from
- void setProperties(
- const std::string &propertiesJson,
- const std::set<std::string> &ignoreProperties = std::set<std::string>());
+ void setProperties(const std::string &propertiesJson,
+ const std::set<std::string> &ignoreProperties =
+ std::set<std::string>()) override;
// Sets all the declared properties from a json object
- void setProperties(
- const ::Json::Value &jsonValue,
- const std::set<std::string> &ignoreProperties = std::set<std::string>());
+ void setProperties(const ::Json::Value &jsonValue,
+ const std::set<std::string> &ignoreProperties =
+ std::set<std::string>()) override;
// sets all the declared properties using a simple string format
- void setPropertiesWithSimpleString(
- const std::string &propertiesString,
- const std::set<std::string> &ignoreProperties = std::set<std::string>());
+ void
+ setPropertiesWithSimpleString(const std::string &propertiesString,
+ const std::set<std::string> &ignoreProperties =
+ std::set<std::string>()) override;
- void setPropertyValue(const std::string &name, const std::string &value);
- void setPropertyOrdinal(const int &index, const std::string &value);
+ void setPropertyValue(const std::string &name,
+ const std::string &value) override;
+ void setPropertyOrdinal(const int &index, const std::string &value) override;
/// Make m_properties point to the same PropertyManager as po.
virtual void copyPropertiesFrom(const PropertyManagerOwner &po) {
*this = po;
}
- bool existsProperty(const std::string &name) const;
- bool validateProperties() const;
- size_t propertyCount() const;
+ bool existsProperty(const std::string &name) const override;
+ bool validateProperties() const override;
+ size_t propertyCount() const override;
- virtual std::string getPropertyValue(const std::string &name) const;
- const std::vector<Property *> &getProperties() const;
+ std::string getPropertyValue(const std::string &name) const override;
+ const std::vector<Property *> &getProperties() const override;
/// Get the value of a property
- virtual TypedValue getProperty(const std::string &name) const;
+ TypedValue getProperty(const std::string &name) const override;
/// Return the property manager serialized as a string.
- virtual std::string asString(bool withDefaultValues = false) const;
+ std::string asString(bool withDefaultValues = false) const override;
/// Return the property manager serialized as a json object.
- virtual ::Json::Value asJson(bool withDefaultValues = false) const;
+ ::Json::Value asJson(bool withDefaultValues = false) const override;
bool isDefault(const std::string &name) const;
/// Removes the property from management
- void removeProperty(const std::string &name, const bool delproperty = true);
+ void removeProperty(const std::string &name,
+ const bool delproperty = true) override;
/// Clears all properties under management
- void clear();
+ void clear() override;
/// Override this method to perform a custom action right after a property was
/// set.
/// The argument is the property name. Default - do nothing.
- virtual void afterPropertySet(const std::string &);
+ void afterPropertySet(const std::string &) override;
- virtual void filterByTime(const DateAndTime & /*start*/,
- const DateAndTime & /*stop*/) {
+ void filterByTime(const DateAndTime & /*start*/,
+ const DateAndTime & /*stop*/) override {
throw(std::runtime_error("Not yet implmented"));
}
- virtual void splitByTime(std::vector<SplittingInterval> & /*splitter*/,
- std::vector<PropertyManager *> /* outputs*/) const {
+ void splitByTime(std::vector<SplittingInterval> & /*splitter*/,
+ std::vector<PropertyManager *> /* outputs*/) const override {
throw(std::runtime_error("Not yet implmented"));
}
- virtual void filterByProperty(const TimeSeriesProperty<bool> & /*filte*/) {
+ void filterByProperty(const TimeSeriesProperty<bool> & /*filte*/) override {
throw(std::runtime_error("Not yet implmented"));
}
public:
- Property *getPointerToProperty(const std::string &name) const;
- Property *getPointerToPropertyOrdinal(const int &index) const;
+ Property *getPointerToProperty(const std::string &name) const override;
+ Property *getPointerToPropertyOrdinal(const int &index) const override;
private:
/// Shared pointer to the 'real' property manager
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h b/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h
index cef85abbfab800bc889c85dfdc0bf9e5d0af86bb..3d16e893e9d48802a8735adf3e2d1d4228b28cfa 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyWithValue.h
@@ -342,17 +342,17 @@ public:
// value of the original object
m_validator(right.m_validator->clone()) {}
/// 'Virtual copy constructor'
- PropertyWithValue<TYPE> *clone() const {
+ PropertyWithValue<TYPE> *clone() const override {
return new PropertyWithValue<TYPE>(*this);
}
/// Virtual destructor
- virtual ~PropertyWithValue() {}
+ ~PropertyWithValue() override {}
/** Get the value of the property as a string
* @return The property's value
*/
- virtual std::string value() const { return toString(m_value); }
+ std::string value() const override { return toString(m_value); }
/**
* Deep comparison.
@@ -376,12 +376,12 @@ public:
/** Get the size of the property.
*/
- virtual int size() const { return findSize(m_value); }
+ int size() const override { return findSize(m_value); }
/** Get the value the property was initialised with -its default value
* @return The default value
*/
- virtual std::string getDefault() const { return toString(m_initialValue); }
+ std::string getDefault() const override { return toString(m_initialValue); }
/** Set the value of the property from a string representation.
* Note that "1" & "0" must be used for bool properties rather than
@@ -390,7 +390,7 @@ public:
* @return Returns "" if the assignment was successful or a user level
* description of the problem
*/
- virtual std::string setValue(const std::string &value) {
+ std::string setValue(const std::string &value) override {
try {
TYPE result = m_value;
toValue(value, result);
@@ -416,7 +416,7 @@ public:
* @return "" if the assignment was successful or a user level description of
* the problem
*/
- virtual std::string setDataItem(const boost::shared_ptr<DataItem> data) {
+ std::string setDataItem(const boost::shared_ptr<DataItem> data) override {
// Pass of the helper function that is able to distinguish whether
// the TYPE of the PropertyWithValue can be converted to a
// shared_ptr<DataItem>
@@ -439,7 +439,7 @@ public:
* @param right the property to add
* @return the sum
*/
- virtual PropertyWithValue &operator+=(Property const *right) {
+ PropertyWithValue &operator+=(Property const *right) override {
PropertyWithValue const *rhs =
dynamic_cast<PropertyWithValue const *>(right);
@@ -497,7 +497,7 @@ public:
* to do more logging
* @returns "" if the value is valid or a discription of the problem
*/
- virtual std::string isValid() const { return m_validator->isValid(m_value); }
+ std::string isValid() const override { return m_validator->isValid(m_value); }
/** Indicates if the property's value is the same as it was when it was set
* N.B. Uses an unsafe comparison in the case of doubles, consider overriding
@@ -505,14 +505,14 @@ public:
* @return true if the value is the same as the initial value or false
* otherwise
*/
- virtual bool isDefault() const { return m_initialValue == m_value; }
+ bool isDefault() const override { return m_initialValue == m_value; }
/** Returns the set of valid values for this property, if such a set exists.
* If not, it returns an empty vector.
* @return Returns the set of valid values for this property, or it returns
* an empty vector.
*/
- virtual std::vector<std::string> allowedValues() const {
+ std::vector<std::string> allowedValues() const override {
return determineAllowedValues(m_value, *m_validator);
}
@@ -539,7 +539,7 @@ private:
* The value is only accepted if the other property has the same type as this
* @param right :: A reference to a property.
*/
- virtual std::string setValueFromProperty(const Property &right) {
+ std::string setValueFromProperty(const Property &right) override {
auto prop = dynamic_cast<const PropertyWithValue<TYPE> *>(&right);
if (!prop) {
return "Could not set value: properties have different type.";
diff --git a/Framework/Kernel/inc/MantidKernel/PseudoRandomNumberGenerator.h b/Framework/Kernel/inc/MantidKernel/PseudoRandomNumberGenerator.h
index 06d1c067c571893d6af827a8b9db2fbdae3684c6..d70eaa96394b5e83d3126807f36bc8a026eb2e00 100644
--- a/Framework/Kernel/inc/MantidKernel/PseudoRandomNumberGenerator.h
+++ b/Framework/Kernel/inc/MantidKernel/PseudoRandomNumberGenerator.h
@@ -48,7 +48,7 @@ public:
/// Return the next number in the sequence
virtual double nextValue() = 0;
/// Generates the next point
- virtual void generateNextPoint();
+ void generateNextPoint() override;
private:
DISABLE_COPY_AND_ASSIGN(PseudoRandomNumberGenerator)
diff --git a/Framework/Kernel/inc/MantidKernel/RebinParamsValidator.h b/Framework/Kernel/inc/MantidKernel/RebinParamsValidator.h
index 5cfa4484bb5485f022011b4fdd830e7c0228f864..edc76ac9f8074fc9b09b496b01f25ec5231219a5 100644
--- a/Framework/Kernel/inc/MantidKernel/RebinParamsValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/RebinParamsValidator.h
@@ -39,13 +39,13 @@ class MANTID_KERNEL_DLL RebinParamsValidator
: public TypedValidator<std::vector<double>> {
public:
RebinParamsValidator(bool allowEmpty = false);
- virtual ~RebinParamsValidator() {}
- IValidator_sptr clone() const {
+ ~RebinParamsValidator() override {}
+ IValidator_sptr clone() const override {
return boost::make_shared<RebinParamsValidator>(*this);
}
private:
- std::string checkValidity(const std::vector<double> &value) const;
+ std::string checkValidity(const std::vector<double> &value) const override;
bool m_allowEmpty;
};
diff --git a/Framework/Kernel/inc/MantidKernel/SobolSequence.h b/Framework/Kernel/inc/MantidKernel/SobolSequence.h
index b45ed71c2deeb540e73ff280f736fbae1675e2f8..0fe915d82e25e044fd1e29e9b5b80306b9c5a0b7 100644
--- a/Framework/Kernel/inc/MantidKernel/SobolSequence.h
+++ b/Framework/Kernel/inc/MantidKernel/SobolSequence.h
@@ -45,16 +45,16 @@ public:
/// Constructor taking the number of dimensions
explicit SobolSequence(const unsigned int ndims);
/// Destructor
- ~SobolSequence();
+ ~SobolSequence() override;
/// Generates the next value in the sequence
- void generateNextPoint();
+ void generateNextPoint() override;
/// Reset the sequence
- void restart();
+ void restart() override;
/// Saves the current state of the generator
- void save();
+ void save() override;
/// Restores the generator to the last saved point, or the beginning if
/// nothing has been saved
- void restore();
+ void restore() override;
private:
DISABLE_DEFAULT_CONSTRUCT(SobolSequence)
diff --git a/Framework/Kernel/inc/MantidKernel/StartsWithValidator.h b/Framework/Kernel/inc/MantidKernel/StartsWithValidator.h
index 85c8172230ddb1c3c5b7cb87d3b0d211542a6039..2a649019236d9ba0a1797b42aef59001de859c0d 100644
--- a/Framework/Kernel/inc/MantidKernel/StartsWithValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/StartsWithValidator.h
@@ -58,7 +58,7 @@ public:
StartsWithValidator(const std::set<std::string> &values)
: Kernel::StringListValidator(values) {}
/// Clone the validator
- IValidator_sptr clone() const {
+ IValidator_sptr clone() const override {
return boost::make_shared<StartsWithValidator>(*this);
}
@@ -68,7 +68,7 @@ protected:
* @return "" if the value is on the list, or "The value does not start with
* any of the allowed values"
*/
- std::string checkValidity(const std::string &value) const;
+ std::string checkValidity(const std::string &value) const override;
};
} // namespace Kernel
diff --git a/Framework/Kernel/inc/MantidKernel/StdoutChannel.h b/Framework/Kernel/inc/MantidKernel/StdoutChannel.h
index f9518832d6be6d6679f992cfe008c0908b840c47..f741195c40df22b0b5c22cd0b479299c19371ccd 100644
--- a/Framework/Kernel/inc/MantidKernel/StdoutChannel.h
+++ b/Framework/Kernel/inc/MantidKernel/StdoutChannel.h
@@ -38,7 +38,7 @@ public:
/// Constructor for StdChannel
StdoutChannel();
/// destructor
- ~StdoutChannel();
+ ~StdoutChannel() override;
};
}
#endif // STDOUTCHANNEL_H
diff --git a/Framework/Kernel/inc/MantidKernel/StringContainsValidator.h b/Framework/Kernel/inc/MantidKernel/StringContainsValidator.h
index 625d9430ee22b74b487783b92de15f0f23b26d78..15d61d84c683c7a883ad512c6440f863e0ebc804 100644
--- a/Framework/Kernel/inc/MantidKernel/StringContainsValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/StringContainsValidator.h
@@ -40,16 +40,16 @@ public:
StringContainsValidator();
/// Clone the current state
- IValidator_sptr clone() const;
+ IValidator_sptr clone() const override;
/// Allows a for a vector of required strings to be passed to the validator
void setRequiredStrings(const std::vector<std::string> &);
- virtual ~StringContainsValidator();
+ ~StringContainsValidator() override;
private:
/// Checks the value is valid
- std::string checkValidity(const std::string &value) const;
+ std::string checkValidity(const std::string &value) const override;
/// A vector of the sub strings the string must contain in order to pass
/// validation
diff --git a/Framework/Kernel/inc/MantidKernel/TestChannel.h b/Framework/Kernel/inc/MantidKernel/TestChannel.h
index 41ff4664f84d5f7efc9c576eaed94e7da025bbb3..6b7ec748496e52c3f076e60dde2626d1f396a67d 100644
--- a/Framework/Kernel/inc/MantidKernel/TestChannel.h
+++ b/Framework/Kernel/inc/MantidKernel/TestChannel.h
@@ -47,9 +47,9 @@ public:
typedef std::list<Poco::Message> MsgList;
TestChannel();
- ~TestChannel();
+ ~TestChannel() override;
- void log(const Poco::Message &msg);
+ void log(const Poco::Message &msg) override;
MsgList &list();
void clear();
diff --git a/Framework/Kernel/inc/MantidKernel/ThreadPoolRunnable.h b/Framework/Kernel/inc/MantidKernel/ThreadPoolRunnable.h
index 552732ce817f274fe2233032bd427ed78d1b6d8e..c39c11d87117d6e85e9ab8a2bb5bd103e5ee9daf 100644
--- a/Framework/Kernel/inc/MantidKernel/ThreadPoolRunnable.h
+++ b/Framework/Kernel/inc/MantidKernel/ThreadPoolRunnable.h
@@ -21,12 +21,12 @@ class MANTID_KERNEL_DLL ThreadPoolRunnable : public Poco::Runnable {
public:
ThreadPoolRunnable(size_t threadnum, ThreadScheduler *scheduler,
ProgressBase *prog = NULL, double waitSec = 0.0);
- ~ThreadPoolRunnable();
+ ~ThreadPoolRunnable() override;
/// Return the thread number of this thread.
size_t threadnum() { return m_threadnum; }
- virtual void run();
+ void run() override;
void clearWait();
diff --git a/Framework/Kernel/inc/MantidKernel/ThreadSafeLogStream.h b/Framework/Kernel/inc/MantidKernel/ThreadSafeLogStream.h
index 8d7306de8c789dc5d8aa109e7eefb68cdcab3b14..2390668bd891f93737d386974b0bb6a32dc3638d 100644
--- a/Framework/Kernel/inc/MantidKernel/ThreadSafeLogStream.h
+++ b/Framework/Kernel/inc/MantidKernel/ThreadSafeLogStream.h
@@ -63,7 +63,7 @@ public:
ThreadSafeLogStreamBuf(Poco::Logger &logger,
Poco::Message::Priority priority);
/// Destructor
- ~ThreadSafeLogStreamBuf();
+ ~ThreadSafeLogStreamBuf() override;
public:
int overflow(char c);
@@ -71,7 +71,7 @@ public:
private:
/// Overridden fron base to write to the device in a thread-safe manner.
- int writeToDevice(char c);
+ int writeToDevice(char c) override;
private:
/// Store a map of thread indices to messages
@@ -92,7 +92,7 @@ public:
/// Constructor
ThreadSafeLogIOS(Poco::Logger &logger, Poco::Message::Priority priority);
/// Destructor
- ~ThreadSafeLogIOS();
+ ~ThreadSafeLogIOS() override;
// Return a pointer to the stream buffer object
Poco::LogStreamBuf *rdbuf();
@@ -130,7 +130,7 @@ public:
const std::string &loggerName,
Poco::Message::Priority priority = Poco::Message::PRIO_INFORMATION);
/// Destroys the ThreadSafeLogStream.
- ~ThreadSafeLogStream();
+ ~ThreadSafeLogStream() override;
/// Sets the priority for log messages to Poco::Message::PRIO_FATAL.
ThreadSafeLogStream &fatal();
/// Sets the priority for log messages to Poco::Message::PRIO_FATAL
diff --git a/Framework/Kernel/inc/MantidKernel/ThreadScheduler.h b/Framework/Kernel/inc/MantidKernel/ThreadScheduler.h
index d710c80af8ee72e6c970ed0cd4923806567543ac..3bf95a226e8d5c51bb556b03c245c5cd313b05d5 100644
--- a/Framework/Kernel/inc/MantidKernel/ThreadScheduler.h
+++ b/Framework/Kernel/inc/MantidKernel/ThreadScheduler.h
@@ -145,17 +145,17 @@ public:
ThreadSchedulerFIFO() : ThreadScheduler() {}
/// Destructor
- virtual ~ThreadSchedulerFIFO() { clear(); }
+ ~ThreadSchedulerFIFO() override { clear(); }
//-------------------------------------------------------------------------------
/// @return true if the queue is empty
- bool empty() {
+ bool empty() override {
Mutex::ScopedLock _lock(m_queueLock);
return m_queue.empty();
}
//-------------------------------------------------------------------------------
- void push(Task *newTask) {
+ void push(Task *newTask) override {
// Cache the total cost
m_queueLock.lock();
m_cost += newTask->cost();
@@ -164,7 +164,7 @@ public:
}
//-------------------------------------------------------------------------------
- virtual Task *pop(size_t threadnum) {
+ Task *pop(size_t threadnum) override {
UNUSED_ARG(threadnum);
Task *temp = NULL;
m_queueLock.lock();
@@ -180,7 +180,7 @@ public:
}
//-------------------------------------------------------------------------------
- size_t size() {
+ size_t size() override {
m_queueLock.lock();
size_t temp = m_queue.size();
m_queueLock.unlock();
@@ -188,7 +188,7 @@ public:
}
//-------------------------------------------------------------------------------
- void clear() {
+ void clear() override {
m_queueLock.lock();
// Empty out the queue and delete the pointers!
for (std::deque<Task *>::iterator it = m_queue.begin(); it != m_queue.end();
@@ -217,7 +217,7 @@ protected:
class MANTID_KERNEL_DLL ThreadSchedulerLIFO : public ThreadSchedulerFIFO {
//-------------------------------------------------------------------------------
- Task *pop(size_t threadnum) {
+ Task *pop(size_t threadnum) override {
UNUSED_ARG(threadnum);
Task *temp = NULL;
m_queueLock.lock();
@@ -250,17 +250,17 @@ public:
ThreadSchedulerLargestCost() : ThreadScheduler() {}
/// Destructor
- virtual ~ThreadSchedulerLargestCost() { clear(); }
+ ~ThreadSchedulerLargestCost() override { clear(); }
//-------------------------------------------------------------------------------
/// @return true if the queue is empty
- bool empty() {
+ bool empty() override {
Mutex::ScopedLock _lock(m_queueLock);
return m_map.empty();
}
//-------------------------------------------------------------------------------
- void push(Task *newTask) {
+ void push(Task *newTask) override {
// Cache the total cost
m_queueLock.lock();
m_cost += newTask->cost();
@@ -269,7 +269,7 @@ public:
}
//-------------------------------------------------------------------------------
- virtual Task *pop(size_t threadnum) {
+ Task *pop(size_t threadnum) override {
UNUSED_ARG(threadnum);
Task *temp = NULL;
m_queueLock.lock();
@@ -287,7 +287,7 @@ public:
}
//-------------------------------------------------------------------------------
- size_t size() {
+ size_t size() override {
m_queueLock.lock();
size_t temp = m_map.size();
m_queueLock.unlock();
@@ -295,7 +295,7 @@ public:
}
//-------------------------------------------------------------------------------
- void clear() {
+ void clear() override {
m_queueLock.lock();
// Empty out the queue and delete the pointers!
for (std::multimap<double, Task *>::iterator it = m_map.begin();
diff --git a/Framework/Kernel/inc/MantidKernel/ThreadSchedulerMutexes.h b/Framework/Kernel/inc/MantidKernel/ThreadSchedulerMutexes.h
index 80f35d0726858555fd5c90a48b2e2f0d99a73f47..6a7a5091280f3ac8c971a83ffa5188696da05bd5 100644
--- a/Framework/Kernel/inc/MantidKernel/ThreadSchedulerMutexes.h
+++ b/Framework/Kernel/inc/MantidKernel/ThreadSchedulerMutexes.h
@@ -28,10 +28,10 @@ class DLLExport ThreadSchedulerMutexes : public ThreadScheduler {
public:
ThreadSchedulerMutexes() : ThreadScheduler() {}
- virtual ~ThreadSchedulerMutexes() { clear(); }
+ ~ThreadSchedulerMutexes() override { clear(); }
//-------------------------------------------------------------------------------
- void push(Task *newTask) {
+ void push(Task *newTask) override {
// Cache the total cost
m_queueLock.lock();
m_cost += newTask->cost();
@@ -42,7 +42,7 @@ public:
}
//-------------------------------------------------------------------------------
- virtual Task *pop(size_t threadnum) {
+ Task *pop(size_t threadnum) override {
UNUSED_ARG(threadnum);
Task *temp = NULL;
@@ -111,7 +111,7 @@ public:
* @param task :: the Task that was completed.
* @param threadnum :: unused argument
*/
- virtual void finished(Task *task, size_t threadnum) {
+ void finished(Task *task, size_t threadnum) override {
UNUSED_ARG(threadnum);
boost::shared_ptr<Mutex> mut = task->getMutex();
if (mut) {
@@ -123,7 +123,7 @@ public:
}
//-------------------------------------------------------------------------------
- size_t size() {
+ size_t size() override {
m_queueLock.lock();
// Add up the sizes of all contained maps.
size_t total = 0;
@@ -137,7 +137,7 @@ public:
//-------------------------------------------------------------------------------
/// @return true if the queue is empty
- bool empty() {
+ bool empty() override {
Mutex::ScopedLock _lock(m_queueLock);
SuperMap::iterator it = m_supermap.begin();
SuperMap::iterator it_end = m_supermap.end();
@@ -148,7 +148,7 @@ public:
}
//-------------------------------------------------------------------------------
- void clear() {
+ void clear() override {
m_queueLock.lock();
// Empty out the queue and delete the pointers!
diff --git a/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h b/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h
index e0d7026ca82500da219cd2fe3dadf707cdd67f00..4f364ab38065423db37cba627ce96623498bcb5e 100644
--- a/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h
+++ b/Framework/Kernel/inc/MantidKernel/TimeSeriesProperty.h
@@ -113,24 +113,24 @@ public:
/// Constructor
explicit TimeSeriesProperty(const std::string &name);
/// Virtual destructor
- virtual ~TimeSeriesProperty();
+ ~TimeSeriesProperty() override;
/// "Virtual" copy constructor
- TimeSeriesProperty<TYPE> *clone() const;
+ TimeSeriesProperty<TYPE> *clone() const override;
//
/// Return time series property, containing time derivative of current
/// property
std::unique_ptr<TimeSeriesProperty<double>> getDerivative() const;
/// "Virtual" copy constructor with a time shift in seconds
- virtual Property *cloneWithTimeShift(const double timeShift) const;
+ Property *cloneWithTimeShift(const double timeShift) const override;
/// Return the memory used by the property, in bytes
- size_t getMemorySize() const;
+ size_t getMemorySize() const override;
/// Merge the given property with this one
- virtual TimeSeriesProperty<TYPE> &merge(Property *rhs);
+ TimeSeriesProperty<TYPE> &merge(Property *rhs) override;
//--------------------------------------------------------------------------------------
/// Add the value of another property
- virtual TimeSeriesProperty &operator+=(Property const *right);
+ TimeSeriesProperty &operator+=(Property const *right) override;
/// Deep comparison
virtual bool operator==(const TimeSeriesProperty<TYPE> &right) const;
/// Deep comparison (not equal).
@@ -145,23 +145,25 @@ public:
/// Filter out a run by time.
void filterByTime(const Kernel::DateAndTime &start,
- const Kernel::DateAndTime &stop);
+ const Kernel::DateAndTime &stop) override;
/// Filter by a range of times
void filterByTimes(const std::vector<SplittingInterval> &splittervec);
/// Split out a time series property by time intervals.
void splitByTime(std::vector<SplittingInterval> &splitter,
- std::vector<Property *> outputs, bool isPeriodic) const;
+ std::vector<Property *> outputs,
+ bool isPeriodic) const override;
/// Fill a TimeSplitterType that will filter the events by matching
void makeFilterByValue(std::vector<SplittingInterval> &split, double min,
double max, double TimeTolerance = 0.0,
- bool centre = false) const;
+ bool centre = false) const override;
/// Make sure an existing filter covers the full time range given
void expandFilterToRange(std::vector<SplittingInterval> &split, double min,
- double max, const TimeInterval &range) const;
+ double max,
+ const TimeInterval &range) const override;
/// Calculate the time-weighted average of a property in a filtered range
- double
- averageValueInFilter(const std::vector<SplittingInterval> &filter) const;
+ double averageValueInFilter(
+ const std::vector<SplittingInterval> &filter) const override;
/// Calculate the time-weighted average of a property
double timeAverageValue() const;
@@ -175,7 +177,7 @@ public:
std::multimap<DateAndTime, TYPE> valueAsMultiMap() const;
/// Return the time series's times as a vector<DateAndTime>
- std::vector<DateAndTime> timesAsVector() const;
+ std::vector<DateAndTime> timesAsVector() const override;
/// Return the series as list of times, where the time is the number of
/// seconds since the start.
std::vector<double> timesAsVectorSeconds() const;
@@ -209,14 +211,14 @@ public:
TYPE maxValue() const;
/// Returns the number of values at UNIQUE time intervals in the time series
- int size() const;
+ int size() const override;
/// Returns the real size of the time series property map:
- int realSize() const;
+ int realSize() const override;
// ==== The following functions are specific to the odd mechanism of
// FilterByLogValue =========
/// Get the time series property as a string of 'time value'
- std::string value() const;
+ std::string value() const override;
/// New method to return time series value pairs as std::vector<std::string>
std::vector<std::string> time_tValue() const;
/// Return the time series as a C++ map<DateAndTime, TYPE>
@@ -224,14 +226,14 @@ public:
// ============================================================================================
/// Set a property from a string
- std::string setValue(const std::string &);
+ std::string setValue(const std::string &) override;
/// Set a property from a DataItem
- std::string setDataItem(const boost::shared_ptr<DataItem>);
+ std::string setDataItem(const boost::shared_ptr<DataItem>) override;
/// Deletes the series of values in the property
- void clear();
+ void clear() override;
/// Deletes all but the 'last entry' in the property
- void clearOutdated();
+ void clearOutdated() override;
/// Clears and creates a TimeSeriesProperty from these parameters
void create(const Kernel::DateAndTime &start_time,
const std::vector<double> &time_sec,
@@ -265,11 +267,11 @@ public:
static bool isTimeString(const std::string &str);
/// This doesn't check anything -we assume these are always valid
- std::string isValid() const;
+ std::string isValid() const override;
/// Returns the default value
- std::string getDefault() const;
+ std::string getDefault() const override;
/// Returns if the value is at the default
- bool isDefault() const;
+ bool isDefault() const override;
/// Return a TimeSeriesPropertyStatistics object
TimeSeriesPropertyStatistics getStatistics() const;
@@ -299,7 +301,7 @@ private:
/// the callers
size_t findNthIndexFromQuickRef(int n) const;
/// Set a value from another property
- virtual std::string setValueFromProperty(const Property &right);
+ std::string setValueFromProperty(const Property &right) override;
/// Holds the time series data
mutable std::vector<TimeValueUnit<TYPE>> m_values;
diff --git a/Framework/Kernel/inc/MantidKernel/TypedValidator.h b/Framework/Kernel/inc/MantidKernel/TypedValidator.h
index 9d8356d35ba02d780316e5867030eb9b4d36a625..078eef53f94f15166fd966d54401b18413d031a7 100644
--- a/Framework/Kernel/inc/MantidKernel/TypedValidator.h
+++ b/Framework/Kernel/inc/MantidKernel/TypedValidator.h
@@ -52,7 +52,7 @@ private:
* @returns An error message to display to users or an empty string on no
* error
*/
- std::string check(const boost::any &value) const {
+ std::string check(const boost::any &value) const override {
try {
const HeldType *dataPtr = boost::any_cast<const HeldType *>(value);
return checkValidity(*dataPtr);
@@ -93,7 +93,7 @@ private:
* @returns An error message to display to users or an empty string on no
* error
*/
- std::string check(const boost::any &value) const {
+ std::string check(const boost::any &value) const override {
try {
const ElementType_sptr typedValue = extractValue(value);
return checkValidity(typedValue);
diff --git a/Framework/Kernel/inc/MantidKernel/Unit.h b/Framework/Kernel/inc/MantidKernel/Unit.h
index 6f563faea76bc1aea63fd2d4aab427a164ad9a00..a3d5da3d29c5ba778432760df9e5b7babe03d9a7 100644
--- a/Framework/Kernel/inc/MantidKernel/Unit.h
+++ b/Framework/Kernel/inc/MantidKernel/Unit.h
@@ -255,39 +255,39 @@ namespace Units {
/// Empty unit
class MANTID_KERNEL_DLL Empty : public Unit {
public:
- const std::string unitID() const; ///< "Empty"
- const std::string caption() const { return ""; }
- const UnitLabel label() const;
+ const std::string unitID() const override; ///< "Empty"
+ const std::string caption() const override { return ""; }
+ const UnitLabel label() const override;
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual void init();
- virtual Unit *clone() const;
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ void init() override;
+ Unit *clone() const override;
- virtual double conversionTOFMin() const;
- virtual double conversionTOFMax() const;
+ double conversionTOFMin() const override;
+ double conversionTOFMax() const override;
/// Constructor
Empty() : Unit() {}
/// Destructor
- ~Empty() {}
+ ~Empty() override {}
};
//=================================================================================================
/// Label unit
class MANTID_KERNEL_DLL Label : public Empty {
public:
- const std::string unitID() const; ///< "Label"
- const std::string caption() const { return m_caption; }
- const UnitLabel label() const;
+ const std::string unitID() const override; ///< "Label"
+ const std::string caption() const override { return m_caption; }
+ const UnitLabel label() const override;
Label();
Label(const std::string &caption, const std::string &label);
void setLabel(const std::string &cpt, const UnitLabel &lbl = UnitLabel(""));
- virtual Unit *clone() const;
+ Unit *clone() const override;
/// Destructor
- ~Label() {}
+ ~Label() override {}
private:
/// Caption
@@ -300,41 +300,41 @@ private:
/// Time of flight in microseconds
class MANTID_KERNEL_DLL TOF : public Unit {
public:
- const std::string unitID() const; ///< "TOF"
- const std::string caption() const { return "Time-of-flight"; }
- const UnitLabel label() const;
+ const std::string unitID() const override; ///< "TOF"
+ const std::string caption() const override { return "Time-of-flight"; }
+ const UnitLabel label() const override;
TOF();
- virtual void init();
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual Unit *clone() const;
+ void init() override;
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ Unit *clone() const override;
///@return -DBL_MAX as ToF convertible to TOF for in any time range
- virtual double conversionTOFMin() const;
+ double conversionTOFMin() const override;
///@return DBL_MAX as ToF convertible to TOF for in any time range
- virtual double conversionTOFMax() const;
+ double conversionTOFMax() const override;
};
//=================================================================================================
/// Wavelength in Angstrom
class MANTID_KERNEL_DLL Wavelength : public Unit {
public:
- const std::string unitID() const; ///< "Wavelength"
- const std::string caption() const { return "Wavelength"; }
- const UnitLabel label() const;
+ const std::string unitID() const override; ///< "Wavelength"
+ const std::string caption() const override { return "Wavelength"; }
+ const UnitLabel label() const override;
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual void init();
- virtual Unit *clone() const;
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ void init() override;
+ Unit *clone() const override;
- virtual double conversionTOFMin() const;
- virtual double conversionTOFMax() const;
+ double conversionTOFMin() const override;
+ double conversionTOFMax() const override;
/// Constructor
Wavelength();
/// Destructor
- ~Wavelength() {}
+ ~Wavelength() override {}
protected:
double sfpTo; ///< Extra correction factor in to conversion
@@ -348,22 +348,22 @@ protected:
/// Energy in milli-electronvolts
class MANTID_KERNEL_DLL Energy : public Unit {
public:
- const std::string unitID() const; ///< "Energy"
- const std::string caption() const { return "Energy"; }
- const UnitLabel label() const;
+ const std::string unitID() const override; ///< "Energy"
+ const std::string caption() const override { return "Energy"; }
+ const UnitLabel label() const override;
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual void init();
- virtual Unit *clone() const;
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ void init() override;
+ Unit *clone() const override;
- virtual double conversionTOFMin() const;
- virtual double conversionTOFMax() const;
+ double conversionTOFMin() const override;
+ double conversionTOFMax() const override;
/// Constructor
Energy();
/// Destructor
- ~Energy() {}
+ ~Energy() override {}
protected:
double factorTo; ///< Constant factor for to conversion
@@ -374,21 +374,21 @@ protected:
/// Absolute energy in units of wavenumber (cm^-1)
class MANTID_KERNEL_DLL Energy_inWavenumber : public Unit {
public:
- const std::string unitID() const; ///< "Energy_inWavenumber"
- const std::string caption() const { return "Energy"; }
- const UnitLabel label() const;
+ const std::string unitID() const override; ///< "Energy_inWavenumber"
+ const std::string caption() const override { return "Energy"; }
+ const UnitLabel label() const override;
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual void init();
- virtual Unit *clone() const;
- virtual double conversionTOFMin() const;
- virtual double conversionTOFMax() const;
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ void init() override;
+ Unit *clone() const override;
+ double conversionTOFMin() const override;
+ double conversionTOFMax() const override;
/// Constructor
Energy_inWavenumber();
/// Destructor
- ~Energy_inWavenumber() {}
+ ~Energy_inWavenumber() override {}
protected:
double factorTo; ///< Constant factor for to conversion
@@ -399,21 +399,21 @@ protected:
/// d-Spacing in Angstrom
class MANTID_KERNEL_DLL dSpacing : public Unit {
public:
- const std::string unitID() const; ///< "dSpacing"
- const std::string caption() const { return "d-Spacing"; }
- const UnitLabel label() const;
+ const std::string unitID() const override; ///< "dSpacing"
+ const std::string caption() const override { return "d-Spacing"; }
+ const UnitLabel label() const override;
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual void init();
- virtual Unit *clone() const;
- virtual double conversionTOFMin() const;
- virtual double conversionTOFMax() const;
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ void init() override;
+ Unit *clone() const override;
+ double conversionTOFMin() const override;
+ double conversionTOFMax() const override;
/// Constructor
dSpacing();
/// Destructor
- ~dSpacing() {}
+ ~dSpacing() override {}
protected:
double factorTo; ///< Constant factor for to conversion
@@ -424,20 +424,20 @@ protected:
/// Momentum Transfer in Angstrom^-1
class MANTID_KERNEL_DLL MomentumTransfer : public Unit {
public:
- const std::string unitID() const; ///< "MomentumTransfer"
- const std::string caption() const { return "q"; }
- const UnitLabel label() const;
-
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual void init();
- virtual Unit *clone() const;
- virtual double conversionTOFMin() const;
- virtual double conversionTOFMax() const;
+ const std::string unitID() const override; ///< "MomentumTransfer"
+ const std::string caption() const override { return "q"; }
+ const UnitLabel label() const override;
+
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ void init() override;
+ Unit *clone() const override;
+ double conversionTOFMin() const override;
+ double conversionTOFMax() const override;
/// Constructor
MomentumTransfer();
/// Destructor
- ~MomentumTransfer() {}
+ ~MomentumTransfer() override {}
protected:
double factorTo; ///< Constant factor for to conversion
@@ -448,21 +448,21 @@ protected:
/// Momentum transfer squared in Angstrom^-2
class MANTID_KERNEL_DLL QSquared : public Unit {
public:
- const std::string unitID() const; ///< "QSquared"
- const std::string caption() const { return "Q2"; }
- const UnitLabel label() const;
+ const std::string unitID() const override; ///< "QSquared"
+ const std::string caption() const override { return "Q2"; }
+ const UnitLabel label() const override;
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual void init();
- virtual Unit *clone() const;
- virtual double conversionTOFMin() const;
- virtual double conversionTOFMax() const;
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ void init() override;
+ Unit *clone() const override;
+ double conversionTOFMin() const override;
+ double conversionTOFMax() const override;
/// Constructor
QSquared();
/// Destructor
- ~QSquared() {}
+ ~QSquared() override {}
protected:
double factorTo; ///< Constant factor for to conversion
@@ -473,22 +473,22 @@ protected:
/// Energy transfer in milli-electronvolts
class MANTID_KERNEL_DLL DeltaE : public Unit {
public:
- virtual const std::string unitID() const; ///< "DeltaE"
- virtual const std::string caption() const { return "Energy transfer"; }
- const UnitLabel label() const;
+ const std::string unitID() const override; ///< "DeltaE"
+ const std::string caption() const override { return "Energy transfer"; }
+ const UnitLabel label() const override;
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual void init();
- virtual Unit *clone() const;
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ void init() override;
+ Unit *clone() const override;
- virtual double conversionTOFMin() const;
- virtual double conversionTOFMax() const;
+ double conversionTOFMin() const override;
+ double conversionTOFMax() const override;
/// Constructor
DeltaE();
/// Destructor
- ~DeltaE() {}
+ ~DeltaE() override {}
protected:
double factorTo; ///< Constant factor for to conversion
@@ -502,39 +502,39 @@ protected:
/// Energy transfer in units of wavenumber (cm^-1)
class MANTID_KERNEL_DLL DeltaE_inWavenumber : public DeltaE {
public:
- const std::string unitID() const; ///< "DeltaE_inWavenumber"
- const std::string caption() const { return "Energy transfer"; }
- const UnitLabel label() const;
-
- virtual void init();
- virtual Unit *clone() const;
- virtual double conversionTOFMin() const;
- virtual double conversionTOFMax() const;
+ const std::string unitID() const override; ///< "DeltaE_inWavenumber"
+ const std::string caption() const override { return "Energy transfer"; }
+ const UnitLabel label() const override;
+
+ void init() override;
+ Unit *clone() const override;
+ double conversionTOFMin() const override;
+ double conversionTOFMax() const override;
/// Constructor
DeltaE_inWavenumber();
/// Destructor
- ~DeltaE_inWavenumber() {}
+ ~DeltaE_inWavenumber() override {}
};
//=================================================================================================
/// Momentum in Angstrom^-1
class MANTID_KERNEL_DLL Momentum : public Unit {
public:
- const std::string unitID() const; ///< "Momentum"
- const std::string caption() const { return "Momentum"; }
- const UnitLabel label() const;
+ const std::string unitID() const override; ///< "Momentum"
+ const std::string caption() const override { return "Momentum"; }
+ const UnitLabel label() const override;
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual void init();
- virtual Unit *clone() const;
- virtual double conversionTOFMin() const;
- virtual double conversionTOFMax() const;
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ void init() override;
+ Unit *clone() const override;
+ double conversionTOFMin() const override;
+ double conversionTOFMax() const override;
/// Constructor
Momentum();
/// Destructor
- ~Momentum() {}
+ ~Momentum() override {}
protected:
double sfpTo; ///< Extra correction factor in to conversion
@@ -548,63 +548,63 @@ protected:
/// SpinEchoLength in nm
class MANTID_KERNEL_DLL SpinEchoLength : public Wavelength {
public:
- const std::string unitID() const; ///< "SpinEchoLength"
- const std::string caption() const { return "Spin Echo Length"; }
- const UnitLabel label() const;
+ const std::string unitID() const override; ///< "SpinEchoLength"
+ const std::string caption() const override { return "Spin Echo Length"; }
+ const UnitLabel label() const override;
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual void init();
- virtual Unit *clone() const;
- virtual double conversionTOFMin() const;
- virtual double conversionTOFMax() const;
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ void init() override;
+ Unit *clone() const override;
+ double conversionTOFMin() const override;
+ double conversionTOFMax() const override;
/// Constructor
SpinEchoLength();
/// Destructor
- ~SpinEchoLength() {}
+ ~SpinEchoLength() override {}
};
//=================================================================================================
/// SpinEchoTime in ns
class MANTID_KERNEL_DLL SpinEchoTime : public Wavelength {
public:
- const std::string unitID() const; ///< "SpinEchoTime"
- const std::string caption() const { return "Spin Echo Time"; }
- const UnitLabel label() const;
+ const std::string unitID() const override; ///< "SpinEchoTime"
+ const std::string caption() const override { return "Spin Echo Time"; }
+ const UnitLabel label() const override;
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual void init();
- virtual Unit *clone() const;
- virtual double conversionTOFMin() const;
- virtual double conversionTOFMax() const;
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ void init() override;
+ Unit *clone() const override;
+ double conversionTOFMin() const override;
+ double conversionTOFMax() const override;
/// Constructor
SpinEchoTime();
/// Destructor
- ~SpinEchoTime() {}
+ ~SpinEchoTime() override {}
};
//=================================================================================================
/// Time In Second
class MANTID_KERNEL_DLL Time : public Unit {
public:
- const std::string unitID() const; ///< "Time"
- const std::string caption() const { return "t"; }
- const UnitLabel label() const;
+ const std::string unitID() const override; ///< "Time"
+ const std::string caption() const override { return "t"; }
+ const UnitLabel label() const override;
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual double conversionTOFMax() const;
- virtual double conversionTOFMin() const;
- virtual void init();
- virtual Unit *clone() const;
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ double conversionTOFMax() const override;
+ double conversionTOFMin() const override;
+ void init() override;
+ Unit *clone() const override;
/// Constructor
Time();
/// Destructor
- ~Time() {}
+ ~Time() override {}
protected:
double factorTo; ///< Constant factor for to conversion
@@ -616,17 +616,17 @@ protected:
class MANTID_KERNEL_DLL Degrees : public Empty {
public:
Degrees();
- const std::string unitID() const; /// < Degrees
- const std::string caption() const { return "Scattering angle"; }
- const UnitLabel label() const;
+ const std::string unitID() const override; /// < Degrees
+ const std::string caption() const override { return "Scattering angle"; }
+ const UnitLabel label() const override;
- virtual void init();
- virtual Unit *clone() const;
+ void init() override;
+ Unit *clone() const override;
- virtual double singleToTOF(const double x) const;
- virtual double singleFromTOF(const double tof) const;
- virtual double conversionTOFMin() const;
- virtual double conversionTOFMax() const;
+ double singleToTOF(const double x) const override;
+ double singleFromTOF(const double tof) const override;
+ double conversionTOFMin() const override;
+ double conversionTOFMax() const override;
private:
UnitLabel m_label;
@@ -636,8 +636,8 @@ private:
/// Phi that has degrees as unit at "Phi" as title
class MANTID_KERNEL_DLL Phi : public Degrees {
- virtual const std::string caption() const { return "Phi"; }
- virtual Unit *clone() const { return new Phi(*this); }
+ const std::string caption() const override { return "Phi"; }
+ Unit *clone() const override { return new Phi(*this); }
};
//=================================================================================================
diff --git a/Framework/Kernel/inc/MantidKernel/UnitFactory.h b/Framework/Kernel/inc/MantidKernel/UnitFactory.h
index 295c075cbdd41fee8eaa92457d41911a441359c3..0a29b4ccda05837e9ee3527de475e977cc5fe2f2 100644
--- a/Framework/Kernel/inc/MantidKernel/UnitFactory.h
+++ b/Framework/Kernel/inc/MantidKernel/UnitFactory.h
@@ -80,7 +80,7 @@ private:
/// Private assignment operator - NO ASSIGNMENT ALLOWED
UnitFactoryImpl &operator=(const UnitFactoryImpl &);
/// Private Destructor
- virtual ~UnitFactoryImpl();
+ ~UnitFactoryImpl() override;
};
/// Forward declaration of a specialisation of SingletonHolder for
diff --git a/Framework/Kernel/inc/MantidKernel/UserCatalogInfo.h b/Framework/Kernel/inc/MantidKernel/UserCatalogInfo.h
index 0312b59f665dd4d281a14893819c3f1a62da860b..049a3a52383d3e9e0e0c8fe4532d9400fb54cf6b 100644
--- a/Framework/Kernel/inc/MantidKernel/UserCatalogInfo.h
+++ b/Framework/Kernel/inc/MantidKernel/UserCatalogInfo.h
@@ -29,7 +29,7 @@ CatalogConfigService *makeCatalogConfigServiceAdapter(
public:
Adapter(const T &adaptee, const std::string key)
: m_adaptee(adaptee), m_key(key) {}
- virtual OptionalPath preferredMountPoint() const {
+ OptionalPath preferredMountPoint() const override {
return m_adaptee.getString(m_key);
}
};
@@ -68,17 +68,17 @@ public:
const CatalogConfigService &catalogConfigService);
UserCatalogInfo(const UserCatalogInfo &other);
- virtual ~UserCatalogInfo();
+ ~UserCatalogInfo() override;
// ICatalogInfo interface
- const std::string catalogName() const;
- const std::string soapEndPoint() const;
- const std::string externalDownloadURL() const;
- const std::string catalogPrefix() const;
- const std::string windowsPrefix() const;
- const std::string macPrefix() const;
- const std::string linuxPrefix() const;
- UserCatalogInfo *clone() const;
+ const std::string catalogName() const override;
+ const std::string soapEndPoint() const override;
+ const std::string externalDownloadURL() const override;
+ const std::string catalogPrefix() const override;
+ const std::string windowsPrefix() const override;
+ const std::string macPrefix() const override;
+ const std::string linuxPrefix() const override;
+ UserCatalogInfo *clone() const override;
private:
/// Facility catalog info. Aggregation only solution here.
diff --git a/Framework/Kernel/inc/MantidKernel/VisibleWhenProperty.h b/Framework/Kernel/inc/MantidKernel/VisibleWhenProperty.h
index 24a7f889fce9d63a3841a3be80fb678905a5d146..ae9d9fa949c748a5ad1bd12336bee2164f0cc41c 100644
--- a/Framework/Kernel/inc/MantidKernel/VisibleWhenProperty.h
+++ b/Framework/Kernel/inc/MantidKernel/VisibleWhenProperty.h
@@ -47,20 +47,20 @@ public:
std::string value = "");
/// Destructor
- virtual ~VisibleWhenProperty();
+ ~VisibleWhenProperty() override;
//--------------------------------------------------------------------------------------------
/// Return true always
- virtual bool isEnabled(const IPropertyManager *) const;
+ bool isEnabled(const IPropertyManager *) const override;
//--------------------------------------------------------------------------------------------
/// Return true/false based on whether the other property satisfies the
/// criterion
- virtual bool isVisible(const IPropertyManager *algo) const;
+ bool isVisible(const IPropertyManager *algo) const override;
//--------------------------------------------------------------------------------------------
/// Make a copy of the present type of validator
- virtual IPropertySettings *clone();
+ IPropertySettings *clone() override;
};
} // namespace Kernel
diff --git a/Framework/Kernel/src/ANN/bd_tree.h b/Framework/Kernel/src/ANN/bd_tree.h
index 3ea6e56e825240100b978348c220579b7b0b5880..0a0b82aaae700dc4e680cffb24fee78a71f9cb8c 100644
--- a/Framework/Kernel/src/ANN/bd_tree.h
+++ b/Framework/Kernel/src/ANN/bd_tree.h
@@ -76,7 +76,7 @@ public:
child[ANN_OUT] = oc;
}
- ~ANNbd_shrink() // destructor
+ ~ANNbd_shrink() override // destructor
{
if (child[ANN_IN] != NULL && child[ANN_IN] != KD_TRIVIAL)
delete child[ANN_IN];
@@ -86,16 +86,16 @@ public:
delete[] bnds; // delete bounds
}
- virtual void getStats( // get tree statistics
- int dim, // dimension of space
- ANNkdStats &st, // statistics
- ANNorthRect &bnd_box); // bounding box
- virtual void print(int level, ostream &out); // print node
- virtual void dump(ostream &out); // dump node
+ void getStats( // get tree statistics
+ int dim, // dimension of space
+ ANNkdStats &st, // statistics
+ ANNorthRect &bnd_box) override; // bounding box
+ void print(int level, ostream &out) override; // print node
+ void dump(ostream &out) override; // dump node
- virtual void ann_search(ANNdist); // standard search
- virtual void ann_pri_search(ANNdist); // priority search
- virtual void ann_FR_search(ANNdist); // fixed-radius search
+ void ann_search(ANNdist) override; // standard search
+ void ann_pri_search(ANNdist) override; // priority search
+ void ann_FR_search(ANNdist) override; // fixed-radius search
};
#endif
diff --git a/Framework/Kernel/src/ANN/kd_tree.h b/Framework/Kernel/src/ANN/kd_tree.h
index 9031bf402ab5db124fd2bd0c4d22238bfd1ac66c..d4a2dd4c0304d7caf45a1072a6cf05a9c70d0631 100644
--- a/Framework/Kernel/src/ANN/kd_tree.h
+++ b/Framework/Kernel/src/ANN/kd_tree.h
@@ -104,18 +104,18 @@ public:
bkt = b; // the bucket
}
- ~ANNkd_leaf() {} // destructor (none)
-
- virtual void getStats( // get tree statistics
- int dim, // dimension of space
- ANNkdStats &st, // statistics
- ANNorthRect &bnd_box); // bounding box
- virtual void print(int level, ostream &out); // print node
- virtual void dump(ostream &out); // dump node
-
- virtual void ann_search(ANNdist); // standard search
- virtual void ann_pri_search(ANNdist); // priority search
- virtual void ann_FR_search(ANNdist); // fixed-radius search
+ ~ANNkd_leaf() override {} // destructor (none)
+
+ void getStats( // get tree statistics
+ int dim, // dimension of space
+ ANNkdStats &st, // statistics
+ ANNorthRect &bnd_box) override; // bounding box
+ void print(int level, ostream &out) override; // print node
+ void dump(ostream &out) override; // dump node
+
+ void ann_search(ANNdist) override; // standard search
+ void ann_pri_search(ANNdist) override; // priority search
+ void ann_FR_search(ANNdist) override; // fixed-radius search
};
//----------------------------------------------------------------------
@@ -165,7 +165,7 @@ public:
child[ANN_HI] = hc; // right child
}
- ~ANNkd_split() // destructor
+ ~ANNkd_split() override // destructor
{
if (child[ANN_LO] != NULL && child[ANN_LO] != KD_TRIVIAL)
delete child[ANN_LO];
@@ -173,16 +173,16 @@ public:
delete child[ANN_HI];
}
- virtual void getStats( // get tree statistics
- int dim, // dimension of space
- ANNkdStats &st, // statistics
- ANNorthRect &bnd_box); // bounding box
- virtual void print(int level, ostream &out); // print node
- virtual void dump(ostream &out); // dump node
+ void getStats( // get tree statistics
+ int dim, // dimension of space
+ ANNkdStats &st, // statistics
+ ANNorthRect &bnd_box) override; // bounding box
+ void print(int level, ostream &out) override; // print node
+ void dump(ostream &out) override; // dump node
- virtual void ann_search(ANNdist); // standard search
- virtual void ann_pri_search(ANNdist); // priority search
- virtual void ann_FR_search(ANNdist); // fixed-radius search
+ void ann_search(ANNdist) override; // standard search
+ void ann_pri_search(ANNdist) override; // priority search
+ void ann_FR_search(ANNdist) override; // fixed-radius search
};
//----------------------------------------------------------------------
diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp
index 60ae1f0b3a0b5e106ebaae86b991c1cee8f2147f..89c7012edfc3c4094d3ada345226b3bca1c81223 100644
--- a/Framework/Kernel/src/ConfigService.cpp
+++ b/Framework/Kernel/src/ConfigService.cpp
@@ -117,7 +117,7 @@ public:
}
/// Virtual destructor
- virtual ~WrappedObject() {}
+ ~WrappedObject() override {}
/// Overloaded * operator returns the wrapped object pointer
const T &operator*() const { return *m_pPtr; }
diff --git a/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h b/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h
index 0b491b7f6a06f8fd2f8096e5b6a39ab28147d76d..ae48f8ae609a48c46676fe2a947f461adc3f17a4 100644
--- a/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h
+++ b/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h
@@ -495,7 +495,7 @@ class DLLExport DetectorBankSetsPkt : public Packet {
public:
DetectorBankSetsPkt(const DetectorBankSetsPkt &pkt);
- virtual ~DetectorBankSetsPkt();
+ ~DetectorBankSetsPkt() override;
// Detector Bank Set Name, alphanumeric characters...
static const size_t SET_NAME_SIZE = 16;
diff --git a/Framework/LiveData/inc/MantidLiveData/Exception.h b/Framework/LiveData/inc/MantidLiveData/Exception.h
index 8e6191b2cf04eac43550d362fa7cfd3ae0f8632d..234e15607727218cd331e0ce23d24edcba608c45 100644
--- a/Framework/LiveData/inc/MantidLiveData/Exception.h
+++ b/Framework/LiveData/inc/MantidLiveData/Exception.h
@@ -46,7 +46,7 @@ public:
explicit NotYet(const std::string &message) : std::runtime_error(message) {}
/// Destructor
- ~NotYet() throw() {}
+ ~NotYet() throw() override {}
};
} // namespace Exception
diff --git a/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h
index 48ff5e7c0d1a997221fbe1acd878189f978da542..cbf808cee5607b030e0dcf7b8005b6d68130cbf1 100644
--- a/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h
@@ -37,19 +37,21 @@ namespace LiveData {
class FakeEventDataListener : public API::ILiveListener {
public:
FakeEventDataListener();
- ~FakeEventDataListener();
+ ~FakeEventDataListener() override;
- std::string name() const { return "FakeEventDataListener"; }
- bool supportsHistory() const { return false; } // For the time being at least
- bool buffersEvents() const { return true; }
+ std::string name() const override { return "FakeEventDataListener"; }
+ bool supportsHistory() const override {
+ return false;
+ } // For the time being at least
+ bool buffersEvents() const override { return true; }
- bool connect(const Poco::Net::SocketAddress &address);
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime());
- boost::shared_ptr<API::Workspace> extractData();
+ bool connect(const Poco::Net::SocketAddress &address) override;
+ void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ boost::shared_ptr<API::Workspace> extractData() override;
- bool isConnected();
- ILiveListener::RunStatus runStatus();
- int runNumber() const;
+ bool isConnected() override;
+ ILiveListener::RunStatus runStatus() override;
+ int runNumber() const override;
private:
void generateEvents(Poco::Timer &);
diff --git a/Framework/LiveData/inc/MantidLiveData/FakeISISHistoDAE.h b/Framework/LiveData/inc/MantidLiveData/FakeISISHistoDAE.h
index e9d4ec4e7653bbb0a8e80e9ccb6660aa695bba9b..842a66d6c308075776333fd8e5008988808cc639 100644
--- a/Framework/LiveData/inc/MantidLiveData/FakeISISHistoDAE.h
+++ b/Framework/LiveData/inc/MantidLiveData/FakeISISHistoDAE.h
@@ -50,25 +50,25 @@ namespace LiveData {
class DLLExport FakeISISHistoDAE : public API::Algorithm {
public:
FakeISISHistoDAE();
- virtual ~FakeISISHistoDAE();
+ ~FakeISISHistoDAE() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "FakeISISHistoDAE"; };
+ const std::string name() const override { return "FakeISISHistoDAE"; };
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\DataAcquisition";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Simulates ISIS histogram DAE.";
}
private:
// Implement abstract Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Poco TCP server
Poco::Net::TCPServer *m_server;
/// Mutex
diff --git a/Framework/LiveData/inc/MantidLiveData/FileEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/FileEventDataListener.h
index 69221fd5e7f57a685a72cc9fa15a1bf12ff62ca5..9c12fbaa176152586d7c50252fb7b800c9639b1d 100644
--- a/Framework/LiveData/inc/MantidLiveData/FileEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/FileEventDataListener.h
@@ -43,19 +43,21 @@ namespace LiveData {
class FileEventDataListener : public API::ILiveListener {
public:
FileEventDataListener();
- ~FileEventDataListener();
+ ~FileEventDataListener() override;
- std::string name() const { return "FileEventDataListener"; }
- bool supportsHistory() const { return false; } // For the time being at least
- bool buffersEvents() const { return true; }
+ std::string name() const override { return "FileEventDataListener"; }
+ bool supportsHistory() const override {
+ return false;
+ } // For the time being at least
+ bool buffersEvents() const override { return true; }
- bool connect(const Poco::Net::SocketAddress &address);
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime());
- boost::shared_ptr<API::Workspace> extractData();
+ bool connect(const Poco::Net::SocketAddress &address) override;
+ void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ boost::shared_ptr<API::Workspace> extractData() override;
- bool isConnected();
- ILiveListener::RunStatus runStatus();
- int runNumber() const;
+ bool isConnected() override;
+ ILiveListener::RunStatus runStatus() override;
+ int runNumber() const override;
private:
std::string m_filename; ///< The file to read
diff --git a/Framework/LiveData/inc/MantidLiveData/ISISHistoDataListener.h b/Framework/LiveData/inc/MantidLiveData/ISISHistoDataListener.h
index 137ef808770398a60fd223660df4e51ca11e3385..ea68c2ba641bad7fa4d4825f3724ec1490cc9486 100644
--- a/Framework/LiveData/inc/MantidLiveData/ISISHistoDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/ISISHistoDataListener.h
@@ -49,22 +49,22 @@ namespace LiveData {
class ISISHistoDataListener : public API::ILiveListener {
public:
ISISHistoDataListener();
- ~ISISHistoDataListener();
+ ~ISISHistoDataListener() override;
- std::string name() const { return "ISISHistoDataListener"; }
- bool supportsHistory() const { return false; }
- bool buffersEvents() const { return false; }
+ std::string name() const override { return "ISISHistoDataListener"; }
+ bool supportsHistory() const override { return false; }
+ bool buffersEvents() const override { return false; }
- bool connect(const Poco::Net::SocketAddress &address);
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime());
- boost::shared_ptr<API::Workspace> extractData();
+ bool connect(const Poco::Net::SocketAddress &address) override;
+ void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ boost::shared_ptr<API::Workspace> extractData() override;
- bool isConnected();
- ILiveListener::RunStatus runStatus();
- int runNumber() const;
+ bool isConnected() override;
+ ILiveListener::RunStatus runStatus() override;
+ int runNumber() const override;
private:
- void setSpectra(const std::vector<specid_t> &specList);
+ void setSpectra(const std::vector<specid_t> &specList) override;
void setPeriods(const std::vector<specid_t> &periodList);
int getInt(const std::string &par) const;
std::string getString(const std::string &par) const;
diff --git a/Framework/LiveData/inc/MantidLiveData/ISISLiveEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/ISISLiveEventDataListener.h
index 888cc70b9530cefeb79d0d5ef916b7576d34c2de..246b1a7b8e4108654d89b4a2a80cd60e2b89ca74 100644
--- a/Framework/LiveData/inc/MantidLiveData/ISISLiveEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/ISISLiveEventDataListener.h
@@ -59,18 +59,18 @@ public:
/// Constructor.
ISISLiveEventDataListener();
/// Destructor. Should handle termination of any socket connections.
- virtual ~ISISLiveEventDataListener();
+ ~ISISLiveEventDataListener() override;
//----------------------------------------------------------------------
// Static properties
//----------------------------------------------------------------------
/// The name of this listener
- std::string name() const { return "ISISLiveEventDataListener"; }
+ std::string name() const override { return "ISISLiveEventDataListener"; }
/// Does this listener support requests for (recent) past data
- virtual bool supportsHistory() const { return false; }
+ bool supportsHistory() const override { return false; }
/// Does this listener buffer events (true) or histogram data (false)
- virtual bool buffersEvents() const { return true; }
+ bool buffersEvents() const override { return true; }
//----------------------------------------------------------------------
// Actions
@@ -80,7 +80,7 @@ public:
* @param address The IP address and port to contact
* @return True if the connection was successfully established
*/
- bool connect(const Poco::Net::SocketAddress &address);
+ bool connect(const Poco::Net::SocketAddress &address) override;
/** Commence the collection of data from the DAS. Must be called before
* extractData().
@@ -95,7 +95,7 @@ public:
* The value of 'now' is zero for compatibility with the SNS
* live stream.
*/
- virtual void start(Kernel::DateAndTime startTime = Kernel::DateAndTime());
+ void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
/** Get the data that's been buffered since the last call to this method
* (or since start() was called).
@@ -112,7 +112,7 @@ public:
* will call extractData() again a short while later. Any other exception
* will stop the calling algorithm.
*/
- virtual boost::shared_ptr<API::Workspace> extractData();
+ boost::shared_ptr<API::Workspace> extractData() override;
//----------------------------------------------------------------------
// State flags
@@ -121,26 +121,26 @@ public:
/** Has the connection to the DAS been established?
* Could also be used to check for a continued connection.
*/
- bool isConnected();
+ bool isConnected() override;
/** Gets the current run status of the listened-to data stream
* @return A value of the RunStatus enumeration indicating the present status
*/
- virtual ILiveListener::RunStatus runStatus();
+ ILiveListener::RunStatus runStatus() override;
- int runNumber() const;
+ int runNumber() const override;
/** Sets a list of spectra to be extracted. Default is reading all available
* spectra.
* @param specList :: A vector with spectra indices.
*/
- virtual void setSpectra(const std::vector<specid_t> &specList) {
+ void setSpectra(const std::vector<specid_t> &specList) override {
(void)specList;
}
/// the background thread. What gets executed when we call
/// POCO::Thread::start()
- virtual void run();
+ void run() override;
protected:
// Initialize the event buffer
diff --git a/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h b/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h
index dac69dcbc04a0d8cc79a348aaf267477fb7df92c..9177597888fdb3e1532754ceb1ef2a97dab7726c 100644
--- a/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h
+++ b/Framework/LiveData/inc/MantidLiveData/LiveDataAlgorithm.h
@@ -41,15 +41,15 @@ namespace LiveData {
class DLLExport LiveDataAlgorithm : public API::Algorithm {
public:
LiveDataAlgorithm();
- virtual ~LiveDataAlgorithm();
- virtual const std::string category() const;
+ ~LiveDataAlgorithm() override;
+ const std::string category() const override;
void copyPropertyValuesFrom(const LiveDataAlgorithm &other);
Mantid::API::ILiveListener_sptr getLiveListener();
void setLiveListener(Mantid::API::ILiveListener_sptr listener);
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
protected:
void initProps();
diff --git a/Framework/LiveData/inc/MantidLiveData/LoadLiveData.h b/Framework/LiveData/inc/MantidLiveData/LoadLiveData.h
index 90df78e104f44bd44f60c5fb4b4cd5b886b54ed2..c2fb1b2456bbe9d02e5b746d9cabbf1edb624e15 100644
--- a/Framework/LiveData/inc/MantidLiveData/LoadLiveData.h
+++ b/Framework/LiveData/inc/MantidLiveData/LoadLiveData.h
@@ -38,22 +38,22 @@ namespace LiveData {
class DLLExport LoadLiveData : public LiveDataAlgorithm {
public:
LoadLiveData();
- virtual ~LoadLiveData();
+ ~LoadLiveData() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load a chunk of live data. You should call StartLiveData, and not "
"this algorithm directly.";
}
- virtual const std::string category() const;
- virtual int version() const;
+ const std::string category() const override;
+ int version() const override;
- void exec();
+ void exec() override;
private:
- void init();
+ void init() override;
Mantid::API::Workspace_sptr runProcessing(Mantid::API::Workspace_sptr inputWS,
bool PostProcess);
diff --git a/Framework/LiveData/inc/MantidLiveData/MonitorLiveData.h b/Framework/LiveData/inc/MantidLiveData/MonitorLiveData.h
index 5321936695ed9949345acb4d007c00e8fafd7cad..493e59000b4281a3d1f63918c3e907a2295a8d4c 100644
--- a/Framework/LiveData/inc/MantidLiveData/MonitorLiveData.h
+++ b/Framework/LiveData/inc/MantidLiveData/MonitorLiveData.h
@@ -38,21 +38,21 @@ namespace LiveData {
class DLLExport MonitorLiveData : public LiveDataAlgorithm {
public:
MonitorLiveData();
- virtual ~MonitorLiveData();
+ ~MonitorLiveData() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Call LoadLiveData at a given update frequency. Do not call this "
"algorithm directly; instead call StartLiveData.";
}
- virtual const std::string category() const;
- virtual int version() const;
+ const std::string category() const override;
+ int version() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void doClone(const std::string &originalName, const std::string &newName);
public:
diff --git a/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h
index 7a6f2ec5b4819f084828797a909218497b76e04e..ed642bdb2a4b0ef9bc8831f5c8a7d94b99e6c460 100644
--- a/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/SNSLiveEventDataListener.h
@@ -43,42 +43,42 @@ class SNSLiveEventDataListener : public API::ILiveListener,
public ADARA::Parser {
public:
SNSLiveEventDataListener();
- virtual ~SNSLiveEventDataListener();
+ ~SNSLiveEventDataListener() override;
- std::string name() const { return "SNSLiveEventDataListener"; }
- bool supportsHistory() const { return true; }
- bool buffersEvents() const { return true; }
+ std::string name() const override { return "SNSLiveEventDataListener"; }
+ bool supportsHistory() const override { return true; }
+ bool buffersEvents() const override { return true; }
- bool connect(const Poco::Net::SocketAddress &address);
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime());
- boost::shared_ptr<API::Workspace> extractData();
+ bool connect(const Poco::Net::SocketAddress &address) override;
+ void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ boost::shared_ptr<API::Workspace> extractData() override;
- ILiveListener::RunStatus runStatus();
+ ILiveListener::RunStatus runStatus() override;
// Note: runStatus() might actually update the value of m_status, so
// it probably shouldn't be called by other member functions. The
// logic it uses for updating m_status is only valid if the function
// is only called by the MonitorLiveData algorithm.
- int runNumber() const { return m_runNumber; };
+ int runNumber() const override { return m_runNumber; };
- bool isConnected();
+ bool isConnected() override;
- virtual void run(); // the background thread. What gets executed when we
- // call POCO::Thread::start()
+ void run() override; // the background thread. What gets executed when we
+ // call POCO::Thread::start()
protected:
using ADARA::Parser::rxPacket;
// virtual bool rxPacket( const ADARA::Packet &pkt);
// virtual bool rxPacket( const ADARA::RawDataPkt &pkt);
- virtual bool rxPacket(const ADARA::BankedEventPkt &pkt);
- virtual bool rxPacket(const ADARA::BeamMonitorPkt &pkt);
- virtual bool rxPacket(const ADARA::GeometryPkt &pkt);
- virtual bool rxPacket(const ADARA::BeamlineInfoPkt &pkt);
- virtual bool rxPacket(const ADARA::RunStatusPkt &pkt);
- virtual bool rxPacket(const ADARA::VariableU32Pkt &pkt);
- virtual bool rxPacket(const ADARA::VariableDoublePkt &pkt);
- virtual bool rxPacket(const ADARA::VariableStringPkt &pkt);
- virtual bool rxPacket(const ADARA::DeviceDescriptorPkt &pkt);
- virtual bool rxPacket(const ADARA::AnnotationPkt &pkt);
+ bool rxPacket(const ADARA::BankedEventPkt &pkt) override;
+ bool rxPacket(const ADARA::BeamMonitorPkt &pkt) override;
+ bool rxPacket(const ADARA::GeometryPkt &pkt) override;
+ bool rxPacket(const ADARA::BeamlineInfoPkt &pkt) override;
+ bool rxPacket(const ADARA::RunStatusPkt &pkt) override;
+ bool rxPacket(const ADARA::VariableU32Pkt &pkt) override;
+ bool rxPacket(const ADARA::VariableDoublePkt &pkt) override;
+ bool rxPacket(const ADARA::VariableStringPkt &pkt) override;
+ bool rxPacket(const ADARA::DeviceDescriptorPkt &pkt) override;
+ bool rxPacket(const ADARA::AnnotationPkt &pkt) override;
// virtual bool rxPacket( const ADARA::RunInfoPkt &pkt);
private:
diff --git a/Framework/LiveData/inc/MantidLiveData/StartLiveData.h b/Framework/LiveData/inc/MantidLiveData/StartLiveData.h
index fcd7bd1db9f90bb7e4917b8bd604137123fc8558..08cec060769c341b04f0b1c740e331e316675015 100644
--- a/Framework/LiveData/inc/MantidLiveData/StartLiveData.h
+++ b/Framework/LiveData/inc/MantidLiveData/StartLiveData.h
@@ -46,19 +46,19 @@ namespace LiveData {
class DLLExport StartLiveData : public LiveDataAlgorithm {
public:
StartLiveData();
- virtual ~StartLiveData();
+ ~StartLiveData() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Begin live data monitoring.";
}
- virtual int version() const;
+ int version() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace LiveData
diff --git a/Framework/LiveData/inc/MantidLiveData/TOPAZLiveEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/TOPAZLiveEventDataListener.h
index 8cc5865ce56ea4f0af11d438c6078cfe43855453..e088fe1fdf59962c67eaaea627aed076a094e27b 100644
--- a/Framework/LiveData/inc/MantidLiveData/TOPAZLiveEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/TOPAZLiveEventDataListener.h
@@ -42,25 +42,25 @@ class TOPAZLiveEventDataListener : public API::ILiveListener,
public Poco::Runnable {
public:
TOPAZLiveEventDataListener();
- virtual ~TOPAZLiveEventDataListener();
+ ~TOPAZLiveEventDataListener() override;
- std::string name() const { return "TOPAZLiveEventDataListener"; }
- bool supportsHistory() const { return false; }
- bool buffersEvents() const { return true; }
+ std::string name() const override { return "TOPAZLiveEventDataListener"; }
+ bool supportsHistory() const override { return false; }
+ bool buffersEvents() const override { return true; }
- bool connect(const Poco::Net::SocketAddress &address);
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime());
- boost::shared_ptr<API::Workspace> extractData();
+ bool connect(const Poco::Net::SocketAddress &address) override;
+ void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ boost::shared_ptr<API::Workspace> extractData() override;
- ILiveListener::RunStatus runStatus();
+ ILiveListener::RunStatus runStatus() override;
// Called by the MonitorLiveData algorithm.
- int runNumber() const { return m_runNumber; };
+ int runNumber() const override { return m_runNumber; };
- bool isConnected();
+ bool isConnected() override;
- virtual void run(); // the background thread. What gets executed when we
- // call POCO::Thread::start()
+ void run() override; // the background thread. What gets executed when we
+ // call POCO::Thread::start()
protected:
private:
void initWorkspace();
diff --git a/Framework/LiveData/src/FakeISISHistoDAE.cpp b/Framework/LiveData/src/FakeISISHistoDAE.cpp
index ac8f9e37d982c67f8e436e4dbbb7d3495443fc32..da71be9f082c067224f82aad838dd7814e3128aa 100644
--- a/Framework/LiveData/src/FakeISISHistoDAE.cpp
+++ b/Framework/LiveData/src/FakeISISHistoDAE.cpp
@@ -81,7 +81,7 @@ public:
sendOK();
}
/// Destructor.
- ~TestServerConnection() {
+ ~TestServerConnection() override {
// std::cerr << "Test connection deleted" << std::endl;
}
/// Sends an OK message when there is nothing to send or an error occured
@@ -191,7 +191,7 @@ public:
/**
* Main method that reads commands from the socket and send out the data.
*/
- void run() {
+ void run() override {
for (;;) {
char buffer[1024];
isisds_command_header_t comm;
@@ -302,7 +302,7 @@ public:
* @param socket :: The socket.
*/
Poco::Net::TCPServerConnection *
- createConnection(const Poco::Net::StreamSocket &socket) {
+ createConnection(const Poco::Net::StreamSocket &socket) override {
return new TestServerConnection(socket, m_nPeriods, m_nSpectra, m_nBins);
}
};
diff --git a/Framework/LiveData/test/TestDataListener.h b/Framework/LiveData/test/TestDataListener.h
index 7dfa91b47a59647d71198b5f3c52e05278829657..0d0be9dd7ca878d8324ba070a42e78fa1bc47ac5 100644
--- a/Framework/LiveData/test/TestDataListener.h
+++ b/Framework/LiveData/test/TestDataListener.h
@@ -17,19 +17,19 @@ namespace LiveData {
class TestDataListener : public API::ILiveListener {
public:
TestDataListener();
- ~TestDataListener();
+ ~TestDataListener() override;
- std::string name() const { return "TestDataListener"; }
- bool supportsHistory() const { return false; }
- bool buffersEvents() const { return true; }
+ std::string name() const override { return "TestDataListener"; }
+ bool supportsHistory() const override { return false; }
+ bool buffersEvents() const override { return true; }
- bool connect(const Poco::Net::SocketAddress &address);
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime());
- boost::shared_ptr<API::Workspace> extractData();
+ bool connect(const Poco::Net::SocketAddress &address) override;
+ void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ boost::shared_ptr<API::Workspace> extractData() override;
- bool isConnected();
- ILiveListener::RunStatus runStatus();
- int runNumber() const;
+ bool isConnected() override;
+ ILiveListener::RunStatus runStatus() override;
+ int runNumber() const override;
private:
DataObjects::EventWorkspace_sptr m_buffer;
diff --git a/Framework/LiveData/test/TestGroupDataListener.h b/Framework/LiveData/test/TestGroupDataListener.h
index e5fdf4d512f0a936fbdeaea0128db2d46c9db703..62054aabd4e27e4e0ef91be29355f6c9307e8a3f 100644
--- a/Framework/LiveData/test/TestGroupDataListener.h
+++ b/Framework/LiveData/test/TestGroupDataListener.h
@@ -16,19 +16,19 @@ namespace LiveData {
class TestGroupDataListener : public API::ILiveListener {
public:
TestGroupDataListener();
- ~TestGroupDataListener();
+ ~TestGroupDataListener() override;
- std::string name() const { return "TestDataListener"; }
- bool supportsHistory() const { return false; }
- bool buffersEvents() const { return true; }
+ std::string name() const override { return "TestDataListener"; }
+ bool supportsHistory() const override { return false; }
+ bool buffersEvents() const override { return true; }
- bool connect(const Poco::Net::SocketAddress &address);
- void start(Kernel::DateAndTime startTime = Kernel::DateAndTime());
- boost::shared_ptr<API::Workspace> extractData();
+ bool connect(const Poco::Net::SocketAddress &address) override;
+ void start(Kernel::DateAndTime startTime = Kernel::DateAndTime()) override;
+ boost::shared_ptr<API::Workspace> extractData() override;
- bool isConnected();
- ILiveListener::RunStatus runStatus();
- int runNumber() const;
+ bool isConnected() override;
+ ILiveListener::RunStatus runStatus() override;
+ int runNumber() const override;
private:
API::WorkspaceGroup_sptr m_buffer;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/AccumulateMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/AccumulateMD.h
index 57137f029333165f0f81a51c7c1db1b52eb1e727..b2d5f228a73d5ef1e1cb88e26788ff5289efd3fb 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/AccumulateMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/AccumulateMD.h
@@ -87,16 +87,16 @@ padParameterVector(std::vector<double> ¶m_vector,
class DLLExport AccumulateMD : public API::DataProcessorAlgorithm {
public:
AccumulateMD();
- virtual ~AccumulateMD();
+ ~AccumulateMD() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Use the CreateMD algorithm to create an MD workspace
Mantid::API::IMDEventWorkspace_sptr createMDWorkspace(
@@ -104,7 +104,7 @@ private:
const std::vector<double> &psi, const std::vector<double> &gl,
const std::vector<double> &gs, const std::vector<double> &efix);
- std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/AndMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/AndMD.h
index d15a1c5a50b68f7a9db16bc36f7de8ce0ccd30a9..90157224be81e5f06abafff98362add980272a5e 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/AndMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/AndMD.h
@@ -37,14 +37,15 @@ namespace MDAlgorithms {
class DLLExport AndMD : public BooleanBinaryOperationMD {
public:
AndMD();
- virtual ~AndMD();
+ ~AndMD() override;
- virtual const std::string name() const;
- virtual int version() const;
+ const std::string name() const override;
+ int version() const override;
private:
- void execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::MDHistoWorkspace_const_sptr operand);
+ void execHistoHisto(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BinMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BinMD.h
index 5f5f689d448f7464043aed2feab6132c232dc0bb..cee4f51932870a46f7cd8ea9adb79761559ddd57 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BinMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BinMD.h
@@ -33,26 +33,28 @@ namespace MDAlgorithms {
class DLLExport BinMD : public SlicingAlgorithm {
public:
BinMD();
- ~BinMD();
+ ~BinMD() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "BinMD"; }
+ const std::string name() const override { return "BinMD"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Take a MDEventWorkspace and bin into into a dense, "
"multi-dimensional histogram workspace (MDHistoWorkspace).";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const { return "MDAlgorithms\\Slicing"; }
+ const std::string category() const override {
+ return "MDAlgorithms\\Slicing";
+ }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
// /// Helper method
// template<typename MDE, size_t nd>
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BinaryOperationMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BinaryOperationMD.h
index 53ef93539efcffa03d9870463aca4159e9afde6e..74e5136c8234a552310b85f6ee3c6eafaf542408 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BinaryOperationMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BinaryOperationMD.h
@@ -46,12 +46,12 @@ namespace MDAlgorithms {
class DLLExport BinaryOperationMD : public API::Algorithm {
public:
BinaryOperationMD();
- virtual ~BinaryOperationMD();
+ ~BinaryOperationMD() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const {
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override {
return "Abstract base class for binary operations on IMDWorkspaces, e.g. A "
"= B + C or A = B / C.";
}
@@ -83,9 +83,9 @@ protected:
/// The name of the output workspace property
virtual std::string outputPropName() const { return "OutputWorkspace"; }
- void init();
+ void init() override;
virtual void initExtraProperties();
- virtual void exec();
+ void exec() override;
/// LHS workspace
Mantid::API::IMDWorkspace_sptr m_lhs;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BooleanBinaryOperationMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BooleanBinaryOperationMD.h
index 028f5cf745d70a11f923b5c1faab20e726e7fa91..92106abb060ccf2e0e541d683c3cc7a7bdc23989 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BooleanBinaryOperationMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BooleanBinaryOperationMD.h
@@ -37,28 +37,28 @@ namespace MDAlgorithms {
class DLLExport BooleanBinaryOperationMD : public BinaryOperationMD {
public:
BooleanBinaryOperationMD();
- virtual ~BooleanBinaryOperationMD();
+ ~BooleanBinaryOperationMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const;
+ const std::string summary() const override;
- virtual int version() const;
+ int version() const override;
protected:
/// Return true if the algorithm can operate on a scalar.
virtual bool acceptScalar() const { return true; }
- virtual bool commutative() const;
- void checkInputs();
- void execEvent();
- virtual void
- execHistoScalar(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar);
+ bool commutative() const override;
+ void checkInputs() override;
+ void execEvent() override;
+ void execHistoScalar(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar) override;
/// Run the algorithm with a MDHisotWorkspace as output and operand
- virtual void
- execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) = 0;
+ void execHistoHisto(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) override = 0;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BoxControllerSettingsAlgorithm.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BoxControllerSettingsAlgorithm.h
index aab8d17553b390a52ace084b6c75f3fa334c297f..eb10474ccd171e9455455d456cbebd795499f0cc 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BoxControllerSettingsAlgorithm.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/BoxControllerSettingsAlgorithm.h
@@ -41,7 +41,7 @@ namespace MDAlgorithms {
class DLLExport BoxControllerSettingsAlgorithm : public API::Algorithm {
public:
BoxControllerSettingsAlgorithm();
- ~BoxControllerSettingsAlgorithm();
+ ~BoxControllerSettingsAlgorithm() override;
protected:
/// Initialise the properties
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CalculateCoverageDGS.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CalculateCoverageDGS.h
index 5f5e76dbc39b04a00df11ae77c9d3aeb6ae1baa9..e138284ad3309021deac1e4aaa342b7d309d9dcb 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CalculateCoverageDGS.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CalculateCoverageDGS.h
@@ -35,16 +35,16 @@ namespace MDAlgorithms {
class DLLExport CalculateCoverageDGS : public API::Algorithm {
public:
CalculateCoverageDGS();
- virtual ~CalculateCoverageDGS();
+ ~CalculateCoverageDGS() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
// ki-kf for Inelastic convention; kf-ki for Crystallography convention
std::string convention;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CentroidPeaksMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CentroidPeaksMD.h
index 8c944647ffcd4ce1d8bcfa49fb0f7f887e873c87..86a930c74f1fed679d0007a7d43ce9093846e616 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CentroidPeaksMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CentroidPeaksMD.h
@@ -19,26 +19,26 @@ namespace MDAlgorithms {
class DLLExport CentroidPeaksMD : public API::Algorithm {
public:
CentroidPeaksMD();
- ~CentroidPeaksMD();
+ ~CentroidPeaksMD() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "CentroidPeaksMD"; };
+ const std::string name() const override { return "CentroidPeaksMD"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Find the centroid of single-crystal peaks in a MDEventWorkspace, "
"in order to refine their positions.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "MDAlgorithms\\Peaks"; }
+ const std::string category() const override { return "MDAlgorithms\\Peaks"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
template <typename MDE, size_t nd>
void integrate(typename DataObjects::MDEventWorkspace<MDE, nd>::sptr ws);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CentroidPeaksMD2.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CentroidPeaksMD2.h
index 4606989eebba2193d6e8f58fae9b457ba0ce0419..09a8ec98fbbb1babf401c18eefa1c6205bcb2890 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CentroidPeaksMD2.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CentroidPeaksMD2.h
@@ -19,26 +19,26 @@ namespace MDAlgorithms {
class DLLExport CentroidPeaksMD2 : public API::Algorithm {
public:
CentroidPeaksMD2();
- ~CentroidPeaksMD2();
+ ~CentroidPeaksMD2() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "CentroidPeaksMD"; };
+ const std::string name() const override { return "CentroidPeaksMD"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Find the centroid of single-crystal peaks in a MDEventWorkspace, "
"in order to refine their positions.";
}
/// Algorithm's version for identification
- virtual int version() const { return 2; };
+ int version() const override { return 2; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "MDAlgorithms\\Peaks"; }
+ const std::string category() const override { return "MDAlgorithms\\Peaks"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
template <typename MDE, size_t nd>
void integrate(typename DataObjects::MDEventWorkspace<MDE, nd>::sptr ws);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ChangeQConvention.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ChangeQConvention.h
index 6d9bd84077783ada7c9142f6991333ceec081b34..70ca1f463fc572d2ce61978802866d795e5b8261 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ChangeQConvention.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ChangeQConvention.h
@@ -35,27 +35,27 @@ namespace MDAlgorithms {
class DLLExport ChangeQConvention : public API::Algorithm {
public:
ChangeQConvention();
- ~ChangeQConvention();
+ ~ChangeQConvention() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "ChangeQConvention"; };
+ const std::string name() const override { return "ChangeQConvention"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Change the convention of MD workspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\DataHandling";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace DataObjects
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CloneMDWorkspace.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CloneMDWorkspace.h
index 66abd2ea535da7ce54d8eb031df24266e54520d7..94a2c05a5262551cc14f2d4912109bb601e2aff6 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CloneMDWorkspace.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CloneMDWorkspace.h
@@ -38,28 +38,28 @@ namespace MDAlgorithms {
class DLLExport CloneMDWorkspace : public API::Algorithm {
public:
CloneMDWorkspace();
- ~CloneMDWorkspace();
+ ~CloneMDWorkspace() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "CloneMDWorkspace"; };
+ const std::string name() const override { return "CloneMDWorkspace"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Clones (copies) an existing MDEventWorkspace or MDHistoWorkspace "
"into a new one.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\Utility\\Workspaces;MDAlgorithms\\Creation";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
template <typename MDE, size_t nd>
void doClone(const typename DataObjects::MDEventWorkspace<MDE, nd>::sptr ws);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
index 7d4e012d680d141bc711d8ff7e6999f59a2c08f2..d8c3217fc752dd8438f704fe853b5d4ddb351e63 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompactMD.h
@@ -39,22 +39,22 @@ namespace MDAlgorithms {
class DLLExport CompactMD : public API::Algorithm {
public:
CompactMD(){};
- ~CompactMD(){};
+ ~CompactMD() override{};
- virtual void init();
- virtual void exec();
+ void init() override;
+ void exec() override;
/// Algorithm's name for identification
- const std::string name() const { return "CompactMD"; }
+ const std::string name() const override { return "CompactMD"; }
/// Summary of algorithms purpose
- const std::string summary() const {
+ const std::string summary() const override {
return "Crops an MDHistoWorkspace based on the first non-zero signals "
"giving a more focussed area of interest.";
}
- const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\Utility\\Workspaces";
}
/// Algorithm's version for identification
- int version() const { return 1; }
+ int version() const override { return 1; }
/// Finding the extents of the first non-zero signals.
void
findFirstNonZeroMinMaxExtents(Mantid::API::IMDHistoWorkspace_sptr inputWs,
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompareMDWorkspaces.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompareMDWorkspaces.h
index d51d54dd9f389b3f766ac5db7261c22c0d4e65b4..a22d69e63ba56c0873e306d610503480c03621b6 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompareMDWorkspaces.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CompareMDWorkspaces.h
@@ -38,20 +38,20 @@ namespace MDAlgorithms {
class DLLExport CompareMDWorkspaces : public API::Algorithm {
public:
CompareMDWorkspaces();
- virtual ~CompareMDWorkspaces();
+ ~CompareMDWorkspaces() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Compare two MDWorkspaces for equality.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void doComparison();
void compareMDGeometry(Mantid::API::IMDWorkspace_sptr ws1,
Mantid::API::IMDWorkspace_sptr ws2);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvToMDEventsWS.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvToMDEventsWS.h
index a46e43344b1ee7d91894b1a96a9cedda31f8ff29..8556bcd5fd2843b45c85485e0e136545b3e702ef 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvToMDEventsWS.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvToMDEventsWS.h
@@ -57,12 +57,12 @@ class ConvToMDEventsWS : public ConvToMDBase {
public:
size_t initialize(const MDWSDescription &WSD,
boost::shared_ptr<MDEventWSWrapper> inWSWrapper,
- bool ignoreZeros);
- void runConversion(API::Progress *pProgress);
+ bool ignoreZeros) override;
+ void runConversion(API::Progress *pProgress) override;
private:
// function runs the conversion on
- virtual size_t conversionChunk(size_t workspaceIndex);
+ size_t conversionChunk(size_t workspaceIndex) override;
// the pointer to the source event workspace as event ws does not work through
// the public Matrix WS interface
DataObjects::EventWorkspace_const_sptr m_EventWS;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvToMDHistoWS.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvToMDHistoWS.h
index 5ff12bea5d6eec41d94da726a8ef408a28f8d4d9..4ffdee3b51efba0d6321d00261f0290187ebd3cd 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvToMDHistoWS.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvToMDHistoWS.h
@@ -56,9 +56,9 @@ public:
size_t initialize(const MDWSDescription &WSD,
boost::shared_ptr<MDEventWSWrapper> inWSWrapper,
- bool ignoreZeros);
+ bool ignoreZeros) override;
- void runConversion(API::Progress *pProgress);
+ void runConversion(API::Progress *pProgress) override;
private:
// the number of spectra to process by single computational thread;
@@ -70,7 +70,7 @@ private:
void estimateThreadWork(size_t nThreads, size_t specSize,
size_t nPointsToProcess);
// the function does a chunk of work. Expected to run on a thread.
- size_t conversionChunk(size_t job_ID);
+ size_t conversionChunk(size_t job_ID) override;
};
} // endNamespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertCWPDMDToSpectra.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertCWPDMDToSpectra.h
index 6430e8e7c947247a942c5b9c26334c2e214f4050..bd855770f3e7617875ed942aa221d452c12b0beb 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertCWPDMDToSpectra.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertCWPDMDToSpectra.h
@@ -101,13 +101,13 @@ class DLLExport ConvertCWPDMDToSpectra : public API::Algorithm {
public:
ConvertCWPDMDToSpectra();
- virtual ~ConvertCWPDMDToSpectra();
+ ~ConvertCWPDMDToSpectra() override;
/// Algorithm's name
- virtual const std::string name() const { return "ConvertCWPDMDToSpectra"; }
+ const std::string name() const override { return "ConvertCWPDMDToSpectra"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Convert constant wavelength (CW) powder diffraction (PD) data in "
"MDEventWorksapces "
" to a single-spectrum MatrixWorkspace, i.e., binning the "
@@ -117,19 +117,19 @@ public:
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\ConstantWavelength;Diffraction\\Focussing";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Main algorithm to reduce powder diffraction data
API::MatrixWorkspace_sptr reducePowderData(
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertCWSDExpToMomentum.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertCWSDExpToMomentum.h
index b0d6b716db12c503e974a07b3dd7372b8628d6bd..e5729016a21953ab0a8ac58c49c5e9e6b04ab79c 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertCWSDExpToMomentum.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertCWSDExpToMomentum.h
@@ -37,27 +37,27 @@ namespace MDAlgorithms {
class DLLExport ConvertCWSDExpToMomentum : public API::Algorithm {
public:
ConvertCWSDExpToMomentum();
- virtual ~ConvertCWSDExpToMomentum();
+ ~ConvertCWSDExpToMomentum() override;
/// Algorithm's name
- virtual const std::string name() const { return "ConvertCWSDExpToMomentum"; }
+ const std::string name() const override { return "ConvertCWSDExpToMomentum"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load and convert a set of files in an HB3A experiment.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\ConstantWavelength;DataHandling\\Text";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void addMDEvents(bool usevirtual);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertCWSDMDtoHKL.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertCWSDMDtoHKL.h
index 48c69d268c0d4cb0c8f3fe6d6666aa67f6bf8cae..2e57541a0b6b8ff8cc49a68fcad69fad2cff8e01 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertCWSDMDtoHKL.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertCWSDMDtoHKL.h
@@ -38,32 +38,32 @@ namespace MDAlgorithms {
class MANTID_MDALGORITHMS_DLL ConvertCWSDMDtoHKL : public API::Algorithm {
public:
ConvertCWSDMDtoHKL();
- virtual ~ConvertCWSDMDtoHKL();
+ ~ConvertCWSDMDtoHKL() override;
/// Algorithm's name
- virtual const std::string name() const { return "ConvertCWSDMDtoHKL"; }
+ const std::string name() const override { return "ConvertCWSDMDtoHKL"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Convert constant wavelength single crystal diffractomer's data"
"in MDEventWorkspace and in unit of Q-sample to the HKL space "
"by UB matrix.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\ConstantWavelength";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void exportEvents(API::IMDEventWorkspace_sptr mdws,
std::vector<Kernel::V3D> &vec_event_qsample,
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertMDHistoToMatrixWorkspace.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertMDHistoToMatrixWorkspace.h
index 0cb01568ece3360521787aefd8aef39a800656f0..62d3c320801ea496d0e675fc10159892df3feb16 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertMDHistoToMatrixWorkspace.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertMDHistoToMatrixWorkspace.h
@@ -53,29 +53,29 @@ public:
/// (Empty) Constructor
ConvertMDHistoToMatrixWorkspace() : API::Algorithm() {}
/// Virtual destructor
- virtual ~ConvertMDHistoToMatrixWorkspace() {}
+ ~ConvertMDHistoToMatrixWorkspace() override {}
/// Algorithm's name
- virtual const std::string name() const {
+ const std::string name() const override {
return "ConvertMDHistoToMatrixWorkspace";
};
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Converts if it can a IMDHistoWorkspace to a Workspace2D.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Utility\\Workspaces;MDAlgorithms\\Transforms";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Make MatrixWorkspace with 1 spectrum
void make1DWorkspace();
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h
index 39f4794955e691a5c75df3cc3d94e072ba80a3c1..0cb2ca16709cf34f56dacbe0671e0e216e6cb983 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertSpiceDataToRealSpace.h
@@ -37,23 +37,23 @@ namespace MDAlgorithms {
class DLLExport ConvertSpiceDataToRealSpace : public API::Algorithm {
public:
ConvertSpiceDataToRealSpace();
- virtual ~ConvertSpiceDataToRealSpace();
+ ~ConvertSpiceDataToRealSpace() override;
/// Algorithm's name
- virtual const std::string name() const {
+ const std::string name() const override {
return "ConvertSpiceDataToRealSpace";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load a HFIR powder diffractometer SPICE file.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\ConstantWavelength;DataHandling\\Text";
}
@@ -65,10 +65,10 @@ private:
typedef std::deque<std::string> DataCollectionType;
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Load data by call
DataObjects::TableWorkspace_sptr
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToDetectorFaceMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToDetectorFaceMD.h
index 951ffc6ae81ece960d6a0e053ea12394fd2378b7..0196b9e3fefcceae6b85bf4edaf591c638979a7e 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToDetectorFaceMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToDetectorFaceMD.h
@@ -41,21 +41,21 @@ class DLLExport ConvertToDetectorFaceMD
: public MDAlgorithms::BoxControllerSettingsAlgorithm {
public:
ConvertToDetectorFaceMD();
- virtual ~ConvertToDetectorFaceMD();
+ ~ConvertToDetectorFaceMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Convert a MatrixWorkspace containing to a MD workspace for viewing "
"the detector face.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
std::map<int, Geometry::RectangularDetector_const_sptr> getBanks();
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToDiffractionMDWorkspace.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToDiffractionMDWorkspace.h
index 2c2775f5a844ef32ac722d66e082a5b93e987c5e..9cb97504f590c6a88d2120cad280ea66644526db 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToDiffractionMDWorkspace.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToDiffractionMDWorkspace.h
@@ -25,25 +25,25 @@ public:
ConvertToDiffractionMDWorkspace();
/// Algorithm's name for identification
- virtual const std::string name() const {
+ const std::string name() const override {
return "ConvertToDiffractionMDWorkspace";
};
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Create a MDEventWorkspace with events in reciprocal space (Qx, Qy, "
"Qz) for an elastic diffraction experiment.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\Creation";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
template <class T>
void convertEventList(int workspaceIndex, DataObjects::EventList &el);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToDiffractionMDWorkspace2.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToDiffractionMDWorkspace2.h
index b083d953bab6845f43ada834aac4dc6f83cd0d92..7ef64b1167c5c76605f82c0d4f1dc7c593a6a32d 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToDiffractionMDWorkspace2.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToDiffractionMDWorkspace2.h
@@ -22,28 +22,28 @@ public:
/** Constructor */
ConvertToDiffractionMDWorkspace2() {}
/** Destructor */
- virtual ~ConvertToDiffractionMDWorkspace2() {}
+ ~ConvertToDiffractionMDWorkspace2() override {}
/// Algorithm's name for identification
- virtual const std::string name() const {
+ const std::string name() const override {
return "ConvertToDiffractionMDWorkspace";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Create a MDEventWorkspace with events in reciprocal space (Qx, Qy, "
"Qz) for an elastic diffraction experiment.";
}
/// Algorithm's version for identification
- virtual int version() const { return 2; }
+ int version() const override { return 2; }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\Creation";
}
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
// the target frame names exposed as the algorithm properties and recognized
// by old convertToDiffractionWorkspace algorithm.
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h
index 3112f5406d7182fd0bfa8dad374636663a950f0b..94a901cc47865c9a35d8bc1b6e87af780fb6a3c7 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h
@@ -51,12 +51,12 @@ namespace MDAlgorithms {
class DLLExport ConvertToMD : public ConvertToMDParent {
public:
ConvertToMD();
- ~ConvertToMD();
+ ~ConvertToMD() override;
/// Algorithm's name for identification
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Create a MDEventWorkspace with selected dimensions, e.g. the "
"reciprocal space of momentums (Qx, Qy, Qz) or momentums modules "
"mod(Q), energy transfer dE if available and any other user "
@@ -64,12 +64,12 @@ public:
}
/// Algorithm's version for identification
- virtual int version() const;
+ int version() const override;
private:
- std::map<std::string, std::string> validateInputs();
- void exec();
- void init();
+ std::map<std::string, std::string> validateInputs() override;
+ void exec() override;
+ void init() override;
/// progress reporter
boost::scoped_ptr<API::Progress> m_Progress;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDMinMaxGlobal.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDMinMaxGlobal.h
index 0109406c5fa4175585dbe0abc99ad479c192b654..43efa28f53a37346139fc44f14385efde1277e4d 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDMinMaxGlobal.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDMinMaxGlobal.h
@@ -36,21 +36,21 @@ namespace MDAlgorithms {
class DLLExport ConvertToMDMinMaxGlobal : public API::Algorithm {
public:
ConvertToMDMinMaxGlobal();
- virtual ~ConvertToMDMinMaxGlobal();
+ ~ConvertToMDMinMaxGlobal() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate limits for ConvertToMD transformation, achievable on a "
"spheric instrument.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDMinMaxLocal.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDMinMaxLocal.h
index 32acb5f7f1eb8eb986ed23ff5fc1bb501c2ce473..c641fa2cbd111f4a89db6c1ea3972f09e3eca693 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDMinMaxLocal.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDMinMaxLocal.h
@@ -34,16 +34,16 @@ namespace MDAlgorithms {
class DLLExport ConvertToMDMinMaxLocal : public ConvertToMDParent {
public:
ConvertToMDMinMaxLocal();
- virtual ~ConvertToMDMinMaxLocal();
+ ~ConvertToMDMinMaxLocal() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Calculate limits of ConvertToMD transformation possible for this "
"particular workspace and the instrument, attached to it.";
}
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
protected: // for testing
void findMinMaxValues(MDWSDescription &targWSDescr,
@@ -53,8 +53,8 @@ protected: // for testing
std::vector<double> &MaxValues);
private:
- void exec();
- void init();
+ void exec() override;
+ void init() override;
/// pointer to the input workspace;
Mantid::DataObjects::Workspace2D_sptr m_MinMaxWS2D;
};
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDParent.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDParent.h
index ce3bce5662a49510111a7a005d121962d9912117..ec8009c2a867d790927bd70535439567ff462bb2 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDParent.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDParent.h
@@ -48,17 +48,17 @@ namespace MDAlgorithms {
class DLLExport ConvertToMDParent : public BoxControllerSettingsAlgorithm {
public:
ConvertToMDParent() {}
- ~ConvertToMDParent() {}
+ ~ConvertToMDParent() override {}
/// Algorithm's name for identification
- virtual const std::string name() const = 0;
+ const std::string name() const override = 0;
/// Algorithm's version for identification
- virtual int version() const = 0;
+ int version() const override = 0;
/// Algorithm's category for identification
- virtual const std::string category() const;
+ const std::string category() const override;
protected:
- void init();
+ void init() override;
//
DataObjects::TableWorkspace_const_sptr preprocessDetectorsPositions(
const Mantid::API::MatrixWorkspace_const_sptr &InWS2D,
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToReflectometryQ.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToReflectometryQ.h
index 4137496a8026f10d62ae80dd3f5101a72f58be19..21cbd98c0632680202100dd601e0d6638d3840ab 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToReflectometryQ.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToReflectometryQ.h
@@ -36,21 +36,21 @@ class DLLExport ConvertToReflectometryQ
: public BoxControllerSettingsAlgorithm {
public:
ConvertToReflectometryQ();
- virtual ~ConvertToReflectometryQ();
+ ~ConvertToReflectometryQ() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Transforms from real-space to Q or momentum space for "
"reflectometry workspaces";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMD.h
index bef90ae36685a330d70eabf55c9b3bf02349dada..dd3124d61e5230bd44c529427e958993f500409d 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMD.h
@@ -44,16 +44,16 @@ extern bool dataExists(const std::string &data_name);
class MANTID_MDALGORITHMS_DLL CreateMD : public API::DataProcessorAlgorithm {
public:
CreateMD();
- virtual ~CreateMD();
+ ~CreateMD() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// Load data from file into a workspace
Mantid::API::Workspace_sptr loadWs(const std::string &filename,
@@ -91,7 +91,7 @@ private:
Mantid::API::IMDEventWorkspace_sptr out_mdws);
/// Validate the algorithm's input properties
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
index 15fb2f2c0a703a9dafedcfa65edd7bc2d9d64588..2e9fced1fd1c83ddef6cf8e1fb7fdd87dc3fc5a0 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDHistoWorkspace.h
@@ -35,21 +35,21 @@ class DLLExport CreateMDHistoWorkspace
: public MDAlgorithms::ImportMDHistoWorkspaceBase {
public:
CreateMDHistoWorkspace();
- virtual ~CreateMDHistoWorkspace();
+ ~CreateMDHistoWorkspace() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates an MDHistoWorkspace from supplied lists of signal and "
"error values.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace DataObjects
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
index 9630aeb7949d0001bd481a1a5bf21ce6d88c8698..0937d87451d9b53d942ff3072210f1260041b3a2 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
@@ -23,27 +23,27 @@ class DLLExport CreateMDWorkspace
: public MDAlgorithms::BoxControllerSettingsAlgorithm {
public:
CreateMDWorkspace();
- ~CreateMDWorkspace();
+ ~CreateMDWorkspace() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "CreateMDWorkspace"; }
+ const std::string name() const override { return "CreateMDWorkspace"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Creates an empty MDEventWorkspace with a given number of "
"dimensions.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\Creation";
}
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
template <typename MDE, size_t nd>
void finish(typename DataObjects::MDEventWorkspace<MDE, nd>::sptr ws);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CutMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CutMD.h
index 60ac039be31272f3951c3cd6b59ef41e419b2936..cad15818268b1dfe8921d178c353f3317c6ddac1 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CutMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CutMD.h
@@ -36,18 +36,20 @@ namespace MDAlgorithms {
class DLLExport CutMD : public API::DataProcessorAlgorithm {
public:
CutMD();
- virtual ~CutMD();
+ ~CutMD() override;
- virtual const std::string name() const { return "CutMD"; }
- virtual int version() const { return 1; }
- virtual const std::string summary() const {
+ const std::string name() const override { return "CutMD"; }
+ int version() const override { return 1; }
+ const std::string summary() const override {
return "Slices multidimensional workspaces using input projection "
"information and binning limits.";
}
- virtual const std::string category() const { return "MDAlgorithms\\Slicing"; }
+ const std::string category() const override {
+ return "MDAlgorithms\\Slicing";
+ }
- virtual void init();
- virtual void exec();
+ void init() override;
+ void exec() override;
static const std::string InvAngstromSymbol;
static const std::string RLUSymbol;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/DivideMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/DivideMD.h
index 3103ceb10ebefd3ef1b4d223e6cd6c6f280b1f75..29ba33156b6b828c5da15f99054293332ce505c2 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/DivideMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/DivideMD.h
@@ -36,34 +36,35 @@ namespace MDAlgorithms {
class DLLExport DivideMD : public BinaryOperationMD {
public:
DivideMD();
- virtual ~DivideMD();
+ ~DivideMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Divide MDHistoWorkspace's";
}
- virtual int version() const;
+ int version() const override;
private:
/// Is the operation commutative?
- bool commutative() const;
+ bool commutative() const override;
/// Check the inputs and throw if the algorithm cannot be run
- void checkInputs();
+ void checkInputs() override;
/// Run the algorithm with an MDEventWorkspace as output
- void execEvent();
+ void execEvent() override;
/// Run the algorithm with a MDHisotWorkspace as output and operand
- void execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::MDHistoWorkspace_const_sptr operand);
+ void execHistoHisto(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) override;
/// Run the algorithm with a MDHisotWorkspace as output, scalar and operand
- void
- execHistoScalar(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar);
+ void execHistoScalar(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar) override;
template <typename MDE, size_t nd>
void execEventScalar(
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/EqualToMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/EqualToMD.h
index 543dbc0d2fe820b2e6ed1a61b92a131ffd0d8a69..5389fd4de5f3c7b98d160c1609155739c90ada9d 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/EqualToMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/EqualToMD.h
@@ -36,19 +36,20 @@ namespace MDAlgorithms {
class DLLExport EqualToMD : public BooleanBinaryOperationMD {
public:
EqualToMD();
- virtual ~EqualToMD();
+ ~EqualToMD() override;
- virtual const std::string name() const;
- virtual int version() const;
+ const std::string name() const override;
+ int version() const override;
private:
- void initExtraProperties();
- bool acceptScalar() const { return true; }
- void execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::MDHistoWorkspace_const_sptr operand);
- void
- execHistoScalar(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar);
+ void initExtraProperties() override;
+ bool acceptScalar() const override { return true; }
+ void execHistoHisto(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) override;
+ void execHistoScalar(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar) override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/EvaluateMDFunction.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/EvaluateMDFunction.h
index ca5362f10eca4ed397921f21538199b32a8d97af..202d5f86e45eb0edeaab13e7579aae7c601f9316 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/EvaluateMDFunction.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/EvaluateMDFunction.h
@@ -35,16 +35,16 @@ class DLLExport EvaluateMDFunction : public API::Algorithm,
public API::DeprecatedAlgorithm {
public:
EvaluateMDFunction();
- virtual ~EvaluateMDFunction();
+ ~EvaluateMDFunction() override;
- virtual const std::string name() const { return "EvaluateMDFunction"; }
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override { return "EvaluateMDFunction"; }
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ExponentialMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ExponentialMD.h
index 0d7abded670feb8840d9ad50e5056a4b06f64ff5..092626ae5bddfc268c266e8b38c897e545c4a8c2 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ExponentialMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ExponentialMD.h
@@ -36,25 +36,25 @@ namespace MDAlgorithms {
class DLLExport ExponentialMD : public UnaryOperationMD {
public:
ExponentialMD();
- virtual ~ExponentialMD();
+ ~ExponentialMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Applies the exponential function on a MDHistoWorkspace.";
}
- virtual int version() const;
+ int version() const override;
private:
/// Check the inputs and throw if the algorithm cannot be run
- void checkInputs();
+ void checkInputs() override;
/// Run the algorithm on a MDEventWorkspace
- void execEvent(Mantid::API::IMDEventWorkspace_sptr out);
+ void execEvent(Mantid::API::IMDEventWorkspace_sptr out) override;
/// Run the algorithm with a MDHistoWorkspace
- void execHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out);
+ void execHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out) override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/FakeMDEventData.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/FakeMDEventData.h
index 76e4dd1bf8c483ca903b7ae107be9999f6b4d578..acb6ae4924718c9cd735796e25817795f63df340 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/FakeMDEventData.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/FakeMDEventData.h
@@ -35,25 +35,25 @@ namespace MDAlgorithms {
class MANTID_MDALGORITHMS_DLL FakeMDEventData : public API::Algorithm {
public:
/// Algorithm's name for identification
- virtual const std::string name() const { return "FakeMDEventData"; }
+ const std::string name() const override { return "FakeMDEventData"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Adds fake multi-dimensional event data to an existing "
"MDEventWorkspace, for use in testing.\nYou can create a blank "
"MDEventWorkspace with CreateMDWorkspace.";
}
/// Algorithm's verion for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\Creation";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Mantid
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/FindPeaksMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/FindPeaksMD.h
index 625fc0f2818ce3968f5bcf2a8c67b8e932ef68d3..198feee76530906eb7ff38f89fc024bc14428607 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/FindPeaksMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/FindPeaksMD.h
@@ -23,28 +23,28 @@ namespace MDAlgorithms {
class DLLExport FindPeaksMD : public API::Algorithm {
public:
FindPeaksMD();
- ~FindPeaksMD();
+ ~FindPeaksMD() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "FindPeaksMD"; };
+ const std::string name() const override { return "FindPeaksMD"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Find peaks in reciprocal space in a MDEventWorkspace or a "
"MDHistoWorkspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Optimization\\PeakFinding;MDAlgorithms\\Peaks";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Read member variables from experiment info
void readExperimentInfo(const Mantid::API::ExperimentInfo_sptr &ei,
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/FitMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/FitMD.h
index 1d13172f5f3d76352a9ea912306c54345160a777..3d3baa7a1065a327a1f282a23e528fe1a5104d23 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/FitMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/FitMD.h
@@ -58,24 +58,26 @@ public:
/// Initialize
void initialize(Kernel::IPropertyManager *pm,
const std::string &workspacePropertyName,
- DomainType domainType);
+ DomainType domainType) override;
/// declare properties that specify the dataset within the workspace to fit
/// to.
- virtual void declareDatasetProperties(const std::string &suffix = "",
- bool addProp = true);
+ void declareDatasetProperties(const std::string &suffix = "",
+ bool addProp = true) override;
/// Create a domain from the input workspace
- virtual void createDomain(boost::shared_ptr<API::FunctionDomain> &,
- boost::shared_ptr<API::FunctionValues> &,
- size_t i0);
- virtual boost::shared_ptr<API::Workspace> createOutputWorkspace(
- const std::string &baseName, API::IFunction_sptr function,
- boost::shared_ptr<API::FunctionDomain> domain,
- boost::shared_ptr<API::FunctionValues> values,
- const std::string &outputWorkspacePropertyName = "OutputWorkspace");
+ void createDomain(boost::shared_ptr<API::FunctionDomain> &,
+ boost::shared_ptr<API::FunctionValues> &,
+ size_t i0) override;
+ boost::shared_ptr<API::Workspace>
+ createOutputWorkspace(const std::string &baseName,
+ API::IFunction_sptr function,
+ boost::shared_ptr<API::FunctionDomain> domain,
+ boost::shared_ptr<API::FunctionValues> values,
+ const std::string &outputWorkspacePropertyName =
+ "OutputWorkspace") override;
/// Return the size of the domain to be created.
- virtual size_t getDomainSize() const;
+ size_t getDomainSize() const override;
/// Set the workspace
void setWorkspace(boost::shared_ptr<API::IMDWorkspace> IMDWorkspace) {
m_IMDWorkspace = IMDWorkspace;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/GetSpiceDataRawCountsFromMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/GetSpiceDataRawCountsFromMD.h
index f574cf824ad62504780768ddde1e291fd20b1d3d..5feb7dcead3cc70da45ba0ceb866ecac26437402 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/GetSpiceDataRawCountsFromMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/GetSpiceDataRawCountsFromMD.h
@@ -40,33 +40,33 @@ public:
GetSpiceDataRawCountsFromMD();
/// Destructor
- virtual ~GetSpiceDataRawCountsFromMD();
+ ~GetSpiceDataRawCountsFromMD() override;
/// Algorithm's name
- virtual const std::string name() const {
+ const std::string name() const override {
return "GetSpiceDataRawCountsFromMD";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Get detectors' raw counts or sample environment log values from "
"IMDEventWorkspace created from SPICE data file.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Diffraction\\ConstantWavelength";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Export all detectors' counts for a run
void exportDetCountsOfRun(API::IMDEventWorkspace_const_sptr datamdws,
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/GreaterThanMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/GreaterThanMD.h
index 86f7214e7124e8695b1132fc0403eed5a1244a21..9f3f12e18e8828aa6a15705006e3f7169fbaf509 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/GreaterThanMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/GreaterThanMD.h
@@ -36,26 +36,27 @@ namespace MDAlgorithms {
class DLLExport GreaterThanMD : public BooleanBinaryOperationMD {
public:
GreaterThanMD();
- virtual ~GreaterThanMD();
+ ~GreaterThanMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Perform the GreaterThan boolean operation on two "
"MDHistoWorkspaces.";
}
- virtual int version() const;
+ int version() const override;
private:
- bool acceptScalar() const { return true; }
- bool commutative() const { return false; }
-
- void execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::MDHistoWorkspace_const_sptr operand);
- void
- execHistoScalar(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar);
+ bool acceptScalar() const override { return true; }
+ bool commutative() const override { return false; }
+
+ void execHistoHisto(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) override;
+ void execHistoScalar(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar) override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ImportMDEventWorkspace.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ImportMDEventWorkspace.h
index 0143a82abfcf515cd9ddf39cf48cf4a34d8a5890..5273e9bd579ff9b33d0b6739a808ea8d85f3a09b 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ImportMDEventWorkspace.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ImportMDEventWorkspace.h
@@ -38,17 +38,17 @@ namespace MDAlgorithms {
class DLLExport ImportMDEventWorkspace : public API::Algorithm {
public:
ImportMDEventWorkspace();
- virtual ~ImportMDEventWorkspace();
+ ~ImportMDEventWorkspace() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Reads an ASCII file containing MDEvent data and constructs an "
"MDEventWorkspace.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
/// Flag used to indicate the dimension block in the file
static const std::string DimensionBlockFlag();
@@ -82,8 +82,8 @@ private:
/// Check that the a flag exists in the file.
bool fileDoesContain(const std::string &flag);
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ImportMDHistoWorkspace.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ImportMDHistoWorkspace.h
index be699d5f8a8e1dbf1f8ce85f2ed465dfc6e0c0cd..1bc383767799752616142cf679eb77ed165b7e10 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ImportMDHistoWorkspace.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ImportMDHistoWorkspace.h
@@ -36,20 +36,20 @@ namespace MDAlgorithms {
class DLLExport ImportMDHistoWorkspace : public ImportMDHistoWorkspaceBase {
public:
ImportMDHistoWorkspace();
- virtual ~ImportMDHistoWorkspace();
+ ~ImportMDHistoWorkspace() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Reads a text file and generates an MDHistoWorkspace from it.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ImportMDHistoWorkspaceBase.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ImportMDHistoWorkspaceBase.h
index 94455e0a1a7720102e8914f04bb96f8a17912857..7d5291d706095be8d0b025cc5a094cc5a95452d4 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ImportMDHistoWorkspaceBase.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ImportMDHistoWorkspaceBase.h
@@ -38,8 +38,8 @@ namespace MDAlgorithms {
class DLLExport ImportMDHistoWorkspaceBase : public API::Algorithm {
public:
ImportMDHistoWorkspaceBase();
- virtual ~ImportMDHistoWorkspaceBase();
- virtual std::map<std::string, std::string> validateInputs();
+ ~ImportMDHistoWorkspaceBase() override;
+ std::map<std::string, std::string> validateInputs() override;
protected:
/// Vector containing the number of bins in each dimension.
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateEllipsoids.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateEllipsoids.h
index e779c8295712753c04190966f20aa625d26894ba..e1ebef1a0ba9ef94aad4c9756e45f697ec9757b7 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateEllipsoids.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateEllipsoids.h
@@ -17,20 +17,20 @@ namespace MDAlgorithms {
class DLLExport IntegrateEllipsoids : public API::Algorithm {
public:
IntegrateEllipsoids();
- virtual ~IntegrateEllipsoids();
- virtual const std::string name() const;
+ ~IntegrateEllipsoids() override;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Integrate Single Crystal Diffraction Bragg peaks using 3D "
"ellipsoids.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void qListFromEventWS(Integrate3DEvents &integrator, API::Progress &prog,
DataObjects::EventWorkspace_sptr &wksp,
Kernel::DblMatrix const &UBinv, bool hkl_integ);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateFlux.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateFlux.h
index 034de3116095598c719633c50f1aa441640bd016..281667f1de9043327af3f7e6b9fb2848194e5da1 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateFlux.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateFlux.h
@@ -44,14 +44,14 @@ namespace MDAlgorithms {
*/
class DLLExport IntegrateFlux : public API::Algorithm {
public:
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
boost::shared_ptr<API::MatrixWorkspace>
createOutputWorkspace(const API::MatrixWorkspace &inputWS, size_t nX) const;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateMDHistoWorkspace.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateMDHistoWorkspace.h
index 087879045912e5cdf664da2075be3bf448bae995..8c9c476803f2f9a062614f9aaeb39f9f5f37e952 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateMDHistoWorkspace.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegrateMDHistoWorkspace.h
@@ -36,17 +36,17 @@ namespace MDAlgorithms {
class DLLExport IntegrateMDHistoWorkspace : public API::Algorithm {
public:
IntegrateMDHistoWorkspace();
- virtual ~IntegrateMDHistoWorkspace();
+ ~IntegrateMDHistoWorkspace() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
- virtual std::map<std::string, std::string> validateInputs();
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
+ std::map<std::string, std::string> validateInputs() override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegratePeaksMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegratePeaksMD.h
index bf6cc39564284fe9e499743c787fd5360e059859..e73e58274259944af00b4183341d5340bfb287cb 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegratePeaksMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegratePeaksMD.h
@@ -19,26 +19,26 @@ namespace MDAlgorithms {
class DLLExport IntegratePeaksMD : public API::Algorithm {
public:
IntegratePeaksMD();
- ~IntegratePeaksMD();
+ ~IntegratePeaksMD() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "IntegratePeaksMD"; };
+ const std::string name() const override { return "IntegratePeaksMD"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Integrate single-crystal peaks in reciprocal space, for "
"MDEventWorkspaces.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "MDAlgorithms\\Peaks"; }
+ const std::string category() const override { return "MDAlgorithms\\Peaks"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
template <typename MDE, size_t nd>
void integrate(typename DataObjects::MDEventWorkspace<MDE, nd>::sptr ws);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegratePeaksMD2.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegratePeaksMD2.h
index b106a6527ad857fad65f9054c24ac1b269052021..d8592e52034ad46bf9b31a05b807215360cbf2d6 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegratePeaksMD2.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/IntegratePeaksMD2.h
@@ -19,26 +19,26 @@ namespace MDAlgorithms {
class DLLExport IntegratePeaksMD2 : public API::Algorithm {
public:
IntegratePeaksMD2();
- ~IntegratePeaksMD2();
+ ~IntegratePeaksMD2() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "IntegratePeaksMD"; };
+ const std::string name() const override { return "IntegratePeaksMD"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Integrate single-crystal peaks in reciprocal space, for "
"MDEventWorkspaces.";
}
/// Algorithm's version for identification
- virtual int version() const { return 2; };
+ int version() const override { return 2; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "MDAlgorithms\\Peaks"; }
+ const std::string category() const override { return "MDAlgorithms\\Peaks"; }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
template <typename MDE, size_t nd>
void integrate(typename DataObjects::MDEventWorkspace<MDE, nd>::sptr ws);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/InvalidParameter.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/InvalidParameter.h
index d08188282cdde324e5fb5036254dbd40a7f37c1e..fa8c29e6342db6b3b6989e9fcf937ce677e4ae88 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/InvalidParameter.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/InvalidParameter.h
@@ -47,17 +47,17 @@ public:
InvalidParameter(std::string value);
- std::string getName() const;
+ std::string getName() const override;
std::string getValue() const;
- bool isValid() const;
+ bool isValid() const override;
- Mantid::MDAlgorithms::InvalidParameter *clone() const;
+ Mantid::MDAlgorithms::InvalidParameter *clone() const override;
- std::string toXMLString() const;
+ std::string toXMLString() const override;
- ~InvalidParameter();
+ ~InvalidParameter() override;
static std::string parameterName() { return "InvalidParameter"; }
};
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/InvalidParameterParser.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/InvalidParameterParser.h
index 501eaea2ac5a3c7a573da85f44b03c352aef041b..14d7ac6f6cf05a09746fa6d404c3e137350c11e0 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/InvalidParameterParser.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/InvalidParameterParser.h
@@ -45,9 +45,9 @@ class DLLExport InvalidParameterParser
public:
InvalidParameterParser();
Mantid::API::ImplicitFunctionParameter *
- createParameter(Poco::XML::Element *parameterElement);
- void
- setSuccessorParser(Mantid::API::ImplicitFunctionParameterParser *paramParser);
+ createParameter(Poco::XML::Element *parameterElement) override;
+ void setSuccessorParser(
+ Mantid::API::ImplicitFunctionParameterParser *paramParser) override;
protected:
ImplicitFunctionParameterParser::SuccessorType m_successor;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LessThanMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LessThanMD.h
index 96997e8fff5e5f57f08f90e9f45c549ca1c9f04e..a8fee16d7efb65db814f27fddd2a53666a54488d 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LessThanMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LessThanMD.h
@@ -36,20 +36,21 @@ namespace MDAlgorithms {
class DLLExport LessThanMD : public BooleanBinaryOperationMD {
public:
LessThanMD();
- virtual ~LessThanMD();
+ ~LessThanMD() override;
- virtual const std::string name() const;
- virtual int version() const;
+ const std::string name() const override;
+ int version() const override;
private:
- bool acceptScalar() const { return true; }
- bool commutative() const { return false; }
-
- void execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::MDHistoWorkspace_const_sptr operand);
- void
- execHistoScalar(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar);
+ bool acceptScalar() const override { return true; }
+ bool commutative() const override { return false; }
+
+ void execHistoHisto(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) override;
+ void execHistoScalar(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar) override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadILLAscii.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadILLAscii.h
index 1dc316f1b983314d9dcca11747b77ebdb3f391bf..8543683b7749ee3636a710c6147dce8b6d57448a 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadILLAscii.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadILLAscii.h
@@ -41,18 +41,18 @@ namespace MDAlgorithms {
class DLLExport LoadILLAscii : public API::IFileLoader<Kernel::FileDescriptor> {
public:
LoadILLAscii();
- virtual ~LoadILLAscii();
+ ~LoadILLAscii() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void loadInstrumentName(ILLParser &);
void loadExperimentDetails(ILLParser &p);
void loadIDF(API::MatrixWorkspace_sptr &workspace);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadMD.h
index edbf96bb1d9bb00ea54bfde855625856e06e87bb..194984602d42f967f9923c99257363f71fd109c0 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadMD.h
@@ -41,30 +41,30 @@ namespace MDAlgorithms {
class DLLExport LoadMD : public API::IFileLoader<Kernel::NexusDescriptor> {
public:
LoadMD();
- ~LoadMD();
+ ~LoadMD() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "LoadMD"; };
+ const std::string name() const override { return "LoadMD"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Load a MDEventWorkspace in .nxs format.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\DataHandling";
}
/// Returns a confidence value that this algorithm can load a file
- int confidence(Kernel::NexusDescriptor &descriptor) const;
+ int confidence(Kernel::NexusDescriptor &descriptor) const override;
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
// ki-kf for Inelastic convention; kf-ki for Crystallography convention
std::string convention;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadSQW.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadSQW.h
index f7c50571aebc4ae626e81926c3c849651389828f..bb003c7cc0685de770972ca397379c995d08f9be 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadSQW.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LoadSQW.h
@@ -83,29 +83,29 @@ struct dataPositions {
class DLLExport LoadSQW : public API::IFileLoader<Kernel::FileDescriptor> {
public:
LoadSQW();
- ~LoadSQW();
+ ~LoadSQW() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "LoadSQW"; };
+ const std::string name() const override { return "LoadSQW"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Create a MDEventWorkspace with events in reciprocal space (Qx, Qy, "
"Qz, Energy) from a SQW file.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "DataHandling\\SQW;MDAlgorithms\\DataHandling";
}
/// Returns a confidence value that this algorithm can load a file
- virtual int confidence(Kernel::FileDescriptor &descriptor) const;
+ int confidence(Kernel::FileDescriptor &descriptor) const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
protected: // for testing
/// Read events onto the workspace.
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LogarithmMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LogarithmMD.h
index 8aa4743d51a173639338dd5561ded9b73f1412e1..67447b3a1f26c862a82d967c84e3c0a1a7c267e2 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LogarithmMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/LogarithmMD.h
@@ -36,27 +36,27 @@ namespace MDAlgorithms {
class DLLExport LogarithmMD : public UnaryOperationMD {
public:
LogarithmMD();
- virtual ~LogarithmMD();
+ ~LogarithmMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Perform a natural logarithm of a MDHistoWorkspace.";
}
- virtual int version() const;
+ int version() const override;
private:
- virtual void initExtraProperties();
+ void initExtraProperties() override;
/// Check the inputs and throw if the algorithm cannot be run
- void checkInputs();
+ void checkInputs() override;
/// Run the algorithm on a MDEventWorkspace
- void execEvent(Mantid::API::IMDEventWorkspace_sptr out);
+ void execEvent(Mantid::API::IMDEventWorkspace_sptr out) override;
/// Run the algorithm with a MDHistoWorkspace
- void execHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out);
+ void execHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out) override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormDirectSC.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormDirectSC.h
index 5866a06487203109c13398dd41728844df9fbd48..7a5e3bea51ef257648242bff8303b7fafce0ddc9 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormDirectSC.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormDirectSC.h
@@ -37,14 +37,14 @@ class DLLExport MDNormDirectSC : public SlicingAlgorithm {
public:
MDNormDirectSC();
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void cacheInputs();
std::string inputEnergyMode() const;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSCD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSCD.h
index 6c4679213a44e3b4bf120a93648830785e32d24c..b7d0f3ddfad0703bf1c72cc1f3ca919735e3998a 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSCD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSCD.h
@@ -37,14 +37,14 @@ class DLLExport MDNormSCD : public SlicingAlgorithm {
public:
MDNormSCD();
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void cacheInputs();
std::string inputEnergyMode() const;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfFactory.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfFactory.h
index 5b4e08a118af3e990901f6028693b39081825bf4..fd4b749ac6cd30b0c5483721eb10af0400e3c71e 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfFactory.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfFactory.h
@@ -93,8 +93,8 @@ namespace MDAlgorithms {
class MANTID_MDALGORITHMS_DLL MDTransfFactoryImpl
: public Kernel::DynamicFactory<MDTransfInterface> {
public:
- virtual boost::shared_ptr<MDTransfInterface>
- create(const std::string &className) const;
+ boost::shared_ptr<MDTransfInterface>
+ create(const std::string &className) const override;
private:
friend struct Kernel::CreateUsingNew<MDTransfFactoryImpl>;
@@ -106,7 +106,7 @@ private:
/// Private assignment operator - NO ASSIGNMENT ALLOWED
MDTransfFactoryImpl &operator=(const MDTransfFactoryImpl &);
/// Private Destructor
- virtual ~MDTransfFactoryImpl();
+ ~MDTransfFactoryImpl() override;
/// Stores pointers to already created unit instances, with their name as the
/// key
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfModQ.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfModQ.h
index da5a704cf782453e0d2973ffd74e54cb85e643e2..f4dc6e31c26b5db18f31e8bf53d27860e8c5c39b 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfModQ.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfModQ.h
@@ -48,24 +48,24 @@ class DLLExport MDTransfModQ : public MDTransfInterface {
public:
/// the name, this ChildAlgorithm is known to users (will appear in selection
/// list)
- const std::string transfID() const; // {return "ModQ"; }
+ const std::string transfID() const override; // {return "ModQ"; }
/** energy conversion modes supported by this class;
* The class supports three standard energy conversion modes */
- std::vector<std::string> getEmodes() const;
+ std::vector<std::string> getEmodes() const override;
- bool calcGenericVariables(std::vector<coord_t> &Coord, size_t nd);
- bool calcYDepCoordinates(std::vector<coord_t> &Coord, size_t i);
+ bool calcGenericVariables(std::vector<coord_t> &Coord, size_t nd) override;
+ bool calcYDepCoordinates(std::vector<coord_t> &Coord, size_t i) override;
bool calcMatrixCoord(const double &k0, std::vector<coord_t> &Coord, double &s,
- double &err) const;
+ double &err) const override;
// constructor;
MDTransfModQ();
/* clone method allowing to provide the copy of the particular class */
- MDTransfInterface *clone() const { return new MDTransfModQ(*this); }
+ MDTransfInterface *clone() const override { return new MDTransfModQ(*this); }
//
- void initialize(const MDWSDescription &ConvParams);
+ void initialize(const MDWSDescription &ConvParams) override;
- virtual std::vector<double>
- getExtremumPoints(const double xMin, const double xMax, size_t det_num) const;
+ std::vector<double> getExtremumPoints(const double xMin, const double xMax,
+ size_t det_num) const override;
// WARNING!!!! THESE METHODS ARE USED BEFORE INITIALIZE IS EXECUTED SO THEY
// CAN NOT RELY ON THE CONTENTS OF THE CLASS TO BE DEFINED (THEY ARE VIRTUAL
@@ -77,26 +77,27 @@ public:
unsigned int
getNMatrixDimensions(Kernel::DeltaEMode::Type mode,
API::MatrixWorkspace_const_sptr Sptr =
- API::MatrixWorkspace_const_sptr()) const;
+ API::MatrixWorkspace_const_sptr()) const override;
/**function returns units ID-s which this transformation prodiuces its ouptut.
It is Momentum and Momentum and DelteE in inelastic modes */
std::vector<std::string>
outputUnitID(Kernel::DeltaEMode::Type dEmode,
API::MatrixWorkspace_const_sptr Sptr =
- API::MatrixWorkspace_const_sptr()) const;
+ API::MatrixWorkspace_const_sptr()) const override;
/**the default dimID-s in ModQ mode are |Q| and dE if necessary */
std::vector<std::string>
getDefaultDimID(Kernel::DeltaEMode::Type dEmode,
API::MatrixWorkspace_const_sptr Sptr =
- API::MatrixWorkspace_const_sptr()) const;
+ API::MatrixWorkspace_const_sptr()) const override;
/** returns the units, the transformation expects for input workspace to be
* expressed in. */
- const std::string inputUnitID(Kernel::DeltaEMode::Type dEmode,
- API::MatrixWorkspace_const_sptr Sptr =
- API::MatrixWorkspace_const_sptr()) const;
- virtual void setDisplayNormalization(
+ const std::string
+ inputUnitID(Kernel::DeltaEMode::Type dEmode,
+ API::MatrixWorkspace_const_sptr Sptr =
+ API::MatrixWorkspace_const_sptr()) const override;
+ void setDisplayNormalization(
Mantid::API::IMDWorkspace_sptr mdWorkspace,
- Mantid::API::MatrixWorkspace_sptr underlyingWorkspace) const;
+ Mantid::API::MatrixWorkspace_sptr underlyingWorkspace) const override;
protected:
// directions to the detectors
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfNoQ.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfNoQ.h
index 1b2070a4e1bcdcc608fc98af1c8c52319a2ae212..b5d75dccbabe411238488e0783c0ac1ae14e81fb 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfNoQ.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfNoQ.h
@@ -46,24 +46,24 @@ class DLLExport MDTransfNoQ : public MDTransfInterface {
public:
/// the name, this ChildAlgorithm is known to users (will appear in selection
/// list)
- const std::string transfID() const; // {return "NoQ"; }
- // calc target coordinates interface:
- bool calcGenericVariables(std::vector<coord_t> &Coord, size_t nd);
- bool calcYDepCoordinates(std::vector<coord_t> &Coord, size_t i);
+ const std::string transfID() const override; // {return "NoQ"; }
+ // calc target coordinates interface:
+ bool calcGenericVariables(std::vector<coord_t> &Coord, size_t nd) override;
+ bool calcYDepCoordinates(std::vector<coord_t> &Coord, size_t i) override;
bool calcMatrixCoord(const double &k0, std::vector<coord_t> &Coord, double &s,
- double &err) const;
+ double &err) const override;
// constructor;
MDTransfNoQ();
/* clone method allowing to provide the copy of the particular class */
- MDTransfInterface *clone() const { return new MDTransfNoQ(*this); }
+ MDTransfInterface *clone() const override { return new MDTransfNoQ(*this); }
// initializes the contents of the class
- void initialize(const MDWSDescription &ConvParams);
+ void initialize(const MDWSDescription &ConvParams) override;
/**This transformation dos nothing with the workspace ranges, so extremum
* points for this transformation coordinates are the
* coordinates themselves */
- virtual std::vector<double>
- getExtremumPoints(const double xMin, const double xMax, size_t det_num) const;
+ std::vector<double> getExtremumPoints(const double xMin, const double xMax,
+ size_t det_num) const override;
// WARNING!!!! THESE METHODS ARE USED BEFORE INITIALIZE IS EXECUTED SO THEY
// CAN NOT RELY ON THE CONTENTS OF THE CLASS TO BE DEFINED (THEY ARE VIRTUAL
@@ -73,22 +73,24 @@ public:
workspace.
Depending on ws axis units, the numebr here is either 1 or 2* and is
independent on emode*/
- unsigned int getNMatrixDimensions(Kernel::DeltaEMode::Type mode,
- API::MatrixWorkspace_const_sptr inWS) const;
+ unsigned int
+ getNMatrixDimensions(Kernel::DeltaEMode::Type mode,
+ API::MatrixWorkspace_const_sptr inWS) const override;
/**function returns units ID-s which this transformation prodiuces its ouptut.
here it is usually input ws units, which are independent on emode */
std::vector<std::string>
outputUnitID(Kernel::DeltaEMode::Type mode,
- API::MatrixWorkspace_const_sptr inWS) const;
+ API::MatrixWorkspace_const_sptr inWS) const override;
std::vector<std::string>
getDefaultDimID(Kernel::DeltaEMode::Type mode,
- API::MatrixWorkspace_const_sptr inWS) const;
- const std::string inputUnitID(Kernel::DeltaEMode::Type mode,
- API::MatrixWorkspace_const_sptr inWS) const;
+ API::MatrixWorkspace_const_sptr inWS) const override;
+ const std::string
+ inputUnitID(Kernel::DeltaEMode::Type mode,
+ API::MatrixWorkspace_const_sptr inWS) const override;
- virtual void setDisplayNormalization(
+ void setDisplayNormalization(
Mantid::API::IMDWorkspace_sptr mdWorkspace,
- Mantid::API::MatrixWorkspace_sptr underlyingWorkspace) const;
+ Mantid::API::MatrixWorkspace_sptr underlyingWorkspace) const override;
private:
unsigned int m_NMatrixDim;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfQ3D.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfQ3D.h
index 5fd669969fc2709d9844efcc0972006a838d382f..0f28ff048d8735c0b7b6b89390eb169ab7dd26b8 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfQ3D.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfQ3D.h
@@ -49,20 +49,20 @@ class DLLExport MDTransfQ3D : public MDTransfModQ {
public:
/// the name, this ChildAlgorithm is known to users (will appear in selection
/// list)
- const std::string transfID() const; // {return "Q3D"; }
- bool calcYDepCoordinates(std::vector<coord_t> &Coord, size_t i);
+ const std::string transfID() const override; // {return "Q3D"; }
+ bool calcYDepCoordinates(std::vector<coord_t> &Coord, size_t i) override;
bool calcMatrixCoord(const double &X, std::vector<coord_t> &Coord, double &s,
- double &err) const;
+ double &err) const override;
// constructor;
MDTransfQ3D();
/* clone method allowing to provide the copy of the particular class */
- MDTransfInterface *clone() const { return new MDTransfQ3D(*this); }
+ MDTransfInterface *clone() const override { return new MDTransfQ3D(*this); }
//
- void initialize(const MDWSDescription &ConvParams);
+ void initialize(const MDWSDescription &ConvParams) override;
/** */
- virtual std::vector<double>
- getExtremumPoints(const double xMin, const double xMax, size_t det_num) const;
+ std::vector<double> getExtremumPoints(const double xMin, const double xMax,
+ size_t det_num) const override;
// WARNING!!!! THESE METHODS ARE USED BEFORE INITIALIZE IS EXECUTED SO THEY
// CAN NOT RELY ON THE CONTENTS OF THE CLASS (THEY ARE VIRTUAL STATIC METHODS)
@@ -73,18 +73,18 @@ public:
unsigned int
getNMatrixDimensions(Kernel::DeltaEMode::Type mode,
API::MatrixWorkspace_const_sptr Sptr =
- API::MatrixWorkspace_const_sptr()) const;
+ API::MatrixWorkspace_const_sptr()) const override;
/**function returns units ID-s which this transformation prodiuces its ouptut.
It is Momentum and Momentum and DelteE in inelastic modes */
std::vector<std::string>
outputUnitID(Kernel::DeltaEMode::Type dEmode,
API::MatrixWorkspace_const_sptr Sptr =
- API::MatrixWorkspace_const_sptr()) const;
+ API::MatrixWorkspace_const_sptr()) const override;
/**the default dimID-s in Q3D mode are Q1,Q2,Q3 and dE if necessary */
std::vector<std::string>
getDefaultDimID(Kernel::DeltaEMode::Type dEmode,
API::MatrixWorkspace_const_sptr Sptr =
- API::MatrixWorkspace_const_sptr()) const;
+ API::MatrixWorkspace_const_sptr()) const override;
protected:
// the variable which verifies if Lorentz corrections have to be calculated in
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MaskMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MaskMD.h
index 5e790b5ac1c434991211c5093d8b947ba1e00492..7cd9825c211c92861250efd2355ddcc92a8cbbfe 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MaskMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MaskMD.h
@@ -41,21 +41,21 @@ parseDimensionNames(const std::string &names_string);
class MANTID_MDALGORITHMS_DLL MaskMD : public API::Algorithm {
public:
MaskMD();
- virtual ~MaskMD();
+ ~MaskMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Mask an MDWorkspace in-situ marking specified boxes as masked";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
- virtual std::map<std::string, std::string> validateInputs();
+ void init() override;
+ void exec() override;
+ std::map<std::string, std::string> validateInputs() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MergeMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MergeMD.h
index d1714354c80df1583c5812031cfe3048a82d3adc..8e9b39aae994a488813d3c2451bfda6dc84ef952 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MergeMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MergeMD.h
@@ -37,20 +37,20 @@ namespace MDAlgorithms {
class DLLExport MergeMD : public BoxControllerSettingsAlgorithm {
public:
MergeMD();
- virtual ~MergeMD();
+ ~MergeMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Merge several MDWorkspaces into one.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void createOutputWorkspace(std::vector<std::string> &inputs);
template <typename MDE, size_t nd>
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MergeMDFiles.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MergeMDFiles.h
index 8503db7f48275d284fc20264fcb72f53f09a1da1..594af92bf886bbc857df3d77689fdca1dd3b94ed 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MergeMDFiles.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MergeMDFiles.h
@@ -41,28 +41,28 @@ namespace MDAlgorithms {
class DLLExport MergeMDFiles : public API::Algorithm {
public:
MergeMDFiles();
- ~MergeMDFiles();
+ ~MergeMDFiles() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "MergeMDFiles"; };
+ const std::string name() const override { return "MergeMDFiles"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Merge multiple MDEventWorkspaces from files that obey a common box "
"format.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\Creation";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
void loadBoxData();
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MinusMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MinusMD.h
index 6a7415c283864fab061178dd3d35629f4c10e2e5..0e8fdefaf3729b005ea639153fc8f869654c2444 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MinusMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MinusMD.h
@@ -36,38 +36,39 @@ namespace MDAlgorithms {
class DLLExport MinusMD : public BinaryOperationMD {
public:
MinusMD();
- virtual ~MinusMD();
+ ~MinusMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Subtract two MDWorkspaces.";
}
- virtual int version() const;
+ int version() const override;
private:
/// Is the operation commutative?
- bool commutative() const;
+ bool commutative() const override;
/// Check the inputs and throw if the algorithm cannot be run
- void checkInputs();
+ void checkInputs() override;
template <typename MDE, size_t nd>
void
doMinus(typename Mantid::DataObjects::MDEventWorkspace<MDE, nd>::sptr ws);
/// Run the algorithm with an MDEventWorkspace as output
- void execEvent();
+ void execEvent() override;
/// Run the algorithm with a MDHisotWorkspace as output and operand
- void execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::MDHistoWorkspace_const_sptr operand);
+ void execHistoHisto(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) override;
/// Run the algorithm with a MDHisotWorkspace as output, scalar and operand
- void
- execHistoScalar(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar);
+ void execHistoScalar(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar) override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MultiplyMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MultiplyMD.h
index 5378bf803645d99ee841edefc5d923d9b4b511db..3c5c587fb404101dac09e21fcdba6f96d6c607eb 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MultiplyMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MultiplyMD.h
@@ -37,34 +37,35 @@ namespace MDAlgorithms {
class DLLExport MultiplyMD : public BinaryOperationMD {
public:
MultiplyMD();
- virtual ~MultiplyMD();
+ ~MultiplyMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Multiply a MDHistoWorkspace by another one or a scalar.";
}
- virtual int version() const;
+ int version() const override;
private:
/// Is the operation commutative?
- bool commutative() const;
+ bool commutative() const override;
/// Check the inputs and throw if the algorithm cannot be run
- void checkInputs();
+ void checkInputs() override;
/// Run the algorithm with an MDEventWorkspace as output
- void execEvent();
+ void execEvent() override;
/// Run the algorithm with a MDHisotWorkspace as output and operand
- void execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::MDHistoWorkspace_const_sptr operand);
+ void execHistoHisto(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) override;
/// Run the algorithm with a MDHisotWorkspace as output, scalar and operand
- void
- execHistoScalar(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar);
+ void execHistoScalar(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar) override;
template <typename MDE, size_t nd>
void execEventScalar(
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/NotMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/NotMD.h
index a023353bcf491ea4165d42ec82db7109e6088732..85db255bb581efddbc5ab00d309f762b77427c34 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/NotMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/NotMD.h
@@ -36,25 +36,25 @@ namespace MDAlgorithms {
class DLLExport NotMD : public UnaryOperationMD {
public:
NotMD();
- virtual ~NotMD();
+ ~NotMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs a boolean negation on a MDHistoWorkspace.";
}
- virtual int version() const;
+ int version() const override;
private:
/// Check the inputs and throw if the algorithm cannot be run
- void checkInputs();
+ void checkInputs() override;
/// Run the algorithm on a MDEventWorkspace
- void execEvent(Mantid::API::IMDEventWorkspace_sptr out);
+ void execEvent(Mantid::API::IMDEventWorkspace_sptr out) override;
/// Run the algorithm with a MDHistoWorkspace
- void execHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out);
+ void execHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out) override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/OneStepMDEW.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/OneStepMDEW.h
index 6d693f31a1a8b58c8f497f23bb2189d3a7b80770..880ec92ce290686d1a5ab4d1f29b4739130a518c 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/OneStepMDEW.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/OneStepMDEW.h
@@ -16,28 +16,28 @@ namespace MDAlgorithms {
class DLLExport OneStepMDEW : public API::Algorithm, API::DeprecatedAlgorithm {
public:
OneStepMDEW();
- ~OneStepMDEW();
+ ~OneStepMDEW() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "OneStepMDEW"; };
+ const std::string name() const override { return "OneStepMDEW"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Create a MDEventWorkspace in one step from a EventNexus file. For "
"use by Paraview loader.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\Creation";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
};
} // namespace Mantid
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/OrMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/OrMD.h
index 3cc11b1e834d1b68c8fa15221890b9bdb1ed9c9e..9a67633e5f3a790dc9d120d3c8436f5e901852b4 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/OrMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/OrMD.h
@@ -36,14 +36,15 @@ namespace MDAlgorithms {
class DLLExport OrMD : public BooleanBinaryOperationMD {
public:
OrMD();
- virtual ~OrMD();
+ ~OrMD() override;
- virtual const std::string name() const;
- virtual int version() const;
+ const std::string name() const override;
+ int version() const override;
private:
- void execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::MDHistoWorkspace_const_sptr operand);
+ void execHistoHisto(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PlusMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PlusMD.h
index 4afdf64a78fa386c87dc30fa69c4cd57c5cb2525..5399d41ed2ed8acac98db5dae86fdaee27ba420c 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PlusMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PlusMD.h
@@ -38,37 +38,38 @@ namespace MDAlgorithms {
class DLLExport PlusMD : public BinaryOperationMD {
public:
PlusMD();
- virtual ~PlusMD();
+ ~PlusMD() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "PlusMD"; };
+ const std::string name() const override { return "PlusMD"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Sum two MDHistoWorkspaces or merges two MDEventWorkspaces together "
"by combining their events together in one workspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
private:
/// Is the operation commutative?
- bool commutative() const;
+ bool commutative() const override;
/// Check the inputs and throw if the algorithm cannot be run
- void checkInputs();
+ void checkInputs() override;
/// Run the algorithm with an MDEventWorkspace as output
- void execEvent();
+ void execEvent() override;
/// Run the algorithm with a MDHisotWorkspace as output and operand
- void execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::MDHistoWorkspace_const_sptr operand);
+ void execHistoHisto(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) override;
/// Run the algorithm with a MDHisotWorkspace as output, scalar and operand
- void
- execHistoScalar(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar);
+ void execHistoScalar(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar) override;
template <typename MDE, size_t nd>
void doPlus(typename Mantid::DataObjects::MDEventWorkspace<MDE, nd>::sptr ws);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PowerMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PowerMD.h
index 1ecb4cf7151a55535b8317f365de3b15c2e2211f..cc012a9f8ea7beed9d956cac56319e85184a9d10 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PowerMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PowerMD.h
@@ -36,27 +36,27 @@ namespace MDAlgorithms {
class DLLExport PowerMD : public UnaryOperationMD {
public:
PowerMD();
- virtual ~PowerMD();
+ ~PowerMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Raise a MDHistoWorkspace to a power";
}
- virtual int version() const;
+ int version() const override;
private:
- virtual void initExtraProperties();
+ void initExtraProperties() override;
/// Check the inputs and throw if the algorithm cannot be run
- void checkInputs();
+ void checkInputs() override;
/// Run the algorithm on a MDEventWorkspace
- void execEvent(Mantid::API::IMDEventWorkspace_sptr out);
+ void execEvent(Mantid::API::IMDEventWorkspace_sptr out) override;
/// Run the algorithm with a MDHistoWorkspace
- void execHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out);
+ void execHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out) override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PreprocessDetectorsToMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PreprocessDetectorsToMD.h
index 5ce5f2d7eaa4c50cd76ef2faa42853dc677ccb0b..8267caadf97a849f58bc04c421c8e142d6126fb5 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PreprocessDetectorsToMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/PreprocessDetectorsToMD.h
@@ -42,9 +42,9 @@ public:
PreprocessDetectorsToMD();
/// Algorithm's name for identification
- virtual const std::string name() const { return "PreprocessDetectorsToMD"; };
+ const std::string name() const override { return "PreprocessDetectorsToMD"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Its a helper algorithm, used to make common part of transformation "
"from real to reciprocal space. "
"It is used by :ref:`algm-ConvertToMD` and "
@@ -55,13 +55,15 @@ public:
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "MDAlgorithms\\Utility"; }
+ const std::string category() const override {
+ return "MDAlgorithms\\Utility";
+ }
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
/// the variable specifies if one needs to calculate efixed for detectors
/// (make sense for indirect instruments)
bool m_getEFixed;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/FitResolutionConvolvedModel.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/FitResolutionConvolvedModel.h
index 2b0a233784f6683f2a1206a23e6d52a1d611719a..dd236708ec225878d26e2f4ad265ddc15de0c618 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/FitResolutionConvolvedModel.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/FitResolutionConvolvedModel.h
@@ -29,15 +29,15 @@ namespace MDAlgorithms {
*/
class DLLExport FitResolutionConvolvedModel : public API::Algorithm {
public:
- const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Fits a cuts/slices from an MDEventWorkspace using a resolution "
"function convolved with a foreground model";
}
- int version() const;
- const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
protected:
/// Returns the number of iterations that should be performed
@@ -51,8 +51,8 @@ protected:
/// Create the function string required by fit
std::string createFunctionString() const;
- void init();
- void exec();
+ void init() override;
+ void exec() override;
private:
/// Create the fitting Child Algorithm
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModel.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModel.h
index 29a258d31bf3f6ca32fb2e4cd5d7d64d80eefe5e..1a879d345cdba2f5c25e2fa4ecdea8208b08d671 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModel.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModel.h
@@ -60,10 +60,10 @@ public:
/// values
ForegroundModel(const API::IFunction &fittingFunction);
/// Destructor
- ~ForegroundModel();
+ ~ForegroundModel() override;
/// Function category
- virtual const std::string category() const { return "Quantification"; }
+ const std::string category() const override { return "Quantification"; }
/// Returns the type of model
virtual ModelType modelType() const = 0;
@@ -77,10 +77,10 @@ public:
/// default constructor
void setFunctionUnderMinimization(const API::IFunction &fitFunction);
/// Declares the parameters
- void declareParameters();
+ void declareParameters() override;
/// Called when an attribute value is set
void setAttribute(const std::string &name,
- const API::IFunction::Attribute &attr);
+ const API::IFunction::Attribute &attr) override;
/// Return the initial value of the parameter according to the fit by index
double getInitialParameterValue(size_t index) const;
/// Return the initial value of the parameter according to the fit by name
@@ -111,7 +111,7 @@ private:
/// Required by the interface
void function(const Mantid::API::FunctionDomain &,
- Mantid::API::FunctionValues &) const {}
+ Mantid::API::FunctionValues &) const override {}
/// Add attributes common to all models
void addAttributes();
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolution.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolution.h
index 12514badb705ac48be13de17ec13eba7640458ff..a1119777d702f56d324d3c027008ffd9f1699f79 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolution.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolution.h
@@ -62,10 +62,10 @@ public:
MDResolutionConvolution(const API::IFunctionMD &fittingFunction,
const std::string &fgModelName);
/// Virtual destructor for a base class
- virtual ~MDResolutionConvolution() {}
+ ~MDResolutionConvolution() override {}
/// Function category
- virtual const std::string category() const { return "Quantification"; }
+ const std::string category() const override { return "Quantification"; }
/**
* Called once before any fit/simulation is started to allow caching of
@@ -97,7 +97,7 @@ public:
/// Declares the parameters. Overridden here to ensure that concrete models
/// override it
- void declareAttributes();
+ void declareAttributes() override;
/// Setup the reference to the function under fit (required for factory)
void setFittingFunction(const API::IFunctionMD &fittingFunction);
/// Set a pointer to a foreground model from a string name (required for
@@ -107,7 +107,7 @@ public:
/// know
/// on the convolution type
void setAttribute(const std::string &name,
- const API::IFunction::Attribute &value);
+ const API::IFunction::Attribute &value) override;
/// Returns a reference to the foreground model
const ForegroundModel &foregroundModel() const;
@@ -121,7 +121,7 @@ private:
/// Required for function interface
void function(const Mantid::API::FunctionDomain &,
- Mantid::API::FunctionValues &) const {};
+ Mantid::API::FunctionValues &) const override{};
/// A reference to the main function under minimzation
const API::IFunctionMD *m_fittingFunction;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Models/MullerAnsatz.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Models/MullerAnsatz.h
index 06c68d581ad1d41381c1ed24c6510d868173e95c..1bfc10bc34a50aef542788315664bad7878d4abe 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Models/MullerAnsatz.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Models/MullerAnsatz.h
@@ -40,19 +40,19 @@ public:
/// Calculates the intensity for the model for the current parameters.
double scatteringIntensity(const API::ExperimentInfo &exptDescr,
- const std::vector<double> &point) const;
+ const std::vector<double> &point) const override;
/// Called when an attribute is set
void setAttribute(const std::string &name,
- const API::IFunction::Attribute &attr);
+ const API::IFunction::Attribute &attr) override;
/// Returns the type of model
- ModelType modelType() const { return Broad; }
+ ModelType modelType() const override { return Broad; }
/// String name of the model
- std::string name() const { return "MullerAnsatz"; }
+ std::string name() const override { return "MullerAnsatz"; }
MullerAnsatz();
private:
/// Setup the model
- void init();
+ void init() override;
// direction of the magnetic chain wrt the lattice vectors
ChainDirection m_ChainDirection;
// direction of the magnetic form factor wrt the lattice vectors.
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Models/QCoordinate.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Models/QCoordinate.h
index d7411760daa390b8bd242bc26bc3fb14d91ad0f4..12156a2d89a4543daff67a8db86fd7fda53ce2ab 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Models/QCoordinate.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Models/QCoordinate.h
@@ -40,19 +40,19 @@ public:
private:
/// String name of the model
- std::string name() const { return "QCoordinate"; }
+ std::string name() const override { return "QCoordinate"; }
/// Setup the model
- void init();
+ void init() override;
/// Called when an attribute is set
void setAttribute(const std::string &name,
- const API::IFunction::Attribute &attr);
+ const API::IFunction::Attribute &attr) override;
/// Returns the type of model
- ModelType modelType() const { return Broad; }
+ ModelType modelType() const override { return Broad; }
/// Calculates the intensity for the model for the current parameters.
double scatteringIntensity(const API::ExperimentInfo &exptDescr,
- const std::vector<double> &point) const;
+ const std::vector<double> &point) const override;
/// Which coordinate has been chosen
size_t m_coord;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Models/Strontium122.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Models/Strontium122.h
index 92e22b60815e6dcb5691b188547444b7b8d882d5..039f085ff7a431cec962ad25e9d1df07e921dd48 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Models/Strontium122.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Models/Strontium122.h
@@ -34,19 +34,19 @@ namespace MDAlgorithms {
class DLLExport Strontium122 : public ForegroundModel {
private:
/// String name of the model
- std::string name() const { return "Strontium122"; }
+ std::string name() const override { return "Strontium122"; }
/// Setup the model
- void init();
+ void init() override;
/// Called when an attribute is set
void setAttribute(const std::string &name,
- const API::IFunction::Attribute &attr);
+ const API::IFunction::Attribute &attr) override;
/// Returns the type of model
- ModelType modelType() const { return Broad; }
+ ModelType modelType() const override { return Broad; }
/// Calculates the intensity for the model for the current parameters.
double scatteringIntensity(const API::ExperimentInfo &exptDescr,
- const std::vector<double> &point) const;
+ const std::vector<double> &point) const override;
/// Twin type attribute
int m_twinType;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Resolution/TobyFitResolutionModel.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Resolution/TobyFitResolutionModel.h
index df512cf7df717e31497dedea0884405f14edbdb6..dc9869906e778067067d3003cdc88240fe04bb41 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Resolution/TobyFitResolutionModel.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Resolution/TobyFitResolutionModel.h
@@ -67,14 +67,13 @@ public:
TobyFitResolutionModel(const API::IFunctionMD &fittedFunction,
const std::string &fgModelName);
/// Destructor
- ~TobyFitResolutionModel();
+ ~TobyFitResolutionModel() override;
/// Returns the function's name
- std::string name() const { return "TobyFitResolutionModel"; }
+ std::string name() const override { return "TobyFitResolutionModel"; }
/// Returns the value of the model convoluted with the resolution
- virtual double signal(const API::IMDIterator &box,
- const uint16_t innerRunIndex,
- const size_t eventIndex) const;
+ double signal(const API::IMDIterator &box, const uint16_t innerRunIndex,
+ const size_t eventIndex) const override;
private:
DISABLE_COPY_AND_ASSIGN(TobyFitResolutionModel)
@@ -82,12 +81,12 @@ private:
friend class TobyFitYVector;
/// Declare function attributes
- void declareAttributes();
+ void declareAttributes() override;
/// Declare fitting parameters
- void declareParameters();
+ void declareParameters() override;
/// Cache some frequently used attributes
void setAttribute(const std::string &name,
- const API::IFunction::Attribute &value);
+ const API::IFunction::Attribute &value) override;
/// Calculate resolution coefficients
void calculateResolutionCoefficients(const CachedExperimentInfo &observation,
@@ -109,16 +108,16 @@ private:
const double sumSigmaSqr, const double avgSigma) const;
/// Called before a function evaluation begins
- void functionEvalStarting();
+ void functionEvalStarting() override;
/// Called after a function evaluation is finished
- void functionEvalFinished();
+ void functionEvalFinished() override;
/// Called just before the monte carlo loop starts
void monteCarloLoopStarting() const;
/// Cache detector observations once when the workspace is set
- void preprocess(const API::IMDEventWorkspace_const_sptr &workspace);
+ void preprocess(const API::IMDEventWorkspace_const_sptr &workspace) override;
/// Called just before the fitting job starts
- void setUpForFit();
+ void setUpForFit() override;
/// Set up the calculator for the given number of threads
void setNThreads(int nthreads);
/// Setup the random number generator based on the given type
@@ -128,7 +127,7 @@ private:
/// Required by the interface. Does nothing
void function(const Mantid::API::FunctionDomain &,
- Mantid::API::FunctionValues &) const {}
+ Mantid::API::FunctionValues &) const override {}
/// Storage for currently in use random number generators
mutable std::vector<Kernel::NDRandomNumberGenerator *> m_randomNumbers;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ResolutionConvolvedCrossSection.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ResolutionConvolvedCrossSection.h
index 8809107d3a137624ec4e0bf2595055772058ee7a..a68e28ece702c6eef1d87de12c427cde9cdf1108 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ResolutionConvolvedCrossSection.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ResolutionConvolvedCrossSection.h
@@ -50,37 +50,39 @@ public:
/// Constructor
ResolutionConvolvedCrossSection();
/// Destructor
- ~ResolutionConvolvedCrossSection();
+ ~ResolutionConvolvedCrossSection() override;
/// Name for the function
- std::string name() const { return "ResolutionConvolvedCrossSection"; }
+ std::string name() const override {
+ return "ResolutionConvolvedCrossSection";
+ }
/// Function category
- virtual const std::string category() const { return "Quantification"; }
+ const std::string category() const override { return "Quantification"; }
/// Declare the attributes associated with this function
- void declareAttributes();
+ void declareAttributes() override;
/// Declare model parameters.
- void declareParameters();
+ void declareParameters() override;
/// Evaluate the function across the domain
void function(const API::FunctionDomain &domain,
- API::FunctionValues &values) const;
+ API::FunctionValues &values) const override;
/// Return the signal contribution for the given box
- double functionMD(const API::IMDIterator &box) const;
+ double functionMD(const API::IMDIterator &box) const override;
/// Store the simulated events in the given workspace
void storeSimulatedEvents(const API::IMDEventWorkspace_sptr &resultWS);
private:
/// Override the call to set the workspace here
- void setWorkspace(boost::shared_ptr<const API::Workspace> workspace);
+ void setWorkspace(boost::shared_ptr<const API::Workspace> workspace) override;
/// Fit is about to start
- void setUpForFit();
+ void setUpForFit() override;
/// Returns an estimate of the number of progress reports a single evaluation
/// of the function will have.
- int64_t estimateNoProgressCalls() const;
+ int64_t estimateNoProgressCalls() const override;
/// Set a value to a named attribute. Ensures additional parameters are set
/// when foreground is set
void setAttribute(const std::string &name,
- const API::IFunction::Attribute &value);
+ const API::IFunction::Attribute &value) override;
/// Set a pointer to the concrete convolution object
void setupResolutionFunction(const std::string &name,
const std::string &fgModelName);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/SimulateResolutionConvolvedModel.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/SimulateResolutionConvolvedModel.h
index 5adc84bb4c12bf0a89cd822d553ef85bea4fd8ff..5925817133cfd3ddecca00330ce169c11031aec6 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/SimulateResolutionConvolvedModel.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/SimulateResolutionConvolvedModel.h
@@ -38,19 +38,19 @@ namespace MDAlgorithms {
class DLLExport SimulateResolutionConvolvedModel
: public FitResolutionConvolvedModel {
public:
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Runs a simulation of a model with a selected resolution function";
}
- virtual int version() const;
+ int version() const override;
private:
/// Returns the number of iterations that should be performed
- virtual int niterations() const;
- void init();
- void exec();
+ int niterations() const override;
+ void init() override;
+ void exec() override;
/// Create the MD function instance
boost::shared_ptr<API::IFunction> createFunction() const;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/QueryMDWorkspace.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/QueryMDWorkspace.h
index e2c17d9968e721617452c34b12b985b410eb05c0..cb8874fc097c8d070f2c517252092de4a1204152 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/QueryMDWorkspace.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/QueryMDWorkspace.h
@@ -37,27 +37,27 @@ namespace MDAlgorithms {
class DLLExport QueryMDWorkspace : public Mantid::API::Algorithm {
public:
QueryMDWorkspace();
- virtual ~QueryMDWorkspace();
+ ~QueryMDWorkspace() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "QueryMDWorkspace"; }
+ const std::string name() const override { return "QueryMDWorkspace"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Query the IMDWorkspace in order to extract summary information.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; }
+ int version() const override { return 1; }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\Utility\\Workspace";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
template <typename MDE, size_t nd>
void getBoxData(typename DataObjects::MDEventWorkspace<MDE, nd>::sptr ws);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReflectometryTransformKiKf.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReflectometryTransformKiKf.h
index a39662c630dd376443305518c39fc8d5ee97e2e9..832c2aad2d8178fc3f4572de5d6990023cd2f303 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReflectometryTransformKiKf.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReflectometryTransformKiKf.h
@@ -43,7 +43,7 @@ public:
double kfMax, double incidentTheta,
int numberOfBinsQx = 100,
int numberOfBinsQz = 100);
- virtual ~ReflectometryTransformKiKf();
+ ~ReflectometryTransformKiKf() override;
private:
DISABLE_DEFAULT_CONSTRUCT(ReflectometryTransformKiKf)
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReflectometryTransformP.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReflectometryTransformP.h
index 8e4d105e70579faec02049a6887a7ed66e8520b9..b6bef37c3ac19466bfffdb8d5984b167ff03ce6a 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReflectometryTransformP.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReflectometryTransformP.h
@@ -39,7 +39,7 @@ public:
ReflectometryTransformP(double pSumMin, double pSumMax, double pDiffMin,
double pDiffMax, double incidentTheta,
int numberOfBinsQx = 100, int numberOfBinsQz = 100);
- virtual ~ReflectometryTransformP();
+ ~ReflectometryTransformP() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReflectometryTransformQxQz.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReflectometryTransformQxQz.h
index 5bb7729df30f599ecfdb77e4eac491a1d5f82042..81f53ad327f2e4513de55555a8595a3895367f11 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReflectometryTransformQxQz.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReflectometryTransformQxQz.h
@@ -47,7 +47,7 @@ public:
int numberOfBinsQx = 100,
int numberOfBinsQz = 100);
/// Destructor
- virtual ~ReflectometryTransformQxQz();
+ ~ReflectometryTransformQxQz() override;
private:
DISABLE_DEFAULT_CONSTRUCT(ReflectometryTransformQxQz)
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReplicateMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReplicateMD.h
index e9b205cfade6e6d69b3eb63289739a2aee0da273..5857cf86ac745f204fe88623e4f5834d5937e0ed 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReplicateMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ReplicateMD.h
@@ -44,14 +44,14 @@ namespace MDAlgorithms {
class MANTID_MDALGORITHMS_DLL ReplicateMD : public API::Algorithm {
public:
ReplicateMD();
- virtual ~ReplicateMD();
+ ~ReplicateMD() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
/// Valdiate the algorithm inputs
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
private:
boost::shared_ptr<const Mantid::DataObjects::MDHistoWorkspace> transposeMD(
@@ -61,8 +61,8 @@ private:
getDataWorkspace() const;
boost::shared_ptr<Mantid::DataObjects::MDHistoWorkspace>
getShapeWorkspace() const;
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveIsawQvector.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveIsawQvector.h
index 1b774e3bfbd9319a7a332bea7b500adf13fa24d7..c65e03911294007983232f951bbeda3079726099 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveIsawQvector.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveIsawQvector.h
@@ -34,20 +34,20 @@ namespace MDAlgorithms {
class DLLExport SaveIsawQvector : public API::Algorithm {
public:
SaveIsawQvector();
- virtual ~SaveIsawQvector();
+ ~SaveIsawQvector() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save an event workspace as an ISAW Q-vector file";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
MDWSDescription m_targWSDescr;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveMD.h
index 43629ef6733f1d44455e45936a00e25c3847d9ca..ee806df7fa5bb0ef2d002fc139a87af4421689b4 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveMD.h
@@ -38,27 +38,27 @@ namespace MDAlgorithms {
class DLLExport SaveMD : public API::Algorithm {
public:
SaveMD();
- ~SaveMD();
+ ~SaveMD() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SaveMD"; };
+ const std::string name() const override { return "SaveMD"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save a MDEventWorkspace or MDHistoWorkspace to a .nxs file.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\DataHandling";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Helper method
template <typename MDE, size_t nd>
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveMD2.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveMD2.h
index 7772ec122d3732817ee87c9a2096ee9186f9fa1b..4cf9a345629832ea5c9279133c0a13b481f99c37 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveMD2.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveMD2.h
@@ -35,27 +35,27 @@ namespace MDAlgorithms {
class DLLExport SaveMD2 : public API::Algorithm {
public:
SaveMD2();
- ~SaveMD2();
+ ~SaveMD2() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SaveMD"; };
+ const std::string name() const override { return "SaveMD"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save a MDEventWorkspace or MDHistoWorkspace to a .nxs file.";
}
/// Algorithm's version for identification
- virtual int version() const { return 2; };
+ int version() const override { return 2; };
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\DataHandling";
}
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Save the MDHistoWorkspace.
void doSaveHisto(Mantid::DataObjects::MDHistoWorkspace_sptr ws);
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveZODS.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveZODS.h
index d24b181207f48302a8edd7b36e76268c45af83c9..7f0ab22df12e658bcd732241c480be755a4d525a 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveZODS.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SaveZODS.h
@@ -36,21 +36,21 @@ namespace MDAlgorithms {
class DLLExport SaveZODS : public API::Algorithm {
public:
SaveZODS();
- virtual ~SaveZODS();
+ ~SaveZODS() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Save a MDHistoWorkspace in HKL space to a HDF5 format for use with "
"the ZODS analysis software.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SetMDFrame.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SetMDFrame.h
index aeef9548b915d01f9021e41e8ea41e2d3f1c7b98..a37006451009678e0a6dc4b45482cb53d24352df 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SetMDFrame.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SetMDFrame.h
@@ -37,17 +37,17 @@ class MANTID_MDALGORITHMS_DLL SetMDFrame : public API::Algorithm {
public:
static const std::string mdFrameSpecifier;
SetMDFrame();
- virtual ~SetMDFrame();
+ ~SetMDFrame() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
- virtual std::map<std::string, std::string> validateInputs();
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
+ std::map<std::string, std::string> validateInputs() override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
Mantid::Geometry::MDFrame_uptr
createMDFrame(const std::string &frameSelection,
const Mantid::Geometry::MDFrame &oldFrame) const;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SetMDUsingMask.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SetMDUsingMask.h
index 485f1f710ce12c0a9a1a1b80e4a8ddd81855fa1f..1334afc5858bd48d8bc0904add98dc649a2c91d3 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SetMDUsingMask.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SetMDUsingMask.h
@@ -36,21 +36,21 @@ namespace MDAlgorithms {
class DLLExport SetMDUsingMask : public API::Algorithm {
public:
SetMDUsingMask();
- virtual ~SetMDUsingMask();
+ ~SetMDUsingMask() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Algorithm to set a MDHistoWorkspace in points determined by a mask "
"boolean MDHistoWorkspace.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SliceMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SliceMD.h
index 2d61d9980acbd18fcf6d4d45b1fb3f5934d36efb..1e27e3246c0a5848e622b86db973510f5ca4f7a9 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SliceMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SliceMD.h
@@ -48,26 +48,28 @@ public:
//};
SliceMD();
- ~SliceMD();
+ ~SliceMD() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "SliceMD"; };
+ const std::string name() const override { return "SliceMD"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Make a MDEventWorkspace containing the events in a slice of an "
"input MDEventWorkspace.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "MDAlgorithms\\Slicing"; }
+ const std::string category() const override {
+ return "MDAlgorithms\\Slicing";
+ }
private:
/// Initialise the properties
- void init();
+ void init() override;
/// Run the algorithm
- void exec();
+ void exec() override;
/// Helper method
template <typename MDE, size_t nd>
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SlicingAlgorithm.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SlicingAlgorithm.h
index 0d6b86fd8fd9693ee51d9d8d7fd82dc8442e43e4..dd6b4fd93cfd5aad1faf7b9dbeb680f1ffc19433 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SlicingAlgorithm.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SlicingAlgorithm.h
@@ -49,7 +49,7 @@ namespace MDAlgorithms {
class DLLExport SlicingAlgorithm : public API::Algorithm {
public:
SlicingAlgorithm();
- ~SlicingAlgorithm();
+ ~SlicingAlgorithm() override;
///@return a string with the character that identifies each dimension in order
///(01234)
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SmoothMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SmoothMD.h
index c23edf1675bd385f512d15b7746aa445b8fcb7b0..4c2577a583c662fa694398b89c4bf5ddd7ab6d8d 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SmoothMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SmoothMD.h
@@ -38,13 +38,13 @@ namespace MDAlgorithms {
class DLLExport SmoothMD : public API::Algorithm {
public:
SmoothMD();
- virtual ~SmoothMD();
+ ~SmoothMD() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
- std::map<std::string, std::string> validateInputs();
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
+ std::map<std::string, std::string> validateInputs() override;
boost::shared_ptr<Mantid::API::IMDHistoWorkspace> hatSmooth(
boost::shared_ptr<const Mantid::API::IMDHistoWorkspace> toSmooth,
@@ -53,8 +53,8 @@ public:
weightingWS);
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ThresholdMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ThresholdMD.h
index 2c0a91ffcadf03acd3387c8975d5341e416277b2..1d3f7e85164747e7302f2ab478bf18c834fcaf3b 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ThresholdMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ThresholdMD.h
@@ -33,20 +33,20 @@ namespace MDAlgorithms {
class DLLExport ThresholdMD : public API::Algorithm {
public:
ThresholdMD();
- virtual ~ThresholdMD();
+ ~ThresholdMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Threshold an MDHistoWorkspace.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/TransformMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/TransformMD.h
index a5d2b6631797a96ce8a7d58cf8ba1769bc0ee66a..a3acf2e80bf12c976801a45714ad9537658f4669 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/TransformMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/TransformMD.h
@@ -36,20 +36,20 @@ namespace MDAlgorithms {
class DLLExport TransformMD : public API::Algorithm {
public:
TransformMD();
- virtual ~TransformMD();
+ ~TransformMD() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Scale and/or offset the coordinates of a MDWorkspace";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void reverse(signal_t *array, size_t arrayLength);
template <typename MDE, size_t nd>
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/TransposeMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/TransposeMD.h
index dad88068318ec8b045a2326e99d236ab48c85558..fe66a462c4acc491899bae5edc36aef2135e4f7d 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/TransposeMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/TransposeMD.h
@@ -34,18 +34,18 @@ namespace MDAlgorithms {
class MANTID_MDALGORITHMS_DLL TransposeMD : public API::Algorithm {
public:
TransposeMD();
- virtual ~TransposeMD();
+ ~TransposeMD() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
- virtual const std::string alias() const { return "PermuteMD"; }
+ const std::string alias() const override { return "PermuteMD"; }
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/UnaryOperationMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/UnaryOperationMD.h
index b04ddc8503a574504007eabd38d380c152e3c25f..b703a01a0604475696275666097f9b8fc7e2a2de 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/UnaryOperationMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/UnaryOperationMD.h
@@ -37,12 +37,12 @@ namespace MDAlgorithms {
class DLLExport UnaryOperationMD : public API::Algorithm {
public:
UnaryOperationMD();
- ~UnaryOperationMD();
+ ~UnaryOperationMD() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const {
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override {
return "Abstract base class for unary operations on MDWorkspaces.";
}
@@ -52,9 +52,9 @@ protected:
/// The name of the output workspace property
virtual const std::string outputPropName() const { return "OutputWorkspace"; }
- void init();
+ void init() override;
virtual void initExtraProperties();
- void exec();
+ void exec() override;
/// Check the inputs and throw if the algorithm cannot be run
virtual void checkInputs() = 0;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/UserFunctionMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/UserFunctionMD.h
index 92cd440ae81edd7a6e08a9063ca37ad53854d397..9c38512c26591c1b5e9301203289b3809f83ce56 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/UserFunctionMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/UserFunctionMD.h
@@ -42,24 +42,24 @@ class DLLExport UserFunctionMD : virtual public API::IFunctionMD,
virtual public API::ParamFunction {
public:
UserFunctionMD();
- std::string name() const { return "UserFunctionMD"; }
+ std::string name() const override { return "UserFunctionMD"; }
- std::vector<std::string> getAttributeNames() const;
- bool hasAttribute(const std::string &attName) const;
- Attribute getAttribute(const std::string &attName) const;
- void setAttribute(const std::string &attName, const Attribute &attr);
+ std::vector<std::string> getAttributeNames() const override;
+ bool hasAttribute(const std::string &attName) const override;
+ Attribute getAttribute(const std::string &attName) const override;
+ void setAttribute(const std::string &attName, const Attribute &attr) override;
/**
* Defining function's parameters here, ie after the workspace is set and
* the dimensions are known.
*/
- void initDimensions();
+ void initDimensions() override;
protected:
/**
* Calculate the function value at a point r in the MD workspace
* @param r :: MD workspace iterator with a reference to the current point
*/
- double functionMD(const API::IMDIterator &r) const;
+ double functionMD(const API::IMDIterator &r) const override;
/** Static callback function used by MuParser to initialize variables
implicitly
@param varName :: The name of a new variable
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Vector3DParameterParser.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Vector3DParameterParser.h
index 3fbe82d379ea1ed40333f609956426f24be1d34e..bbe0092e4d7878138d36b9f13b1a6c8cfa6de101 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Vector3DParameterParser.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Vector3DParameterParser.h
@@ -53,12 +53,12 @@ public:
VectorValueParameterType *parseVectorParameter(std::string value);
Mantid::API::ImplicitFunctionParameter *
- createParameter(Poco::XML::Element *parameterElement);
+ createParameter(Poco::XML::Element *parameterElement) override;
- void
- setSuccessorParser(Mantid::API::ImplicitFunctionParameterParser *paramParser);
+ void setSuccessorParser(
+ Mantid::API::ImplicitFunctionParameterParser *paramParser) override;
- ~Vector3DParameterParser();
+ ~Vector3DParameterParser() override;
};
////////////////////////////////////////////////////////////////////
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/WeightedMeanMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/WeightedMeanMD.h
index 1e2bca3ebda7b1b3ff596b604c3050c98158be79..26108da62f469b6c254825382ae68de16eb55c95 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/WeightedMeanMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/WeightedMeanMD.h
@@ -36,36 +36,37 @@ namespace MDAlgorithms {
class DLLExport WeightedMeanMD : public BinaryOperationMD {
public:
WeightedMeanMD();
- virtual ~WeightedMeanMD();
+ ~WeightedMeanMD() override;
/// Algorithm's name for identification
- virtual const std::string name() const { return "WeightedMeanMD"; };
+ const std::string name() const override { return "WeightedMeanMD"; };
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Find weighted mean of two MDHistoWorkspaces.";
}
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
private:
/// Is the operation commutative?
- bool commutative() const;
+ bool commutative() const override;
/// Check the inputs and throw if the algorithm cannot be run
- void checkInputs();
+ void checkInputs() override;
/// Run the algorithm with an MDEventWorkspace as output
- void execEvent();
+ void execEvent() override;
/// Run the algorithm with a MDHisotWorkspace as output and operand
- void execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::MDHistoWorkspace_const_sptr operand);
+ void execHistoHisto(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) override;
/// Run the algorithm with a MDHisotWorkspace as output, scalar and operand
- void
- execHistoScalar(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar);
+ void execHistoScalar(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar) override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/XorMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/XorMD.h
index 4e2d46a08bde9944018879b9a2af58987468c909..288fe9258f7a1a8693b37f843d962a99465766da 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/XorMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/XorMD.h
@@ -36,14 +36,15 @@ namespace MDAlgorithms {
class DLLExport XorMD : public BooleanBinaryOperationMD {
public:
XorMD();
- virtual ~XorMD();
+ ~XorMD() override;
- virtual const std::string name() const;
- virtual int version() const;
+ const std::string name() const override;
+ int version() const override;
private:
- void execHistoHisto(Mantid::DataObjects::MDHistoWorkspace_sptr out,
- Mantid::DataObjects::MDHistoWorkspace_const_sptr operand);
+ void execHistoHisto(
+ Mantid::DataObjects::MDHistoWorkspace_sptr out,
+ Mantid::DataObjects::MDHistoWorkspace_const_sptr operand) override;
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp b/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp
index 20a7d9c86aa9966219a5dc94a572b01c4502095d..06f9b9d1e20bfbab35410e8118a739ba55c0ebaf 100644
--- a/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp
+++ b/Framework/MDAlgorithms/src/CompareMDWorkspaces.cpp
@@ -20,7 +20,7 @@ class CompareFailsException : public std::runtime_error {
public:
explicit CompareFailsException(const std::string &msg)
: std::runtime_error(msg) {}
- ~CompareFailsException() throw() {}
+ ~CompareFailsException() throw() override {}
std::string getMessage() const { return this->what(); }
};
diff --git a/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace2.cpp b/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace2.cpp
index dbf99e420f22fd7b668a40d7bc9cdf5f54150ce1..b13333d56013ba2344c36316e03b49f587569084 100644
--- a/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace2.cpp
+++ b/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace2.cpp
@@ -28,7 +28,7 @@ DECLARE_ALGORITHM(ConvertToDiffractionMDWorkspace2)
class DisabledProperty : public EnabledWhenProperty {
public:
DisabledProperty() : EnabledWhenProperty("NonExistingProperty", IS_DEFAULT) {}
- virtual bool fulfillsCriterion(const IPropertyManager * /*algo*/) const {
+ bool fulfillsCriterion(const IPropertyManager * /*algo*/) const override {
return false;
}
};
diff --git a/Framework/Nexus/inc/MantidNexus/NexusClasses.h b/Framework/Nexus/inc/MantidNexus/NexusClasses.h
index ada03dca2d7b9d9a380d22bb0be6acbef03f07ea..f37118f95eee5fc5dbaea4c61c2caf0e8a4c7e81 100644
--- a/Framework/Nexus/inc/MantidNexus/NexusClasses.h
+++ b/Framework/Nexus/inc/MantidNexus/NexusClasses.h
@@ -154,7 +154,7 @@ public:
// Constructor
NXDataSet(const NXClass &parent, const std::string &name);
/// NX class name. Returns "SDS"
- std::string NX_class() const { return "SDS"; }
+ std::string NX_class() const override { return "SDS"; }
/// Opens the data set. Does not read in any data. Call load(...) to load the
/// data
void open();
@@ -294,7 +294,7 @@ public:
* The rank of the data must be 4
*/
void load(const int blocksize = 1, int i = -1, int j = -1, int k = -1,
- int l = -1) {
+ int l = -1) override {
if (rank() > 4) {
throw std::runtime_error("Cannot load dataset of rank greater than 4");
}
@@ -502,7 +502,7 @@ public:
*/
NXClass(const NXClass &parent, const std::string &name);
/// The NX class identifier
- std::string NX_class() const { return "NXClass"; }
+ std::string NX_class() const override { return "NXClass"; }
/** Returns the class information about the next entry (class or dataset) in
* this class.
*/
@@ -651,7 +651,7 @@ public:
NXLog(const NXClass &parent, const std::string &name)
: NXClass(parent, name) {}
/// Nexus class id
- std::string NX_class() const { return "NXlog"; }
+ std::string NX_class() const override { return "NXlog"; }
/// Creates a property wrapper around the log
Kernel::Property *createProperty();
/// Creates a TimeSeriesProperty and returns a pointer to it
@@ -761,7 +761,7 @@ public:
NXNote(const NXClass &parent, const std::string &name)
: NXClass(parent, name), m_author_ok(), m_data_ok(), m_description_ok() {}
/// Nexus class id
- std::string NX_class() const { return "NXnote"; }
+ std::string NX_class() const override { return "NXnote"; }
/// Returns the note's author
std::string author();
/// Returns the note's content
@@ -834,7 +834,7 @@ public:
*/
NXData(const NXClass &parent, const std::string &name);
/// Nexus class id
- std::string NX_class() const { return "NXdata"; }
+ std::string NX_class() const override { return "NXdata"; }
/** Opens the dataset within this NXData with signal=1 attribute.
*/
template <typename T> NXDataSetTyped<T> openData() {
@@ -874,7 +874,7 @@ public:
NXDetector(const NXClass &parent, const std::string &name)
: NXMainClass(parent, name) {}
/// Nexus class id
- std::string NX_class() const { return "NXdetector"; }
+ std::string NX_class() const override { return "NXdetector"; }
/// Opens the dataset containing pixel distances
NXFloat openDistance() { return openNXFloat("distance"); }
/// Opens the dataset containing pixel azimuthal angles
@@ -895,7 +895,7 @@ public:
NXDiskChopper(const NXClass &parent, const std::string &name)
: NXMainClass(parent, name) {}
/// Nexus class id
- std::string NX_class() const { return "NXdisk_chopper"; }
+ std::string NX_class() const override { return "NXdisk_chopper"; }
/// Opens the dataset containing pixel distances
NXFloat openRotationSpeed() { return openNXFloat("rotation_speed"); }
};
@@ -912,7 +912,7 @@ public:
NXInstrument(const NXClass &parent, const std::string &name)
: NXMainClass(parent, name) {}
/// Nexus class id
- std::string NX_class() const { return "NXinstrument"; }
+ std::string NX_class() const override { return "NXinstrument"; }
/** Opens a NXDetector
* @param name :: The name of the class
* @return The detector
@@ -942,7 +942,7 @@ public:
NXEntry(const NXClass &parent, const std::string &name)
: NXMainClass(parent, name) {}
/// Nexus class id
- std::string NX_class() const { return "NXentry"; }
+ std::string NX_class() const override { return "NXentry"; }
/** Opens a NXData
* @param name :: The name of the class
* @return the nxdata entry
@@ -968,9 +968,9 @@ public:
// Constructor
NXRoot(const std::string &fname, const std::string &entry);
/// Destructor
- virtual ~NXRoot();
+ ~NXRoot() override;
/// Return the NX class for a class (HDF group) or "SDS" for a data set;
- std::string NX_class() const { return "NXroot"; }
+ std::string NX_class() const override { return "NXroot"; }
/// True if complies with our understanding of the www.nexusformat.org
/// definition.
bool isStandard() const;
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/api/Algorithms/RunPythonScript.h b/Framework/PythonInterface/inc/MantidPythonInterface/api/Algorithms/RunPythonScript.h
index 84ea807e2bb5526821c39265cffd1851356fb8d3..ddbd29f2fd1625b90066bc7c8b183dfcc42253c6 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/api/Algorithms/RunPythonScript.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/api/Algorithms/RunPythonScript.h
@@ -33,15 +33,15 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
class DLLExport RunPythonScript : public API::Algorithm {
public:
- const std::string name() const;
- int version() const;
- const std::string category() const;
- const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- virtual bool checkGroups();
- void init();
- void exec();
+ bool checkGroups() override;
+ void init() override;
+ void exec() override;
/// Return the code string to execute
std::string scriptCode() const;
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunction1DAdapter.h b/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunction1DAdapter.h
index 8fe630929c357dc9b6158d3dc4c21f867fb0c8c9..090d8a8b0e5ee48a029f52957525bfc47e558cac 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunction1DAdapter.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunction1DAdapter.h
@@ -60,13 +60,14 @@ public:
/** @name Virtual methods */
///@{
/// Base-class method
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
/// Python-type signature
boost::python::object function1D(const boost::python::object &xvals) const;
/// Derivatives of function with respect to active parameters (C++ override)
void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
///@}
private:
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunctionAdapter.h b/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunctionAdapter.h
index be516ec572fc44a65ab23a81fca99a9cf55499bf..498b21c29072809d15cc26a5e4583494d7f652d2 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunctionAdapter.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunctionAdapter.h
@@ -42,11 +42,11 @@ public:
IFunctionAdapter(PyObject *self);
/// Returns the name of the function
- std::string name() const;
+ std::string name() const override;
/// Specify a category for the function
- const std::string category() const;
+ const std::string category() const override;
/// Declare all attributes & parameters
- void init();
+ void init() override;
/// Declare an attribute with an initial value
void declareAttribute(const std::string &name,
@@ -57,7 +57,7 @@ public:
PyObject *getAttributeValue(const API::IFunction::Attribute &attr);
/// Called by the framework when an attribute has been set
void setAttribute(const std::string &attName,
- const API::IFunction::Attribute &attr);
+ const API::IFunction::Attribute &attr) override;
/// Store the attribute's value in the default IFunction's cache
void storeAttributePythonValue(const std::string &name,
const boost::python::object &value);
@@ -96,9 +96,9 @@ public:
/// Override this method to make fitted parameters different from the
/// declared
- double activeParameter(size_t i) const;
+ double activeParameter(size_t i) const override;
/// Override this method to make fitted parameters different from the declared
- void setActiveParameter(size_t i, double value);
+ void setActiveParameter(size_t i, double value) override;
protected:
/**
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IPeakFunctionAdapter.h b/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IPeakFunctionAdapter.h
index 9db1bee7f03a8f82af7f16e3d265618ad3fb3047..158a754045a6db62c7f0f78f5739d0abc79cc36d 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IPeakFunctionAdapter.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IPeakFunctionAdapter.h
@@ -47,40 +47,40 @@ public:
IPeakFunctionAdapter(PyObject *self);
/// Calls 'centre' method in Python
- double centre() const;
+ double centre() const override;
/// Calls 'height' method in Python
- double height() const;
+ double height() const override;
/// Calls 'setCentre' method in Python
- void setCentre(const double c);
+ void setCentre(const double c) override;
/// Calls 'setHeight' method in Python
- void setHeight(const double h);
+ void setHeight(const double h) override;
/// Calls Python fwhm method
- double fwhm() const;
+ double fwhm() const override;
/// Called by framework when the width is changed
- void setFwhm(const double w);
+ void setFwhm(const double w) override;
/// Required to solve compiler ambiguity between IPeakFunction &
/// IFunction1DAdapter
void function1D(double *out, const double *xValues,
- const size_t nData) const {
+ const size_t nData) const override {
IPeakFunction::function1D(out, xValues, nData);
}
/// Required to solve compiler ambiguity between IPeakFunction &
/// IFunction1DAdapter
void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData) {
+ const size_t nData) override {
IPeakFunction::functionDeriv1D(out, xValues, nData);
}
/// Implemented Base-class method
void functionLocal(double *out, const double *xValues,
- const size_t nData) const;
+ const size_t nData) const override;
/// Python-type signature for above method
boost::python::object functionLocal(const boost::python::object &xvals) const;
/// Implemented base-class method
void functionDerivLocal(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
/// Python signature
void functionDerivLocal(const boost::python::object &xvals,
boost::python::object &jacobian);
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/api/PythonAlgorithm/AlgorithmAdapter.h b/Framework/PythonInterface/inc/MantidPythonInterface/api/PythonAlgorithm/AlgorithmAdapter.h
index 4ff4e6147e7179cdba497844e0f64cc30ebfe276..47a89f4438143e9cf1522b85fe4caa6c2f2ed2ed 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/api/PythonAlgorithm/AlgorithmAdapter.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/api/PythonAlgorithm/AlgorithmAdapter.h
@@ -52,29 +52,29 @@ public:
/** @name Algorithm virtual methods */
///@{
/// Returns the name of the algorithm
- const std::string name() const;
+ const std::string name() const override;
/// Returns a version of the algorithm
- virtual int version() const;
+ int version() const override;
/// A default version, chosen if there is no override
int defaultVersion() const;
/// Returns the summary for the algorithm
- virtual const std::string summary() const;
+ const std::string summary() const override;
/// Returns the summary for the algorithm
std::string defaultSummary() const;
/// Returns a category of the algorithm.
- virtual const std::string category() const;
+ const std::string category() const override;
/// A default category, chosen if there is no override
std::string defaultCategory() const;
/// Allow the isRunning method to be overridden
- virtual bool isRunning() const;
+ bool isRunning() const override;
/// Allow the cancel method to be overridden
- virtual void cancel();
+ void cancel() override;
/// A return of false will allow processing workspace groups as a whole
- virtual bool checkGroups();
+ bool checkGroups() override;
/// A default value for checkGroups, chosen if there is no override
bool checkGroupsDefault();
/// Returns the validateInputs result of the algorithm.
- std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
///@}
// -- Deprecated methods --
@@ -127,9 +127,9 @@ private:
DISABLE_COPY_AND_ASSIGN(AlgorithmAdapter)
/// Private init for this algorithm
- virtual void init();
+ void init() override;
/// Private exec for this algorithm
- virtual void exec();
+ void exec() override;
/// We don't want the base class versions
using SuperClass::declareProperty;
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/PythonObjectInstantiator.h b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/PythonObjectInstantiator.h
index 7947ea3e55aa0b3f6cdaad62ec225eb2de5821f7..d7767430c125b9541cc26551d945139cbc6ac5f2 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/PythonObjectInstantiator.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/PythonObjectInstantiator.h
@@ -71,10 +71,10 @@ public:
: m_classObject(classObject) {}
/// Creates an instance of the object as shared_ptr to the Base type
- boost::shared_ptr<Base> createInstance() const;
+ boost::shared_ptr<Base> createInstance() const override;
/// Creates an instance of the object as raw pointer to the Base type
- Base *createUnwrappedInstance() const;
+ Base *createUnwrappedInstance() const override;
private:
/// The class name
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Registry/SequenceTypeHandler.h b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Registry/SequenceTypeHandler.h
index ea140827a887629c6a81f59f7eaaf762c81d6bb4..084d2f7a97ad7e686b22a10b37592705209e8de2 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Registry/SequenceTypeHandler.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Registry/SequenceTypeHandler.h
@@ -38,13 +38,13 @@ struct DLLExport SequenceTypeHandler
/// Call to set a named property where the value is some container type
void set(Kernel::IPropertyManager *alg, const std::string &name,
- const boost::python::object &value) const;
+ const boost::python::object &value) const override;
/// Call to create a name property where the value is some container type
Kernel::Property *create(const std::string &name,
const boost::python::object &defaultValue,
const boost::python::object &validator,
- const unsigned int direction) const;
+ const unsigned int direction) const override;
// /**
// * Return the PyTypeObject of the DerivedType
// * @returns A PyTypeObject for the given DerivedType
diff --git a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Registry/TypedPropertyValueHandler.h b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Registry/TypedPropertyValueHandler.h
index 7a6208201681492e3e0bea56527e7bb74b7ff853..ed0791ce5751965246467e742f47ede5e7d84c8e 100644
--- a/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Registry/TypedPropertyValueHandler.h
+++ b/Framework/PythonInterface/inc/MantidPythonInterface/kernel/Registry/TypedPropertyValueHandler.h
@@ -56,7 +56,7 @@ struct DLLExport TypedPropertyValueHandler : public PropertyValueHandler {
* @param value :: A boost python object that stores the value
*/
void set(Kernel::IPropertyManager *alg, const std::string &name,
- const boost::python::object &value) const {
+ const boost::python::object &value) const override {
alg->setProperty<ValueType>(name, boost::python::extract<ValueType>(value));
}
/**
@@ -73,7 +73,7 @@ struct DLLExport TypedPropertyValueHandler : public PropertyValueHandler {
Kernel::Property *create(const std::string &name,
const boost::python::object &defaultValue,
const boost::python::object &validator,
- const unsigned int direction) const {
+ const unsigned int direction) const override {
using boost::python::extract;
const ValueType valueInC = extract<ValueType>(defaultValue)();
Kernel::Property *valueProp(NULL);
@@ -112,7 +112,7 @@ struct DLLExport TypedPropertyValueHandler<boost::shared_ptr<T>>
* @param value :: A boost python object that stores the value
*/
void set(Kernel::IPropertyManager *alg, const std::string &name,
- const boost::python::object &value) const {
+ const boost::python::object &value) const override {
alg->setProperty<HeldType>(
name, boost::dynamic_pointer_cast<T>(ExtractWorkspace(value)()));
}
@@ -131,7 +131,7 @@ struct DLLExport TypedPropertyValueHandler<boost::shared_ptr<T>>
Kernel::Property *create(const std::string &name,
const boost::python::object &defaultValue,
const boost::python::object &validator,
- const unsigned int direction) const {
+ const unsigned int direction) const override {
using boost::python::extract;
const PropertyValueType valueInC =
extract<PropertyValueType>(defaultValue)();
diff --git a/Framework/PythonInterface/mantid/kernel/src/Exports/OptionalBool.cpp b/Framework/PythonInterface/mantid/kernel/src/Exports/OptionalBool.cpp
index 14fdf3c1f6a59260a304574f1780a3dcab787cc3..82135026d8509fcbf3f1b94cfc150b6d24a4f8a7 100644
--- a/Framework/PythonInterface/mantid/kernel/src/Exports/OptionalBool.cpp
+++ b/Framework/PythonInterface/mantid/kernel/src/Exports/OptionalBool.cpp
@@ -50,14 +50,13 @@ private:
public:
typedef OptionalBool HeldType;
- virtual ~OptionalBoolPropertyValueHandler() {}
+ ~OptionalBoolPropertyValueHandler() override {}
/**
* Set function to handle Python -> C++ calls and get the correct type
*/
- virtual void set(Mantid::Kernel::IPropertyManager *alg,
- const std::string &name,
- const boost::python::object &value) const {
+ void set(Mantid::Kernel::IPropertyManager *alg, const std::string &name,
+ const boost::python::object &value) const override {
alg->setProperty<OptionalBool>(name, fromPyObj(value));
}
@@ -65,10 +64,10 @@ public:
/**
* Create a PropertyWithValue from the given python object value
*/
- virtual Mantid::Kernel::Property *
+ Mantid::Kernel::Property *
create(const std::string &name, const boost::python::object &value,
const boost::python::object &validator,
- const unsigned int direction) const {
+ const unsigned int direction) const override {
using boost::python::extract;
auto optBool = fromPyObj(value);
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/AbortRemoteJob.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/AbortRemoteJob.h
index d8590dfa9d1d2dfbd7848b0c0340050a0650f947..227af13b6a656da4ccbe3fe731d3e4baaeefc7ca 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/AbortRemoteJob.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/AbortRemoteJob.h
@@ -11,23 +11,23 @@ public:
/// (Empty) Constructor
AbortRemoteJob() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~AbortRemoteJob() {}
+ ~AbortRemoteJob() override {}
/// Algorithm's name
- virtual const std::string name() const { return "AbortRemoteJob"; }
+ const std::string name() const override { return "AbortRemoteJob"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Abort a previously submitted job.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/AbortRemoteJob2.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/AbortRemoteJob2.h
index 18731a49c6030b9cd43a20df9508a8c7edc189d6..0f125b75c4181c1acc5c51741818abaecafbcd9e 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/AbortRemoteJob2.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/AbortRemoteJob2.h
@@ -35,23 +35,23 @@ public:
/// (Empty) Constructor
AbortRemoteJob2() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~AbortRemoteJob2() {}
+ ~AbortRemoteJob2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "AbortRemoteJob"; }
+ const std::string name() const override { return "AbortRemoteJob"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Abort a previously submitted job.";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/Authenticate.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/Authenticate.h
index 8b662b902bd97b1b671c5c2109855779ee2b5cb0..d2fe8116054fbc669f34b320f363773bd1642b7c 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/Authenticate.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/Authenticate.h
@@ -51,23 +51,23 @@ public:
/// (Empty) Constructor
Authenticate() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~Authenticate() {}
+ ~Authenticate() override {}
/// Algorithm's name
- virtual const std::string name() const { return "Authenticate"; }
+ const std::string name() const override { return "Authenticate"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Authenticate to the remote compute resource.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/Authenticate2.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/Authenticate2.h
index 58626d273230f6110b1ea52c1ba8b51efc994de0..64a6c551647230b4acacc35b7e5b6e69968787f3 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/Authenticate2.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/Authenticate2.h
@@ -35,23 +35,23 @@ public:
/// (Empty) Constructor
Authenticate2() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~Authenticate2() {}
+ ~Authenticate2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "Authenticate"; }
+ const std::string name() const override { return "Authenticate"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Authenticate to the remote compute resource.";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/DownloadRemoteFile.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/DownloadRemoteFile.h
index 02a8f2c1dae4c266aa64ee055609afacd1cf2b24..1ef7bd5e9ca020e0d3d59558911c050fa57aa5a1 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/DownloadRemoteFile.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/DownloadRemoteFile.h
@@ -11,23 +11,23 @@ public:
/// (Empty) Constructor
DownloadRemoteFile() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~DownloadRemoteFile() {}
+ ~DownloadRemoteFile() override {}
/// Algorithm's name
- virtual const std::string name() const { return "DownloadRemoteFile"; }
+ const std::string name() const override { return "DownloadRemoteFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Download a file from a remote compute resource.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/DownloadRemoteFile2.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/DownloadRemoteFile2.h
index 3c09b928883fd44930573b4302235baebbdfcadb..aafea407ca36470637c560148993b6b6665f08bb 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/DownloadRemoteFile2.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/DownloadRemoteFile2.h
@@ -35,23 +35,23 @@ public:
/// (Empty) Constructor
DownloadRemoteFile2() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~DownloadRemoteFile2() {}
+ ~DownloadRemoteFile2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "DownloadRemoteFile"; }
+ const std::string name() const override { return "DownloadRemoteFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Download a file from a remote compute resource.";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/Logout2.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/Logout2.h
index 033f47da026443648a5bef9b8f94243d6ae01bf3..2a51c01da58bd94dcd4d491b2def4d69fe5e6a28 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/Logout2.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/Logout2.h
@@ -35,23 +35,23 @@ public:
/// Default constructor
Logout2() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~Logout2() {}
+ ~Logout2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "Logout"; }
+ const std::string name() const override { return "Logout"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Logout from a remote compute resource.";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryAllRemoteJobs.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryAllRemoteJobs.h
index 49a153b41525c9a7b36be2b1f4684064f3c1d064..03afb7cde4777c516bb9c8b6abfa3029f10ad851 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryAllRemoteJobs.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryAllRemoteJobs.h
@@ -11,24 +11,24 @@ public:
/// (Empty) Constructor
QueryAllRemoteJobs() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~QueryAllRemoteJobs() {}
+ ~QueryAllRemoteJobs() override {}
/// Algorithm's name
- virtual const std::string name() const { return "QueryAllRemoteJobs"; }
+ const std::string name() const override { return "QueryAllRemoteJobs"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Query a remote compute resource for all jobs the user has "
"submitted.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryAllRemoteJobs2.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryAllRemoteJobs2.h
index dccdcbaca1fbba9a3a87708015771fe0a835e89d..676fd37ffe422f61ce24cd2c7e5a6b88991d5285 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryAllRemoteJobs2.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryAllRemoteJobs2.h
@@ -36,24 +36,24 @@ public:
/// (Empty) Constructor
QueryAllRemoteJobs2() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~QueryAllRemoteJobs2() {}
+ ~QueryAllRemoteJobs2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "QueryAllRemoteJobs"; }
+ const std::string name() const override { return "QueryAllRemoteJobs"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Query a remote compute resource for all jobs the user has "
"submitted.";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteFile.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteFile.h
index 2a07da2a6370e9bc3d1578f468718f1123325b5f..7bbc5bd971e43e57731788bfaf277bf9b97da7d4 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteFile.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteFile.h
@@ -11,23 +11,23 @@ public:
/// (Empty) Constructor
QueryRemoteFile() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~QueryRemoteFile() {}
+ ~QueryRemoteFile() override {}
/// Algorithm's name
- virtual const std::string name() const { return "QueryRemoteFile"; }
+ const std::string name() const override { return "QueryRemoteFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Retrieve a list of the files from a remote compute resource.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteFile2.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteFile2.h
index b58f8d6387ce7bb04fdc07bbb38efc35f2d802b0..23a29e66fc6d0fad0eedc564226ba35c1c6a93db 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteFile2.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteFile2.h
@@ -35,23 +35,23 @@ public:
/// (Empty) Constructor
QueryRemoteFile2() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~QueryRemoteFile2() {}
+ ~QueryRemoteFile2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "QueryRemoteFile"; }
+ const std::string name() const override { return "QueryRemoteFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Retrieve a list of the files from a remote compute resource.";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteJob.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteJob.h
index 7f6f41bbcfb8038a132e5309fa642ba1f7624bd7..63466ebcba3804741e0ce412173aca76505da107 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteJob.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteJob.h
@@ -11,23 +11,23 @@ public:
/// (Empty) Constructor
QueryRemoteJob() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~QueryRemoteJob() {}
+ ~QueryRemoteJob() override {}
/// Algorithm's name
- virtual const std::string name() const { return "QueryRemoteJob"; }
+ const std::string name() const override { return "QueryRemoteJob"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Query a remote compute resource for a specific job";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteJob2.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteJob2.h
index 58f2fad70dd7d13aab657ca90b9f718adc88ae6a..0214e9c06ca1ba27532fe513118aafa09c151e04 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteJob2.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/QueryRemoteJob2.h
@@ -35,23 +35,23 @@ public:
/// (Empty) Constructor
QueryRemoteJob2() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~QueryRemoteJob2() {}
+ ~QueryRemoteJob2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "QueryRemoteJob"; }
+ const std::string name() const override { return "QueryRemoteJob"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Query staus information about a job on a remote compute resource";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SCARFTomoReconstruction.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SCARFTomoReconstruction.h
index 45b19b580f8ea1ef880c435703f39ca56b92d4f3..f0c51a18341673f96e60242c31bc6b8ced74e6e0 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SCARFTomoReconstruction.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SCARFTomoReconstruction.h
@@ -43,18 +43,18 @@ public:
/// Constructor
SCARFTomoReconstruction();
/// Virtual destructor
- virtual ~SCARFTomoReconstruction() {}
+ ~SCARFTomoReconstruction() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SCARFTomoReconstruction"; }
+ const std::string name() const override { return "SCARFTomoReconstruction"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Perform a control action on jobs running on the SCARF computer "
"cluster at RAL, STFC (http://www.scarf.rl.ac.uk/)";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
protected:
/// different methods (HTTP requests) to process reconstruction job commands
@@ -84,9 +84,9 @@ protected:
const std::string &method = std::string(), const std::string &body = "");
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
// helper for the submit request
std::string buildSubmitBody(const std::string &appName,
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SimpleJSON.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SimpleJSON.h
index 5f6f92a27783af5575a3987b65b1f3154182aeb2..87d839dc2ec49ca195a6b8296d8c3f882277035c 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SimpleJSON.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SimpleJSON.h
@@ -99,7 +99,7 @@ public:
// Default constructor, copy constructor & assignment operator are fine
- virtual ~JSONException() throw() {}
+ ~JSONException() throw() override {}
private:
std::string m_msg;
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StartRemoteTransaction.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StartRemoteTransaction.h
index 19ea02ec2d3fb2c1166e269209246320790832d5..290cea6fd25149289ddb71e8791c7587bca6624f 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StartRemoteTransaction.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StartRemoteTransaction.h
@@ -11,23 +11,23 @@ public:
/// (Empty) Constructor
StartRemoteTransaction() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~StartRemoteTransaction() {}
+ ~StartRemoteTransaction() override {}
/// Algorithm's name
- virtual const std::string name() const { return "StartRemoteTransaction"; }
+ const std::string name() const override { return "StartRemoteTransaction"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Start a job transaction on a remote compute resource.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StartRemoteTransaction2.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StartRemoteTransaction2.h
index 99418192a8be54c4d7d5046d049a77ae0ad500cf..36a2f79d808454019fb72c30392d2edcbf9acd3a 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StartRemoteTransaction2.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StartRemoteTransaction2.h
@@ -35,23 +35,23 @@ public:
/// (Empty) Constructor
StartRemoteTransaction2() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~StartRemoteTransaction2() {}
+ ~StartRemoteTransaction2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "StartRemoteTransaction"; }
+ const std::string name() const override { return "StartRemoteTransaction"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Start a (new) transaction on a remote compute resource.";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StopRemoteTransaction.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StopRemoteTransaction.h
index faf0224d11e4419ebfa2d56dd00a91a14a819e9b..f30f72b8a723397b17b849fb555bc77b35c85bf7 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StopRemoteTransaction.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StopRemoteTransaction.h
@@ -11,23 +11,23 @@ public:
/// (Empty) Constructor
StopRemoteTransaction() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~StopRemoteTransaction() {}
+ ~StopRemoteTransaction() override {}
/// Algorithm's name
- virtual const std::string name() const { return "StopRemoteTransaction"; }
+ const std::string name() const override { return "StopRemoteTransaction"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Stop a job transaction on a remote compute resource.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StopRemoteTransaction2.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StopRemoteTransaction2.h
index a3c7996b4d67a4be28cb1e85753cb44cd3beffcd..9e77edcede05e353e5d0b6889cb3e22f1b25c2eb 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StopRemoteTransaction2.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/StopRemoteTransaction2.h
@@ -35,23 +35,23 @@ public:
/// (Empty) Constructor
StopRemoteTransaction2() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~StopRemoteTransaction2() {}
+ ~StopRemoteTransaction2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "StopRemoteTransaction"; }
+ const std::string name() const override { return "StopRemoteTransaction"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Stop a job transaction on a (remote) compute resource.";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SubmitRemoteJob.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SubmitRemoteJob.h
index 5f1be99a5ac3e5a63bffe5c9005bace1115af78b..93f5f9da289272bf53b18bd106c6e950fb5f2875 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SubmitRemoteJob.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SubmitRemoteJob.h
@@ -59,24 +59,24 @@ public:
/// (Empty) Constructor
SubmitRemoteJob() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~SubmitRemoteJob() {}
+ ~SubmitRemoteJob() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SubmitRemoteJob"; }
+ const std::string name() const override { return "SubmitRemoteJob"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Submit a job to be executed on the specified remote compute "
"resource.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SubmitRemoteJob2.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SubmitRemoteJob2.h
index 6a87661a6293cd122d9a9f80fb152350f12214b1..0fedefb14f5aa72153579f399eacfb4073519fa6 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SubmitRemoteJob2.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/SubmitRemoteJob2.h
@@ -35,24 +35,24 @@ public:
/// (Empty) Constructor
SubmitRemoteJob2() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~SubmitRemoteJob2() {}
+ ~SubmitRemoteJob2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SubmitRemoteJob"; }
+ const std::string name() const override { return "SubmitRemoteJob"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Submit a job to be executed on the specified remote compute "
"resource.";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/UploadRemoteFile.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/UploadRemoteFile.h
index ab6689c86d054d0a6378b533a71f0e42f930019d..f37cd1d05c41f4daaa7e109f861b9b30c99ac552 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/UploadRemoteFile.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/UploadRemoteFile.h
@@ -54,23 +54,23 @@ public:
/// (Empty) Constructor
UploadRemoteFile() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~UploadRemoteFile() {}
+ ~UploadRemoteFile() override {}
/// Algorithm's name
- virtual const std::string name() const { return "UploadRemoteFile"; }
+ const std::string name() const override { return "UploadRemoteFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Uploads a file to the specified compute resource.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/UploadRemoteFile2.h b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/UploadRemoteFile2.h
index 1da4f6691fc1f82cbc464b2cd7ed72dce26e9158..f190b686568b98e5edfef44513f1148d8b6d34be 100644
--- a/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/UploadRemoteFile2.h
+++ b/Framework/RemoteAlgorithms/inc/MantidRemoteAlgorithms/UploadRemoteFile2.h
@@ -34,23 +34,23 @@ public:
/// (Empty) Constructor
UploadRemoteFile2() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~UploadRemoteFile2() {}
+ ~UploadRemoteFile2() override {}
/// Algorithm's name
- virtual const std::string name() const { return "UploadRemoteFile"; }
+ const std::string name() const override { return "UploadRemoteFile"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Transfers/uploads a file to the specified compute resource.";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Remote"; }
+ const std::string category() const override { return "Remote"; }
private:
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // end namespace RemoteAlgorithms
diff --git a/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/LSFJobManager.h b/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/LSFJobManager.h
index d1253983ca2f43725a2b2bab7af0331795af0aac..303acf098812b77602a28d1a0e81554b33d65605 100644
--- a/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/LSFJobManager.h
+++ b/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/LSFJobManager.h
@@ -46,37 +46,37 @@ class DLLExport LSFJobManager : public Mantid::API::IRemoteJobManager {
public:
/// We currently do not have a (tested) implementation of authenticate for LSF
/// Platform
- virtual void authenticate(const std::string &username,
- const std::string &password) = 0;
+ void authenticate(const std::string &username,
+ const std::string &password) override = 0;
/// Most likely the logout method specific to SCARFLSF would be valid here
- virtual void logout(const std::string &username) = 0;
+ void logout(const std::string &username) override = 0;
- virtual void abortRemoteJob(const std::string &jobID);
+ void abortRemoteJob(const std::string &jobID) override;
- virtual std::string
+ std::string
submitRemoteJob(const std::string &transactionID, const std::string &runnable,
const std::string ¶m, const std::string &taskName = "",
- const int numNodes = 0, const int coresPerNode = 0);
+ const int numNodes = 0, const int coresPerNode = 0) override;
- virtual void downloadRemoteFile(const std::string &transactionID,
- const std::string &remoteFileName,
- const std::string &localFileName);
+ void downloadRemoteFile(const std::string &transactionID,
+ const std::string &remoteFileName,
+ const std::string &localFileName) override;
- virtual std::vector<RemoteJobInfo> queryAllRemoteJobs() const;
+ std::vector<RemoteJobInfo> queryAllRemoteJobs() const override;
- virtual std::vector<std::string>
- queryRemoteFile(const std::string &transactionID) const;
+ std::vector<std::string>
+ queryRemoteFile(const std::string &transactionID) const override;
- virtual RemoteJobInfo queryRemoteJob(const std::string &jobID) const;
+ RemoteJobInfo queryRemoteJob(const std::string &jobID) const override;
- virtual std::string startRemoteTransaction();
+ std::string startRemoteTransaction() override;
- virtual void stopRemoteTransaction(const std::string &transactionID);
+ void stopRemoteTransaction(const std::string &transactionID) override;
- virtual void uploadRemoteFile(const std::string &transactionID,
- const std::string &remoteFileName,
- const std::string &localFileName);
+ void uploadRemoteFile(const std::string &transactionID,
+ const std::string &remoteFileName,
+ const std::string &localFileName) override;
protected:
/// define the "application type" (or "submission form" in the LSF web portal)
diff --git a/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/MantidWebServiceAPIJobManager.h b/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/MantidWebServiceAPIJobManager.h
index f248696ef7850fbd731338df31f9d772bfdb71fe..0c9937def7771dad62e05dbec3b556d43cab0add 100644
--- a/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/MantidWebServiceAPIJobManager.h
+++ b/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/MantidWebServiceAPIJobManager.h
@@ -36,39 +36,40 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport MantidWebServiceAPIJobManager
: public Mantid::API::IRemoteJobManager {
public:
- virtual ~MantidWebServiceAPIJobManager(){};
+ ~MantidWebServiceAPIJobManager() override{};
- void authenticate(const std::string &username, const std::string &password);
+ void authenticate(const std::string &username,
+ const std::string &password) override;
- void logout(const std::string &username);
+ void logout(const std::string &username) override;
std::string
submitRemoteJob(const std::string &transactionID, const std::string &runnable,
const std::string ¶m, const std::string &taskName = "",
- const int numNodes = 1, const int coresPerNode = 1);
+ const int numNodes = 1, const int coresPerNode = 1) override;
void downloadRemoteFile(const std::string &transactionID,
const std::string &remoteFileName,
- const std::string &localFileName);
+ const std::string &localFileName) override;
std::vector<Mantid::API::IRemoteJobManager::RemoteJobInfo>
- queryAllRemoteJobs() const;
+ queryAllRemoteJobs() const override;
std::vector<std::string>
- queryRemoteFile(const std::string &transactionID) const;
+ queryRemoteFile(const std::string &transactionID) const override;
Mantid::API::IRemoteJobManager::RemoteJobInfo
- queryRemoteJob(const std::string &jobID) const;
+ queryRemoteJob(const std::string &jobID) const override;
- std::string startRemoteTransaction();
+ std::string startRemoteTransaction() override;
- void stopRemoteTransaction(const std::string &transactionID);
+ void stopRemoteTransaction(const std::string &transactionID) override;
- void abortRemoteJob(const std::string &jobID);
+ void abortRemoteJob(const std::string &jobID) override;
void uploadRemoteFile(const std::string &transactionID,
const std::string &remoteFileName,
- const std::string &localFileName);
+ const std::string &localFileName) override;
protected:
/// Use the helper for these operations
diff --git a/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/SCARFLSFJobManager.h b/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/SCARFLSFJobManager.h
index 61390b798e0fd44beb3d27358d7c76b41e26f31d..7fb256eb08c0dc9986615d1bc1ebd1fed2dc1917 100644
--- a/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/SCARFLSFJobManager.h
+++ b/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/SCARFLSFJobManager.h
@@ -36,17 +36,17 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport SCARFLSFJobManager
: public Mantid::RemoteJobManagers::LSFJobManager {
public:
- virtual void authenticate(const std::string &username,
- const std::string &password);
+ void authenticate(const std::string &username,
+ const std::string &password) override;
/// Ping the server to see if it is alive and responding.
virtual bool ping();
- virtual void logout(const std::string &username = std::string());
+ void logout(const std::string &username = std::string()) override;
private:
std::string guessJobSubmissionAppName(const std::string &runnablePath,
- const std::string &jobOptions);
+ const std::string &jobOptions) override;
/// helper to encode uri components (SCARF username / passwords)
static std::string urlComponentEncode(const std::string &in);
diff --git a/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/SimpleJSON.h b/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/SimpleJSON.h
index 293b7b7ce26abfe32cabdeea86f4c8768ddac0ff..dd3336adbe9281cce7d3d3f047aed87fa00b20c2 100644
--- a/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/SimpleJSON.h
+++ b/Framework/RemoteJobManagers/inc/MantidRemoteJobManagers/SimpleJSON.h
@@ -97,7 +97,7 @@ public:
// Default constructor, copy constructor & assignment operator are fine
- virtual ~JSONException() throw() {}
+ ~JSONException() throw() override {}
private:
std::string m_msg;
diff --git a/Framework/SINQ/inc/MantidSINQ/InvertMDDim.h b/Framework/SINQ/inc/MantidSINQ/InvertMDDim.h
index f52abdc3a251c136ac566ba0ec954d9f7ee16b9a..064c87ab99e6b4973fc2c09ca6a4ba89f98d59b0 100644
--- a/Framework/SINQ/inc/MantidSINQ/InvertMDDim.h
+++ b/Framework/SINQ/inc/MantidSINQ/InvertMDDim.h
@@ -38,26 +38,26 @@ public:
/// (Empty) Constructor
InvertMDDim() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~InvertMDDim() {}
+ ~InvertMDDim() override {}
/// Algorithm's name
- virtual const std::string name() const { return "InvertMDDim"; }
+ const std::string name() const override { return "InvertMDDim"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Inverts dimensions of a MDHistoWorkspace";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\Transforms";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void copyMetaData(Mantid::API::IMDHistoWorkspace_sptr inws,
Mantid::API::IMDHistoWorkspace_sptr outws);
diff --git a/Framework/SINQ/inc/MantidSINQ/LoadFlexiNexus.h b/Framework/SINQ/inc/MantidSINQ/LoadFlexiNexus.h
index 83886f6d59e237b89fd4ccf24df4ca8cdc2dbeae..5edfb1350b1d5b65645a66db80189565512bbb8f 100644
--- a/Framework/SINQ/inc/MantidSINQ/LoadFlexiNexus.h
+++ b/Framework/SINQ/inc/MantidSINQ/LoadFlexiNexus.h
@@ -55,24 +55,24 @@ public:
/// (Empty) Constructor
LoadFlexiNexus() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~LoadFlexiNexus() {}
+ ~LoadFlexiNexus() override {}
/// Algorithm's name
- virtual const std::string name() const { return "LoadFlexiNexus"; }
+ const std::string name() const override { return "LoadFlexiNexus"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Loads a NeXus file directed by a dictionary file";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "DataHandling\\Nexus"; }
+ const std::string category() const override { return "DataHandling\\Nexus"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
// A dictionary
std::map<std::string, std::string> dictionary;
diff --git a/Framework/SINQ/inc/MantidSINQ/MDHistoToWorkspace2D.h b/Framework/SINQ/inc/MantidSINQ/MDHistoToWorkspace2D.h
index 9b79b8e63b7d21aa988fff52854264e2d6b6d3e8..7027b3607566bda3f8087874ba6d238b04d465c0 100644
--- a/Framework/SINQ/inc/MantidSINQ/MDHistoToWorkspace2D.h
+++ b/Framework/SINQ/inc/MantidSINQ/MDHistoToWorkspace2D.h
@@ -40,27 +40,27 @@ public:
/// Default constructor
MDHistoToWorkspace2D();
/// Virtual destructor
- virtual ~MDHistoToWorkspace2D() {}
+ ~MDHistoToWorkspace2D() override {}
/// Algorithm's name
- virtual const std::string name() const { return "MDHistoToWorkspace2D"; }
+ const std::string name() const override { return "MDHistoToWorkspace2D"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Flattens a n dimensional MDHistoWorkspace into a Workspace2D with "
"many spectra";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\Transforms";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
size_t m_rank;
size_t m_currentSpectra;
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiAnalyseResiduals.h b/Framework/SINQ/inc/MantidSINQ/PoldiAnalyseResiduals.h
index 0210ef89ef9e2e96f466c9da23156c3624ec9977..b924cb1eda682b83dac271d525490041481e52e8 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiAnalyseResiduals.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiAnalyseResiduals.h
@@ -42,12 +42,12 @@ namespace Poldi {
class MANTID_SINQ_DLL PoldiAnalyseResiduals : public API::Algorithm {
public:
PoldiAnalyseResiduals();
- virtual ~PoldiAnalyseResiduals();
+ ~PoldiAnalyseResiduals() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
protected:
double sumCounts(const DataObjects::Workspace2D_sptr &workspace,
@@ -75,8 +75,8 @@ protected:
bool iterationLimitReached(int iterations);
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Poldi
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiAutoCorrelation5.h b/Framework/SINQ/inc/MantidSINQ/PoldiAutoCorrelation5.h
index 2c81cfe39224954e78f4d71cb68b37399088f172..88915b0e9eb160951fba0255140dd29721ca8de0 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiAutoCorrelation5.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiAutoCorrelation5.h
@@ -61,22 +61,22 @@ public:
/// Default constructor
PoldiAutoCorrelation5() {}
/// Destructor
- virtual ~PoldiAutoCorrelation5() {}
+ ~PoldiAutoCorrelation5() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "PoldiAutoCorrelation"; }
+ const std::string name() const override { return "PoldiAutoCorrelation"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs correlation analysis of POLDI 2D-data.";
}
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return 5; }
+ int version() const override { return 5; }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "SINQ\\Poldi"; }
+ const std::string category() const override { return "SINQ\\Poldi"; }
protected:
/// Overwrites Algorithm method
- void exec();
+ void exec() override;
void logConfigurationInformation(
boost::shared_ptr<PoldiDeadWireDecorator> cleanDetector,
@@ -84,7 +84,7 @@ protected:
private:
/// Overwrites Algorithm method.
- void init();
+ void init() override;
boost::shared_ptr<PoldiAutoCorrelationCore> m_core;
};
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiCreatePeaksFromCell.h b/Framework/SINQ/inc/MantidSINQ/PoldiCreatePeaksFromCell.h
index 0e1d54336ca6c9bf1a146f6a4390ea19ff1c6a71..74896651c8d00f26623e6148df5106a2e8c440ba 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiCreatePeaksFromCell.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiCreatePeaksFromCell.h
@@ -44,14 +44,14 @@ namespace Poldi {
class MANTID_SINQ_DLL PoldiCreatePeaksFromCell : public API::Algorithm {
public:
PoldiCreatePeaksFromCell();
- virtual ~PoldiCreatePeaksFromCell();
+ ~PoldiCreatePeaksFromCell() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
protected:
Geometry::SpaceGroup_const_sptr
@@ -69,8 +69,8 @@ protected:
Geometry::Group::Orthogonal) const;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace SINQ
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D.h b/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D.h
index aa2a44b82c82cfaa23cded49f06bc14b13b375ed..4ee4a572393570d285ac71db6b24d13603917186 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D.h
@@ -43,16 +43,16 @@ namespace Poldi {
class MANTID_SINQ_DLL PoldiFitPeaks1D : public API::Algorithm {
public:
PoldiFitPeaks1D();
- virtual ~PoldiFitPeaks1D();
+ ~PoldiFitPeaks1D() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "PoldiPeakFit1D fits peak profiles to POLDI auto-correlation data.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
protected:
void setPeakFunction(const std::string &peakFunction);
@@ -78,8 +78,8 @@ protected:
double m_fwhmMultiples;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Poldi
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D2.h b/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D2.h
index abf245c3fbae98b5826f88b6ff481adfce7593b4..56da9255e559dba5e0924f49218dd9a7cb5f294b 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D2.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks1D2.h
@@ -82,16 +82,16 @@ operator<(const RefinedRange_sptr &lhs, const RefinedRange_sptr &rhs);
class MANTID_SINQ_DLL PoldiFitPeaks1D2 : public API::Algorithm {
public:
PoldiFitPeaks1D2();
- virtual ~PoldiFitPeaks1D2();
+ ~PoldiFitPeaks1D2() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "PoldiPeakFit1D fits peak profiles to POLDI auto-correlation data.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
protected:
PoldiPeakCollection_sptr fitPeaks(const PoldiPeakCollection_sptr &peaks);
@@ -139,8 +139,8 @@ protected:
double m_maxRelativeFwhm;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Poldi
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks2D.h b/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks2D.h
index 44e22c88b05ac47ed2345d071902bb8bf4330984..6a330be52dd6bf4b4dad768cf1ba4d3ab6beeeef 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks2D.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiFitPeaks2D.h
@@ -55,17 +55,17 @@ namespace Poldi {
class MANTID_SINQ_DLL PoldiFitPeaks2D : public API::Algorithm {
public:
PoldiFitPeaks2D();
- virtual ~PoldiFitPeaks2D();
+ ~PoldiFitPeaks2D() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
- virtual const std::string summary() const;
+ const std::string summary() const override;
- std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
- bool checkGroups() { return false; }
+ bool checkGroups() override { return false; }
protected:
// Workspace handling
@@ -168,8 +168,8 @@ protected:
double m_deltaT;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Poldi
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiIndexKnownCompounds.h b/Framework/SINQ/inc/MantidSINQ/PoldiIndexKnownCompounds.h
index 73d750ce7344fc0888e1708ba07497e3061cffd4..462c44f6bc80eac36d07302d33f02b8f8feb9f9a 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiIndexKnownCompounds.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiIndexKnownCompounds.h
@@ -66,14 +66,14 @@ struct MANTID_SINQ_DLL IndexCandidatePair {
class MANTID_SINQ_DLL PoldiIndexKnownCompounds : public API::Algorithm {
public:
PoldiIndexKnownCompounds();
- virtual ~PoldiIndexKnownCompounds();
+ ~PoldiIndexKnownCompounds() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
- virtual std::map<std::string, std::string> validateInputs();
+ std::map<std::string, std::string> validateInputs() override;
void setMeasuredPeaks(const PoldiPeakCollection_sptr &measuredPeaks);
void setExpectedPhases(
@@ -163,8 +163,8 @@ protected:
std::vector<PoldiPeakCollection_sptr> m_indexedPeaks;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Poldi
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiPeakSearch.h b/Framework/SINQ/inc/MantidSINQ/PoldiPeakSearch.h
index fd87762b5bc5c04c21746fb3551e7f57641b9a0d..241f10146916c9705f6bdb98087a621ad58d6f82 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiPeakSearch.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiPeakSearch.h
@@ -49,17 +49,17 @@ namespace Poldi {
class MANTID_SINQ_DLL PoldiPeakSearch : public API::Algorithm {
public:
PoldiPeakSearch();
- virtual ~PoldiPeakSearch() {}
+ ~PoldiPeakSearch() override {}
- virtual int version() const { return 1; }
- virtual const std::string name() const { return "PoldiPeakSearch"; }
+ int version() const override { return 1; }
+ const std::string name() const override { return "PoldiPeakSearch"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "This algorithm finds the peaks in a POLDI auto-correlation "
"spectrum.";
}
- virtual const std::string category() const { return "SINQ\\Poldi"; }
+ const std::string category() const override { return "SINQ\\Poldi"; }
protected:
MantidVec getNeighborSums(MantidVec correlationCounts) const;
@@ -127,8 +127,8 @@ protected:
PoldiPeakCollection_sptr m_peaks;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Poldi
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiPeakSummary.h b/Framework/SINQ/inc/MantidSINQ/PoldiPeakSummary.h
index 75370c301473e239a58d7293ed632e82d6718bbb..95be620f12446ce842de2cc235047969c6f3629e 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiPeakSummary.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiPeakSummary.h
@@ -43,12 +43,12 @@ namespace Poldi {
class MANTID_SINQ_DLL PoldiPeakSummary : public API::Algorithm {
public:
PoldiPeakSummary();
- virtual ~PoldiPeakSummary();
+ ~PoldiPeakSummary() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
protected:
DataObjects::TableWorkspace_sptr
@@ -59,8 +59,8 @@ protected:
const PoldiPeak_sptr &peak) const;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace Poldi
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiTruncateData.h b/Framework/SINQ/inc/MantidSINQ/PoldiTruncateData.h
index b7676d2521d2bb9574a13e87ca16d1c0eed249ac..5ae46ba23d8c09171bef989b3959d16fa357c91a 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiTruncateData.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiTruncateData.h
@@ -48,12 +48,12 @@ namespace Poldi {
class DLLExport PoldiTruncateData : public API::Algorithm {
public:
PoldiTruncateData();
- virtual ~PoldiTruncateData() {}
+ ~PoldiTruncateData() override {}
- virtual const std::string name() const { return "PoldiTruncateData"; }
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override { return "PoldiTruncateData"; }
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
size_t getCalculatedBinCount();
size_t getActualBinCount();
@@ -91,8 +91,8 @@ protected:
size_t m_actualBinCount;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace SINQ
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/Poldi2DFunction.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/Poldi2DFunction.h
index 0ab9bb58bf55cc5a4918adc49c741af84255d8b1..c5f37a6bf978e7f933c3f0a0030080bd36e05a96 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/Poldi2DFunction.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/Poldi2DFunction.h
@@ -44,21 +44,21 @@ class MANTID_SINQ_DLL Poldi2DFunction : public API::IFunction1DSpectrum,
public IPoldiFunction1D {
public:
Poldi2DFunction();
- virtual ~Poldi2DFunction() {}
+ ~Poldi2DFunction() override {}
- virtual void function(const API::FunctionDomain &domain,
- API::FunctionValues &values) const;
- virtual void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &jacobian);
+ void function(const API::FunctionDomain &domain,
+ API::FunctionValues &values) const override;
+ void functionDeriv(const API::FunctionDomain &domain,
+ API::Jacobian &jacobian) override;
- virtual void function1DSpectrum(const API::FunctionDomain1DSpectrum &domain,
- API::FunctionValues &values) const;
+ void function1DSpectrum(const API::FunctionDomain1DSpectrum &domain,
+ API::FunctionValues &values) const override;
- virtual void poldiFunction1D(const std::vector<int> &indices,
- const API::FunctionDomain1D &domain,
- API::FunctionValues &values) const;
+ void poldiFunction1D(const std::vector<int> &indices,
+ const API::FunctionDomain1D &domain,
+ API::FunctionValues &values) const override;
- void iterationFinished();
+ void iterationFinished() override;
private:
size_t m_iteration;
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiBasicChopper.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiBasicChopper.h
index 728341d6bf14a222dd857336e2d08349627fc63a..1fdb2dd07cff8748af99586bbe8646e1e008413b 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiBasicChopper.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiBasicChopper.h
@@ -41,20 +41,21 @@ namespace Poldi {
class MANTID_SINQ_DLL PoldiBasicChopper : public PoldiAbstractChopper {
public:
PoldiBasicChopper();
- ~PoldiBasicChopper() {}
+ ~PoldiBasicChopper() override {}
- void loadConfiguration(Geometry::Instrument_const_sptr poldiInstrument);
+ void
+ loadConfiguration(Geometry::Instrument_const_sptr poldiInstrument) override;
- void setRotationSpeed(double rotationSpeed);
+ void setRotationSpeed(double rotationSpeed) override;
- const std::vector<double> &slitPositions();
- const std::vector<double> &slitTimes();
+ const std::vector<double> &slitPositions() override;
+ const std::vector<double> &slitTimes() override;
- double rotationSpeed();
- double cycleTime();
- double zeroOffset();
+ double rotationSpeed() override;
+ double cycleTime() override;
+ double zeroOffset() override;
- double distanceFromSample();
+ double distanceFromSample() override;
protected:
void initializeFixedParameters(std::vector<double> slitPositions,
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDeadWireDecorator.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDeadWireDecorator.h
index 49e6f35896609c1938f467fe6105a9c41f4b09c8..743793311bc92ed18e72a5f524650e5834acaf45 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDeadWireDecorator.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDeadWireDecorator.h
@@ -51,16 +51,16 @@ public:
boost::shared_ptr<PoldiAbstractDetector> detector =
boost::shared_ptr<PoldiAbstractDetector>());
- virtual ~PoldiDeadWireDecorator() {}
+ ~PoldiDeadWireDecorator() override {}
void setDeadWires(std::set<int> deadWires);
std::set<int> deadWires();
- size_t elementCount();
- const std::vector<int> &availableElements();
+ size_t elementCount() override;
+ const std::vector<int> &availableElements() override;
protected:
- void detectorSetHook();
+ void detectorSetHook() override;
std::vector<int> getGoodElements(std::vector<int> rawElements);
static bool detectorIsNotMasked(Geometry::Instrument_const_sptr instrument,
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDetectorDecorator.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDetectorDecorator.h
index 021b4b5b0d5a0809d9e47a4ea0753c667a6c0d68..04ea690fd29ce964f544df580e9ae0b006c89c93 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDetectorDecorator.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiDetectorDecorator.h
@@ -44,25 +44,26 @@ public:
boost::shared_ptr<PoldiAbstractDetector> decoratedDetector =
boost::shared_ptr<PoldiAbstractDetector>());
- virtual ~PoldiDetectorDecorator() {}
+ ~PoldiDetectorDecorator() override {}
void setDecoratedDetector(boost::shared_ptr<PoldiAbstractDetector> detector);
boost::shared_ptr<PoldiAbstractDetector> decoratedDetector();
- virtual void
- loadConfiguration(Geometry::Instrument_const_sptr poldiInstrument);
+ void
+ loadConfiguration(Geometry::Instrument_const_sptr poldiInstrument) override;
- virtual double efficiency();
+ double efficiency() override;
- virtual double twoTheta(int elementIndex);
- virtual double distanceFromSample(int elementIndex);
+ double twoTheta(int elementIndex) override;
+ double distanceFromSample(int elementIndex) override;
- virtual size_t elementCount();
- virtual size_t centralElement();
+ size_t elementCount() override;
+ size_t centralElement() override;
- virtual const std::vector<int> &availableElements();
+ const std::vector<int> &availableElements() override;
- virtual std::pair<double, double> qLimits(double lambdaMin, double lambdaMax);
+ std::pair<double, double> qLimits(double lambdaMin,
+ double lambdaMax) override;
protected:
virtual void detectorSetHook();
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiHeliumDetector.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiHeliumDetector.h
index 05a2c0bd968aff766f3f0fec676dc2708f9ebccc..cf0a05d088c59f443ef7e4b67fb041015382a012 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiHeliumDetector.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiHeliumDetector.h
@@ -43,21 +43,23 @@ using namespace Kernel;
class MANTID_SINQ_DLL PoldiHeliumDetector : public PoldiAbstractDetector {
public:
PoldiHeliumDetector();
- ~PoldiHeliumDetector() {}
+ ~PoldiHeliumDetector() override {}
- void loadConfiguration(Geometry::Instrument_const_sptr poldiInstrument);
+ void
+ loadConfiguration(Geometry::Instrument_const_sptr poldiInstrument) override;
- double efficiency();
+ double efficiency() override;
- double twoTheta(int elementIndex);
- double distanceFromSample(int elementIndex);
+ double twoTheta(int elementIndex) override;
+ double distanceFromSample(int elementIndex) override;
- size_t elementCount();
- size_t centralElement();
+ size_t elementCount() override;
+ size_t centralElement() override;
- const std::vector<int> &availableElements();
+ const std::vector<int> &availableElements() override;
- std::pair<double, double> qLimits(double lambdaMin, double lambdaMax);
+ std::pair<double, double> qLimits(double lambdaMin,
+ double lambdaMax) override;
protected:
double phi(int elementIndex);
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h
index 301ab12523e334886abe5b4d03fb0bad121f2424..5bcbc02b6cd83384a0b623240c4162ac435d071b 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h
@@ -53,10 +53,10 @@ typedef boost::shared_ptr<AbstractDoubleValueExtractor>
class NumberDoubleValueExtractor : public AbstractDoubleValueExtractor {
public:
NumberDoubleValueExtractor() : AbstractDoubleValueExtractor() {}
- virtual ~NumberDoubleValueExtractor() {}
+ ~NumberDoubleValueExtractor() override {}
- virtual double operator()(const API::Run &runInformation,
- const std::string &propertyName) const {
+ double operator()(const API::Run &runInformation,
+ const std::string &propertyName) const override {
return runInformation.getPropertyValueAsType<double>(propertyName);
}
};
@@ -64,10 +64,10 @@ public:
class VectorDoubleValueExtractor : public AbstractDoubleValueExtractor {
public:
VectorDoubleValueExtractor() : AbstractDoubleValueExtractor() {}
- virtual ~VectorDoubleValueExtractor() {}
+ ~VectorDoubleValueExtractor() override {}
- virtual double operator()(const API::Run &runInformation,
- const std::string &propertyName) const {
+ double operator()(const API::Run &runInformation,
+ const std::string &propertyName) const override {
return runInformation.getPropertyValueAsType<std::vector<double>>(
propertyName).front();
}
@@ -76,10 +76,10 @@ public:
class VectorIntValueExtractor : public AbstractDoubleValueExtractor {
public:
VectorIntValueExtractor() : AbstractDoubleValueExtractor() {}
- virtual ~VectorIntValueExtractor() {}
+ ~VectorIntValueExtractor() override {}
- virtual double operator()(const API::Run &runInformation,
- const std::string &propertyName) const {
+ double operator()(const API::Run &runInformation,
+ const std::string &propertyName) const override {
return static_cast<double>(
runInformation.getPropertyValueAsType<std::vector<int>>(propertyName)
.front());
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiResidualCorrelationCore.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiResidualCorrelationCore.h
index bea8fc35ac763b8b1e04e89e091d28487e9bdc4c..e4e4bd89947db85ae593bce01fa4c56a815d5a43 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiResidualCorrelationCore.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiResidualCorrelationCore.h
@@ -43,25 +43,25 @@ class MANTID_SINQ_DLL PoldiResidualCorrelationCore
: public PoldiAutoCorrelationCore {
public:
PoldiResidualCorrelationCore(Kernel::Logger &g_log, double weight = 0.0);
- virtual ~PoldiResidualCorrelationCore() {}
+ ~PoldiResidualCorrelationCore() override {}
double getWeight() const;
void setWeight(double newWeight);
protected:
- double getNormCounts(int x, int y) const;
+ double getNormCounts(int x, int y) const override;
double
reduceChopperSlitList(const std::vector<UncertainValue> &valuesWithSigma,
- double weight) const;
+ double weight) const override;
double calculateAverage(const std::vector<double> &values) const;
double calculateAverageDeviationFromValue(const std::vector<double> &values,
double value) const;
double calculateCorrelationBackground(double sumOfCorrelationCounts,
- double sumOfCounts) const;
+ double sumOfCounts) const override;
DataObjects::Workspace2D_sptr
finalizeCalculation(const std::vector<double> &correctedCorrelatedIntensities,
- const std::vector<double> &dValues) const;
+ const std::vector<double> &dValues) const override;
void distributeCorrelationCounts(
const std::vector<double> &correctedCorrelatedIntensities,
const std::vector<double> &dValues) const;
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumConstantBackground.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumConstantBackground.h
index 88e8a6f9b6f3a4fc32bfc6215cd3c250cc2591d3..8b432a352b9e3e58b19937870d4f3e57c83a9446 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumConstantBackground.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumConstantBackground.h
@@ -43,30 +43,34 @@ class MANTID_SINQ_DLL PoldiSpectrumConstantBackground
public IPoldiFunction1D {
public:
PoldiSpectrumConstantBackground();
- virtual ~PoldiSpectrumConstantBackground();
+ ~PoldiSpectrumConstantBackground() override;
- virtual std::string name() const { return "PoldiSpectrumConstantBackground"; }
+ std::string name() const override {
+ return "PoldiSpectrumConstantBackground";
+ }
- void function1D(double *out, const double *xValues, const size_t nData) const;
+ void function1D(double *out, const double *xValues,
+ const size_t nData) const override;
void functionDeriv1D(API::Jacobian *out, const double *xValues,
- const size_t nData);
+ const size_t nData) override;
- virtual void setWorkspace(boost::shared_ptr<const API::Workspace> ws);
+ void setWorkspace(boost::shared_ptr<const API::Workspace> ws) override;
size_t getTimeBinCount() const;
- virtual void poldiFunction1D(const std::vector<int> &indices,
- const API::FunctionDomain1D &domain,
- API::FunctionValues &values) const;
+ void poldiFunction1D(const std::vector<int> &indices,
+ const API::FunctionDomain1D &domain,
+ API::FunctionValues &values) const override;
void setParameter(const std::string &name, const double &value,
- bool explicitlySet = true);
- void setParameter(size_t i, const double &value, bool explicitlySet = true);
+ bool explicitlySet = true) override;
+ void setParameter(size_t i, const double &value,
+ bool explicitlySet = true) override;
- double getParameter(const std::string &name) const;
- double getParameter(size_t i) const;
+ double getParameter(const std::string &name) const override;
+ double getParameter(size_t i) const override;
protected:
- void init();
+ void init() override;
size_t m_timeBinCount;
API::IFunction1D_sptr m_flatBackground;
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumDomainFunction.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumDomainFunction.h
index 4333fcb43786875b0c18a6dd2a8b334125301c92..28df9565138d058fe67a76f66339e3db4e68fef3 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumDomainFunction.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumDomainFunction.h
@@ -108,9 +108,9 @@ public:
: m_jacobian(jacobian), m_offset(offset), m_factors(factors),
m_factorOffset(factorOffset), m_domainSize(domainSize) {}
- double get(size_t iY, size_t iP) { return m_jacobian.get(iY, iP); }
+ double get(size_t iY, size_t iP) override { return m_jacobian.get(iY, iP); }
- void set(size_t iY, size_t iP, double value) {
+ void set(size_t iY, size_t iP, double value) override {
size_t realY = (m_offset + iY) % m_domainSize;
m_jacobian.set(realY, iP, m_jacobian.get(realY, iP) +
value * m_factors[m_factorOffset + iY]);
@@ -143,17 +143,19 @@ public:
m_jacobian(nValues * nParams) {}
/// Destructor
- ~LocalJacobian() {}
+ ~LocalJacobian() override {}
/// Implementation of API::Jacobian::set. Throws std::out_of_range on invalid
/// index.
- void set(size_t iY, size_t iP, double value) {
+ void set(size_t iY, size_t iP, double value) override {
m_jacobian[safeIndex(iY, iP)] = value;
}
/// Implementation of API::Jacobian::get. Throws std::out_of_range on invalid
/// index.
- double get(size_t iY, size_t iP) { return m_jacobian[safeIndex(iY, iP)]; }
+ double get(size_t iY, size_t iP) override {
+ return m_jacobian[safeIndex(iY, iP)];
+ }
/// Provides raw pointer access to the underlying std::vector. Required for
/// adept-interface.
@@ -238,33 +240,32 @@ class MANTID_SINQ_DLL PoldiSpectrumDomainFunction
public IPoldiFunction1D {
public:
PoldiSpectrumDomainFunction();
- virtual ~PoldiSpectrumDomainFunction() {}
+ ~PoldiSpectrumDomainFunction() override {}
- virtual std::string name() const { return "PoldiSpectrumDomainFunction"; }
+ std::string name() const override { return "PoldiSpectrumDomainFunction"; }
- virtual void setWorkspace(boost::shared_ptr<const API::Workspace> ws);
- virtual void function1DSpectrum(const API::FunctionDomain1DSpectrum &domain,
- API::FunctionValues &values) const;
+ void setWorkspace(boost::shared_ptr<const API::Workspace> ws) override;
+ void function1DSpectrum(const API::FunctionDomain1DSpectrum &domain,
+ API::FunctionValues &values) const override;
- virtual void
- functionDeriv1DSpectrum(const API::FunctionDomain1DSpectrum &domain,
- API::Jacobian &jacobian);
+ void functionDeriv1DSpectrum(const API::FunctionDomain1DSpectrum &domain,
+ API::Jacobian &jacobian) override;
void poldiFunction1D(const std::vector<int> &indices,
const API::FunctionDomain1D &domain,
- API::FunctionValues &values) const;
+ API::FunctionValues &values) const override;
API::IPeakFunction_sptr getProfileFunction() const;
protected:
- virtual void init();
+ void init() override;
void initializeParametersFromWorkspace(
const DataObjects::Workspace2D_const_sptr &workspace2D);
void initializeInstrumentParameters(
const PoldiInstrumentAdapter_sptr &poldiInstrument);
- void beforeDecoratedFunctionSet(const API::IFunction_sptr &fn);
+ void beforeDecoratedFunctionSet(const API::IFunction_sptr &fn) override;
std::vector<double>
getChopperSlitOffsets(const PoldiAbstractChopper_sptr &chopper);
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumLinearBackground.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumLinearBackground.h
index 1d1cdc4362bdca5b2ea6fc33850404e180a826f8..0fc76b5fd0d8e9efd4ea6750c66a0a46b8b19280 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumLinearBackground.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumLinearBackground.h
@@ -48,25 +48,24 @@ class MANTID_SINQ_DLL PoldiSpectrumLinearBackground
public IPoldiFunction1D {
public:
PoldiSpectrumLinearBackground();
- virtual ~PoldiSpectrumLinearBackground() {}
+ ~PoldiSpectrumLinearBackground() override {}
- virtual std::string name() const { return "PoldiSpectrumLinearBackground"; }
+ std::string name() const override { return "PoldiSpectrumLinearBackground"; }
- virtual void setWorkspace(boost::shared_ptr<const API::Workspace> ws);
+ void setWorkspace(boost::shared_ptr<const API::Workspace> ws) override;
size_t getTimeBinCount() const;
- virtual void function1DSpectrum(const API::FunctionDomain1DSpectrum &domain,
- API::FunctionValues &values) const;
- virtual void
- functionDeriv1DSpectrum(const API::FunctionDomain1DSpectrum &domain,
- API::Jacobian &jacobian);
+ void function1DSpectrum(const API::FunctionDomain1DSpectrum &domain,
+ API::FunctionValues &values) const override;
+ void functionDeriv1DSpectrum(const API::FunctionDomain1DSpectrum &domain,
+ API::Jacobian &jacobian) override;
- virtual void poldiFunction1D(const std::vector<int> &indices,
- const API::FunctionDomain1D &domain,
- API::FunctionValues &values) const;
+ void poldiFunction1D(const std::vector<int> &indices,
+ const API::FunctionDomain1D &domain,
+ API::FunctionValues &values) const override;
protected:
- void init();
+ void init() override;
size_t m_timeBinCount;
};
diff --git a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumPawleyFunction.h b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumPawleyFunction.h
index 97d973c68b3f7b03bcf341923cdaf5803e83aad9..cc2524a4598db8d2aef7137d759432296e67480d 100644
--- a/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumPawleyFunction.h
+++ b/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumPawleyFunction.h
@@ -35,26 +35,26 @@ class MANTID_SINQ_DLL PoldiSpectrumPawleyFunction
: public PoldiSpectrumDomainFunction {
public:
PoldiSpectrumPawleyFunction();
- virtual ~PoldiSpectrumPawleyFunction() {}
+ ~PoldiSpectrumPawleyFunction() override {}
- std::string name() const { return "PoldiSpectrumPawleyFunction"; }
+ std::string name() const override { return "PoldiSpectrumPawleyFunction"; }
void
setMatrixWorkspace(boost::shared_ptr<const API::MatrixWorkspace> workspace,
- size_t wi, double startX, double endX);
+ size_t wi, double startX, double endX) override;
void function1DSpectrum(const API::FunctionDomain1DSpectrum &domain,
- API::FunctionValues &values) const;
+ API::FunctionValues &values) const override;
void functionDeriv1DSpectrum(const API::FunctionDomain1DSpectrum &domain,
- API::Jacobian &jacobian);
+ API::Jacobian &jacobian) override;
void poldiFunction1D(const std::vector<int> &indices,
const API::FunctionDomain1D &domain,
- API::FunctionValues &values) const;
+ API::FunctionValues &values) const override;
API::IPawleyFunction_sptr getPawleyFunction() const;
protected:
- void beforeDecoratedFunctionSet(const API::IFunction_sptr &fn);
+ void beforeDecoratedFunctionSet(const API::IFunction_sptr &fn) override;
API::IPawleyFunction_sptr m_pawleyFunction;
};
diff --git a/Framework/SINQ/inc/MantidSINQ/ProjectMD.h b/Framework/SINQ/inc/MantidSINQ/ProjectMD.h
index 2c81a71345aeae26a7a9e70ae5feed810c35b8ba..1a0b52eefa78de6cb44472e04bdc7c505b3b5e61 100644
--- a/Framework/SINQ/inc/MantidSINQ/ProjectMD.h
+++ b/Framework/SINQ/inc/MantidSINQ/ProjectMD.h
@@ -37,24 +37,26 @@ public:
/// (Empty) Constructor
ProjectMD() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~ProjectMD() {}
+ ~ProjectMD() override {}
/// Algorithm's name
- virtual const std::string name() const { return "ProjectMD"; }
+ const std::string name() const override { return "ProjectMD"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Sum a MDHistoWorkspace along a choosen dimension";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "MDAlgorithms\\Slicing"; }
+ const std::string category() const override {
+ return "MDAlgorithms\\Slicing";
+ }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void copyMetaData(Mantid::API::IMDHistoWorkspace_sptr inws,
Mantid::API::IMDHistoWorkspace_sptr outws);
diff --git a/Framework/SINQ/inc/MantidSINQ/SINQHMListener.h b/Framework/SINQ/inc/MantidSINQ/SINQHMListener.h
index 157470718ead71ff40eb98e96474c5b27ad5909c..c0048b452cf5b42e51de6d86c2cb4623141bb50a 100644
--- a/Framework/SINQ/inc/MantidSINQ/SINQHMListener.h
+++ b/Framework/SINQ/inc/MantidSINQ/SINQHMListener.h
@@ -42,21 +42,21 @@
class MANTID_SINQ_DLL SINQHMListener : public Mantid::API::ILiveListener {
public:
SINQHMListener();
- ~SINQHMListener();
+ ~SINQHMListener() override;
- std::string name() const { return "SINQHMListener"; }
- bool supportsHistory() const { return false; }
- bool buffersEvents() const { return false; }
+ std::string name() const override { return "SINQHMListener"; }
+ bool supportsHistory() const override { return false; }
+ bool buffersEvents() const override { return false; }
- bool connect(const Poco::Net::SocketAddress &address);
- void
- start(Mantid::Kernel::DateAndTime startTime = Mantid::Kernel::DateAndTime());
- boost::shared_ptr<Mantid::API::Workspace> extractData();
- bool isConnected();
- ILiveListener::RunStatus runStatus();
- int runNumber() const { return 0; }
+ bool connect(const Poco::Net::SocketAddress &address) override;
+ void start(Mantid::Kernel::DateAndTime startTime =
+ Mantid::Kernel::DateAndTime()) override;
+ boost::shared_ptr<Mantid::API::Workspace> extractData() override;
+ bool isConnected() override;
+ ILiveListener::RunStatus runStatus() override;
+ int runNumber() const override { return 0; }
- void setSpectra(const std::vector<Mantid::specid_t> &specList);
+ void setSpectra(const std::vector<Mantid::specid_t> &specList) override;
private:
Poco::Net::HTTPClientSession httpcon;
diff --git a/Framework/SINQ/inc/MantidSINQ/SINQTranspose3D.h b/Framework/SINQ/inc/MantidSINQ/SINQTranspose3D.h
index 259cffe5b38f23a895456a9359dc01ca5e01f80f..c087662ac5ac40736b85c8b3d4136cfe8763493f 100644
--- a/Framework/SINQ/inc/MantidSINQ/SINQTranspose3D.h
+++ b/Framework/SINQ/inc/MantidSINQ/SINQTranspose3D.h
@@ -44,26 +44,26 @@ public:
/// (Empty) Constructor
SINQTranspose3D() : Mantid::API::Algorithm() {}
/// Virtual destructor
- virtual ~SINQTranspose3D() {}
+ ~SINQTranspose3D() override {}
/// Algorithm's name
- virtual const std::string name() const { return "Transpose3D"; }
+ const std::string name() const override { return "Transpose3D"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "SINQ specific MD data reordering";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "MDAlgorithms\\Transforms";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void doYXZ(Mantid::API::IMDHistoWorkspace_sptr inws);
void doXZY(Mantid::API::IMDHistoWorkspace_sptr inws);
diff --git a/Framework/SINQ/inc/MantidSINQ/SliceMDHisto.h b/Framework/SINQ/inc/MantidSINQ/SliceMDHisto.h
index 2445c8c084c01a293212b03df8927d6fabfea06c..6c134601c392897bd2257fadbea69b6afa1014bc 100644
--- a/Framework/SINQ/inc/MantidSINQ/SliceMDHisto.h
+++ b/Framework/SINQ/inc/MantidSINQ/SliceMDHisto.h
@@ -37,24 +37,26 @@ public:
/// Default constructor
SliceMDHisto();
/// Virtual destructor
- virtual ~SliceMDHisto() {}
+ ~SliceMDHisto() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SliceMDHisto"; }
+ const std::string name() const override { return "SliceMDHisto"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Extracts a hyperslab of data from a MDHistoWorkspace";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "MDAlgorithms\\Slicing"; }
+ const std::string category() const override {
+ return "MDAlgorithms\\Slicing";
+ }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
unsigned int m_rank;
std::vector<int> m_dim;
diff --git a/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h b/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
index 6c9678c0477c33b62e3d62914f1503adcdd284f5..0dcfb6fda4b4b7584c3da29e95aa7c6f66bc98ce 100644
--- a/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
+++ b/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
@@ -88,37 +88,37 @@ public:
ScriptRepositoryImpl(const std::string &local_repository = std::string(),
const std::string &remote_url = std::string());
- virtual ~ScriptRepositoryImpl() throw();
+ ~ScriptRepositoryImpl() throw() override;
- void connect(const std::string &server);
+ void connect(const std::string &server) override;
- void install(const std::string &local_path);
+ void install(const std::string &local_path) override;
- ScriptInfo info(const std::string &path);
- const std::string &description(const std::string &path);
+ ScriptInfo info(const std::string &path) override;
+ const std::string &description(const std::string &path) override;
- std::vector<std::string> listFiles();
+ std::vector<std::string> listFiles() override;
- void download(const std::string &file_path);
+ void download(const std::string &file_path) override;
- SCRIPTSTATUS fileStatus(const std::string &file_path);
+ SCRIPTSTATUS fileStatus(const std::string &file_path) override;
void upload(const std::string &file_path, const std::string &comment,
- const std::string &author, const std::string &email);
+ const std::string &author, const std::string &email) override;
// remove file from the central repository and from local folder
void remove(const std::string &file_path, const std::string &comment,
- const std::string &author, const std::string &email);
+ const std::string &author, const std::string &email) override;
/* Return true if there is a local repository installed*/
- bool isValid(void);
+ bool isValid(void) override;
- std::vector<std::string> check4Update(void);
+ std::vector<std::string> check4Update(void) override;
- void setIgnorePatterns(const std::string &patterns);
+ void setIgnorePatterns(const std::string &patterns) override;
- std::string ignorePatterns(void);
+ std::string ignorePatterns(void) override;
- int setAutoUpdate(const std::string &path, bool option = true);
+ int setAutoUpdate(const std::string &path, bool option = true) override;
/// @deprecated Should avoid this, it is not in the design file.
std::string localRepository() const { return local_repository; }
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/BoxControllerDummyIO.h b/Framework/TestHelpers/inc/MantidTestHelpers/BoxControllerDummyIO.h
index e52acadf53aa53cc1b1d8b4aff3626468780b863..cc48affecf1ba9828edff02175918e61da9a1839 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/BoxControllerDummyIO.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/BoxControllerDummyIO.h
@@ -50,38 +50,37 @@ public:
BoxControllerDummyIO(const Mantid::API::BoxController *theBC);
///@return true if the file to write events is opened and false otherwise
- virtual bool isOpened() const { return (m_isOpened); }
+ pened() const override override { return (m_isOpened); }
/// get the full file name of the file used for IO operations
- virtual const std::string &getFileName() const { return m_fileName; }
+ d::string &getFileName() const override override { return m_fileName; }
/**Return the size of the NeXus data block used in NeXus data array*/
- size_t getDataChunk() const { return 1; }
+ size_t getDataChunk() const override override { return 1; }
- virtual bool openFile(const std::string &fileName, const std::string &mode);
- virtual void saveBlock(const std::vector<float> & /* DataBlock */,
- const uint64_t /*blockPosition*/) const;
- virtual void saveBlock(const std::vector<double> & /* DataBlock */,
- const uint64_t /*blockPosition*/) const {
+ nFile(const std::string &fileName, const std::string &mode) override override;
+ eBlock(const std::vector<float> & /* DataBlock */,
+ const uint64_t /*blockPosition*/) const override override;
+ eBlock(const std::vector<double> & /* DataBlock */,
+ const uint64_t /*blockPosition*/) const override override {
throw Mantid::Kernel::Exception::NotImplementedError(
"Saving double presision events blocks is not supported at the moment");
}
- virtual void loadBlock(std::vector<float> & /* Block */,
- const uint64_t /*blockPosition*/,
- const size_t /*BlockSize*/) const;
- virtual void loadBlock(std::vector<double> & /* Block */,
- const uint64_t /*blockPosition*/,
- const size_t /*BlockSize*/) const {
+ dBlock(std::vector<float> & /* Block */, const uint64_t /*blockPosition*/,
+ const size_t /*BlockSize*/) const override override;
+ dBlock(std::vector<double> & /* Block */, const uint64_t /*blockPosition*/,
+ const size_t /*BlockSize*/) const override override {
throw Mantid::Kernel::Exception::NotImplementedError(
"Loading double presision events blocks is not supported at the "
"moment");
}
- virtual void flushData() const {};
- virtual void closeFile() { m_isOpened = false; }
+ shData() const override override{};
+ seFile() override override { m_isOpened = false; }
- virtual ~BoxControllerDummyIO();
+ rollerDummyIO() override override;
// Auxiliary functions. Used to change default state of this object which is
// not fully supported. Should be replaced by some IBoxControllerIO factory
- virtual void setDataType(const size_t coordSize, const std::string &typeName);
- virtual void getDataType(size_t &coordSize, std::string &typeName) const;
+ DataType(const size_t coordSize,
+ const std::string &typeName) override override;
+ DataType(size_t &coordSize, std::string &typeName) const override override;
// Auxiliary functions (non-virtual, used at testing)
int64_t getNDataColums() const { return 2; }
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/TearDownWorld.h b/Framework/TestHelpers/inc/MantidTestHelpers/TearDownWorld.h
index ae5a1c482a5efd66846c21c4b0e41ef81b415b95..39aee1902a48f98f4403dbf09d05bbf4990a731f 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/TearDownWorld.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/TearDownWorld.h
@@ -33,7 +33,8 @@
* when its tearDownWorld() method is called.
*/
class ClearAlgorithmManager : public CxxTest::GlobalFixture {
- bool tearDownWorld();
+ bool tearDownWorld() override override override override override override
+ override override override override override override override;
};
//-----------------------------------------------------------------------------
@@ -43,7 +44,8 @@ class ClearAlgorithmManager : public CxxTest::GlobalFixture {
* when its tearDownWorld() method is called.
*/
class ClearADS : public CxxTest::GlobalFixture {
- bool tearDownWorld();
+ bool tearDownWorld() override override override override override override
+ override override override override override override override;
};
//-----------------------------------------------------------------------------
@@ -53,7 +55,8 @@ class ClearADS : public CxxTest::GlobalFixture {
* when its tearDownWorld() method is called.
*/
class ClearPropertyManagerDataService : public CxxTest::GlobalFixture {
- bool tearDownWorld();
+ bool tearDownWorld() override override override override override override
+ override override override override override override override;
};
#endif // TEARDOWNWORLD_H_
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h b/Framework/TestHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h
index dbd1c6124d6df891d948e3538150af9448f050df..d51ccf1b62b4375ac6cb7eb9e58ab4f7850ea5c6 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/WorkspaceCreationHelper.h
@@ -51,16 +51,16 @@ public:
class MockAlgorithm : public Mantid::API::Algorithm {
public:
MockAlgorithm(size_t nSteps = 100);
- ~MockAlgorithm(){};
+ ~MockAlgorithm() override{};
/// Algorithm's name for identification
- virtual const std::string name() const { return "MockAlgorithm"; };
+ const std::string name() const override { return "MockAlgorithm"; };
/// Algorithm's version for identification
- virtual int version() const { return 1; };
+ int version() const override { return 1; };
/// Algorithm's category for identification
- virtual const std::string category() const { return "Test"; }
+ const std::string category() const override { return "Test"; }
/// Algorithm's summary.
- virtual const std::string summary() const { return "Test summary."; }
+ const std::string summary() const override { return "Test summary."; }
Mantid::Kernel::Logger &getLogger() { return g_log; }
@@ -71,8 +71,8 @@ public:
}
private:
- void init(){};
- void exec(){};
+ void init() override{};
+ void exec() override{};
std::unique_ptr<Mantid::API::Progress> m_Progress;
/// logger -> to provide logging,
diff --git a/Framework/UserAlgorithms/HelloWorldAlgorithm.h b/Framework/UserAlgorithms/HelloWorldAlgorithm.h
index b84395a4245233a8063d15084b35f8c7d11d4f38..525bed432f7a8a047dac28eaa02d455a3e7dd4c1 100644
--- a/Framework/UserAlgorithms/HelloWorldAlgorithm.h
+++ b/Framework/UserAlgorithms/HelloWorldAlgorithm.h
@@ -36,22 +36,22 @@ public:
/// no arg constructor
HelloWorldAlgorithm() : API::Algorithm() {}
/// virtual destructor
- virtual ~HelloWorldAlgorithm() {}
+ ~HelloWorldAlgorithm() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "HelloWorldAlgorithm"; }
+ const std::string name() const override { return "HelloWorldAlgorithm"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Examples"; }
- virtual const std::string summary() const {
+ const std::string category() const override { return "Examples"; }
+ const std::string summary() const override {
return "Summary of this algorithm - Outputs Hello World!.";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/UserAlgorithms/LorentzianTest.h b/Framework/UserAlgorithms/LorentzianTest.h
index ced596a141c0b1903bd63b9976eecf7334d25760..eb428fcf78f4ca267cb4de5761d6c30185bfb394 100644
--- a/Framework/UserAlgorithms/LorentzianTest.h
+++ b/Framework/UserAlgorithms/LorentzianTest.h
@@ -91,16 +91,16 @@ public:
// virtual void setWidth(const double w) {}
//
// I.e. replace the below 6 lines of code with the above 6 lines
- virtual double centre() const { return getParameter("PeakCentre"); }
- virtual double height() const { return getParameter("Height"); }
- virtual double fwhm() const { return 2 * getParameter("HWHM"); }
- virtual void setCentre(const double c) { setParameter("PeakCentre", c); }
- virtual void setHeight(const double h) { setParameter("Height", h); }
- virtual void setFwhm(const double w) { setParameter("HWHM", w / 2.0); }
+ double centre() const override { return getParameter("PeakCentre"); }
+ double height() const override { return getParameter("Height"); }
+ double fwhm() const override { return 2 * getParameter("HWHM"); }
+ void setCentre(const double c) override { setParameter("PeakCentre", c); }
+ void setHeight(const double h) override { setParameter("Height", h); }
+ void setFwhm(const double w) override { setParameter("HWHM", w / 2.0); }
// ** MODIFY THIS **
/// The name of the fitting function
- std::string name() const { return "LorentzianTest"; }
+ std::string name() const override { return "LorentzianTest"; }
// ** OPTIONALLY MODIFY THIS **
/// The categories the Fit function belong to.
@@ -108,18 +108,18 @@ public:
/// For example: "General, Muon\\Custom" which adds
/// this function to the category "General" and the sub-category
/// "Muon\\Custom"
- virtual const std::string category() const { return "C++ User Defined"; }
+ const std::string category() const override { return "C++ User Defined"; }
virtual const std::string summary() const {
return "C++ User defined algorithm.";
}
protected:
- virtual void functionLocal(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDerivLocal(API::Jacobian *out, const double *xValues,
- const size_t nData);
- virtual void init();
+ void functionLocal(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDerivLocal(API::Jacobian *out, const double *xValues,
+ const size_t nData) override;
+ void init() override;
};
} // namespace CurveFitting
diff --git a/Framework/UserAlgorithms/ModifyData.h b/Framework/UserAlgorithms/ModifyData.h
index 0c1f551ef11df87e6662bd58e3c57893c735eac5..e7d54691119d0155d367a37eef6696d7110aef30 100644
--- a/Framework/UserAlgorithms/ModifyData.h
+++ b/Framework/UserAlgorithms/ModifyData.h
@@ -36,20 +36,20 @@ public:
/// no arg constructor
ModifyData() : API::Algorithm() {}
/// virtual destructor
- virtual ~ModifyData() {}
+ ~ModifyData() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "ModifyData"; }
+ const std::string name() const override { return "ModifyData"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Examples"; }
- virtual const std::string summary() const { return "An example summary"; }
+ const std::string category() const override { return "Examples"; }
+ const std::string summary() const override { return "An example summary"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/UserAlgorithms/Muon_ExpDecayOscTest.h b/Framework/UserAlgorithms/Muon_ExpDecayOscTest.h
index d13398066716f1f27fd2efabe88a9a7a767f2920..9ef769f73e8801dff8b431b2e0a20fb6cbfde150 100644
--- a/Framework/UserAlgorithms/Muon_ExpDecayOscTest.h
+++ b/Framework/UserAlgorithms/Muon_ExpDecayOscTest.h
@@ -40,19 +40,19 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport Muon_ExpDecayOscTest : public API::IPeakFunction {
public:
/// Destructor
- virtual ~Muon_ExpDecayOscTest(){};
+ ~Muon_ExpDecayOscTest() override{};
/// overwrite IPeakFunction base class methods
- virtual double centre() const { return getParameter("lambda"); }
- virtual double height() const { return getParameter("A"); }
- virtual double fwhm() const { return 1 / getParameter("frequency"); }
- virtual void setCentre(const double c) { setParameter("lambda", c); }
- virtual void setHeight(const double h) { setParameter("A", h); }
- virtual void setFwhm(const double w) { setParameter("frequency", 1 / w); }
+ double centre() const override { return getParameter("lambda"); }
+ double height() const override { return getParameter("A"); }
+ double fwhm() const override { return 1 / getParameter("frequency"); }
+ void setCentre(const double c) override { setParameter("lambda", c); }
+ void setHeight(const double h) override { setParameter("A", h); }
+ void setFwhm(const double w) override { setParameter("frequency", 1 / w); }
/// Here specify name of function as it will appear
- std::string name() const { return "Muon_ExpDecayOscTest"; }
+ std::string name() const override { return "Muon_ExpDecayOscTest"; }
// ** OPTIONALLY MODIFY THIS **
/// The categories the Fit function belong to.
@@ -60,9 +60,9 @@ public:
/// For example: "General, Muon\\Custom" which adds
/// this function to the category "General" and the sub-category
/// "Muon\\Custom"
- virtual const std::string category() const { return "C++ User Defined"; }
- virtual void functionDeriv(const API::FunctionDomain &domain,
- API::Jacobian &out);
+ const std::string category() const override { return "C++ User Defined"; }
+ void functionDeriv(const API::FunctionDomain &domain,
+ API::Jacobian &out) override;
// ** OPTIONALLY MODIFY THIS **
virtual const std::string summary() const {
@@ -71,12 +71,12 @@ public:
}
protected:
- virtual void functionLocal(double *out, const double *xValues,
- const size_t nData) const;
- virtual void functionDerivLocal(API::Jacobian *, const double *,
- const size_t) {}
+ void functionLocal(double *out, const double *xValues,
+ const size_t nData) const override;
+ void functionDerivLocal(API::Jacobian *, const double *,
+ const size_t) override {}
/// overwrite IFunction base class method, which declare function parameters
- virtual void init();
+ void init() override;
};
} // namespace CurveFitting
diff --git a/Framework/UserAlgorithms/PropertyAlgorithm.h b/Framework/UserAlgorithms/PropertyAlgorithm.h
index b8c6239e4b2c593cc7db0d39a4010da89db45cc2..baa6f495aaad4d2918c6ca124062fdbb7e45452d 100644
--- a/Framework/UserAlgorithms/PropertyAlgorithm.h
+++ b/Framework/UserAlgorithms/PropertyAlgorithm.h
@@ -36,21 +36,21 @@ public:
/// no arg constructor
PropertyAlgorithm() : API::Algorithm() {}
/// virtual destructor
- virtual ~PropertyAlgorithm() {}
+ ~PropertyAlgorithm() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "PropertyAlgorithm"; }
+ const std::string name() const override { return "PropertyAlgorithm"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Examples"; }
+ const std::string category() const override { return "Examples"; }
// Algorithm's summary. Overriding a virtual method.
- virtual const std::string summary() const { return "Example summary text."; }
+ const std::string summary() const override { return "Example summary text."; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/UserAlgorithms/WorkspaceAlgorithm.h b/Framework/UserAlgorithms/WorkspaceAlgorithm.h
index 85ce653e80cc63022f38aa92a51129831116b797..ec7a1f67e86ea664bb1f44b8d074fc5474da454e 100644
--- a/Framework/UserAlgorithms/WorkspaceAlgorithm.h
+++ b/Framework/UserAlgorithms/WorkspaceAlgorithm.h
@@ -36,21 +36,21 @@ public:
/// no arg constructor
WorkspaceAlgorithm() : API::Algorithm() {}
/// virtual destructor
- virtual ~WorkspaceAlgorithm() {}
+ ~WorkspaceAlgorithm() override {}
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const { return "WorkspaceAlgorithm"; }
+ const std::string name() const override { return "WorkspaceAlgorithm"; }
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const { return "Examples"; }
+ const std::string category() const override { return "Examples"; }
// Algorithm's summary. Overriding a virtual method.
- virtual const std::string summary() const { return "Example summary text."; }
+ const std::string summary() const override { return "Example summary text."; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithm
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/AlignAndFocusPowder.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/AlignAndFocusPowder.h
index 8ab71675b580fadbb1e53976f4ff92ce9afca2f3..685a7307f2b770f80cb78dd753b029b4173af6f6 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/AlignAndFocusPowder.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/AlignAndFocusPowder.h
@@ -65,15 +65,15 @@ public:
/// Constructor
AlignAndFocusPowder();
/// Destructor
- virtual ~AlignAndFocusPowder();
+ ~AlignAndFocusPowder() override;
/// Algorithm's name for identification overriding a virtual method
- virtual const std::string name() const;
+ const std::string name() const override;
/// Algorithm's version for identification overriding a virtual method
- virtual int version() const;
+ int version() const override;
/// Algorithm's category for identification overriding a virtual method
- virtual const std::string category() const;
+ const std::string category() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Algorithm to focus powder diffraction data into a number of "
"histograms "
"according to a grouping scheme defined in a CalFile.";
@@ -81,8 +81,8 @@ public:
private:
// Overridden Algorithm methods
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void loadCalFile(const std::string &calFileName);
API::MatrixWorkspace_sptr rebin(API::MatrixWorkspace_sptr matrixws);
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ComputeSensitivity.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ComputeSensitivity.h
index 1298b315c431e5550990aedcbbc8002a39889b01..f3f277e315d4a0949e5e47bbcbd5e10a6d28a64e 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ComputeSensitivity.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ComputeSensitivity.h
@@ -37,25 +37,25 @@ public:
/// (Empty) Constructor
ComputeSensitivity() : API::DataProcessorAlgorithm() {}
/// Virtual destructor
- virtual ~ComputeSensitivity() {}
+ ~ComputeSensitivity() override {}
/// Algorithm's name
- virtual const std::string name() const { return "ComputeSensitivity"; }
+ const std::string name() const override { return "ComputeSensitivity"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Workflow to calculate EQSANS sensitivity correction.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Workflow\\SANS\\UsesPropertyManager";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ConvolutionFitSequential.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ConvolutionFitSequential.h
index efdbbf5ee7913659ea0bad1f86f63933ffbc67cc..54c148761fb480c822a564b428c048fe4b23ccbf 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ConvolutionFitSequential.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ConvolutionFitSequential.h
@@ -36,16 +36,16 @@ namespace Algorithms {
class DLLExport ConvolutionFitSequential : public API::DataProcessorAlgorithm {
public:
ConvolutionFitSequential();
- virtual ~ConvolutionFitSequential();
+ ~ConvolutionFitSequential() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
bool checkForTwoLorentz(const std::string &);
std::vector<std::string> findValuesFromFunction(const std::string &);
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsAbsoluteUnitsReduction.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsAbsoluteUnitsReduction.h
index dad57616ceda520c9ba620404177e93ded544ce5..dae8eb03d2556569cc174d4a1b8a8105752e444c 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsAbsoluteUnitsReduction.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsAbsoluteUnitsReduction.h
@@ -36,18 +36,18 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport DgsAbsoluteUnitsReduction : public API::Algorithm {
public:
DgsAbsoluteUnitsReduction();
- virtual ~DgsAbsoluteUnitsReduction();
- virtual const std::string name() const;
+ ~DgsAbsoluteUnitsReduction() override;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Process the absolute units sample.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace WorkflowAlgorithms
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsConvertToEnergyTransfer.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsConvertToEnergyTransfer.h
index eafd36f03ed8f26e13b265c3b760cb59395c357c..a55f679eff9ba3f939fadd7535cb475f7fdea799 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsConvertToEnergyTransfer.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsConvertToEnergyTransfer.h
@@ -36,18 +36,18 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport DgsConvertToEnergyTransfer : public API::Algorithm {
public:
DgsConvertToEnergyTransfer();
- virtual ~DgsConvertToEnergyTransfer();
- virtual const std::string name() const;
+ ~DgsConvertToEnergyTransfer() override;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Algorithm to convert from TOF to energy transfer.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace WorkflowAlgorithms
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsDiagnose.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsDiagnose.h
index 59dbe4e613e6f03058d62f18e291f04270ad6ebf..0868568d64f00ae0449c407049926e9335d604e6 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsDiagnose.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsDiagnose.h
@@ -37,20 +37,20 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport DgsDiagnose : public API::Algorithm {
public:
DgsDiagnose();
- virtual ~DgsDiagnose();
+ ~DgsDiagnose() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Setup and run DetectorDiagnostic.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace WorkflowAlgorithms
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsPreprocessData.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsPreprocessData.h
index dc1b71d81612b7ae3ddc1bc69685e10fc6630558..8f129be36d7722c4853aacdc49fa14ed1ffc27e8 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsPreprocessData.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsPreprocessData.h
@@ -37,20 +37,20 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport DgsPreprocessData : public API::Algorithm {
public:
DgsPreprocessData();
- virtual ~DgsPreprocessData();
+ ~DgsPreprocessData() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Preprocess data via an incident beam parameter.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace WorkflowAlgorithms
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsProcessDetectorVanadium.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsProcessDetectorVanadium.h
index 9e3a443c42823b7d090e3e997133923859949fd9..5a93d930b22074014df4c909ee45c5e18ca75ddd 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsProcessDetectorVanadium.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsProcessDetectorVanadium.h
@@ -39,20 +39,20 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport DgsProcessDetectorVanadium : public API::Algorithm {
public:
DgsProcessDetectorVanadium();
- virtual ~DgsProcessDetectorVanadium();
+ ~DgsProcessDetectorVanadium() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Algorithm to process detector vanadium.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
};
} // namespace WorkflowAlgorithms
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsReduction.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsReduction.h
index 056672e49f916b56827d4f5bdb83306debd00aa3..4632ec47a7c35b5d995822ce0001904a4e3d18fb 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsReduction.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsReduction.h
@@ -37,20 +37,20 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
class DLLExport DgsReduction : public API::DataProcessorAlgorithm {
public:
DgsReduction();
- virtual ~DgsReduction();
+ ~DgsReduction() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Top-level workflow algorithm for DGS reduction.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
API::Workspace_sptr loadInputData(const std::string prop,
const bool mustLoad = true);
API::MatrixWorkspace_sptr loadGroupingFile(const std::string prop);
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsRemap.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsRemap.h
index 56bc2103577ca0cdd8c7d669cba0f70068b0d425..02935a32804e4ce81b3f293a054f7c437b86057f 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsRemap.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/DgsRemap.h
@@ -37,20 +37,20 @@ namespace WorkflowAlgorithms {
class DLLExport DgsRemap : public API::Algorithm {
public:
DgsRemap();
- virtual ~DgsRemap();
+ ~DgsRemap() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Mask and/or group the given workspace.";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
void execGrouping(API::MatrixWorkspace_sptr iWS,
API::MatrixWorkspace_sptr &oWS);
void execMasking(API::MatrixWorkspace_sptr iWS);
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSDarkCurrentSubtraction.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSDarkCurrentSubtraction.h
index a3a4b230479040f77c2786e593e64751ae5ac0af..b3f22ca51c666436f3f1a2aac5a59b04e065e1b9 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSDarkCurrentSubtraction.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSDarkCurrentSubtraction.h
@@ -36,27 +36,27 @@ public:
/// (Empty) Constructor
EQSANSDarkCurrentSubtraction() : API::Algorithm() {}
/// Virtual destructor
- virtual ~EQSANSDarkCurrentSubtraction() {}
+ ~EQSANSDarkCurrentSubtraction() override {}
/// Algorithm's name
- virtual const std::string name() const {
+ const std::string name() const override {
return "EQSANSDarkCurrentSubtraction";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Perform EQSANS dark current subtraction.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Workflow\\SANS\\UsesPropertyManager";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSDarkCurrentSubtraction2.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSDarkCurrentSubtraction2.h
index 3dc5d31e67411786c7498e2531de8a0b0118c333..110277f874083be1898dc42f55edea99caf5d428 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSDarkCurrentSubtraction2.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSDarkCurrentSubtraction2.h
@@ -36,27 +36,27 @@ public:
/// (Empty) Constructor
EQSANSDarkCurrentSubtraction2() : API::Algorithm() {}
/// Virtual destructor
- virtual ~EQSANSDarkCurrentSubtraction2() {}
+ ~EQSANSDarkCurrentSubtraction2() override {}
/// Algorithm's name
- virtual const std::string name() const {
+ const std::string name() const override {
return "EQSANSDarkCurrentSubtraction";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Perform EQSANS dark current subtraction.";
}
/// Algorithm's version
- virtual int version() const { return (2); }
+ int version() const override { return (2); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Workflow\\SANS\\UsesPropertyManager";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSLoad.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSLoad.h
index 6c1ffa6805d265febb1c0d670257801fff470441..486f64e12574a281ba62c12effb8981cf1c6c0e6 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSLoad.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSLoad.h
@@ -55,21 +55,21 @@ public:
m_slit_to_source[2] = 12150;
}
/// Virtual destructor
- virtual ~EQSANSLoad() {}
+ ~EQSANSLoad() override {}
/// Algorithm's name
- virtual const std::string name() const { return "EQSANSLoad"; }
+ const std::string name() const override { return "EQSANSLoad"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const { return "Load EQSANS data."; }
+ const std::string summary() const override { return "Load EQSANS data."; }
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Workflow\\SANS"; }
+ const std::string category() const override { return "Workflow\\SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
std::string findConfigFile(const int &run);
void readConfigFile(const std::string &filePath);
void readRectangularMasks(const std::string &line);
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSMonitorTOF.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSMonitorTOF.h
index 9c3e0f7a00860913c1552082dd6ec0fd35efc896..280bca6052b606c104c062914c633a55782c677a 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSMonitorTOF.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSMonitorTOF.h
@@ -53,24 +53,24 @@ public:
/// (Empty) Constructor
EQSANSMonitorTOF() : API::Algorithm() {}
/// Virtual destructor
- virtual ~EQSANSMonitorTOF() {}
+ ~EQSANSMonitorTOF() override {}
/// Algorithm's name
- virtual const std::string name() const { return "EQSANSMonitorTOF"; }
+ const std::string name() const override { return "EQSANSMonitorTOF"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Converts the TOF into a wavelength for the beam monitor. This "
"algorithm needs to be run once on every data set.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Workflow\\SANS"; }
+ const std::string category() const override { return "Workflow\\SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Compute TOF offset
double getTofOffset(API::MatrixWorkspace_const_sptr inputWS,
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSPatchSensitivity.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSPatchSensitivity.h
index f303b587e9e6d19fe1ba441840390289f0807e5f..69a18ef82a0177fbee489109acf878479b04d3de 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSPatchSensitivity.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSPatchSensitivity.h
@@ -38,23 +38,23 @@ public:
/// (Empty) Constructor
EQSANSPatchSensitivity() : API::Algorithm() {}
/// Virtual destructor
- virtual ~EQSANSPatchSensitivity() {}
+ ~EQSANSPatchSensitivity() override {}
/// Algorithm's name
- virtual const std::string name() const { return "EQSANSPatchSensitivity"; }
+ const std::string name() const override { return "EQSANSPatchSensitivity"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Patch EQSANS sensitivity correction.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Workflow\\SANS"; }
+ const std::string category() const override { return "Workflow\\SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSQ2D.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSQ2D.h
index 6b9a1e133d224d7f8553439cb6f567c3ab440085..4c967c575377bff626a6c23e21c105e4d2dff12d 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSQ2D.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/EQSANSQ2D.h
@@ -23,24 +23,24 @@ public:
/// (Empty) Constructor
EQSANSQ2D() : API::Algorithm() {}
/// Virtual destructor
- virtual ~EQSANSQ2D() {}
+ ~EQSANSQ2D() override {}
/// Algorithm's name
- virtual const std::string name() const { return "EQSANSQ2D"; }
+ const std::string name() const override { return "EQSANSQ2D"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Workflow algorithm to process a reduced EQSANS workspace and "
"produce I(Qx,Qy).";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Workflow\\SANS"; }
+ const std::string category() const override { return "Workflow\\SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/HFIRDarkCurrentSubtraction.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/HFIRDarkCurrentSubtraction.h
index 426c08278730d59f73ffb792c87d44f3a4338621..7fff7b7fe0c8d87c88ecf2002301815577f22542 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/HFIRDarkCurrentSubtraction.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/HFIRDarkCurrentSubtraction.h
@@ -37,27 +37,27 @@ public:
/// (Empty) Constructor
HFIRDarkCurrentSubtraction() : API::Algorithm() {}
/// Virtual destructor
- virtual ~HFIRDarkCurrentSubtraction() {}
+ ~HFIRDarkCurrentSubtraction() override {}
/// Algorithm's name
- virtual const std::string name() const {
+ const std::string name() const override {
return "HFIRDarkCurrentSubtraction";
}
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Perform HFIR SANS dark current subtraction.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Workflow\\SANS\\UsesPropertyManager";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
double getCountingTime(API::MatrixWorkspace_sptr inputWS);
static const int DEFAULT_MONITOR_ID = 0;
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/HFIRLoad.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/HFIRLoad.h
index 2667040ae19ef604ac80f3fb1c0244a070e65c41..a833b9008c840faeca659f05d9f29b4e5b1a6aa7 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/HFIRLoad.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/HFIRLoad.h
@@ -48,23 +48,23 @@ public:
/// Constructor
HFIRLoad() : API::Algorithm() {}
/// Virtual destructor
- virtual ~HFIRLoad() {}
+ ~HFIRLoad() override {}
/// Algorithm's name
- virtual const std::string name() const { return "HFIRLoad"; }
+ const std::string name() const override { return "HFIRLoad"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const { return "Load HFIR SANS data."; }
+ const std::string summary() const override { return "Load HFIR SANS data."; }
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Workflow\\SANS\\UsesPropertyManager";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void moveToBeamCenter(API::MatrixWorkspace_sptr &dataWS, double ¢er_x,
double ¢er_y);
};
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/HFIRSANSNormalise.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/HFIRSANSNormalise.h
index 382864c637bfc2ae8370274b4de31d102f6d2130..41fc4c16cf3894fd59c85f7e439b1869cc358900 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/HFIRSANSNormalise.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/HFIRSANSNormalise.h
@@ -14,23 +14,23 @@ public:
/// (Empty) Constructor
HFIRSANSNormalise() : API::Algorithm() {}
/// Virtual destructor
- virtual ~HFIRSANSNormalise() {}
+ ~HFIRSANSNormalise() override {}
/// Algorithm's name
- virtual const std::string name() const { return "HFIRSANSNormalise"; }
+ const std::string name() const override { return "HFIRSANSNormalise"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Apply normalisation correction to HFIR SANS data.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Workflow\\SANS"; }
+ const std::string category() const override { return "Workflow\\SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
};
} // namespace Algorithms
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/LoadEventAndCompress.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/LoadEventAndCompress.h
index 30ca6ca85a9c6b141058cbbc8a7e46ac71af49fb..21205dd83381c8b2a3a00c00c131ad1e2f46b708 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/LoadEventAndCompress.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/LoadEventAndCompress.h
@@ -34,23 +34,23 @@ namespace WorkflowAlgorithms {
class DLLExport LoadEventAndCompress : public API::DataProcessorAlgorithm {
public:
LoadEventAndCompress();
- virtual ~LoadEventAndCompress() override;
+ ~LoadEventAndCompress() override;
- virtual const std::string name() const override;
- virtual int version() const override;
- virtual const std::string category() const override;
- virtual const std::string summary() const override;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
protected:
- virtual API::ITableWorkspace_sptr
+ API::ITableWorkspace_sptr
determineChunk(const std::string &filename) override;
- virtual API::MatrixWorkspace_sptr loadChunk(const size_t rowIndex) override;
+ API::MatrixWorkspace_sptr loadChunk(const size_t rowIndex) override;
API::MatrixWorkspace_sptr processChunk(API::MatrixWorkspace_sptr &wksp,
double filterBadPulses);
private:
- virtual void init() override;
- virtual void exec() override;
+ void init() override;
+ void exec() override;
API::ITableWorkspace_sptr m_chunkingTable;
};
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonGroupAsymmetryCalculator.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonGroupAsymmetryCalculator.h
index fe9cf096d2db82506c7c97d6b38628504e4679cc..ba33603697aa65c314b0841dffeaafb643f03fcb 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonGroupAsymmetryCalculator.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonGroupAsymmetryCalculator.h
@@ -36,10 +36,10 @@ public:
const std::vector<int> summedPeriods,
const std::vector<int> subtractedPeriods,
const int groupIndex);
- virtual ~MuonGroupAsymmetryCalculator();
+ ~MuonGroupAsymmetryCalculator() override;
/// Performs group asymmetry calculation
- virtual API::MatrixWorkspace_sptr calculate() const override;
+ API::MatrixWorkspace_sptr calculate() const override;
private:
/// Removes exponential decay from the workspace
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonGroupCalculator.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonGroupCalculator.h
index 6c2dd02286395592def776956153c08be79f5286..46f27a537c8fcfa7620b87c9482f56d936dd07ad 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonGroupCalculator.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonGroupCalculator.h
@@ -35,7 +35,7 @@ public:
const std::vector<int> summedPeriods,
const std::vector<int> subtractedPeriods,
const int groupIndex);
- virtual ~MuonGroupCalculator();
+ ~MuonGroupCalculator() override;
protected:
/// Workspace index of the group to analyse
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonGroupCountsCalculator.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonGroupCountsCalculator.h
index 6f1d2e5406674cba5f6a8162f91323e837eaecd4..41cd5a2798aa56d71eee2a45dc7469c218434345 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonGroupCountsCalculator.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonGroupCountsCalculator.h
@@ -36,10 +36,10 @@ public:
const std::vector<int> summedPeriods,
const std::vector<int> subtractedPeriods,
const int groupIndex);
- virtual ~MuonGroupCountsCalculator();
+ ~MuonGroupCountsCalculator() override;
/// Performs group counts calculation
- virtual Mantid::API::MatrixWorkspace_sptr calculate() const override;
+ Mantid::API::MatrixWorkspace_sptr calculate() const override;
};
} // namespace WorkflowAlgorithms
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonPairAsymmetryCalculator.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonPairAsymmetryCalculator.h
index ee93f891a270139873ab64f66ba412b34d421886..32308e17f69f68ba5e6877f95dc86b3f3fa5c6e8 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonPairAsymmetryCalculator.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonPairAsymmetryCalculator.h
@@ -38,10 +38,10 @@ public:
const int firstPairIndex,
const int secondPairIndex,
const double alpha = 1);
- virtual ~MuonPairAsymmetryCalculator();
+ ~MuonPairAsymmetryCalculator() override;
/// Performs pair asymmetry calculation
- virtual API::MatrixWorkspace_sptr calculate() const override;
+ API::MatrixWorkspace_sptr calculate() const override;
private:
/// Calculate asymmetry for the given workspace
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonProcess.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonProcess.h
index 975951641aec799b1bcd699e1e175f154b064b9f..2fd37018553fb33426fd675b40841897adfd0ed6 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonProcess.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/MuonProcess.h
@@ -33,26 +33,26 @@ namespace WorkflowAlgorithms {
class DLLExport MuonProcess : public API::DataProcessorAlgorithm {
public:
MuonProcess();
- virtual ~MuonProcess();
+ ~MuonProcess() override;
- virtual const std::string name() const override;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const override {
+ const std::string summary() const override {
return "Processes and analyses Muon workspace.";
}
- virtual int version() const override;
- virtual const std::string category() const override;
+ int version() const override;
+ const std::string category() const override;
/// Perform validation of inputs to the algorithm
- virtual std::map<std::string, std::string> validateInputs() override;
+ std::map<std::string, std::string> validateInputs() override;
private:
void init() override;
void exec() override;
// We dont' want processGroups to be called
- virtual bool checkGroups() override { return false; }
+ bool checkGroups() override { return false; }
/// Groups specified workspace group according to specified
/// DetectorGroupingTable.
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ProcessIndirectFitParameters.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ProcessIndirectFitParameters.h
index 533e75b88b660d4d337bbb58269098599ceea25c..03c9a32842a9b432ba679fd670ad264b5eea9ec6 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ProcessIndirectFitParameters.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/ProcessIndirectFitParameters.h
@@ -37,16 +37,16 @@ namespace Algorithms {
class DLLExport ProcessIndirectFitParameters : public API::Algorithm {
public:
ProcessIndirectFitParameters();
- virtual ~ProcessIndirectFitParameters();
+ ~ProcessIndirectFitParameters() override;
- virtual const std::string name() const;
- virtual int version() const;
- virtual const std::string category() const;
- virtual const std::string summary() const;
+ const std::string name() const override;
+ int version() const override;
+ const std::string category() const override;
+ const std::string summary() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
std::vector<std::string> listToVector(std::string &);
std::vector<std::string> searchForFitParams(const std::string &,
const std::vector<std::string> &);
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/RefReduction.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/RefReduction.h
index d3506445a1551e063d9f207f66f839cf1b6986e8..56a5bfcf22c181d2e17d4bd869958139fb0cd882 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/RefReduction.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/RefReduction.h
@@ -40,25 +40,25 @@ public:
/// (Empty) Constructor
RefReduction() : API::Algorithm() {}
/// Virtual destructor
- virtual ~RefReduction() {}
+ ~RefReduction() override {}
/// Algorithm's name
- virtual const std::string name() const { return "RefReduction"; }
+ const std::string name() const override { return "RefReduction"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Data reduction for reflectometry.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Workflow\\Reflectometry";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
static const std::string PolStateOffOff;
static const std::string PolStateOnOff;
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/RefRoi.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/RefRoi.h
index 94f7061b2ace9c04704a32c87d223651d106360c..9bff6af37ddfa2ba2891bd2883ed6ba707230a30 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/RefRoi.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/RefRoi.h
@@ -40,26 +40,26 @@ public:
/// Constructor
RefRoi();
/// Virtual destructor
- virtual ~RefRoi() {}
+ ~RefRoi() override {}
/// Algorithm's name
- virtual const std::string name() const { return "RefRoi"; }
+ const std::string name() const override { return "RefRoi"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Workflow algorithm for reflectometry to sum up a region of "
"interest on a 2D detector.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Workflow\\Reflectometry";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void extractReflectivity();
void reverse(API::MatrixWorkspace_sptr WS);
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSBeamFinder.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSBeamFinder.h
index 3534b504021c91b2ad4f9dc9b332ba1eede5a2e2..698e8c284df697c33d756b29b9a329e11fd48498 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSBeamFinder.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSBeamFinder.h
@@ -39,25 +39,25 @@ public:
/// (Empty) Constructor
SANSBeamFinder() : API::Algorithm() {}
/// Virtual destructor
- virtual ~SANSBeamFinder() {}
+ ~SANSBeamFinder() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SANSBeamFinder"; }
+ const std::string name() const override { return "SANSBeamFinder"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Beam finder workflow algorithm for SANS instruments.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Workflow\\SANS\\UsesPropertyManager";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
API::MatrixWorkspace_sptr
loadBeamFinderFile(const std::string &beamCenterFile);
void maskEdges(API::MatrixWorkspace_sptr beamCenterWS, int high, int low,
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSBeamFluxCorrection.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSBeamFluxCorrection.h
index a301ef9f05a7b41f0ddf7f539d985f68a821be24..9bc5649f3c95150a56709718ddf31173733d0f94 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSBeamFluxCorrection.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSBeamFluxCorrection.h
@@ -19,26 +19,26 @@ public:
/// (Empty) Constructor
SANSBeamFluxCorrection() : API::DataProcessorAlgorithm() {}
/// Virtual destructor
- virtual ~SANSBeamFluxCorrection() {}
+ ~SANSBeamFluxCorrection() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SANSBeamFluxCorrection"; }
+ const std::string name() const override { return "SANSBeamFluxCorrection"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs beam flux correction on TOF SANS data.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Workflow\\SANS\\UsesPropertyManager;"
"CorrectionFunctions\\InstrumentCorrections";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void execEvent();
API::MatrixWorkspace_sptr loadReference();
boost::shared_ptr<Kernel::PropertyManager> m_reductionManager;
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSSensitivityCorrection.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSSensitivityCorrection.h
index b55c40bd4e1d187eefd7c4b7cc43460ab2454382..dd9faf5f4c97c5cf8981171cfe3096c942ff9f16 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSSensitivityCorrection.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSSensitivityCorrection.h
@@ -38,25 +38,27 @@ public:
/// (Empty) Constructor
SANSSensitivityCorrection() : API::Algorithm() { m_output_message = ""; }
/// Virtual destructor
- virtual ~SANSSensitivityCorrection() {}
+ ~SANSSensitivityCorrection() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SANSSensitivityCorrection"; }
+ const std::string name() const override {
+ return "SANSSensitivityCorrection";
+ }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Perform SANS sensitivity correction.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Workflow\\SANS\\UsesPropertyManager";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
/// Check whether we have a processed file of not
bool fileCheck(const std::string &filePath);
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSSolidAngleCorrection.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSSolidAngleCorrection.h
index ce43ca722e06e95890ef3be55b5c2ead95c0b353..b53f4c193f62d7ba43774fda8dbd6689a29c9a2e 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSSolidAngleCorrection.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SANSSolidAngleCorrection.h
@@ -39,26 +39,26 @@ public:
/// (Empty) Constructor
SANSSolidAngleCorrection() : API::Algorithm() {}
/// Virtual destructor
- virtual ~SANSSolidAngleCorrection() {}
+ ~SANSSolidAngleCorrection() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SANSSolidAngleCorrection"; }
+ const std::string name() const override { return "SANSSolidAngleCorrection"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Performs solid angle correction on SANS 2D data.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const {
+ const std::string category() const override {
return "Workflow\\SANS\\UsesPropertyManager;"
"CorrectionFunctions\\InstrumentCorrections";
}
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void execEvent();
};
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SetupEQSANSReduction.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SetupEQSANSReduction.h
index ad05fa7cae3c8bf199da4365a9ee89236470e683..455e9cbec24d0708ff4a878cee88db5f52c600c3 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SetupEQSANSReduction.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SetupEQSANSReduction.h
@@ -41,23 +41,23 @@ public:
/// Constructor
SetupEQSANSReduction() : API::Algorithm() {}
/// Virtual destructor
- virtual ~SetupEQSANSReduction() {}
+ ~SetupEQSANSReduction() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SetupEQSANSReduction"; }
+ const std::string name() const override { return "SetupEQSANSReduction"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Set up EQSANS SANS reduction options.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Workflow\\SANS"; }
+ const std::string category() const override { return "Workflow\\SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
std::string _findFile(std::string dataRun);
void
setupSensitivity(boost::shared_ptr<Kernel::PropertyManager> reductionManager);
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SetupHFIRReduction.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SetupHFIRReduction.h
index 3f34dcd6428c24ebdf6ee78f0cae50fb2c6c4292..087b63506621fb77a224086ac339c246c9e38152 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SetupHFIRReduction.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SetupHFIRReduction.h
@@ -42,23 +42,23 @@ public:
/// Constructor
SetupHFIRReduction() : API::Algorithm() {}
/// Virtual destructor
- virtual ~SetupHFIRReduction() {}
+ ~SetupHFIRReduction() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SetupHFIRReduction"; }
+ const std::string name() const override { return "SetupHFIRReduction"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Set up HFIR SANS reduction options.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Workflow\\SANS"; }
+ const std::string category() const override { return "Workflow\\SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
void setupTransmission(
boost::shared_ptr<Kernel::PropertyManager> reductionManager);
void
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SetupILLD33Reduction.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SetupILLD33Reduction.h
index 18ffeb7cff593038c89d70fdd4fa0a4992049d6e..d3090ab4f3e561d062f6b62960664cbbe5044938 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SetupILLD33Reduction.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/SetupILLD33Reduction.h
@@ -41,24 +41,24 @@ public:
/// Constructor
SetupILLD33Reduction() : API::Algorithm() {}
/// Virtual destructor
- virtual ~SetupILLD33Reduction() {}
+ ~SetupILLD33Reduction() override {}
/// Algorithm's name
- virtual const std::string name() const { return "SetupILLD33Reduction"; }
+ const std::string name() const override { return "SetupILLD33Reduction"; }
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Set up ILL D33 SANS reduction options.";
}
/// Algorithm's version
- virtual int version() const { return (1); }
+ int version() const override { return (1); }
/// Algorithm's category for identification
- virtual const std::string category() const { return "Workflow\\SANS"; }
+ const std::string category() const override { return "Workflow\\SANS"; }
private:
/// Initialisation code
- void init();
+ void init() override;
/// Execution code
- void exec();
+ void exec() override;
std::string _findFile(std::string dataRun);
void
setupSensitivity(boost::shared_ptr<Kernel::PropertyManager> reductionManager);
diff --git a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/StepScan.h b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/StepScan.h
index 339c1ba0c5590c511d3d7f0272f9a0ac179fef2a..6d05d4f1d2d6f380a4fbf88ecb4a72595cfa965d 100644
--- a/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/StepScan.h
+++ b/Framework/WorkflowAlgorithms/inc/MantidWorkflowAlgorithms/StepScan.h
@@ -37,21 +37,21 @@ namespace WorkflowAlgorithms {
class DLLExport StepScan : public API::Algorithm {
public:
StepScan();
- virtual ~StepScan();
+ ~StepScan() override;
- virtual const std::string name() const;
+ const std::string name() const override;
/// Summary of algorithms purpose
- virtual const std::string summary() const {
+ const std::string summary() const override {
return "Workflow algorithm for analysis of an alignment scan from an SNS "
"Adara-enabled beam line";
}
- virtual int version() const;
- virtual const std::string category() const;
+ int version() const override;
+ const std::string category() const override;
private:
- void init();
- void exec();
+ void init() override;
+ void exec() override;
DataObjects::EventWorkspace_sptr
getMonitorWorkspace(API::MatrixWorkspace_sptr inputWS);