From 3322a6ee950a4ac4b75a6ab3c8d12efefee8f748 Mon Sep 17 00:00:00 2001
From: Anthony Lim <anthony.lim@stfc.ac.uk>
Date: Mon, 2 Jul 2018 17:02:02 +0100
Subject: [PATCH] refs #21718 muon TFFit GUI clean up of code clang
---
.../Muon/MuonAnalysis.cpp | 20 +++--
.../common/src/MuonFitPropertyBrowser.cpp | 84 ++++++++++---------
2 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/qt/scientific_interfaces/Muon/MuonAnalysis.cpp b/qt/scientific_interfaces/Muon/MuonAnalysis.cpp
index ff13aff41b6..acec36bd327 100644
--- a/qt/scientific_interfaces/Muon/MuonAnalysis.cpp
+++ b/qt/scientific_interfaces/Muon/MuonAnalysis.cpp
@@ -2012,11 +2012,11 @@ void MuonAnalysis::selectMultiPeak(const QString &wsName, const bool update,
std::transform(groups.pairNames.begin(), groups.pairNames.end(),
std::back_inserter(groupsAndPairs), &QString::fromStdString);
setGroupsAndPairs();
- if (update) {
- // Set the selected run, group/pair and period
- m_fitDataPresenter->setAssignedFirstRun(wsName, filePath);
- setChosenGroupAndPeriods(wsName);
- }
+ if (update) {
+ // Set the selected run, group/pair and period
+ m_fitDataPresenter->setAssignedFirstRun(wsName, filePath);
+ setChosenGroupAndPeriods(wsName);
+ }
}
QString code;
@@ -2031,23 +2031,25 @@ void MuonAnalysis::selectMultiPeak(const QString &wsName, const bool update,
}
/**
- * Pass through to selectMultiPeak(wsName, update, filePath) where filePath is set
+ * Pass through to selectMultiPeak(wsName, update, filePath) where filePath is
+ * set
* to blank. Enables connection as a slot without Qt understanding
* boost::optional.
* @param wsName Name of the selected workspace
*/
void MuonAnalysis::selectMultiPeak(const QString &wsName) {
- selectMultiPeak(wsName, true,boost::optional<QString>());
+ selectMultiPeak(wsName, true, boost::optional<QString>());
}
/**
-* Pass through to selectMultiPeak(wsName, update, filePath) where filePath is set
+* Pass through to selectMultiPeak(wsName, update, filePath) where filePath is
+* set
* to blank. Enables connection as a slot without Qt understanding
* boost::optional. This will not update the data selector
* @param wsName Name of the selected workspace
*/
void MuonAnalysis::selectMultiPeakNoUpdate(const QString &wsName) {
- selectMultiPeak(wsName, false, boost::optional<QString>());
+ selectMultiPeak(wsName, false, boost::optional<QString>());
}
/**
diff --git a/qt/widgets/common/src/MuonFitPropertyBrowser.cpp b/qt/widgets/common/src/MuonFitPropertyBrowser.cpp
index c8d825ed736..843913cbfeb 100644
--- a/qt/widgets/common/src/MuonFitPropertyBrowser.cpp
+++ b/qt/widgets/common/src/MuonFitPropertyBrowser.cpp
@@ -886,34 +886,34 @@ bool MuonFitPropertyBrowser::isWorkspaceValid(Workspace_sptr ws) const {
return dynamic_cast<MatrixWorkspace *>(ws.get()) != nullptr;
}
-void MuonFitPropertyBrowser::setFitWorkspaces(const std::string input){
-// Copy experiment info to output workspace
-if (AnalysisDataService::Instance().doesExist(outputName() + "_Workspace")) {
- // Input workspace should be a MatrixWorkspace according to isWorkspaceValid
- auto inWs = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(input);
- auto outWs = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(
- outputName() + "_Workspace");
- if (inWs && outWs) {
- outWs->copyExperimentInfoFrom(inWs.get());
- }
-}
-else if (AnalysisDataService::Instance().doesExist(outputName() +
- "_Workspaces")) {
- // Output workspace was a group
- auto outGroup = AnalysisDataService::Instance().retrieveWS<WorkspaceGroup>(
- outputName() + "_Workspaces");
- if (outGroup->size() == m_workspacesToFit.size()) {
- for (size_t i = 0; i < outGroup->size(); i++) {
- auto outWs =
- boost::dynamic_pointer_cast<MatrixWorkspace>(outGroup->getItem(i));
- auto inWs = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(
- m_workspacesToFit[i]);
- if (inWs && outWs) {
- outWs->copyExperimentInfoFrom(inWs.get());
- }
- }
- }
-}
+void MuonFitPropertyBrowser::setFitWorkspaces(const std::string input) {
+ // Copy experiment info to output workspace
+ if (AnalysisDataService::Instance().doesExist(outputName() + "_Workspace")) {
+ // Input workspace should be a MatrixWorkspace according to isWorkspaceValid
+ auto inWs =
+ AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(input);
+ auto outWs = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(
+ outputName() + "_Workspace");
+ if (inWs && outWs) {
+ outWs->copyExperimentInfoFrom(inWs.get());
+ }
+ } else if (AnalysisDataService::Instance().doesExist(outputName() +
+ "_Workspaces")) {
+ // Output workspace was a group
+ auto outGroup = AnalysisDataService::Instance().retrieveWS<WorkspaceGroup>(
+ outputName() + "_Workspaces");
+ if (outGroup->size() == m_workspacesToFit.size()) {
+ for (size_t i = 0; i < outGroup->size(); i++) {
+ auto outWs =
+ boost::dynamic_pointer_cast<MatrixWorkspace>(outGroup->getItem(i));
+ auto inWs = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(
+ m_workspacesToFit[i]);
+ if (inWs && outWs) {
+ outWs->copyExperimentInfoFrom(inWs.get());
+ }
+ }
+ }
+ }
}
void MuonFitPropertyBrowser::finishHandle(const IAlgorithm *alg) {
@@ -925,9 +925,9 @@ void MuonFitPropertyBrowser::finishHandle(const IAlgorithm *alg) {
}
void MuonFitPropertyBrowser::finishHandleTF(const IAlgorithm *alg) {
- setFitWorkspaces(static_cast<std::string>(
- alg->getProperty("UnNormalizedWorkspaceList")));
-
+ setFitWorkspaces(
+ static_cast<std::string>(alg->getProperty("UnNormalizedWorkspaceList")));
+
auto status = QString::fromStdString(alg->getPropertyValue("OutputStatus"));
emit fitResultsChanged(status);
FitPropertyBrowser::fitResultsChanged(status);
@@ -936,21 +936,22 @@ void MuonFitPropertyBrowser::finishHandleTF(const IAlgorithm *alg) {
// and group the output workspaces
const int nWorkspaces = static_cast<int>(m_workspacesToFit.size());
if (nWorkspaces > 1) {
- std::string baseName = outputName();
- finishAfterTFSimultaneousFit(alg, baseName);
+ std::string baseName = outputName();
+ finishAfterTFSimultaneousFit(alg, baseName);
}
- getFitResults();
- std::vector<std::string> wsList =
- alg->getProperty("UnNormalizedWorkspaceList");
- emit fittingDone(QString::fromStdString(wsList[0]));
- if(nWorkspaces==1) {
+ getFitResults();
+ std::vector<std::string> wsList =
+ alg->getProperty("UnNormalizedWorkspaceList");
+ emit fittingDone(QString::fromStdString(wsList[0]));
+ if (nWorkspaces == 1) {
emit algorithmFinished(QString::fromStdString(wsList[0] + "_workspace"));
}
}
void MuonFitPropertyBrowser::finishHandleNormal(const IAlgorithm *alg) {
// Copy experiment info to output workspace
- setFitWorkspaces(static_cast<std::string>(alg->getProperty("InputWorkspace")));
+ setFitWorkspaces(
+ static_cast<std::string>(alg->getProperty("InputWorkspace")));
// If fit was simultaneous, insert extra information into params table
// and group the output workspaces
const int nWorkspaces = static_cast<int>(m_workspacesToFit.size());
@@ -1154,7 +1155,8 @@ void MuonFitPropertyBrowser::setMultiFittingMode(bool enabled) {
bool MuonFitPropertyBrowser::isMultiFittingMode() const {
return m_isMultiFittingMode;
}
-void MuonFitPropertyBrowser::ConvertFitFunctionForMuonTFAsymmetry(bool enabled) {
+void MuonFitPropertyBrowser::ConvertFitFunctionForMuonTFAsymmetry(
+ bool enabled) {
// set new fit func
IAlgorithm_sptr alg = AlgorithmManager::Instance().create(
"ConvertFitFunctionForMuonTFAsymmetry");
@@ -1241,7 +1243,7 @@ void MuonFitPropertyBrowser::ConvertFitFunctionForMuonTFAsymmetry(bool enabled)
* @param enabled :: [input] Whether to turn this mode on or off
*/
void MuonFitPropertyBrowser::setTFAsymmMode(bool enabled) {
- ConvertFitFunctionForMuonTFAsymmetry(enabled);
+ ConvertFitFunctionForMuonTFAsymmetry(enabled);
// Show or hide the TFAsymmetry fit
if (enabled) {
--
GitLab