Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix reading dead time data in Muon interface #18972

Merged
merged 5 commits into from Feb 23, 2017
Merged

Fix reading dead time data in Muon interface #18972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a2b5275
refs #18950 Forced deadTime data to be read during cache
AnthonyLim23 Feb 22, 2017
67ea45d
refs #18950 Empty cache for deadTimes, firstGoodData and startTime
AnthonyLim23 Feb 23, 2017
7efdc11
refs #18950 Removed indent in DataLoader
AnthonyLim23 Feb 23, 2017
abd3fe0
refs #18950 Renamed emptyCache to clearCache
AnthonyLim23 Feb 23, 2017
786d435
refs #18950 clang format
AnthonyLim23 Feb 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Muon/MuonAnalysisDataLoader.h
View file
Open in desktop
Expand Up @@ -95,6 +95,8 @@ class MANTIDQT_CUSTOMINTERFACES_DLL MuonAnalysisDataLoader {
/// Load dead times from file
Mantid::API::Workspace_sptr
loadDeadTimesFromFile(const std::string &filename) const;
// empty the cache
void clearCache();

protected:
/// Set properties of algorithm from options
Expand Down
4 changes: 3 additions & 1 deletion MantidQt/CustomInterfaces/src/Muon/MuonAnalysis.cpp
View file
Open in desktop
Expand Up @@ -2694,7 +2694,7 @@ void MuonAnalysis::doSetToolbarsHidden(bool hidden) {
*/
void MuonAnalysis::onDeadTimeTypeChanged(int choice) {
m_deadTimesChanged = true;

m_dataLoader.clearCache();
if (choice == 0 || choice == 1) // if choice == none || choice == from file
{
m_uiForm.mwRunDeadTimeFile->setVisible(false);
Expand Down Expand Up @@ -2757,6 +2757,7 @@ void MuonAnalysis::deadTimeFileSelected() {
* from the form
*/
void MuonAnalysis::setTimeZeroState(int checkBoxState) {
m_dataLoader.clearCache();
if (checkBoxState == -1)
checkBoxState = m_uiForm.timeZeroAuto->checkState();

Expand All @@ -2778,6 +2779,7 @@ void MuonAnalysis::setTimeZeroState(int checkBoxState) {
* from the form
*/
void MuonAnalysis::setFirstGoodDataState(int checkBoxState) {
m_dataLoader.clearCache();
if (checkBoxState == -1)
checkBoxState = m_uiForm.firstGoodDataAuto->checkState();

Expand Down
6 changes: 6 additions & 0 deletions MantidQt/CustomInterfaces/src/Muon/MuonAnalysisDataLoader.cpp
View file
Open in desktop
Expand Up @@ -472,5 +472,11 @@ void MuonAnalysisDataLoader::updateCache() const {
}
}

void MuonAnalysisDataLoader::clearCache() {
if (!m_loadedDataCache.empty()) {
m_loadedDataCache.clear();
}
}

} // namespace CustomInterfaces
} // namespace MantidQt