From 964686492feceb89aa1762f25a29f8189b61108c Mon Sep 17 00:00:00 2001
From: Harriet Brown <harriet.brown@stfc.ac.uk>
Date: Tue, 24 Mar 2020 14:54:05 +0000
Subject: [PATCH] Change output ws names in Polaris.create_total_scattering_pdf
This commit adds lines in generate_ts_pdf to change the names of the workspaces produced as a result from the function.
re: #28414
---
.../isis_powder/polaris_routines/polaris_algs.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
index 125d6d63427..13dbee46715 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
@@ -9,6 +9,7 @@ import numpy as np
import math
import mantid.simpleapi as mantid
+from mantid.api import WorkspaceGroup
from six import string_types
from isis_powder.routines import absorb_corrections, common
@@ -125,6 +126,18 @@ def generate_ts_pdf(run_number, focus_file_path, merge_banks=False, q_lims=None,
pdf_output = mantid.Rebin(InputWorkspace=pdf_output, Params=output_binning)
except RuntimeError:
return pdf_output
+ # Rename output ws
+ if 'merged_ws' in locals():
+ mantid.RenameWorkspace(InputWorkspace=merged_ws, OutputWorkspace=run_number + '_merged_Q')
+ mantid.RenameWorkspace(InputWorkspace=focused_ws, OutputWorkspace=run_number+'_focused_Q')
+ if isinstance(focused_ws, WorkspaceGroup):
+ for i in range(len(focused_ws)):
+ print(focused_ws[i])
+ mantid.RenameWorkspace(InputWorkspace=focused_ws[i], OutputWorkspace=run_number+'_focused_Q_'+str(i+1))
+ mantid.RenameWorkspace(InputWorkspace=pdf_output, OutputWorkspace=run_number+'_pdf_R')
+ if isinstance(pdf_output, WorkspaceGroup):
+ for i in range(len(pdf_output)):
+ mantid.RenameWorkspace(InputWorkspace=pdf_output[i], OutputWorkspace=run_number+'_pdf_R_'+str(i+1))
return pdf_output
--
GitLab