From a2e1ae02faecf52eb8e8ec0fcbcc09d212993e6d Mon Sep 17 00:00:00 2001
From: Sam Jenkins <s.jenkins@stfc.ac.uk>
Date: Thu, 22 Nov 2018 16:01:15 +0000
Subject: [PATCH] Re #22698 updated release notes
---
docs/source/release/v3.14.0/diffraction.rst | 1 +
scripts/Diffraction/isis_powder/routines/focus.py | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/docs/source/release/v3.14.0/diffraction.rst b/docs/source/release/v3.14.0/diffraction.rst
index b0a488456a6..eb6057c877b 100644
--- a/docs/source/release/v3.14.0/diffraction.rst
+++ b/docs/source/release/v3.14.0/diffraction.rst
@@ -65,6 +65,7 @@ Improvements
- Focus on Pearl now has a focused_bin_widths parameter in pearl_advanced_config.py to allow setting default rebin values.
- Focus on Pearl now saves out xye_tof files.
- :ref:`PDLoadCharacterizations <algm-PDLoadCharacterizations>` now sets the same run numbers for all rows when using an ``exp.ini`` file.
+- Focus now checks if the vanadium for a run is already loaded before loading it in to prevent reloading the same vanadium multiple times.
Bugfixes
diff --git a/scripts/Diffraction/isis_powder/routines/focus.py b/scripts/Diffraction/isis_powder/routines/focus.py
index 38d6ac0f4c4..b3260d7353f 100644
--- a/scripts/Diffraction/isis_powder/routines/focus.py
+++ b/scripts/Diffraction/isis_powder/routines/focus.py
@@ -113,12 +113,10 @@ def _batched_run_focusing(instrument, perform_vanadium_norm, run_number_string,
van = "van_{}".format(run_details.vanadium_run_numbers)
if perform_vanadium_norm:
if van not in mantid.mtd:
- print ("load van")
vanadium_splines = mantid.LoadNexus(Filename=run_details.splined_vanadium_file_path,
OutputWorkspace=van)
else:
vanadium_splines = mantid.mtd[van]
- print(vanadium_splines)
output = None
for ws in read_ws_list:
@@ -167,7 +165,6 @@ def _individual_run_focusing(instrument, perform_vanadium_norm, run_number, abso
van = "van_{}".format(run_details.vanadium_run_numbers)
if perform_vanadium_norm:
if van not in mantid.mtd:
- print("load van")
vanadium_splines = mantid.LoadNexus(Filename=run_details.splined_vanadium_file_path,
OutputWorkspace=van)
else:
--
GitLab