From 3859fed7753705e1659b05a7d494d913b9b943f2 Mon Sep 17 00:00:00 2001
From: Harriet Brown <harriet.brown@stfc.ac.uk>
Date: Mon, 7 Oct 2019 10:56:55 +0100
Subject: [PATCH] Fix bug caused by calling create_total_scattering_pdf without
q_lims
---
scripts/Diffraction/isis_powder/polaris.py | 4 ++--
.../Diffraction/isis_powder/polaris_routines/polaris_algs.py | 4 +++-
.../isis_powder/polaris_routines/polaris_param_mapping.py | 1 -
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/Diffraction/isis_powder/polaris.py b/scripts/Diffraction/isis_powder/polaris.py
index 9d82c9948ee..484544b37a2 100644
--- a/scripts/Diffraction/isis_powder/polaris.py
+++ b/scripts/Diffraction/isis_powder/polaris.py
@@ -48,7 +48,7 @@ class Polaris(AbstractInst):
output_path=run_details.unsplined_vanadium_file_path)
return vanadium_d
- def create_total_scattering_pdf(self, **kwargs):
+ def create_total_scattering_pdf(self, q_lims=None, **kwargs):
self._inst_settings.update_attributes(kwargs=kwargs)
# Generate pdf
run_details = self._get_run_details(self._inst_settings.run_number)
@@ -57,7 +57,7 @@ class Polaris(AbstractInst):
pdf_output = polaris_algs.generate_ts_pdf(run_number=self._inst_settings.run_number,
focus_file_path=focus_file_path,
merge_banks=self._inst_settings.merge_banks,
- q_lims=self._inst_settings.q_lims,
+ q_lims=q_lims,
cal_file_name=cal_file_name)
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 c762d67e8ca..239c3d33ef3 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
@@ -170,7 +170,9 @@ def _generate_grouped_ts_pdf(focused_ws, q_lims, cal_file_name):
binning = [group_bin_min, group_bin_width, group_bin_max]
focused_data = mantid.Rebin(InputWorkspace=focused_ws, Params=binning)
focused_data_combined = mantid.ConjoinSpectra(InputWorkspaces=focused_data)
- mantid.MatchSpectra(InputWorkspace=focused_data_combined, OutputWorkspace=focused_data_combined, ReferenceSpectrum=1)
+ mantid.MatchSpectra(InputWorkspace=focused_data_combined,
+ OutputWorkspace=focused_data_combined,
+ ReferenceSpectrum=1)
if type(q_lims) == str:
q_min = []
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 911791606e0..102354db49e 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_param_mapping.py
@@ -28,7 +28,6 @@ attr_mapping = [
ParamMapEntry(ext_name="mode", int_name="mode", enum_class=POLARIS_CHOPPER_MODES,
optional=True),
ParamMapEntry(ext_name="multiple_scattering", int_name="multiple_scattering", optional=True),
- ParamMapEntry(ext_name="q_lims", int_name="q_lims"),
ParamMapEntry(ext_name="raw_data_cropping_values", int_name="raw_data_crop_values"),
ParamMapEntry(ext_name="run_number", int_name="run_number"),
ParamMapEntry(ext_name="sample_empty", int_name="sample_empty", optional=True),
--
GitLab