Commit c5e8836e authored by Lamar Moore's avatar Lamar Moore
Browse files

Re #15487 applied clang tidy fixes for readability-inconsistent-declaration-parameter-name

parent 01b6ecba
......@@ -57,7 +57,7 @@ public:
/// Set the rotation speed in rads/sec
void setAngularVelocityInHz(const double value);
/// Set the angular velocity log name
void setAngularVelocityLog(const std::string &name);
void setAngularVelocityLog(const std::string &logName);
/// Returns the current angular velocity in rads/sec
double getAngularVelocity() const;
/// Sets the chopper jitter sigma value in microseconds. This is the FWHH
......@@ -186,13 +186,13 @@ private:
/// instrument group open.
void loadEmbeddedInstrumentInfoNexus(::NeXus::File *file,
std::string &instrumentName,
std::string &instrumentXML);
std::string &instrumentXml);
/// Set the instrument given the name and XML leading from IDF file if XML
/// string is empty
void setInstumentFromXML(const std::string &nxFilename,
std::string &instrumentName,
std::string &instrumentXML);
std::string &instrumentXml);
// Loads the xml from an instrument file with some basic error handling
std::string loadInstrumentXML(const std::string &filename);
......@@ -38,7 +38,7 @@ class MANTID_API_DLL FileBackedExperimentInfo : public ExperimentInfo {
/// Constructor
FileBackedExperimentInfo(const std::string &filename,
const std::string &path);
const std::string &nxpath);
ExperimentInfo *cloneExperimentInfo() const override;
......@@ -53,8 +53,8 @@ public:
std::string getFullPath(const std::string &filename,
const bool ignoreDirs = false) const;
std::string getPath(const std::vector<IArchiveSearch_sptr> &archs,
const std::set<std::string> &filename,
const std::vector<std::string> &extensions) const;
const std::set<std::string> &filenames,
const std::vector<std::string> &exts) const;
std::string makeFileName(const std::string &hint,
const Kernel::InstrumentInfo &instrument) const;
......@@ -53,7 +53,7 @@ class MANTID_API_DLL FuncMinimizerFactoryImpl
/// Creates an instance of a minimizer
createMinimizer(const std::string &type) const;
createMinimizer(const std::string &str) const;
friend struct Mantid::Kernel::CreateUsingNew<FuncMinimizerFactoryImpl>;
......@@ -477,11 +477,11 @@ public:
/// Returns a list of attribute names
virtual std::vector<std::string> getAttributeNames() const;
/// Return a value of attribute attName
virtual Attribute getAttribute(const std::string &attName) const;
virtual Attribute getAttribute(const std::string &name) const;
/// Set a value to attribute attName
virtual void setAttribute(const std::string &attName, const Attribute &);
virtual void setAttribute(const std::string &name, const Attribute &);
/// Check if attribute attName exists
virtual bool hasAttribute(const std::string &attName) const;
virtual bool hasAttribute(const std::string &name) const;
/// Set an attribute value
template <typename T>
void setAttributeValue(const std::string &attName, const T &value) {
......@@ -495,7 +495,7 @@ public:
virtual void setUpForFit() = 0;
/// Calculate numerical derivatives
void calNumericalDeriv(const FunctionDomain &domain, Jacobian &out);
void calNumericalDeriv(const FunctionDomain &domain, Jacobian &jacobian);
/// Set the covariance matrix
void setCovarianceMatrix(boost::shared_ptr<Kernel::Matrix<double>> covar);
/// Get the covariance matrix
......@@ -525,7 +525,7 @@ protected:
const std::string &description = "") = 0;
/// Convert a value from one unit (inUnit) to unit defined in workspace (ws)
double convertValue(double value, Kernel::Unit_sptr &inUnit,
double convertValue(double value, Kernel::Unit_sptr &outUnit,
boost::shared_ptr<const MatrixWorkspace> ws,
size_t wsIndex) const;
......@@ -76,7 +76,7 @@ public:
const size_t nData, const size_t order) const;
/// Derivatives of function with respect to active parameters
virtual void functionDeriv1D(Jacobian *out, const double *xValues,
virtual void functionDeriv1D(Jacobian *jacobian, const double *xValues,
const size_t nData);
......@@ -126,7 +126,7 @@ public:
Mantid::Geometry::MDImplicitFunction *function = nullptr) const;
std::string getConvention() const;
void setConvention(std::string m_convention);
void setConvention(std::string convention);
std::string changeQConvention();
signal_t getSignalAtVMD(const Mantid::Kernel::VMD &coords,
......@@ -89,7 +89,7 @@ public:
/// Override setting a new value to a parameter by name
void setParameter(const std::string &name, const double &value,
bool explicitlySe = true) override;
bool explicitlySet = true) override;
/// Check whether a parameter is a profile parameter
virtual bool hasProfileParameter(std::string paramname);
......@@ -92,7 +92,7 @@ private:
/// given fraction of the range
double areaToTimeFunction(const double fraction) const;
/// Returns the area of the IKeda-Carpenter function for the given time value
double area(const double t) const;
double area(const double x) const;
/// The value of the 1/fast decay coefficient
double m_tau_f;
......@@ -51,7 +51,7 @@ public:
create(const std::string &xmlString) const override;
ImplicitFunctionParser *
createImplicitFunctionParserFromXML(const std::string &configXML) const;
createImplicitFunctionParserFromXML(const std::string &functionXML) const;
ImplicitFunctionParser *createImplicitFunctionParserFromXML(
Poco::XML::Element *functionElement) const;
......@@ -52,7 +52,7 @@ class MANTID_API_DLL LiveListenerFactoryImpl
create(const std::string &instrumentName, bool connect,
const Kernel::IPropertyManager *props = nullptr) const;
const Kernel::IPropertyManager *properties = nullptr) const;
LiveListenerFactoryImpl(const LiveListenerFactoryImpl &) = delete;
LiveListenerFactoryImpl &operator=(const LiveListenerFactoryImpl &) = delete;
bool checkConnection(const std::string &instrumentName) const;
......@@ -96,7 +96,7 @@ public:
/// Does the property exist on the object
bool hasProperty(const std::string &name) const;
/// Remove a named property
void removeProperty(const std::string &name, bool delproperty = true);
void removeProperty(const std::string &name, bool delProperty = true);
* Return all of the current properties
* @returns A vector of the current list of properties
......@@ -55,13 +55,13 @@ public:
/// Determine which histogram an index in a 1D array relates to given the
/// known blockSize
HistogramIndex getHistogramIndex(Index index) const;
HistogramIndex getHistogramIndex(Index oneDimIndex) const;
/// Get the bin index.
BinIndex getBinIndex(Index index, HistogramIndex histogram) const;
BinIndex getBinIndex(Index oneDimIndex, HistogramIndex histogramDimIndex) const;
/// Get the one dimensional index given a histogram and bin index.
Index getOneDimIndex(HistogramIndex histogram, BinIndex binIndex) const;
Index getOneDimIndex(HistogramIndex histogramIndex, BinIndex binIndex) const;
////Assignment operator
MatrixWSIndexCalculator &operator=(const MatrixWSIndexCalculator &other);
......@@ -366,11 +366,11 @@ public:
const double &weight = 1.0);
void flagMasked(const size_t &spectrumIndex, const size_t &binIndex,
const double &weight = 1.0);
bool hasMaskedBins(const size_t &spectrumIndex) const;
bool hasMaskedBins(const size_t &workspaceIndex) const;
/// Masked bins for each spectrum are stored as a set of pairs containing <bin
/// index, weight>
typedef std::map<size_t, double> MaskList;
const MaskList &maskedBins(const size_t &spectrumIndex) const;
const MaskList &maskedBins(const size_t &workspaceIndex) const;
// Methods handling the internal monitor workspace
virtual void
......@@ -470,7 +470,7 @@ protected:
MatrixWorkspace(const MatrixWorkspace &other);
Mantid::Geometry::INearestNeighboursFactory *factory = nullptr);
Mantid::Geometry::INearestNeighboursFactory *nnFactory = nullptr);
/// Initialises the workspace. Sets the size and lengths of the arrays. Must
/// be overloaded.
......@@ -40,7 +40,7 @@ class MANTID_API_DLL NotebookWriter {
virtual ~NotebookWriter() = default;
std::string markdownCell(std::string string_array);
std::string markdownCell(std::string string_text);
std::string codeCell(std::string string_code);
std::string writeNotebook();
......@@ -51,7 +51,7 @@ private:
Json::Value buildNotebook();
void markdownCell(Json::Value string_array);
void codeCell(Json::Value string_code);
void codeCell(Json::Value array_code);
Json::Value m_cell_buffer;
......@@ -69,10 +69,10 @@ public:
integrateProtonCharge(const std::string &logname = "proton_charge") const;
/// Store the given values as a set of histogram bin boundaries
void storeHistogramBinBoundaries(const std::vector<double> &energyBins);
void storeHistogramBinBoundaries(const std::vector<double> &histoBins);
/// Returns the bin boundaries for a given value
std::pair<double, double>
histogramBinBoundaries(const double energyValue) const;
histogramBinBoundaries(const double value) const;
/// Returns the vector of bin boundaries
std::vector<double> getBinBoundaries() const;
......@@ -69,7 +69,7 @@ public:
const std::set<detid_t> &
getDetectorIDsForSpectrumNo(const specnum_t spectrumNo) const;
const std::set<detid_t> &
getDetectorIDsForSpectrumIndex(const size_t index) const;
getDetectorIDsForSpectrumIndex(const size_t spectrumIndex) const;
const sdmap &getMapping() const;
bool indexIsSpecNumber() const;
......@@ -53,7 +53,7 @@ template <class VectorValueParameterType>
class DLLExport VectorParameterParser
: public Mantid::API::ImplicitFunctionParameterParser {
VectorValueParameterType *parseVectorParameter(std::string value);
VectorValueParameterType *parseVectorParameter(std::string sValue);
Mantid::API::ImplicitFunctionParameter *
createParameter(Poco::XML::Element *parameterElement) override;
......@@ -82,7 +82,7 @@ public:
/// Inidicates that the workspace group can be treated as multiperiod.
bool isMultiperiod() const;
/// Check if a workspace is included in this group or any nested groups.
bool isInGroup(const Workspace &workspace, size_t level = 0) const;
bool isInGroup(const Workspace &workspaceToCheck, size_t level = 0) const;
/// Prints the group to the screen using the logger at debug
void print() const;
......@@ -100,7 +100,7 @@ public:
/// Does a workspace exist within the group
bool contains(const std::string &wsName) const;
/// Does a workspace exist within the group
bool contains(const Workspace_sptr &wsName) const;
bool contains(const Workspace_sptr &workspace) const;
/// Add the members of the group to the given list
void reportMembers(std::set<Workspace_sptr> &memberList) const;
/// Returns the names of workspaces that make up this group. Note that this
......@@ -122,11 +122,11 @@ private:
/// ADS removes a member of this group using this method. It doesn't send
/// notifications in contrast to remove(name).
void removeByADS(const std::string &name);
void removeByADS(const std::string &wsName);
/// Turn ADS observations on/off
void observeADSNotifications(const bool observeADS);
/// Check if a workspace is included in any child groups and groups in them.
bool isInChildGroup(const Workspace &workspace) const;
bool isInChildGroup(const Workspace &workspaceToCheck) const;
/// Callback when a delete notification is received
void workspaceDeleteHandle(
Mantid::API::WorkspacePostDeleteNotification_ptr notice);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment