From ec2ef96689e9360413f22294c11cca142405369f Mon Sep 17 00:00:00 2001
From: Matthew Andrew <matthew.andrew@tessella.com>
Date: Thu, 10 Oct 2019 15:25:59 +0100
Subject: [PATCH] Applied clang format Re #22055
---
.../Indirect/ConvFitModel.cpp | 10 +++---
.../Indirect/FunctionTemplateBrowser.cpp | 4 +--
.../Indirect/IndexTypes.h | 14 ++++----
.../Indirect/IndirectDataTablePresenter.cpp | 23 +++++++------
.../Indirect/IndirectDataTablePresenter.h | 14 ++++----
.../Indirect/IndirectFitAnalysisTab.cpp | 30 ++++++++++-------
.../Indirect/IndirectFitAnalysisTab.h | 3 +-
.../Indirect/IndirectFitData.cpp | 10 +++---
.../Indirect/IndirectFitData.h | 5 ++-
.../Indirect/IndirectFitDataLegacy.cpp | 10 ++++--
.../Indirect/IndirectFitDataLegacy.h | 14 +++++---
.../Indirect/IndirectFitDataPresenter.cpp | 15 ++++++---
.../Indirect/IndirectFitDataPresenter.h | 3 +-
.../Indirect/IndirectFitOutput.cpp | 15 ++++-----
.../Indirect/IndirectFitOutput.h | 9 +++---
.../Indirect/IndirectFitOutputLegacy.cpp | 26 ++++++++-------
.../Indirect/IndirectFitOutputLegacy.h | 3 +-
.../Indirect/IndirectFitPlotModel.cpp | 3 +-
.../Indirect/IndirectFitPlotView.cpp | 4 +--
.../Indirect/IndirectFitPropertyBrowser.cpp | 4 +--
.../Indirect/IndirectFitPropertyBrowser.h | 3 +-
.../Indirect/IndirectFittingModel.cpp | 32 +++++++++++--------
.../Indirect/IndirectFittingModel.h | 11 ++++---
.../Indirect/IndirectFittingModelLegacy.cpp | 19 +++++------
.../Indirect/IndirectFittingModelLegacy.h | 3 +-
.../Indirect/test/ConvFitModelTest.h | 3 +-
.../Indirect/test/IndirectFitDataTest.h | 3 +-
.../Indirect/test/IndirectFitOutputTest.h | 3 +-
.../Indirect/test/IndirectFittingModelTest.h | 3 +-
.../Indirect/test/JumpFitModelTest.h | 3 +-
30 files changed, 174 insertions(+), 128 deletions(-)
diff --git a/qt/scientific_interfaces/Indirect/ConvFitModel.cpp b/qt/scientific_interfaces/Indirect/ConvFitModel.cpp
index a7725ff6b95..d1b88ccdfc1 100644
--- a/qt/scientific_interfaces/Indirect/ConvFitModel.cpp
+++ b/qt/scientific_interfaces/Indirect/ConvFitModel.cpp
@@ -657,10 +657,12 @@ void ConvFitModel::addSampleLogs() {
}
}
-IndirectFitOutputLegacy ConvFitModel::createFitOutput(
- WorkspaceGroup_sptr resultGroup, ITableWorkspace_sptr parameterTable,
- WorkspaceGroup_sptr resultWorkspace, const FitDataIteratorLegacy &fitDataBegin,
- const FitDataIteratorLegacy &fitDataEnd) const {
+IndirectFitOutputLegacy
+ConvFitModel::createFitOutput(WorkspaceGroup_sptr resultGroup,
+ ITableWorkspace_sptr parameterTable,
+ WorkspaceGroup_sptr resultWorkspace,
+ const FitDataIteratorLegacy &fitDataBegin,
+ const FitDataIteratorLegacy &fitDataEnd) const {
auto output = IndirectFitOutputLegacy(
resultGroup, parameterTable, resultWorkspace, fitDataBegin, fitDataEnd);
output.mapParameterNames(m_parameterNameChanges, fitDataBegin, fitDataEnd);
diff --git a/qt/scientific_interfaces/Indirect/FunctionTemplateBrowser.cpp b/qt/scientific_interfaces/Indirect/FunctionTemplateBrowser.cpp
index 25c71e1f45c..61c40ac580d 100644
--- a/qt/scientific_interfaces/Indirect/FunctionTemplateBrowser.cpp
+++ b/qt/scientific_interfaces/Indirect/FunctionTemplateBrowser.cpp
@@ -13,13 +13,13 @@
#include "MantidAPI/IWorkspaceProperty.h"
#include "MantidKernel/PropertyWithValue.h"
-#include "MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h"
-#include "MantidQtWidgets/Common/QtPropertyBrowser/qttreepropertybrowser.h"
#include "MantidQtWidgets/Common/QtPropertyBrowser/ButtonEditorFactory.h"
#include "MantidQtWidgets/Common/QtPropertyBrowser/CompositeEditorFactory.h"
#include "MantidQtWidgets/Common/QtPropertyBrowser/DoubleDialogEditor.h"
#include "MantidQtWidgets/Common/QtPropertyBrowser/DoubleEditorFactory.h"
#include "MantidQtWidgets/Common/QtPropertyBrowser/qteditorfactory.h"
+#include "MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h"
+#include "MantidQtWidgets/Common/QtPropertyBrowser/qttreepropertybrowser.h"
#include <QMessageBox>
#include <QSettings>
diff --git a/qt/scientific_interfaces/Indirect/IndexTypes.h b/qt/scientific_interfaces/Indirect/IndexTypes.h
index 48ac3c5ab21..40fd8765bb5 100644
--- a/qt/scientific_interfaces/Indirect/IndexTypes.h
+++ b/qt/scientific_interfaces/Indirect/IndexTypes.h
@@ -4,10 +4,10 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
-//
+//
// This file contains the implimentation of type safe indices for use
// in the indirect interface code.
-// TODO merge this to use the generic index framework from IndexType.h
+// TODO merge this to use the generic index framework from IndexType.h
#ifndef MANTIDQTCUSTOMINTERFACESIDA_INDEXTYPE_H_
#define MANTIDQTCUSTOMINTERFACESIDA_INDEXTYPE_H_
@@ -20,9 +20,9 @@ namespace CustomInterfaces {
namespace IDA {
/** A struct to impliment strongly typed integers, without implicit conversion.
- * Currently operations and comparitors are only defined between instances of the
- * same type.
-*/
+ * Currently operations and comparitors are only defined between instances of
+ * the same type.
+ */
template <int Class> struct IndexType {
using IntImplementationType = int;
IntImplementationType value = 0;
@@ -61,12 +61,12 @@ using TableRowIndex = IndexType<0>;
using WorkspaceIndex = IndexType<1>;
// Used to index worspaces in workspace groups
using WorkspaceGroupIndex = IndexType<2>;
-// Used to index
+// Used to index
using TableDatasetIndex = IndexType<3>;
/** A class which wraps a vector so that you supply not only the value
* type but also the expected index type.
-*/
+ */
template <class CollectionIndexType, class CollectionValueType>
class IndexCollectionType {
public:
diff --git a/qt/scientific_interfaces/Indirect/IndirectDataTablePresenter.cpp b/qt/scientific_interfaces/Indirect/IndirectDataTablePresenter.cpp
index 57ccf96eb3e..9a4898732b8 100644
--- a/qt/scientific_interfaces/Indirect/IndirectDataTablePresenter.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectDataTablePresenter.cpp
@@ -218,10 +218,10 @@ IndirectDataTablePresenter::getSpectra(TableRowIndex start,
WorkspaceIndex maximum = minimum;
start++;
while (start < end &&
- getWorkspaceIndex(start) == maximum + WorkspaceIndex{1}){
+ getWorkspaceIndex(start) == maximum + WorkspaceIndex{1}) {
++maximum;
start++;
- }
+ }
spectraPairs.emplace_back(minimum, maximum);
}
return pairsToSpectra(spectraPairs);
@@ -255,8 +255,7 @@ void IndirectDataTablePresenter::setStartX(double startX,
}
}
-void IndirectDataTablePresenter::setStartX(double startX,
- TableRowIndex index) {
+void IndirectDataTablePresenter::setStartX(double startX, TableRowIndex index) {
MantidQt::API::SignalBlocker blocker(m_dataTable);
m_dataTable->item(index.value, startXColumn())->setText(makeNumber(startX));
}
@@ -265,13 +264,15 @@ void IndirectDataTablePresenter::setStartX(double startX) {
setColumnValues(startXColumn(), makeNumber(startX));
}
-void IndirectDataTablePresenter::setEndX(double endX, TableDatasetIndex dataIndex,
+void IndirectDataTablePresenter::setEndX(double endX,
+ TableDatasetIndex dataIndex,
WorkspaceIndex spectrumIndex) {
if (auto const row = getRowIndex(dataIndex, spectrumIndex))
setEndX(endX, *row);
}
-void IndirectDataTablePresenter::setEndX(double endX, TableDatasetIndex dataIndex) {
+void IndirectDataTablePresenter::setEndX(double endX,
+ TableDatasetIndex dataIndex) {
if (auto const spectra = getSpectra(dataIndex)) {
for (auto const spectrumIndex : *spectra) {
if (auto const row = getRowIndex(dataIndex, spectrumIndex))
@@ -389,13 +390,15 @@ void IndirectDataTablePresenter::removeSelectedData() {
auto &modifiedIndices = modifiedIndicesAndCount.first;
for (auto i = 0u; i < modifiedIndices.size(); ++i)
- shiftDataPositions(-modifiedCount[i], modifiedIndices[i] + TableDatasetIndex{1},
+ shiftDataPositions(-modifiedCount[i],
+ modifiedIndices[i] + TableDatasetIndex{1},
m_dataPositions.size());
if (!modifiedIndices.empty()) {
updateFromRemovedIndices(modifiedIndices);
updateDataPositionsInCells(modifiedIndices.back() > TableDatasetIndex{0}
- ? modifiedIndices.back() - TableDatasetIndex{1}
+ ? modifiedIndices.back() -
+ TableDatasetIndex{1}
: TableDatasetIndex{0},
m_dataPositions.size());
}
@@ -616,8 +619,8 @@ void IndirectDataTablePresenter::shiftDataPositions(TableRowIndex shift,
m_dataPositions[i] += shift;
}
-void IndirectDataTablePresenter::updateDataPositionsInCells(TableDatasetIndex from,
- TableDatasetIndex to) {
+void IndirectDataTablePresenter::updateDataPositionsInCells(
+ TableDatasetIndex from, TableDatasetIndex to) {
for (auto i = from; i < to; ++i) {
const auto nextPosition = getNextPosition(i);
for (auto row = m_dataPositions[i]; row < nextPosition; ++row)
diff --git a/qt/scientific_interfaces/Indirect/IndirectDataTablePresenter.h b/qt/scientific_interfaces/Indirect/IndirectDataTablePresenter.h
index fee70335b89..9ec4bf5f169 100644
--- a/qt/scientific_interfaces/Indirect/IndirectDataTablePresenter.h
+++ b/qt/scientific_interfaces/Indirect/IndirectDataTablePresenter.h
@@ -51,8 +51,8 @@ signals:
WorkspaceIndex /*_t3*/);
void endXChanged(double /*_t1*/, TableDatasetIndex /*_t2*/,
WorkspaceIndex /*_t3*/);
- void excludeRegionChanged(const std::string & /*_t1*/, TableDatasetIndex /*_t2*/,
- WorkspaceIndex /*_t3*/);
+ void excludeRegionChanged(const std::string & /*_t1*/,
+ TableDatasetIndex /*_t2*/, WorkspaceIndex /*_t3*/);
public slots:
void addData(TableDatasetIndex index);
@@ -74,12 +74,12 @@ protected:
TableRowIndex getFirstRow(TableDatasetIndex dataIndex) const;
std::string getString(TableRowIndex row, int column) const;
- virtual void addTableEntry(TableDatasetIndex dataIndex, WorkspaceIndex spectrum,
- TableRowIndex row);
+ virtual void addTableEntry(TableDatasetIndex dataIndex,
+ WorkspaceIndex spectrum, TableRowIndex row);
void setCell(std::unique_ptr<QTableWidgetItem> cell, TableRowIndex row,
int column);
- virtual void updateTableEntry(TableDatasetIndex dataIndex, WorkspaceIndex spectrum,
- TableRowIndex row);
+ virtual void updateTableEntry(TableDatasetIndex dataIndex,
+ WorkspaceIndex spectrum, TableRowIndex row);
void setCellText(const QString &text, TableRowIndex row, int column);
private:
@@ -98,7 +98,7 @@ private:
TableDatasetIndex getDataIndex(TableRowIndex row) const;
boost::optional<Spectra> getSpectra(TableDatasetIndex dataIndex) const;
boost::optional<Spectra> getSpectra(TableRowIndex start,
- TableRowIndex end) const;
+ TableRowIndex end) const;
boost::optional<TableRowIndex>
getRowIndex(TableDatasetIndex dataIndex, WorkspaceIndex spectrumIndex) const;
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.cpp b/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.cpp
index b8437dc8c89..667624dc87a 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.cpp
@@ -62,7 +62,8 @@ void IndirectFitAnalysisTab::setup() {
void IndirectFitAnalysisTab::connectDataPresenter() {
connect(m_dataPresenter.get(),
- SIGNAL(startXChanged(double, TableDatasetIndex, WorkspaceIndex)), this,
+ SIGNAL(startXChanged(double, TableDatasetIndex, WorkspaceIndex)),
+ this,
SLOT(tableStartXChanged(double, TableDatasetIndex, WorkspaceIndex)));
connect(m_dataPresenter.get(),
SIGNAL(endXChanged(double, TableDatasetIndex, WorkspaceIndex)), this,
@@ -103,8 +104,9 @@ void IndirectFitAnalysisTab::connectPlotPresenter() {
SLOT(setDataTableStartX(double)));
connect(m_plotPresenter.get(), SIGNAL(endXChanged(double)), this,
SLOT(setDataTableEndX(double)));
- connect(m_plotPresenter.get(), SIGNAL(selectedFitDataChanged(TableDatasetIndex)),
- this, SLOT(respondToSelectedFitDataChanged(TableDatasetIndex)));
+ connect(m_plotPresenter.get(),
+ SIGNAL(selectedFitDataChanged(TableDatasetIndex)), this,
+ SLOT(respondToSelectedFitDataChanged(TableDatasetIndex)));
connect(m_plotPresenter.get(), SIGNAL(noFitDataSelected()), this,
SLOT(respondToNoFitDataSelected()));
connect(m_plotPresenter.get(), SIGNAL(plotSpectrumChanged(WorkspaceIndex)),
@@ -116,8 +118,8 @@ void IndirectFitAnalysisTab::connectPlotPresenter() {
}
void IndirectFitAnalysisTab::connectSpectrumPresenter() {
- connect(m_spectrumPresenter.get(), SIGNAL(spectraChanged(TableDatasetIndex)), this,
- SLOT(respondToChangeOfSpectraRange(TableDatasetIndex)));
+ connect(m_spectrumPresenter.get(), SIGNAL(spectraChanged(TableDatasetIndex)),
+ this, SLOT(respondToChangeOfSpectraRange(TableDatasetIndex)));
connect(m_spectrumPresenter.get(), SIGNAL(maskChanged(const std::string &)),
this, SLOT(setDataTableExclude(const std::string &)));
}
@@ -335,10 +337,12 @@ void IndirectFitAnalysisTab::updateSingleFitOutput(bool error) {
SLOT(updateSingleFitOutput(bool)));
if (error) {
- m_fittingModel->cleanFailedSingleRun(m_fittingAlgorithm, TableDatasetIndex{0});
+ m_fittingModel->cleanFailedSingleRun(m_fittingAlgorithm,
+ TableDatasetIndex{0});
m_fittingAlgorithm.reset();
} else
- m_fittingModel->addSingleFitOutput(m_fittingAlgorithm, TableDatasetIndex{0});
+ m_fittingModel->addSingleFitOutput(m_fittingAlgorithm,
+ TableDatasetIndex{0});
}
/**
@@ -379,9 +383,11 @@ void IndirectFitAnalysisTab::updateParameterValues(
try {
updateFitBrowserParameterValues();
} catch (const std::out_of_range &) {
- g_log.warning("Warning issue updating parameter values in fit property browser");
+ g_log.warning(
+ "Warning issue updating parameter values in fit property browser");
} catch (const std::invalid_argument &) {
- g_log.warning("Warning issue updating parameter values in fit property browser");
+ g_log.warning(
+ "Warning issue updating parameter values in fit property browser");
}
}
@@ -664,7 +670,8 @@ void IndirectFitAnalysisTab::updateResultOptions() {
m_outOptionsPresenter->setSaveEnabled(isFit);
}
-void IndirectFitAnalysisTab::respondToChangeOfSpectraRange(TableDatasetIndex i) {
+void IndirectFitAnalysisTab::respondToChangeOfSpectraRange(
+ TableDatasetIndex i) {
m_plotPresenter->updateSelectedDataName();
m_plotPresenter->updateAvailableSpectra();
m_dataPresenter->updateSpectraInTable(i);
@@ -711,7 +718,8 @@ void IndirectFitAnalysisTab::respondToDataRemoved() {
updateParameterEstimationData();
}
-void IndirectFitAnalysisTab::respondToSelectedFitDataChanged(TableDatasetIndex i) {
+void IndirectFitAnalysisTab::respondToSelectedFitDataChanged(
+ TableDatasetIndex i) {
m_spectrumPresenter->setActiveModelIndex(i);
updateParameterValues();
}
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.h b/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.h
index 3e31775e137..98a91770502 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.h
+++ b/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.h
@@ -89,7 +89,8 @@ protected slots:
WorkspaceIndex spectrum);
void tableEndXChanged(double endX, TableDatasetIndex dataIndex,
WorkspaceIndex spectrum);
- void tableExcludeChanged(const std::string &exclude, TableDatasetIndex dataIndex,
+ void tableExcludeChanged(const std::string &exclude,
+ TableDatasetIndex dataIndex,
WorkspaceIndex spectrum);
void startXChanged(double startX);
void endXChanged(double endX);
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitData.cpp b/qt/scientific_interfaces/Indirect/IndirectFitData.cpp
index 4f4f44b018b..a3e63d5c55e 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitData.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitData.cpp
@@ -363,10 +363,12 @@ void IndirectFitData::validateSpectra(Spectra const &spectra) {
}
if (!notInRange.empty()) {
if (notInRange.size() > 5)
- throw std::runtime_error("Spectra out of range: " +
- join(std::vector<int>(notInRange.begin(), notInRange.begin()+ 5), ",") + "...");
- throw std::runtime_error("Spectra out of range: " +
- join(notInRange, ","));
+ throw std::runtime_error(
+ "Spectra out of range: " +
+ join(std::vector<int>(notInRange.begin(), notInRange.begin() + 5),
+ ",") +
+ "...");
+ throw std::runtime_error("Spectra out of range: " + join(notInRange, ","));
}
}
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitData.h b/qt/scientific_interfaces/Indirect/IndirectFitData.h
index 756d7e79bde..5794c5ae9b6 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitData.h
+++ b/qt/scientific_interfaces/Indirect/IndirectFitData.h
@@ -78,8 +78,7 @@ private:
};
template <typename F> struct ApplyEnumeratedSpectra {
- ApplyEnumeratedSpectra(F &&functor,
- WorkspaceIndex start = WorkspaceIndex{0})
+ ApplyEnumeratedSpectra(F &&functor, WorkspaceIndex start = WorkspaceIndex{0})
: m_start(start), m_functor(std::forward<F>(functor)) {}
WorkspaceIndex operator()(const Spectra &spectra) const {
@@ -139,7 +138,7 @@ public:
applyEnumeratedSpectra(F &&functor,
WorkspaceIndex start = WorkspaceIndex{0}) const {
return ApplyEnumeratedSpectra<F>(std::forward<F>(functor),
- start)(m_spectra);
+ start)(m_spectra);
}
void setSpectra(std::string const &spectra);
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.cpp b/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.cpp
index 79a82a66fcb..447acfa216a 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.cpp
@@ -167,7 +167,8 @@ struct CombineSpectra : boost::static_visitor<SpectraLegacy> {
}
}
- SpectraLegacy operator()(const SpectraLegacy &spectra1, const SpectraLegacy &spectra2) const {
+ SpectraLegacy operator()(const SpectraLegacy &spectra1,
+ const SpectraLegacy &spectra2) const {
return DiscontinuousSpectra<std::size_t>(createSpectraString(
boost::apply_visitor(SpectraToString(), spectra1) + "," +
boost::apply_visitor(SpectraToString(), spectra2)));
@@ -312,7 +313,9 @@ Mantid::API::MatrixWorkspace_sptr IndirectFitDataLegacy::workspace() const {
return m_workspace;
}
-const SpectraLegacy &IndirectFitDataLegacy::spectra() const { return m_spectra; }
+const SpectraLegacy &IndirectFitDataLegacy::spectra() const {
+ return m_spectra;
+}
std::size_t IndirectFitDataLegacy::getSpectrum(std::size_t index) const {
return boost::apply_visitor(GetSpectrum(index), m_spectra);
@@ -378,7 +381,8 @@ void IndirectFitDataLegacy::validateSpectra(SpectraLegacy const &spectra) {
if (notInRange.size() > 5)
throw std::runtime_error("SpectraLegacy out of range: " +
join(subvector(notInRange, 0, 5), ",") + "...");
- throw std::runtime_error("SpectraLegacy out of range: " + join(notInRange, ","));
+ throw std::runtime_error("SpectraLegacy out of range: " +
+ join(notInRange, ","));
}
}
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.h b/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.h
index 33a61fa50dc..d2c9fda05c6 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.h
+++ b/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.h
@@ -91,10 +91,11 @@ private:
* a continuous range.
*/
using SpectraLegacy = boost::variant<DiscontinuousSpectra<std::size_t>,
- std::pair<std::size_t, std::size_t>>;
+ std::pair<std::size_t, std::size_t>>;
template <typename F> struct ApplySpectraLegacy : boost::static_visitor<> {
- explicit ApplySpectraLegacy(F &&functor) : m_functor(std::forward<F>(functor)) {}
+ explicit ApplySpectraLegacy(F &&functor)
+ : m_functor(std::forward<F>(functor)) {}
void operator()(const std::pair<std::size_t, std::size_t> &spectra) const {
for (auto spectrum = spectra.first; spectrum <= spectra.second; ++spectrum)
@@ -164,13 +165,16 @@ public:
std::vector<double> excludeRegionsVector(std::size_t spectrum) const;
template <typename F> void applySpectra(F &&functor) const {
- boost::apply_visitor(ApplySpectraLegacy<F>(std::forward<F>(functor)), m_spectra);
+ boost::apply_visitor(ApplySpectraLegacy<F>(std::forward<F>(functor)),
+ m_spectra);
}
template <typename F>
- std::size_t applyEnumeratedSpectraLegacy(F &&functor, std::size_t start = 0) const {
+ std::size_t applyEnumeratedSpectraLegacy(F &&functor,
+ std::size_t start = 0) const {
return boost::apply_visitor(
- ApplyEnumeratedSpectraLegacy<F>(std::forward<F>(functor), start), m_spectra);
+ ApplyEnumeratedSpectraLegacy<F>(std::forward<F>(functor), start),
+ m_spectra);
}
void setSpectra(std::string const &spectra);
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitDataPresenter.cpp b/qt/scientific_interfaces/Indirect/IndirectFitDataPresenter.cpp
index 6351b74304c..88120298666 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitDataPresenter.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitDataPresenter.cpp
@@ -53,7 +53,8 @@ IndirectFitDataPresenter::IndirectFitDataPresenter(
SIGNAL(endXChanged(double)));
connect(m_tablePresenter.get(),
- SIGNAL(startXChanged(double, TableDatasetIndex, WorkspaceIndex)), this,
+ SIGNAL(startXChanged(double, TableDatasetIndex, WorkspaceIndex)),
+ this,
SIGNAL(startXChanged(double, TableDatasetIndex, WorkspaceIndex)));
connect(m_tablePresenter.get(),
SIGNAL(endXChanged(double, TableDatasetIndex, WorkspaceIndex)), this,
@@ -121,7 +122,8 @@ void IndirectFitDataPresenter::setMultiInputResolutionWSSuffixes(
IAddWorkspaceDialog *dialog) {
UNUSED_ARG(dialog);
}
-void IndirectFitDataPresenter::setStartX(double startX, TableDatasetIndex dataIndex,
+void IndirectFitDataPresenter::setStartX(double startX,
+ TableDatasetIndex dataIndex,
WorkspaceIndex spectrumIndex) {
m_tablePresenter->setStartX(startX, dataIndex, spectrumIndex);
m_view->setStartX(startX);
@@ -139,7 +141,8 @@ void IndirectFitDataPresenter::setEndX(double endX, TableDatasetIndex dataIndex,
m_view->setEndX(endX);
}
-void IndirectFitDataPresenter::setEndX(double endX, TableDatasetIndex dataIndex) {
+void IndirectFitDataPresenter::setEndX(double endX,
+ TableDatasetIndex dataIndex) {
m_tablePresenter->setEndX(endX, dataIndex);
m_view->setEndX(endX);
}
@@ -162,7 +165,8 @@ void IndirectFitDataPresenter::setModelFromMultipleData() {
emit dataChanged();
}
-void IndirectFitDataPresenter::updateSpectraInTable(TableDatasetIndex dataIndex) {
+void IndirectFitDataPresenter::updateSpectraInTable(
+ TableDatasetIndex dataIndex) {
if (m_view->isMultipleDataTabSelected())
m_tablePresenter->updateData(dataIndex);
}
@@ -248,7 +252,8 @@ void IndirectFitDataPresenter::closeDialog() {
void IndirectFitDataPresenter::addData(IAddWorkspaceDialog const *dialog) {
try {
addDataToModel(dialog);
- m_tablePresenter->addData(m_model->numberOfWorkspaces() - TableDatasetIndex{1});
+ m_tablePresenter->addData(m_model->numberOfWorkspaces() -
+ TableDatasetIndex{1});
emit dataAdded();
emit dataChanged();
} catch (const std::runtime_error &ex) {
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitDataPresenter.h b/qt/scientific_interfaces/Indirect/IndirectFitDataPresenter.h
index 69d000216a0..d667d776c81 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitDataPresenter.h
+++ b/qt/scientific_interfaces/Indirect/IndirectFitDataPresenter.h
@@ -81,7 +81,8 @@ signals:
void startXChanged(double);
void endXChanged(double, TableDatasetIndex, WorkspaceIndex);
void endXChanged(double);
- void excludeRegionChanged(const std::string &, TableDatasetIndex, WorkspaceIndex);
+ void excludeRegionChanged(const std::string &, TableDatasetIndex,
+ WorkspaceIndex);
void multipleDataViewSelected();
void singleDataViewSelected();
void requestedAddWorkspaceDialog();
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitOutput.cpp b/qt/scientific_interfaces/Indirect/IndirectFitOutput.cpp
index 48a8379c19f..8695dd90134 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitOutput.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitOutput.cpp
@@ -35,8 +35,7 @@ struct TableRowExtractor {
for (auto i = 1u; i < m_chiIndex; i += 2) {
const auto &columnName = m_columns[i];
- parameters[columnName] =
- ParameterValue(row.Double(i), row.Double(i + 1));
+ parameters[columnName] = ParameterValue(row.Double(i), row.Double(i + 1));
}
return parameters;
}
@@ -227,7 +226,7 @@ typename Map::mapped_type &findOrCreateDefaultInMap(Map &map, const Key &key) {
}
TableRowIndex numberOfSpectraIn(const FitDataIterator &fitDataBegin,
- const FitDataIterator &fitDataEnd) {
+ const FitDataIterator &fitDataEnd) {
TableRowIndex spectra{0};
for (auto it = fitDataBegin; it < fitDataEnd; ++it)
spectra += (*it)->numberOfSpectra();
@@ -271,8 +270,8 @@ std::unordered_map<std::string, ParameterValue>
IndirectFitOutput::getParameters(IndirectFitData const *fitData,
WorkspaceIndex spectrum) const {
return getValueOr(m_parameters,
- std::unordered_map<std::string, ParameterValue>(),
- fitData, spectrum);
+ std::unordered_map<std::string, ParameterValue>(), fitData,
+ spectrum);
}
boost::optional<ResultLocationNew>
@@ -300,8 +299,7 @@ WorkspaceGroup_sptr IndirectFitOutput::getLastResultGroup() const {
void IndirectFitOutput::mapParameterNames(
const std::unordered_map<std::string, std::string> ¶meterNameChanges,
- const FitDataIterator &fitDataBegin,
- const FitDataIterator &fitDataEnd) {
+ const FitDataIterator &fitDataBegin, const FitDataIterator &fitDataEnd) {
for (auto it = fitDataBegin; it < fitDataEnd; ++it)
mapParameterNames(parameterNameChanges, it->get());
}
@@ -375,7 +373,8 @@ void IndirectFitOutput::updateParameters(ITableWorkspace_sptr parameterTable,
void IndirectFitOutput::updateFitResultsFromUnstructured(
WorkspaceGroup_sptr resultGroup, const FitDataIterator &fitDataBegin,
const FitDataIterator &fitDataEnd) {
- std::unordered_map<MatrixWorkspace *, std::map<WorkspaceIndex, WorkspaceGroupIndex>>
+ std::unordered_map<MatrixWorkspace *,
+ std::map<WorkspaceIndex, WorkspaceGroupIndex>>
resultIndices;
WorkspaceGroupIndex index{0};
for (auto fitData = fitDataBegin; fitData < fitDataEnd; ++fitData) {
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitOutput.h b/qt/scientific_interfaces/Indirect/IndirectFitOutput.h
index f25e06e7f19..0273f73b9d3 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitOutput.h
+++ b/qt/scientific_interfaces/Indirect/IndirectFitOutput.h
@@ -31,15 +31,15 @@ struct ParameterValue {
struct ResultLocationNew {
ResultLocationNew() = default;
- ResultLocationNew(Mantid::API::WorkspaceGroup_sptr group, WorkspaceGroupIndex i)
+ ResultLocationNew(Mantid::API::WorkspaceGroup_sptr group,
+ WorkspaceGroupIndex i)
: result(group), index(i) {}
boost::weak_ptr<Mantid::API::WorkspaceGroup> result;
WorkspaceGroupIndex index = WorkspaceGroupIndex{0};
};
using ParameterValuesNew =
- std::map<WorkspaceIndex,
- std::unordered_map<std::string, ParameterValue>>;
+ std::map<WorkspaceIndex, std::unordered_map<std::string, ParameterValue>>;
using ResultLocationsNew = std::map<WorkspaceIndex, ResultLocationNew>;
@@ -78,8 +78,7 @@ public:
void mapParameterNames(
const std::unordered_map<std::string, std::string> ¶meterNameChanges,
- const FitDataIterator &fitDataBegin,
- const FitDataIterator &fitDataEnd);
+ const FitDataIterator &fitDataBegin, const FitDataIterator &fitDataEnd);
void mapParameterNames(
const std::unordered_map<std::string, std::string> ¶meterNameChanges,
IndirectFitData const *fitData);
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitOutputLegacy.cpp b/qt/scientific_interfaces/Indirect/IndirectFitOutputLegacy.cpp
index 52115747f3a..637942957e8 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitOutputLegacy.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitOutputLegacy.cpp
@@ -34,7 +34,8 @@ struct TableRowExtractor {
for (auto i = 1u; i < m_chiIndex; i += 2) {
const auto &columnName = m_columns[i];
- parameters[columnName] = ParameterValueLegacy(row.Double(i), row.Double(i + 1));
+ parameters[columnName] =
+ ParameterValueLegacy(row.Double(i), row.Double(i + 1));
}
return parameters;
}
@@ -264,7 +265,8 @@ namespace IDA {
IndirectFitOutputLegacy::IndirectFitOutputLegacy(
WorkspaceGroup_sptr resultGroup, ITableWorkspace_sptr parameterTable,
- WorkspaceGroup_sptr resultWorkspace, const FitDataIteratorLegacy &fitDataBegin,
+ WorkspaceGroup_sptr resultWorkspace,
+ const FitDataIteratorLegacy &fitDataBegin,
const FitDataIteratorLegacy &fitDataEnd)
: m_resultGroup(resultGroup), m_resultWorkspace(resultWorkspace),
m_parameters(), m_outputResultLocations() {
@@ -292,8 +294,8 @@ std::unordered_map<std::string, ParameterValueLegacy>
IndirectFitOutputLegacy::getParameters(IndirectFitDataLegacy const *fitData,
std::size_t spectrum) const {
return getValueOr(m_parameters,
- std::unordered_map<std::string, ParameterValueLegacy>(), fitData,
- spectrum);
+ std::unordered_map<std::string, ParameterValueLegacy>(),
+ fitData, spectrum);
}
boost::optional<ResultLocation>
@@ -322,7 +324,8 @@ WorkspaceGroup_sptr IndirectFitOutputLegacy::getLastResultGroup() const {
void IndirectFitOutputLegacy::mapParameterNames(
const std::unordered_map<std::string, std::string> ¶meterNameChanges,
- const FitDataIteratorLegacy &fitDataBegin, const FitDataIteratorLegacy &fitDataEnd) {
+ const FitDataIteratorLegacy &fitDataBegin,
+ const FitDataIteratorLegacy &fitDataEnd) {
for (auto it = fitDataBegin; it < fitDataEnd; ++it)
mapParameterNames(parameterNameChanges, it->get());
}
@@ -345,11 +348,11 @@ void IndirectFitOutputLegacy::mapParameterNames(
parameters = mapKeys(parameters, parameterNameChanges);
}
-void IndirectFitOutputLegacy::addOutput(WorkspaceGroup_sptr resultGroup,
- ITableWorkspace_sptr parameterTable,
- WorkspaceGroup_sptr resultWorkspace,
- const FitDataIteratorLegacy &fitDataBegin,
- const FitDataIteratorLegacy &fitDataEnd) {
+void IndirectFitOutputLegacy::addOutput(
+ WorkspaceGroup_sptr resultGroup, ITableWorkspace_sptr parameterTable,
+ WorkspaceGroup_sptr resultWorkspace,
+ const FitDataIteratorLegacy &fitDataBegin,
+ const FitDataIteratorLegacy &fitDataEnd) {
updateParameters(parameterTable, fitDataBegin, fitDataEnd);
updateFitResults(resultGroup, fitDataBegin, fitDataEnd);
renameResult(resultWorkspace, fitDataBegin, fitDataEnd);
@@ -386,7 +389,8 @@ void IndirectFitOutputLegacy::updateFitResults(
}
void IndirectFitOutputLegacy::updateParameters(
- ITableWorkspace_sptr parameterTable, const FitDataIteratorLegacy &fitDataBegin,
+ ITableWorkspace_sptr parameterTable,
+ const FitDataIteratorLegacy &fitDataBegin,
const FitDataIteratorLegacy &fitDataEnd) {
extractParametersFromTable(parameterTable, fitDataBegin, fitDataEnd,
m_parameters);
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitOutputLegacy.h b/qt/scientific_interfaces/Indirect/IndirectFitOutputLegacy.h
index b2f9e47a27e..5a497547e9a 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitOutputLegacy.h
+++ b/qt/scientific_interfaces/Indirect/IndirectFitOutputLegacy.h
@@ -80,7 +80,8 @@ public:
void mapParameterNames(
const std::unordered_map<std::string, std::string> ¶meterNameChanges,
- const FitDataIteratorLegacy &fitDataBegin, const FitDataIteratorLegacy &fitDataEnd);
+ const FitDataIteratorLegacy &fitDataBegin,
+ const FitDataIteratorLegacy &fitDataEnd);
void mapParameterNames(
const std::unordered_map<std::string, std::string> ¶meterNameChanges,
IndirectFitDataLegacy const *fitData);
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitPlotModel.cpp b/qt/scientific_interfaces/Indirect/IndirectFitPlotModel.cpp
index e9d3fe10d80..86400ddf727 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitPlotModel.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitPlotModel.cpp
@@ -215,7 +215,8 @@ TableRowIndex IndirectFitPlotModel::getActiveDomainIndex() const {
return index;
}
-std::string IndirectFitPlotModel::getFitDataName(TableDatasetIndex index) const {
+std::string
+IndirectFitPlotModel::getFitDataName(TableDatasetIndex index) const {
if (m_fittingModel->getWorkspace(index))
return m_fittingModel->createDisplayName("%1% (%2%)", "-", index);
return "";
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitPlotView.cpp b/qt/scientific_interfaces/Indirect/IndirectFitPlotView.cpp
index c97136235cc..a3fab2c6a32 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitPlotView.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitPlotView.cpp
@@ -57,7 +57,7 @@ WorkspaceIndex IndirectFitPlotView::getSelectedSpectrum() const {
TableRowIndex IndirectFitPlotView::getSelectedSpectrumIndex() const {
if (m_plotForm->swPlotSpectrum->currentIndex() == 0)
return TableRowIndex{m_plotForm->spPlotSpectrum->value() -
- m_plotForm->spPlotSpectrum->minimum()};
+ m_plotForm->spPlotSpectrum->minimum()};
return TableRowIndex{m_plotForm->cbPlotSpectrum->currentIndex()};
}
@@ -285,7 +285,7 @@ void IndirectFitPlotView::emitPlotSpectrumChanged(int spectrum) {
void IndirectFitPlotView::emitPlotSpectrumChanged(const QString &spectrum) {
bool successState{false};
int spectrumInt = spectrum.toInt(&successState);
- if(successState)
+ if (successState)
emit plotSpectrumChanged(WorkspaceIndex{spectrumInt});
}
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitPropertyBrowser.cpp b/qt/scientific_interfaces/Indirect/IndirectFitPropertyBrowser.cpp
index a826dccd03d..3114c932569 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitPropertyBrowser.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitPropertyBrowser.cpp
@@ -343,8 +343,8 @@ void IndirectFitPropertyBrowser::sequentialFit() {
emit sequentialFitScheduled();
}
-void IndirectFitPropertyBrowser::setModelResolution(std::string const &name,
- TableDatasetIndex const &index) {
+void IndirectFitPropertyBrowser::setModelResolution(
+ std::string const &name, TableDatasetIndex const &index) {
if (isFullFunctionBrowserActive()) {
showFullFunctionBrowser(false);
}
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitPropertyBrowser.h b/qt/scientific_interfaces/Indirect/IndirectFitPropertyBrowser.h
index 8e158b6b721..0537633f541 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitPropertyBrowser.h
+++ b/qt/scientific_interfaces/Indirect/IndirectFitPropertyBrowser.h
@@ -73,7 +73,8 @@ public:
public slots:
void fit();
void sequentialFit();
- void setModelResolution(std::string const &name, TableDatasetIndex const &index);
+ void setModelResolution(std::string const &name,
+ TableDatasetIndex const &index);
protected slots:
void clear();
diff --git a/qt/scientific_interfaces/Indirect/IndirectFittingModel.cpp b/qt/scientific_interfaces/Indirect/IndirectFittingModel.cpp
index 5ccc85038a9..346dcfcef4c 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFittingModel.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFittingModel.cpp
@@ -501,7 +501,8 @@ void IndirectFittingModel::setStartX(double startX, TableDatasetIndex dataIndex,
m_fittingData[dataIndex]->setStartX(startX, spectrum);
}
-void IndirectFittingModel::setStartX(double startX, TableDatasetIndex dataIndex) {
+void IndirectFittingModel::setStartX(double startX,
+ TableDatasetIndex dataIndex) {
if (m_fittingData.empty())
return;
m_fittingData[dataIndex]->setStartX(startX);
@@ -532,8 +533,8 @@ void IndirectFittingModel::addWorkspace(const std::string &workspaceName) {
auto ws = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(
workspaceName);
addWorkspace(
- ws, Spectra(
- WorkspaceIndex{0},
+ ws,
+ Spectra(WorkspaceIndex{0},
WorkspaceIndex{static_cast<int>(ws->getNumberHistograms()) - 1}));
}
@@ -584,11 +585,13 @@ void IndirectFittingModel::removeWorkspace(TableDatasetIndex index) {
removeWorkspaceFromFittingData(index);
if (index > m_fittingData.zero() && m_fittingData.size() > index) {
- const auto previousWS = m_fittingData[index - TableDatasetIndex{1}]->workspace();
+ const auto previousWS =
+ m_fittingData[index - TableDatasetIndex{1}]->workspace();
const auto subsequentWS = m_fittingData[index]->workspace();
if (equivalentWorkspaces(previousWS, subsequentWS)) {
- m_fittingData[index - TableDatasetIndex{1}]->combine(*m_fittingData[index]);
+ m_fittingData[index - TableDatasetIndex{1}]->combine(
+ *m_fittingData[index]);
m_fittingData.remove(index);
}
}
@@ -616,9 +619,8 @@ void IndirectFittingModel::setFitFunction(MultiDomainFunction_sptr function) {
m_previousModelSelected = isPreviousModelSelected();
}
-void IndirectFittingModel::setDefaultParameterValue(const std::string &name,
- double value,
- TableDatasetIndex dataIndex) {
+void IndirectFittingModel::setDefaultParameterValue(
+ const std::string &name, double value, TableDatasetIndex dataIndex) {
if (m_defaultParameters.size() > dataIndex)
m_defaultParameters[dataIndex][name] = ParameterValue(value);
}
@@ -696,11 +698,12 @@ IndirectFitOutput IndirectFittingModel::createFitOutput(
fitData, spectrum);
}
-void IndirectFittingModel::addOutput(
- IndirectFitOutput *fitOutput, WorkspaceGroup_sptr resultGroup,
- ITableWorkspace_sptr parameterTable, WorkspaceGroup_sptr resultWorkspace,
- const FitDataIterator &fitDataBegin,
- const FitDataIterator &fitDataEnd) const {
+void IndirectFittingModel::addOutput(IndirectFitOutput *fitOutput,
+ WorkspaceGroup_sptr resultGroup,
+ ITableWorkspace_sptr parameterTable,
+ WorkspaceGroup_sptr resultWorkspace,
+ const FitDataIterator &fitDataBegin,
+ const FitDataIterator &fitDataEnd) const {
fitOutput->addOutput(resultGroup, parameterTable, resultWorkspace,
fitDataBegin, fitDataEnd);
}
@@ -755,7 +758,8 @@ IndirectFittingModel::mapDefaultParameterNames() const {
}
std::unordered_map<std::string, ParameterValue>
-IndirectFittingModel::createDefaultParameters(TableDatasetIndex /*unused*/) const {
+IndirectFittingModel::createDefaultParameters(
+ TableDatasetIndex /*unused*/) const {
return std::unordered_map<std::string, ParameterValue>();
}
diff --git a/qt/scientific_interfaces/Indirect/IndirectFittingModel.h b/qt/scientific_interfaces/Indirect/IndirectFittingModel.h
index 66aa79126b5..b6628284181 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFittingModel.h
+++ b/qt/scientific_interfaces/Indirect/IndirectFittingModel.h
@@ -70,13 +70,14 @@ public:
const std::string &rangeDelimiter,
TableDatasetIndex dataIndex) const;
virtual bool isMultiFit() const;
- bool isPreviouslyFit(TableDatasetIndex dataIndex, WorkspaceIndex spectrum) const;
+ bool isPreviouslyFit(TableDatasetIndex dataIndex,
+ WorkspaceIndex spectrum) const;
virtual boost::optional<std::string> isInvalidFunction() const;
virtual TableDatasetIndex numberOfWorkspaces() const;
TableRowIndex getNumberOfSpectra(TableDatasetIndex index) const;
TableRowIndex getNumberOfDomains() const;
virtual TableRowIndex getDomainIndex(TableDatasetIndex dataIndex,
- WorkspaceIndex spectrum) const;
+ WorkspaceIndex spectrum) const;
std::vector<std::string> getFitParameterNames() const;
virtual Mantid::API::MultiDomainFunction_sptr getFittingFunction() const;
@@ -99,8 +100,7 @@ public:
virtual void addWorkspace(const std::string &workspaceName);
void addWorkspace(const std::string &workspaceName,
const std::string &spectra);
- void addWorkspace(const std::string &workspaceName,
- const Spectra &spectra);
+ void addWorkspace(const std::string &workspaceName, const Spectra &spectra);
virtual void addWorkspace(Mantid::API::MatrixWorkspace_sptr workspace,
const Spectra &spectra);
virtual void removeWorkspace(TableDatasetIndex index);
@@ -118,7 +118,8 @@ public:
FittingMode getFittingMode() const;
std::unordered_map<std::string, ParameterValue>
- getParameterValues(TableDatasetIndex dataIndex, WorkspaceIndex spectrum) const;
+ getParameterValues(TableDatasetIndex dataIndex,
+ WorkspaceIndex spectrum) const;
std::unordered_map<std::string, ParameterValue>
getFitParameters(TableDatasetIndex dataIndex, WorkspaceIndex spectrum) const;
std::unordered_map<std::string, ParameterValue>
diff --git a/qt/scientific_interfaces/Indirect/IndirectFittingModelLegacy.cpp b/qt/scientific_interfaces/Indirect/IndirectFittingModelLegacy.cpp
index 74458c93f17..77889d1c58e 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFittingModelLegacy.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFittingModelLegacy.cpp
@@ -610,9 +610,9 @@ void IndirectFittingModelLegacy::addOutput(IAlgorithm_sptr fitAlgorithm) {
addOutput(fitAlgorithm, m_fittingData.begin(), m_fittingData.end());
}
-void IndirectFittingModelLegacy::addOutput(IAlgorithm_sptr fitAlgorithm,
- const FitDataIteratorLegacy &fitDataBegin,
- const FitDataIteratorLegacy &fitDataEnd) {
+void IndirectFittingModelLegacy::addOutput(
+ IAlgorithm_sptr fitAlgorithm, const FitDataIteratorLegacy &fitDataBegin,
+ const FitDataIteratorLegacy &fitDataEnd) {
auto group = getOutputGroup(fitAlgorithm);
auto parameters = getOutputParameters(fitAlgorithm);
auto result = getOutputResult(fitAlgorithm);
@@ -633,11 +633,11 @@ void IndirectFittingModelLegacy::addSingleFitOutput(
boost::numeric_cast<std::size_t>(spectrum));
}
-void IndirectFittingModelLegacy::addOutput(WorkspaceGroup_sptr resultGroup,
- ITableWorkspace_sptr parameterTable,
- WorkspaceGroup_sptr resultWorkspace,
- const FitDataIteratorLegacy &fitDataBegin,
- const FitDataIteratorLegacy &fitDataEnd) {
+void IndirectFittingModelLegacy::addOutput(
+ WorkspaceGroup_sptr resultGroup, ITableWorkspace_sptr parameterTable,
+ WorkspaceGroup_sptr resultWorkspace,
+ const FitDataIteratorLegacy &fitDataBegin,
+ const FitDataIteratorLegacy &fitDataEnd) {
if (m_previousModelSelected && m_fitOutput)
addOutput(m_fitOutput.get(), resultGroup, parameterTable, resultWorkspace,
fitDataBegin, fitDataEnd);
@@ -664,7 +664,8 @@ void IndirectFittingModelLegacy::addOutput(WorkspaceGroup_sptr resultGroup,
IndirectFitOutputLegacy IndirectFittingModelLegacy::createFitOutput(
WorkspaceGroup_sptr resultGroup, ITableWorkspace_sptr parameterTable,
- WorkspaceGroup_sptr resultWorkspace, const FitDataIteratorLegacy &fitDataBegin,
+ WorkspaceGroup_sptr resultWorkspace,
+ const FitDataIteratorLegacy &fitDataBegin,
const FitDataIteratorLegacy &fitDataEnd) const {
return IndirectFitOutputLegacy(resultGroup, parameterTable, resultWorkspace,
fitDataBegin, fitDataEnd);
diff --git a/qt/scientific_interfaces/Indirect/IndirectFittingModelLegacy.h b/qt/scientific_interfaces/Indirect/IndirectFittingModelLegacy.h
index 3e68d4d2f1e..8bb8ba9960c 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFittingModelLegacy.h
+++ b/qt/scientific_interfaces/Indirect/IndirectFittingModelLegacy.h
@@ -87,7 +87,8 @@ public:
virtual void addWorkspace(const std::string &workspaceName);
void addWorkspace(const std::string &workspaceName,
const std::string &spectra);
- void addWorkspace(const std::string &workspaceName, const SpectraLegacy &spectra);
+ void addWorkspace(const std::string &workspaceName,
+ const SpectraLegacy &spectra);
virtual void addWorkspace(Mantid::API::MatrixWorkspace_sptr workspace,
const SpectraLegacy &spectra);
virtual void removeWorkspace(std::size_t index);
diff --git a/qt/scientific_interfaces/Indirect/test/ConvFitModelTest.h b/qt/scientific_interfaces/Indirect/test/ConvFitModelTest.h
index c5dfe2429c3..8b19d6831dd 100644
--- a/qt/scientific_interfaces/Indirect/test/ConvFitModelTest.h
+++ b/qt/scientific_interfaces/Indirect/test/ConvFitModelTest.h
@@ -202,7 +202,8 @@ public:
private:
template <typename Workspace, typename... Workspaces>
- void addWorkspacesToModel(SpectraLegacy const &spectra, Workspace const &workspace,
+ void addWorkspacesToModel(SpectraLegacy const &spectra,
+ Workspace const &workspace,
Workspaces const &... workspaces) {
m_model->addWorkspace(workspace, spectra);
addWorkspacesToModel(spectra, workspaces...);
diff --git a/qt/scientific_interfaces/Indirect/test/IndirectFitDataTest.h b/qt/scientific_interfaces/Indirect/test/IndirectFitDataTest.h
index d3423098c98..85e0058d02f 100644
--- a/qt/scientific_interfaces/Indirect/test/IndirectFitDataTest.h
+++ b/qt/scientific_interfaces/Indirect/test/IndirectFitDataTest.h
@@ -25,7 +25,8 @@ namespace {
std::unique_ptr<IndirectFitDataLegacy>
getIndirectFitData(int const &numberOfSpectra) {
auto const workspace = createWorkspace(numberOfSpectra);
- SpectraLegacy const spec = std::make_pair(0u, workspace->getNumberHistograms() - 1);
+ SpectraLegacy const spec =
+ std::make_pair(0u, workspace->getNumberHistograms() - 1);
IndirectFitDataLegacy data(workspace, spec);
return std::make_unique<IndirectFitDataLegacy>(data);
}
diff --git a/qt/scientific_interfaces/Indirect/test/IndirectFitOutputTest.h b/qt/scientific_interfaces/Indirect/test/IndirectFitOutputTest.h
index d4ebae7915e..b09a71a4fe5 100644
--- a/qt/scientific_interfaces/Indirect/test/IndirectFitOutputTest.h
+++ b/qt/scientific_interfaces/Indirect/test/IndirectFitOutputTest.h
@@ -57,7 +57,8 @@ MatrixWorkspace_sptr createPopulatedworkspace(int const &numberOfSpectra) {
IndirectFitDataLegacy getIndirectFitData(int const &numberOfSpectra) {
auto const workspace = createWorkspace(numberOfSpectra);
- SpectraLegacy const spec = std::make_pair(0u, workspace->getNumberHistograms() - 1);
+ SpectraLegacy const spec =
+ std::make_pair(0u, workspace->getNumberHistograms() - 1);
IndirectFitDataLegacy data(workspace, spec);
return data;
}
diff --git a/qt/scientific_interfaces/Indirect/test/IndirectFittingModelTest.h b/qt/scientific_interfaces/Indirect/test/IndirectFittingModelTest.h
index cb0287584b4..d64de55df6f 100644
--- a/qt/scientific_interfaces/Indirect/test/IndirectFittingModelTest.h
+++ b/qt/scientific_interfaces/Indirect/test/IndirectFittingModelTest.h
@@ -556,7 +556,8 @@ public:
test_that_setSpectra_will_set_the_spectra_to_the_provided_inputSpectra() {
auto model = createModelWithSingleWorkspace("WorkspaceName", 10);
- SpectraLegacy const inputSpectra = DiscontinuousSpectra<std::size_t>("2,4,6-8");
+ SpectraLegacy const inputSpectra =
+ DiscontinuousSpectra<std::size_t>("2,4,6-8");
model->setSpectra(inputSpectra, 0);
SpectraLegacy const spectra = model->getSpectra(0);
diff --git a/qt/scientific_interfaces/Indirect/test/JumpFitModelTest.h b/qt/scientific_interfaces/Indirect/test/JumpFitModelTest.h
index 49ce438633e..bcdceff6aff 100644
--- a/qt/scientific_interfaces/Indirect/test/JumpFitModelTest.h
+++ b/qt/scientific_interfaces/Indirect/test/JumpFitModelTest.h
@@ -290,7 +290,8 @@ public:
private:
template <typename Workspace, typename... Workspaces>
- void addWorkspacesToModel(SpectraLegacy const &spectra, Workspace const &workspace,
+ void addWorkspacesToModel(SpectraLegacy const &spectra,
+ Workspace const &workspace,
Workspaces const &... workspaces) {
m_model->addWorkspace(workspace, spectra);
addWorkspacesToModel(spectra, workspaces...);
--
GitLab