From 2e46d5e2d43a7924800de5d11a66e1fe9d210555 Mon Sep 17 00:00:00 2001
From: Elliot Oram <Elliot.Oram@stfc.ac.uk>
Date: Thu, 24 Sep 2015 12:13:48 +0100
Subject: [PATCH] Changed workspaces and naming convention for logs
Refs #13649
---
.../CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp | 5 ++---
.../CustomInterfaces/src/Indirect/ContainerSubtraction.cpp | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp
index 26800419917..5c9c8ea3c93 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp
@@ -222,9 +222,8 @@ void ApplyPaalmanPings::absCorComplete(bool error) {
IAlgorithm_sptr addLog = AlgorithmManager::Instance().create("AddSampleLog");
addLog->initialize();
- addLog->setProperty("Workspace",
- m_uiForm.dsSample->getCurrentDataName().toStdString());
- addLog->setProperty("LogName", "correction");
+ addLog->setProperty("Workspace", m_pythonExportWsName);
+ addLog->setProperty("LogName", "correction_filename");
addLog->setProperty(
"LogText", m_uiForm.dsCorrections->getCurrentDataName().toStdString());
addLog->setProperty("LogType", "String");
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp
index 406d9932bd5..8a5343bcf91 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp
@@ -265,9 +265,8 @@ void ContainerSubtraction::absCorComplete(bool error) {
IAlgorithm_sptr addLog = AlgorithmManager::Instance().create("AddSampleLog");
addLog->initialize();
- addLog->setProperty("Workspace",
- m_uiForm.dsSample->getCurrentDataName().toStdString());
- addLog->setProperty("LogName", "container");
+ addLog->setProperty("Workspace", m_pythonExportWsName);
+ addLog->setProperty("LogName", "container_filename");
addLog->setProperty("LogText",
m_uiForm.dsContainer->getCurrentDataName().toStdString());
addLog->setProperty("LogType", "String");
--
GitLab