From 230c52b5e0ce9a10cb3f065e0980b86e70ed51ab Mon Sep 17 00:00:00 2001
From: David Fairbrother <DavidFair@users.noreply.github.com>
Date: Wed, 2 Nov 2016 16:37:53 +0000
Subject: [PATCH] Re #17839 Fixed flake warnings
---
scripts/Diffraction/isis_powder/__init__.py | 4 ++--
scripts/Diffraction/isis_powder/abstract_inst.py | 12 ++++++------
scripts/Diffraction/isis_powder/pearl.py | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/scripts/Diffraction/isis_powder/__init__.py b/scripts/Diffraction/isis_powder/__init__.py
index 68a487cfec9..7d4b197e67d 100644
--- a/scripts/Diffraction/isis_powder/__init__.py
+++ b/scripts/Diffraction/isis_powder/__init__.py
@@ -1,3 +1,3 @@
-from .abstract_inst import AbstractInst
-# User imports
from .pearl import Pearl
+
+__all__ = ["Pearl"]
diff --git a/scripts/Diffraction/isis_powder/abstract_inst.py b/scripts/Diffraction/isis_powder/abstract_inst.py
index bd9fa177858..898c58c74c2 100644
--- a/scripts/Diffraction/isis_powder/abstract_inst.py
+++ b/scripts/Diffraction/isis_powder/abstract_inst.py
@@ -66,7 +66,7 @@ class AbstractInst(object):
self.default_input_ext = input_ext
return common.focus(instrument=self, number=run_number,
- attenuate=do_attenuation, van_norm=do_van_normalisation)
+ attenuate=do_attenuation, van_norm=do_van_normalisation)
def create_empty_calibration_by_names(self, calibration_numbers, output_file_name, group_names=None):
@@ -74,7 +74,7 @@ class AbstractInst(object):
group_names = self._get_default_group_names()
common.create_calibration_by_names(calibration_runs=calibration_numbers, grouping_file_name=output_file_name,
- group_names=group_names, startup_objects=self)
+ group_names=group_names, startup_objects=self)
def create_calibration(self, calibration_runs, offset_file_name, grouping_file_name):
self._create_calibration(calibration_runs=calibration_runs,
@@ -88,10 +88,10 @@ class AbstractInst(object):
do_absorb_corrections=True, gen_absorb_correction=False):
common.create_vanadium(startup_object=self, vanadium_runs=vanadium_runs,
- empty_runs=empty_runs, output_file_name=output_file_name,
- num_of_spline_coefficients=num_of_splines,
- do_absorb_corrections=do_absorb_corrections,
- generate_absorb_corrections=gen_absorb_correction)
+ empty_runs=empty_runs, output_file_name=output_file_name,
+ num_of_spline_coefficients=num_of_splines,
+ do_absorb_corrections=do_absorb_corrections,
+ generate_absorb_corrections=gen_absorb_correction)
@staticmethod
def set_debug_mode(val):
diff --git a/scripts/Diffraction/isis_powder/pearl.py b/scripts/Diffraction/isis_powder/pearl.py
index 8a84c19ddc9..3e14fdf3ed8 100644
--- a/scripts/Diffraction/isis_powder/pearl.py
+++ b/scripts/Diffraction/isis_powder/pearl.py
@@ -5,7 +5,7 @@ import numpy as numpy
import os
-from isis_powder import AbstractInst
+from isis_powder.abstract_inst import AbstractInst
from isis_powder import pearl_calib_factory
from isis_powder import pearl_cycle_factory
import isis_powder.common as common
--
GitLab