Moved addition of logs from interface into algorithm

Refs #13649

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

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)));

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)));