From f12e5f28b186a255c5d87306534a44adb4166cca Mon Sep 17 00:00:00 2001
From: Harriet Brown <harriet.brown@stfc.ac.uk>
Date: Fri, 27 Mar 2020 11:02:39 +0000
Subject: [PATCH] Add rebinning option for focused workspaces in polaris create
pdf
This commit adds an option to rebin the focused/merged workspace with a delta_q paramiter in polaris create pdf.
re: #28415
---
scripts/Diffraction/isis_powder/polaris.py | 1 +
.../Diffraction/isis_powder/polaris_routines/polaris_algs.py | 5 +++--
.../isis_powder/polaris_routines/polaris_param_mapping.py | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/scripts/Diffraction/isis_powder/polaris.py b/scripts/Diffraction/isis_powder/polaris.py
index f0e5c729912..ea5ba23699b 100644
--- a/scripts/Diffraction/isis_powder/polaris.py
+++ b/scripts/Diffraction/isis_powder/polaris.py
@@ -65,6 +65,7 @@ class Polaris(AbstractInst):
cal_file_name=cal_file_name,
sample_details=self._sample_details,
delta_r=self._inst_settings.delta_r,
+ delta_q=self._inst_settings.delta_q,
pdf_type=self._inst_settings.pdf_type,
freq_params=self._inst_settings.freq_params)
return pdf_output
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
index 34226e8d063..bca40810c0a 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
@@ -83,7 +83,7 @@ def save_unsplined_vanadium(vanadium_ws, output_path):
def generate_ts_pdf(run_number, focus_file_path, merge_banks=False, q_lims=None, cal_file_name=None,
- sample_details=None, delta_r=None, pdf_type="G(r)", freq_params=None):
+ sample_details=None, delta_r=None, delta_q=None, pdf_type="G(r)", freq_params=None):
focused_ws = _obtain_focused_run(run_number, focus_file_path)
focused_ws = mantid.ConvertUnits(InputWorkspace=focused_ws, Target="MomentumTransfer", EMode='Elastic')
@@ -105,7 +105,8 @@ def generate_ts_pdf(run_number, focus_file_path, merge_banks=False, q_lims=None,
self_scattering_correction = mantid.RebinToWorkspace(WorkspaceToRebin=self_scattering_correction,
WorkspaceToMatch=focused_ws)
focused_ws = mantid.Subtract(LHSWorkspace=focused_ws, RHSWorkspace=self_scattering_correction)
-
+ if delta_q:
+ focused_ws = mantid.Rebin(InputWorkspace=focused_ws, Params=delta_q)
if merge_banks:
q_min, q_max = _load_qlims(q_lims)
merged_ws = mantid.MatchAndMergeWorkspaces(InputWorkspaces=focused_ws, XMin=q_min, XMax=q_max,
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py
index 40890a20c47..d5889d4dca8 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py
@@ -17,6 +17,7 @@ attr_mapping = [
ParamMapEntry(ext_name="calibration_mapping_file", int_name="cal_mapping_path"),
ParamMapEntry(ext_name="config_file", int_name="config_file"),
ParamMapEntry(ext_name="delta_r", int_name="delta_r", optional=True),
+ ParamMapEntry(ext_name="delta_q", int_name="delta_q", optional=True),
ParamMapEntry(ext_name="do_absorb_corrections", int_name="do_absorb_corrections"),
ParamMapEntry(ext_name="do_van_normalisation", int_name="do_van_normalisation"),
ParamMapEntry(ext_name="file_ext", int_name="file_extension", optional=True),
--
GitLab