From f6e9ee657e3e64c6b9acd0ae6fc31332c4f2e8c3 Mon Sep 17 00:00:00 2001
From: David Fairbrother <DavidFair@users.noreply.github.com>
Date: Fri, 27 Jan 2017 13:40:35 +0000
Subject: [PATCH] Re #18108 Fixed flake warnings
---
Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py | 2 --
scripts/Diffraction/isis_powder/abstract_inst.py | 4 +---
scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py | 1 +
.../Diffraction/isis_powder/polaris_routines/polaris_algs.py | 1 -
scripts/Diffraction/isis_powder/routines/RunDetails.py | 1 -
scripts/Diffraction/isis_powder/routines/yaml_parser.py | 1 -
6 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
index c162b44bf8c..d645319580e 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
@@ -3,7 +3,6 @@ from __future__ import (absolute_import, division, print_function)
import os
import stresstesting
-import mantid.simpleapi as mantid
from mantid import config
from isis_powder.pearl import Pearl
@@ -95,4 +94,3 @@ def _setup_pearl_instrument(tt_mode):
calibration_directory=_get_calibration_dir(), output_directory=_get_output_dir(),
calibration_config_path=calibration_map_file_path)
return pearl_obj
-
diff --git a/scripts/Diffraction/isis_powder/abstract_inst.py b/scripts/Diffraction/isis_powder/abstract_inst.py
index 380fe71341b..91bc70c66e4 100644
--- a/scripts/Diffraction/isis_powder/abstract_inst.py
+++ b/scripts/Diffraction/isis_powder/abstract_inst.py
@@ -5,7 +5,7 @@ from abc import ABCMeta, abstractmethod
from six import add_metaclass
-from isis_powder.routines import calibrate, focus, common
+from isis_powder.routines import calibrate, focus
# This class provides common hooks for instruments to override
@@ -104,8 +104,6 @@ class AbstractInst(object):
return None
# Optional overrides
-
-
@abstractmethod
def apply_absorb_corrections(self, run_details, van_ws, gen_absorb=False):
"""
diff --git a/scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py b/scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py
index 3e5219fe13c..34899454d3d 100644
--- a/scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py
+++ b/scripts/Diffraction/isis_powder/pearl_routines/pearl_algs.py
@@ -44,6 +44,7 @@ def generate_vanadium_absorb_corrections(van_ws):
mantid.CreateSampleShape(InputWorkspace=shape_ws, ShapeXML='<sphere id="sphere_1"> <centre x="0" y="0" z= "0" />\
<radius val="0.005" /> </sphere>')
+ calibration_full_paths = None
absorb_ws = \
mantid.AbsorptionCorrection(InputWorkspace=shape_ws, AttenuationXSection="5.08",
ScatteringXSection="5.1", SampleNumberDensity="0.072",
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
index e859af6fa82..3d6fcafc4dc 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
@@ -3,7 +3,6 @@ from __future__ import (absolute_import, division, print_function)
import mantid.simpleapi as mantid
import os
from isis_powder.routines import common, yaml_parser
-from isis_powder.routines.common_enums import InputBatchingEnum
from isis_powder.routines.RunDetails import RunDetails
from isis_powder.polaris_routines import polaris_advanced_config
diff --git a/scripts/Diffraction/isis_powder/routines/RunDetails.py b/scripts/Diffraction/isis_powder/routines/RunDetails.py
index a66f4dc2c0d..bc674c8e84e 100644
--- a/scripts/Diffraction/isis_powder/routines/RunDetails.py
+++ b/scripts/Diffraction/isis_powder/routines/RunDetails.py
@@ -19,4 +19,3 @@ class RunDetails(object):
self.splined_vanadium_file_path = None
self.vanadium_absorption_path = None
self.vanadium_run_numbers = None
-
diff --git a/scripts/Diffraction/isis_powder/routines/yaml_parser.py b/scripts/Diffraction/isis_powder/routines/yaml_parser.py
index dc3f9bda270..78c79f4b877 100644
--- a/scripts/Diffraction/isis_powder/routines/yaml_parser.py
+++ b/scripts/Diffraction/isis_powder/routines/yaml_parser.py
@@ -1,7 +1,6 @@
from __future__ import (absolute_import, division, print_function)
import os
-import warnings
import yaml
from isis_powder.routines import common as common
from isis_powder.routines import yaml_sanity
--
GitLab