From 647434a2e0855145a73f1fe1619db187b03f4077 Mon Sep 17 00:00:00 2001
From: Joseph Ramsay <joseph.ramsay@stfc.ac.uk>
Date: Tue, 10 Oct 2017 16:26:26 +0100
Subject: [PATCH] Re #20603 Tidied up a little
---
scripts/Diffraction/isis_powder/polaris.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/scripts/Diffraction/isis_powder/polaris.py b/scripts/Diffraction/isis_powder/polaris.py
index 66172962f71..34ebea682a0 100644
--- a/scripts/Diffraction/isis_powder/polaris.py
+++ b/scripts/Diffraction/isis_powder/polaris.py
@@ -31,8 +31,10 @@ class Polaris(AbstractInst):
def create_vanadium(self, **kwargs):
self._inst_settings.update_attributes(kwargs=kwargs)
- return self._create_vanadium(run_number_string=self._inst_settings.run_in_range,
- do_absorb_corrections=self._inst_settings.do_absorb_corrections)
+ vanadium_d = self._create_vanadium(run_number_string=self._inst_settings.run_in_range,
+ do_absorb_corrections=self._inst_settings.do_absorb_corrections)
+ # TODO: save vanadium_d
+ return vanadium_d
def set_sample_details(self, **kwargs):
kwarg_name = "sample"
@@ -83,9 +85,9 @@ class Polaris(AbstractInst):
# Test if it can be converted to an int or if we need to ask Mantid to do it for us
if isinstance(run_number, str) and not run_number.isdigit():
# Convert using Mantid and take the first element which is most likely to be the lowest digit
- use_new_name = True if int(common.generate_run_numbers(run_number)[0]) >= first_run_new_name else False
+ use_new_name = int(common.generate_run_numbers(run_number)[0]) >= first_run_new_name
else:
- use_new_name = True if int(run_number) >= first_run_new_name else False
+ use_new_name = int(run_number) >= first_run_new_name
prefix = polaris_new_name if use_new_name else polaris_old_name
@@ -93,7 +95,8 @@ class Polaris(AbstractInst):
def _generate_output_file_name(self, run_number_string):
suffix = self._inst_settings.suffix
- suffix = "" if suffix is None else suffix
+ if suffix is None:
+ suffix = ""
return Polaris._generate_input_file_name(run_number_string) + suffix
def _get_input_batching_mode(self):
--
GitLab