Skip to content

Commit

Permalink
refs #18950 Forced deadTime data to be read during cache
Browse files Browse the repository at this point in the history
  • Loading branch information
AnthonyLim23 committed Feb 22, 2017
1 parent f2adf0c commit a2b5275
Showing 1 changed file with 22 additions and 4 deletions.
26 changes: 22 additions & 4 deletions MantidQt/CustomInterfaces/src/Muon/MuonAnalysisDataLoader.cpp
Expand Up @@ -73,7 +73,7 @@ LoadResult MuonAnalysisDataLoader::loadFiles(const QStringList &files) const {
throw std::invalid_argument("Supplied list of files is empty");

// Convert list of files into a mangled map key
const auto toString = [](QStringList qsl) {
const auto toString = [](QStringList qsl) {
std::ostringstream oss;
qsl.sort();
for (const QString qs : qsl) {
Expand All @@ -86,9 +86,27 @@ LoadResult MuonAnalysisDataLoader::loadFiles(const QStringList &files) const {
updateCache();
// Check cache to see if we've loaded this set of files before
const std::string fileString = toString(files);
if (m_loadedDataCache.find(fileString) != m_loadedDataCache.end()) {
g_log.information("Using cached workspace for file(s): " + fileString);
return m_loadedDataCache[fileString];
if (m_loadedDataCache.find(fileString) != m_loadedDataCache.end())
{
LoadResult result = m_loadedDataCache[fileString];
if (m_deadTimesType == DeadTimesType::FromFile) { // manually reset the DeadTime
IAlgorithm_sptr load =
AlgorithmManager::Instance().createUnmanaged("LoadMuonNexus");
load->initialize();
load->setChild(true);
load->setLogging(false); // We'll take care of printing messages ourselves
std::string fileString2 = toString(files);
fileString2.pop_back();
const std::string fileString3 = fileString2;
load->setPropertyValue("Filename", fileString3);
g_log.information("Using cached workspace for file(s): " + fileString);
// Just to pass validation
load->setPropertyValue("OutputWorkspace", "__NotUsed");
load->setPropertyValue("DeadTimeTable", "__NotUsed");
load->execute();
result.loadedDeadTimes = load->getProperty("DeadTimeTable");
}
return result;
}

LoadResult result;
Expand Down

0 comments on commit a2b5275

Please sign in to comment.