diff --git a/Framework/CurveFitting/src/Algorithms/QENSFitSequential.cpp b/Framework/CurveFitting/src/Algorithms/QENSFitSequential.cpp index d7a8b8ea2140631a2492e344489a3f2eefb8c043..a8d8dc6148da074671a7c96ec24af801533bfd28 100644 --- a/Framework/CurveFitting/src/Algorithms/QENSFitSequential.cpp +++ b/Framework/CurveFitting/src/Algorithms/QENSFitSequential.cpp @@ -398,7 +398,7 @@ void QENSFitSequential::init() { declareProperty( std::make_unique<FunctionProperty>("Function", Direction::InOut), "The fitting function, common for all workspaces in the input."); - declareProperty("LogValue", "axis-1", + declareProperty("LogName", "axis-1", "Name of the log value to plot the " "parameters against. Default: use spectra " "numbers."); @@ -660,7 +660,7 @@ std::vector<std::size_t> QENSFitSequential::getDatasetGrouping( WorkspaceGroup_sptr QENSFitSequential::processIndirectFitParameters( ITableWorkspace_sptr parameterWorkspace, const std::vector<std::size_t> &grouping) { - std::string const columnX = getProperty("LogValue"); + std::string const columnX = getProperty("LogName"); std::string const xAxisUnit = getProperty("ResultXAxisUnit"); auto pifp = createChildAlgorithm("ProcessIndirectFitParameters", 0.91, 0.95, false); @@ -733,7 +733,7 @@ ITableWorkspace_sptr QENSFitSequential::performFit(const std::string &input, plotPeaks->setProperty("Minimizer", getPropertyValue("Minimizer")); plotPeaks->setProperty("PassWSIndexToFunction", passWsIndex); plotPeaks->setProperty("PeakRadius", getPropertyValue("PeakRadius")); - plotPeaks->setProperty("LogValue", getPropertyValue("LogValue")); + plotPeaks->setProperty("LogValue", getPropertyValue("LogName")); plotPeaks->setProperty("EvaluationType", getPropertyValue("EvaluationType")); plotPeaks->setProperty("CostFunction", getPropertyValue("CostFunction")); plotPeaks->executeAsChildAlg(); diff --git a/qt/scientific_interfaces/Indirect/IndirectFittingModel.cpp b/qt/scientific_interfaces/Indirect/IndirectFittingModel.cpp index e328a295a018d05715b45428363ae802e9d0af06..9182558d19b2550541352e2eca7b5a3301a494e8 100644 --- a/qt/scientific_interfaces/Indirect/IndirectFittingModel.cpp +++ b/qt/scientific_interfaces/Indirect/IndirectFittingModel.cpp @@ -329,8 +329,8 @@ PrivateFittingData::PrivateFittingData( std::vector<std::unique_ptr<IndirectFitData>> &&data) : m_data(std::move(data)) {} -PrivateFittingData &PrivateFittingData:: -operator=(PrivateFittingData &&fittingData) { +PrivateFittingData & +PrivateFittingData::operator=(PrivateFittingData &&fittingData) { m_data = std::move(fittingData.m_data); return *this; } @@ -738,7 +738,7 @@ std::string IndirectFittingModel::getResultXAxisUnit() const { return "MomentumTransfer"; } -std::string IndirectFittingModel::getResultLogValue() const { return "axis-1"; } +std::string IndirectFittingModel::getResultLogName() const { return "axis-1"; } boost::optional<ResultLocation> IndirectFittingModel::getResultLocation(std::size_t index, @@ -816,7 +816,7 @@ IAlgorithm_sptr IndirectFittingModel::createSequentialFit( fitAlgorithm->setProperty("Input", input); fitAlgorithm->setProperty("OutputWorkspace", sequentialFitOutputName()); fitAlgorithm->setProperty("PassWSIndexToFunction", true); - fitAlgorithm->setProperty("LogValue", getResultLogValue()); + fitAlgorithm->setProperty("LogName", getResultLogName()); const auto range = initialFitData->getRange(0); fitAlgorithm->setProperty("StartX", range.first); diff --git a/qt/scientific_interfaces/Indirect/IndirectFittingModel.h b/qt/scientific_interfaces/Indirect/IndirectFittingModel.h index de28554fd8339ca4655526457c6e429198e0cf01..c6f43c3e91f474bded09ca26b7c7a0c8419e52ad 100644 --- a/qt/scientific_interfaces/Indirect/IndirectFittingModel.h +++ b/qt/scientific_interfaces/Indirect/IndirectFittingModel.h @@ -159,7 +159,7 @@ private: createDefaultParameters(std::size_t index) const; virtual std::string getResultXAxisUnit() const; - virtual std::string getResultLogValue() const; + virtual std::string getResultLogName() const; bool isPreviousModelSelected() const; diff --git a/qt/scientific_interfaces/Indirect/JumpFitModel.cpp b/qt/scientific_interfaces/Indirect/JumpFitModel.cpp index 98ac826df5b54ab56d2ec0a203cf5696791af685..7e940a9ce28c7069d588a485a74df5554887a724 100644 --- a/qt/scientific_interfaces/Indirect/JumpFitModel.cpp +++ b/qt/scientific_interfaces/Indirect/JumpFitModel.cpp @@ -364,7 +364,7 @@ std::string JumpFitModel::singleFitOutputName(std::size_t index, std::string JumpFitModel::getResultXAxisUnit() const { return ""; } -std::string JumpFitModel::getResultLogValue() const { return "SourceName"; } +std::string JumpFitModel::getResultLogName() const { return "SourceName"; } std::string JumpFitModel::constructOutputName() const { auto const name = createOutputName("%1%_FofQFit_" + m_fitType, "", 0); diff --git a/qt/scientific_interfaces/Indirect/JumpFitModel.h b/qt/scientific_interfaces/Indirect/JumpFitModel.h index c3a3dedd5808575d448bcb507ce645f6ce5b82cb..0deafe0e84ef2d0fe9e313b655ccb7fdf1750d32 100644 --- a/qt/scientific_interfaces/Indirect/JumpFitModel.h +++ b/qt/scientific_interfaces/Indirect/JumpFitModel.h @@ -61,7 +61,7 @@ private: std::unordered_map<std::string, JumpFitParameters>::const_iterator findJumpFitParameters(std::size_t dataIndex) const; std::string getResultXAxisUnit() const override; - std::string getResultLogValue() const override; + std::string getResultLogName() const override; std::string m_fitType; std::unordered_map<std::string, JumpFitParameters> m_jumpParameters;