Skip to content
Snippets Groups Projects
Unverified Commit a24a29ae authored by Martyn Gigg's avatar Martyn Gigg Committed by GitHub
Browse files

Merge pull request #22177 from mantidproject/22153_SeqFitResults

Muon analysis and results table
parents 0b78ea69 9676fff6
No related branches found
No related tags found
No related merge requests found
...@@ -8,12 +8,18 @@ MuSR Changes ...@@ -8,12 +8,18 @@ MuSR Changes
Interface Interface
--------- ---------
Interface
---------
Improvements Improvements
############ ############
Bug fixes Bug fixes
######### #########
- Results table can now detect sequential fits.
- Fit options are not disabled after changing tabs. - Fit options are not disabled after changing tabs.
Algorithms Algorithms
......
...@@ -305,11 +305,22 @@ MuonAnalysisResultTableTab::getMultipleFitWorkspaces(const QString &label, ...@@ -305,11 +305,22 @@ MuonAnalysisResultTableTab::getMultipleFitWorkspaces(const QString &label,
QStringList workspaces; QStringList workspaces;
for (auto it = wsNames.begin(); it != wsNames.end(); it++) { for (auto subGroup = wsNames.begin(); subGroup != wsNames.end(); subGroup++) {
if (!isFittedWs(*it)) auto wsGroup = ads.retrieveWS<WorkspaceGroup>(*subGroup);
continue; // Doesn't pass basic checks if (sequential) {
std::vector<std::string> tmpNames = wsGroup->getNames();
for (auto it = tmpNames.begin(); it != tmpNames.end(); it++) {
if (!isFittedWs(*it))
continue; // Doesn't pass basic checks
workspaces << QString::fromStdString(wsBaseName(*it)); workspaces << QString::fromStdString(wsBaseName(*it));
}
} else {
if (!isFittedWs(*subGroup))
continue; // Doesn't pass basic checks
workspaces << QString::fromStdString(wsBaseName(*subGroup));
}
} }
return workspaces; return workspaces;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment