From b56fbdce1f7e6b674f90c876c98645646e7171ed Mon Sep 17 00:00:00 2001
From: Elliot Oram <Elliot.Oram@stfc.ac.uk>
Date: Fri, 25 Sep 2015 13:25:24 +0100
Subject: [PATCH] Moved addition of logs from interface into algorithm
Refs #13649
---
.../ApplyPaalmanPingsCorrection.py | 16 ++++++++++++++
.../src/Indirect/ApplyPaalmanPings.cpp | 22 -------------------
.../src/Indirect/ContainerSubtraction.cpp | 22 -------------------
3 files changed, 16 insertions(+), 44 deletions(-)
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py
index adef35b3919..525db109bfc 100644
--- a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py
+++ b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ApplyPaalmanPingsCorrection.py
@@ -78,11 +78,21 @@ class ApplyPaalmanPingsCorrection(PythonAlgorithm):
# Use sample factor only
self._correct_sample()
correction_type = 'sample_corrections_only'
+ # Add corrections filename to log values
+ AddSampleLog(Workspace=self._output_ws_name,
+ LogName='corrections_filename',
+ LogType='String',
+ LogText=self._corrections_ws_name)
else:
# Do simple subtraction
self._subtract()
correction_type = 'can_subtraction'
+ # Add container filename to log values
+ AddSampleLog(Workspace=self._output_ws_name,
+ LogName='container_filename',
+ LogType='String',
+ LogText=self._can_ws_name)
# Record the container scale factor
if self._use_can and self._scale_can:
@@ -97,6 +107,12 @@ class ApplyPaalmanPingsCorrection(PythonAlgorithm):
LogType='String',
LogText=correction_type)
+ # Add original sample as log entry
+ AddSampleLog(Workspace=self._output_ws_name,
+ LogName='sample_filename',
+ LogType='String',
+ LogText=self._sample_ws_name)
+
self.setPropertyValue('OutputWorkspace', self._output_ws_name)
# Remove temporary workspaces
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp
index ad0710a7e36..042905b2189 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ApplyPaalmanPings.cpp
@@ -220,28 +220,6 @@ void ApplyPaalmanPings::absCorComplete(bool error) {
if (save)
addSaveWorkspaceToQueue(QString::fromStdString(m_pythonExportWsName));
- IAlgorithm_sptr addLogCorr =
- AlgorithmManager::Instance().create("AddSampleLog");
- addLogCorr->initialize();
- addLogCorr->setProperty("Workspace", m_pythonExportWsName);
- addLogCorr->setProperty("LogName", "correction_filename");
- addLogCorr->setProperty(
- "LogText", m_uiForm.dsCorrections->getCurrentDataName().toStdString());
- addLogCorr->setProperty("LogType", "String");
-
- m_batchAlgoRunner->addAlgorithm(addLogCorr);
-
- IAlgorithm_sptr addLogSample =
- AlgorithmManager::Instance().create("AddSampleLog");
- addLogSample->initialize();
- addLogSample->setProperty("Workspace", m_pythonExportWsName);
- addLogSample->setProperty("LogName", "sample_filename");
- addLogSample->setProperty(
- "LogText", m_uiForm.dsSample->getCurrentDataName().toStdString());
- addLogSample->setProperty("LogType", "String");
-
- m_batchAlgoRunner->addAlgorithm(addLogSample);
-
// Run algorithm queue
connect(m_batchAlgoRunner, SIGNAL(batchComplete(bool)), this,
SLOT(postProcessComplete(bool)));
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp
index b177153a5cf..0992f1d648e 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp
@@ -263,28 +263,6 @@ void ContainerSubtraction::absCorComplete(bool error) {
if (save)
addSaveWorkspaceToQueue(QString::fromStdString(m_pythonExportWsName));
- IAlgorithm_sptr addLogContainer =
- AlgorithmManager::Instance().create("AddSampleLog");
- addLogContainer->initialize();
- addLogContainer->setProperty("Workspace", m_pythonExportWsName);
- addLogContainer->setProperty("LogName", "container_filename");
- addLogContainer->setProperty(
- "LogText", m_uiForm.dsContainer->getCurrentDataName().toStdString());
- addLogContainer->setProperty("LogType", "String");
-
- m_batchAlgoRunner->addAlgorithm(addLogContainer);
-
- IAlgorithm_sptr addLogSample =
- AlgorithmManager::Instance().create("AddSampleLog");
- addLogSample->initialize();
- addLogSample->setProperty("Workspace", m_pythonExportWsName);
- addLogSample->setProperty("LogName", "sample_filename");
- addLogSample->setProperty(
- "LogText", m_uiForm.dsSample->getCurrentDataName().toStdString());
- addLogSample->setProperty("LogType", "String");
-
- m_batchAlgoRunner->addAlgorithm(addLogSample);
-
// Run algorithm queue
connect(m_batchAlgoRunner, SIGNAL(batchComplete(bool)), this,
SLOT(postProcessComplete(bool)));
--
GitLab