From 24f58df3e95173c1d74dcd3460aafec29e285e06 Mon Sep 17 00:00:00 2001
From: Alex Buts <Alex.Buts@stfc.ac.uk>
Date: Sat, 12 Oct 2019 22:46:58 +0100
Subject: [PATCH] Re #26871 more and more flake
---
.../tests/analysis/ISIS_LETReduction.py | 19 ++++----
.../tests/analysis/ISIS_MAPS_DGSReduction.py | 18 ++++----
.../tests/analysis/ISIS_MERLINReduction.py | 17 ++++---
.../tests/analysis/ISIS_MariReduction.py | 24 +++++-----
scripts/Inelastic/Direct/AbsorptionShapes.py | 46 ++++++++++---------
.../Direct/DirectEnergyConversion.py | 2 +-
.../Inelastic/Direct/PropertiesDescriptors.py | 14 +++---
scripts/Inelastic/Direct/ReductionWrapper.py | 6 ++-
8 files changed, 75 insertions(+), 71 deletions(-)
diff --git a/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py b/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py
index f7593e2abda..e9e9095d0a1 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py
@@ -14,9 +14,10 @@ except ImportError:
web_var = None
try:
import mantidplot as mpl
-except:
+except:
mpl = None
+
#
def find_binning_range(energy,ebin):
""" function finds the binning range used in multirep mode
@@ -237,7 +238,7 @@ class ReduceLET_MultiRep2015(ReductionWrapper):
Applied after diagnostics but before any further reduction is invoked.
Inputs:
self -- initialized instance of the instrument reduction class
- reducer -- initialized instance of the reducer
+ reducer -- initialized instance of the reducer
(DirectEnergyConversion class initialized for specific reduction)
ws the workspace, describing the run or partial run in multirep mode
to preprocess
@@ -250,13 +251,13 @@ class ReduceLET_MultiRep2015(ReductionWrapper):
#
def do_postprocessing(self,reducer,ws):
- """ Custom function, applied to each reduced run or every reduced workspace,
+ """ Custom function, applied to each reduced run or every reduced workspace,
the run is divided into, in multirep mode.
Applied after reduction is completed but before saving the result.
Inputs:
self -- initialized instance of the instrument reduction class
- reducer -- initialized instance of the reducer
+ reducer -- initialized instance of the reducer
(DirectEnergyConversion class initialized for specific reduction)
ws the workspace, describing the run or partial run in multirep mode
after reduction to postprocess
@@ -328,7 +329,7 @@ class ReduceLET_MultiRep2015(ReductionWrapper):
# Set up Sample as one of:
# 1) Cylinder([Chem_formula],[Height,Radius])
# 2) FlatPlate([Chem_formula],[Height,Width,Thick])
- # 3) HollowCylinder([Chem_formula],[Height,InnerRadius,OuterRadius])
+ # 3) HollowCylinder([Chem_formula],[Height,InnerRadius,OuterRadius])
# 4) Sphere([[Chem_formula],Radius)
# The units are in cm
propman.correct_absorption_on = Cylinder('Fe',[10,2]) # Will be taken from def_advanced_properties
@@ -337,7 +338,7 @@ class ReduceLET_MultiRep2015(ReductionWrapper):
# Use Monte-Carlo integration. Take sparse energy points and a few integration attempts
# to increase initial speed. Increase these numbers to achieve better accuracy.
propman.abs_corr_info = {'EventsPerPoint':3000}#,'NumberOfWavelengthPoints':30}
- # See MonteCarloAbsorption for all possible properties description and possibility to define
+ # See MonteCarloAbsorption for all possible properties description and possibility to define
# a sparse instrument for speed.
#
# Gain access to the workspace. The workspace should contain Ei log, containing incident energy
@@ -346,12 +347,12 @@ class ReduceLET_MultiRep2015(ReductionWrapper):
test_ws = PropertyManager.sample_run.get_workspace()
# Define spectra list to test absorption on
check_spectra = [1,200]
- # Evaluate corrections on the selected spectra of the workspace and the time to obtain
+ # Evaluate corrections on the selected spectra of the workspace and the time to obtain
# the corrections on the whole workspace.
corrections,time_to_correct_abs = self.evaluate_abs_corrections(test_ws,check_spectra)
# When accuracy and speed of the corrections is satisfactory, copy chosen abs_corr_info
# properties from above to the advanced_porperties area to run in reduction.
- if not mpl is None:
+ if mpl:
mpl.plotSpectrum(corrections,range(0,len(check_spectra)))
#
return corrections
@@ -403,4 +404,4 @@ if __name__=="__main__":
rd.run_reduction()
###### Test absorption corrections to find optimal settings for corrections algorithm
-# corr = rd.eval_absorption_corrections()
\ No newline at end of file
+# corr = rd.eval_absorption_corrections()
diff --git a/Testing/SystemTests/tests/analysis/ISIS_MAPS_DGSReduction.py b/Testing/SystemTests/tests/analysis/ISIS_MAPS_DGSReduction.py
index 12c13b1031c..5208a0ae996 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_MAPS_DGSReduction.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_MAPS_DGSReduction.py
@@ -13,7 +13,7 @@ except:
web_var = None
try:
import mantidplot as mpl
-except:
+except:
mpl = None
@@ -82,14 +82,14 @@ class ReduceMAPS(ReductionWrapper):
Mt = MethodType(self.do_postprocessing, self.reducer,DirectEnergyConversion)
DirectEnergyConversion.__setattr__(self.reducer,'do_postprocessing',Mt)
#
-
+
def do_preprocessing(self,reducer,ws):
""" Custom function, applied to each run or every workspace, the run is divided to
in multirep mode
Applied after diagnostics but before any further reduction is invoked.
Inputs:
self -- initialized instance of the instrument reduction class
- reducer -- initialized instance of the reducer
+ reducer -- initialized instance of the reducer
(DirectEnergyConversion class initialized for specific reduction)
ws the workspace, describing the run or partial run in multirep mode
to preprocess
@@ -102,13 +102,13 @@ class ReduceMAPS(ReductionWrapper):
#
def do_postprocessing(self,reducer,ws):
- """ Custom function, applied to each reduced run or every reduced workspace,
+ """ Custom function, applied to each reduced run or every reduced workspace,
the run is divided into, in multirep mode.
Applied after reduction is completed but before saving the result.
Inputs:
self -- initialized instance of the instrument reduction class
- reducer -- initialized instance of the reducer
+ reducer -- initialized instance of the reducer
(DirectEnergyConversion class initialized for specific reduction)
ws the workspace, describing the run or partial run in multirep mode
after reduction to postprocess
@@ -180,7 +180,7 @@ class ReduceMAPS(ReductionWrapper):
# Set up Sample as one of:
# 1) Cylinder([Chem_formula],[Height,Radius])
# 2) FlatPlate([Chem_formula],[Height,Width,Thick])
- # 3) HollowCylinder([Chem_formula],[Height,InnerRadius,OuterRadius])
+ # 3) HollowCylinder([Chem_formula],[Height,InnerRadius,OuterRadius])
# 4) Sphere([[Chem_formula],Radius)
# The units are in cm
propman.correct_absorption_on = Cylinder('Fe',[10,2]) # Will be taken from def_advanced_properties
@@ -189,7 +189,7 @@ class ReduceMAPS(ReductionWrapper):
# Use Monte-Carlo integration. Take sparse energy points and a few integration attempts
# to increase initial speed. Increase these numbers to achieve better accuracy.
propman.abs_corr_info = {'EventsPerPoint':3000}#,'NumberOfWavelengthPoints':30}
- # See MonteCarloAbsorption for all possible properties description and possibility to define
+ # See MonteCarloAbsorption for all possible properties description and possibility to define
# a sparse instrument for speed.
#
# Gain access to the workspace. The workspace should contain Ei log, containing incident energy
@@ -198,12 +198,12 @@ class ReduceMAPS(ReductionWrapper):
test_ws = PropertyManager.sample_run.get_workspace()
# Define spectra list to test absorption on
check_spectra = [1,200]
- # Evaluate corrections on the selected spectra of the workspace and the time to obtain
+ # Evaluate corrections on the selected spectra of the workspace and the time to obtain
# the corrections on the whole workspace.
corrections,time_to_correct_abs = self.evaluate_abs_corrections(test_ws,check_spectra)
# When accuracy and speed of the corrections is satisfactory, copy chosen abs_corr_info
# properties from above to the advanced_porperties area to run in reduction.
- if not mpl is None:
+ if mpl:
mpl.plotSpectrum(corrections,range(0,len(check_spectra)))
#
return corrections
diff --git a/Testing/SystemTests/tests/analysis/ISIS_MERLINReduction.py b/Testing/SystemTests/tests/analysis/ISIS_MERLINReduction.py
index 002605fc8b3..465dd0bc27f 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_MERLINReduction.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_MERLINReduction.py
@@ -13,11 +13,10 @@ except:
web_var = None
try:
import mantidplot as mpl
-except:
+except:
mpl = None
-
class ReduceMERLIN(ReductionWrapper):
@MainProperties
def def_main_properties(self):
@@ -68,7 +67,7 @@ class ReduceMERLIN(ReductionWrapper):
Applied after diagnostics but before any further reduction is invoked.
Inputs:
self -- initialized instance of the instrument reduction class
- reducer -- initialized instance of the reducer
+ reducer -- initialized instance of the reducer
(DirectEnergyConversion class initialized for specific reduction)
ws the workspace, describing the run or partial run in multirep mode
to preprocess
@@ -81,13 +80,13 @@ class ReduceMERLIN(ReductionWrapper):
#
def do_postprocessing(self,reducer,ws):
- """ Custom function, applied to each reduced run or every reduced workspace,
+ """ Custom function, applied to each reduced run or every reduced workspace,
the run is divided into, in multirep mode.
Applied after reduction is completed but before saving the result.
Inputs:
self -- initialized instance of the instrument reduction class
- reducer -- initialized instance of the reducer
+ reducer -- initialized instance of the reducer
(DirectEnergyConversion class initialized for specific reduction)
ws the workspace, describing the run or partial run in multirep mode
after reduction to postprocess
@@ -133,7 +132,7 @@ class ReduceMERLIN(ReductionWrapper):
# Set up Sample as one of:
# 1) Cylinder([Chem_formula],[Height,Radius])
# 2) FlatPlate([Chem_formula],[Height,Width,Thick])
- # 3) HollowCylinder([Chem_formula],[Height,InnerRadius,OuterRadius])
+ # 3) HollowCylinder([Chem_formula],[Height,InnerRadius,OuterRadius])
# 4) Sphere([[Chem_formula],Radius)
# The units are in cm
propman.correct_absorption_on = Cylinder('Fe',[10,2]) # Will be taken from def_advanced_properties
@@ -142,7 +141,7 @@ class ReduceMERLIN(ReductionWrapper):
# Use Monte-Carlo integration. Take sparse energy points and a few integration attempts
# to increase initial speed. Increase these numbers to achieve better accuracy.
propman.abs_corr_info = {'EventsPerPoint':3000}#,'NumberOfWavelengthPoints':30}
- # See MonteCarloAbsorption for all possible properties description and possibility to define
+ # See MonteCarloAbsorption for all possible properties description and possibility to define
# a sparse instrument for speed.
#
# Gain access to the workspace. The workspace should contain Ei log, containing incident energy
@@ -151,12 +150,12 @@ class ReduceMERLIN(ReductionWrapper):
test_ws = PropertyManager.sample_run.get_workspace()
# Define spectra list to test absorption on
check_spectra = [1,200]
- # Evaluate corrections on the selected spectra of the workspace and the time to obtain
+ # Evaluate corrections on the selected spectra of the workspace and the time to obtain
# the corrections on the whole workspace.
corrections,time_to_correct_abs = self.evaluate_abs_corrections(test_ws,check_spectra)
# When accuracy and speed of the corrections is satisfactory, copy chosen abs_corr_info
# properties from above to the advanced_porperties area to run in reduction.
- if not mpl is None:
+ if mpl:
mpl.plotSpectrum(corrections,range(0,len(check_spectra)))
#
return corrections
diff --git a/Testing/SystemTests/tests/analysis/ISIS_MariReduction.py b/Testing/SystemTests/tests/analysis/ISIS_MariReduction.py
index f0255924752..146a5d88f3c 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_MariReduction.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_MariReduction.py
@@ -15,7 +15,7 @@ except:
web_var = None
try:
import mantidplot as mpl
-except:
+except:
mpl = None
@@ -95,7 +95,7 @@ class ReduceMARIFromFile(ReductionWrapper):
Applied after diagnostics but before any further reduction is invoked.
Inputs:
self -- initialized instance of the instrument reduction class
- reducer -- initialized instance of the reducer
+ reducer -- initialized instance of the reducer
(DirectEnergyConversion class initialized for specific reduction)
ws the workspace, describing the run or partial run in multirep mode
to preprocess
@@ -108,13 +108,13 @@ class ReduceMARIFromFile(ReductionWrapper):
#
def do_postprocessing(self,reducer,ws):
- """ Custom function, applied to each reduced run or every reduced workspace,
+ """ Custom function, applied to each reduced run or every reduced workspace,
the run is divided into, in multirep mode.
Applied after reduction is completed but before saving the result.
Inputs:
self -- initialized instance of the instrument reduction class
- reducer -- initialized instance of the reducer
+ reducer -- initialized instance of the reducer
(DirectEnergyConversion class initialized for specific reduction)
ws the workspace, describing the run or partial run in multirep mode
after reduction to postprocess
@@ -214,7 +214,7 @@ class ReduceMARIFromWorkspace(ReductionWrapper):
Applied after diagnostics but before any further reduction is invoked.
Inputs:
self -- initialized instance of the instrument reduction class
- reducer -- initialized instance of the reducer
+ reducer -- initialized instance of the reducer
(DirectEnergyConversion class initialized for specific reduction)
ws the workspace, describing the run or partial run in multirep mode
to preprocess
@@ -227,13 +227,13 @@ class ReduceMARIFromWorkspace(ReductionWrapper):
#
def do_postprocessing(self,reducer,ws):
- """ Custom function, applied to each reduced run or every reduced workspace,
+ """ Custom function, applied to each reduced run or every reduced workspace,
the run is divided into, in multirep mode.
Applied after reduction is completed but before saving the result.
Inputs:
self -- initialized instance of the instrument reduction class
- reducer -- initialized instance of the reducer
+ reducer -- initialized instance of the reducer
(DirectEnergyConversion class initialized for specific reduction)
ws the workspace, describing the run or partial run in multirep mode
after reduction to postprocess
@@ -314,7 +314,7 @@ class ReduceMARIMon2Norm(ReductionWrapper):
Applied after diagnostics but before any further reduction is invoked.
Inputs:
self -- initialized instance of the instrument reduction class
- reducer -- initialized instance of the reducer
+ reducer -- initialized instance of the reducer
(DirectEnergyConversion class initialized for specific reduction)
ws the workspace, describing the run or partial run in multirep mode
to preprocess
@@ -327,13 +327,13 @@ class ReduceMARIMon2Norm(ReductionWrapper):
#
def do_postprocessing(self,reducer,ws):
- """ Custom function, applied to each reduced run or every reduced workspace,
+ """ Custom function, applied to each reduced run or every reduced workspace,
the run is divided into, in multirep mode.
Applied after reduction is completed but before saving the result.
Inputs:
self -- initialized instance of the instrument reduction class
- reducer -- initialized instance of the reducer
+ reducer -- initialized instance of the reducer
(DirectEnergyConversion class initialized for specific reduction)
ws the workspace, describing the run or partial run in multirep mode
after reduction to postprocess
@@ -726,7 +726,7 @@ class ReduceMARIAutoEi(ReductionWrapper):
corrections,time_to_correct_abs = self.evaluate_abs_corrections(test_ws,check_spectra)
# When accuracy and speed of the corrections is satisfactory, copy chosen abs_corr_info
# properties from above to the advanced_porperties area to run in reduction.
- if not mpl is None:
+ if mpl:
mpl.plotSpectrum(corrections,range(0,len(check_spectra)))
#
return corrections
@@ -789,4 +789,4 @@ if __name__ == "__main__":
rd.run_reduction()
###### Test absorption corrections to find optimal settings for corrections algorithm
-# corr = rd.eval_absorption_corrections()
\ No newline at end of file
+# corr = rd.eval_absorption_corrections()
diff --git a/scripts/Inelastic/Direct/AbsorptionShapes.py b/scripts/Inelastic/Direct/AbsorptionShapes.py
index b244d99684c..8a81e9f4f83 100644
--- a/scripts/Inelastic/Direct/AbsorptionShapes.py
+++ b/scripts/Inelastic/Direct/AbsorptionShapes.py
@@ -21,7 +21,7 @@ class anAbsorptionShape(object):
in direct inelastic analysis.
Contains material and environment properties necessary for absorption corrections calculations,
- as recognized by SetSampleMaterial algorithm.
+ as recognized by SetSampleMaterial algorithm.
See SetSampleMaterial for full list of properties available to set.
@@ -51,9 +51,9 @@ class anAbsorptionShape(object):
or
anShape.material = {'ChemicalFormula':'Br'} (change existing ChemicalFormula)
- Note:
+ Note:
Adding dictionary appends or modifies existing properties, but adding a list, clears up all properties, previously
- set-up on class.
+ set-up on class.
The list can contain up two members where first corresponds to the ChemicalFormula and the second one -- to the
material's number density
"""
@@ -109,7 +109,7 @@ class anAbsorptionShape(object):
elif len(value) == 1:
self._Material = {'ChemicalFormula':value[0]}
else:
- raise TypeError(\
+ raise TypeError(
'*** If material is defined by list or tuple,'
' it may consist of 1 or 2 members,'
' defining the material formula and the material number density')
@@ -117,7 +117,7 @@ class anAbsorptionShape(object):
for key,val in value.iteritems():
self._Material[key] = val
else:
- raise TypeError(\
+ raise TypeError(
'*** Material accepts only list or tuple containing up to 2 values'
' corresponding to material formula and material number density'
' or dictionary with keys, recognized by SetSampleMaterial algorithm')
@@ -174,7 +174,7 @@ class anAbsorptionShape(object):
fast_corrections = corr_properties.pop('is_fast',False)
if not (mc_corrections or fast_corrections):
fast_corrections = False
- if fast_corrections:
+ if fast_corrections:
raise RuntimeError('Analytical absorption corrections are not currently implemented in Direct mode')
abs_corrections = self._fast_abs_corrections(correction_base_ws,corr_properties)
else:
@@ -197,7 +197,7 @@ class anAbsorptionShape(object):
def _fast_abs_corrections(self,correction_base_ws,kwarg={}):
""" Method to correct adsorption on a shape using fast (Numerical Integration) method
if such method is available for the shape
-
+
Not available on arbitrary shapes
Inputs:
ws -- workspace to correct. Should be in the units of wavelength
@@ -319,12 +319,12 @@ class Cylinder(anAbsorptionShape):
CylinderParameters can have the form:
a) The list consisting of 2 to 4 members.:
- CylinderParameters = [Height,Radus,[[Axis],[Center]]
+ CylinderParameters = [Height,Radus,[[Axis],[Center]]
where Height, Radus are the cylinder height and radius in cm and
Axis, if present is the direction of the cylinder wrt to the beam direction [0,0,1]
e.g.:
abs = Cylinder(['Al',0.1],[10,2,[1,0,0],[0,0,0]])
- b) The diary:
+ b) The diary:
CylinderParameters = {Height:Height_value,Radus:Radius_value,[Axis:axisValue],[Center:TheSampleCentre]}
e.g:
abs = Cylinder(['Al',0.1],[Height:10,Radius:2,Axis:[1,0,0]])
@@ -348,8 +348,8 @@ class Cylinder(anAbsorptionShape):
@shape.setter
def shape(self,value):
shape_dict = self._set_list_property(value,
- 'Cylinder',['Height','Radius'],
- ['Axis','Center'],[[0.,1.,0.],[0,0,0]]) # noqa: E127
+ 'Cylinder',['Height','Radius'], # noqa
+ ['Axis','Center'],[[0.,1.,0.],[0,0,0]]) # noqa
self._ShapeDescription = shape_dict
@@ -364,7 +364,7 @@ class Cylinder(anAbsorptionShape):
"""
kw = kwarg.copy()
elem_size = kw.pop('NumberOfSlices',None)
- if not elem_size is None: # noqa: E714
+ if not elem_size is None: # noqa
shape_dic = self.shape
n_slices = int(shape_dic['Height']/elem_size)
if n_slices <1:
@@ -404,7 +404,7 @@ class FlatPlate(anAbsorptionShape):
e.g.:
abs = FlatPlate(['Al',0.1],[10,2,0.2,[1,0,0],5])
- b) The diary:
+ b) The diary:
PlateParameters = {Height:Height_value,Width:Width_value,Thickness:Thickness_value etc}
e.g:
abs = FlatPlate(['Al',0.1],['Height':10,'Width':4,'Thickness':2,'Angle':30)
@@ -454,10 +454,10 @@ class FlatPlate(anAbsorptionShape):
##---------------------------------------------------------------------------------------------------
class HollowCylinder(anAbsorptionShape):
"""Define the Hollow absorbing cylinder and calculate absorption corrections for this cylinder
-
+
Usage:
abs = HollowCylinder(SampleMaterial,CylinderParameters)
- The SampleMaterial is the list or dictionary as described on anAbsorptionShape class
+ The SampleMaterial is the list or dictionary as described on anAbsorptionShape class
and
@@ -465,7 +465,7 @@ class HollowCylinder(anAbsorptionShape):
a) The list consisting of 3 to 5 members.:
CylinderParameters = [Height,InnerRadus,OuterRadus,[[Axis],[Center]]
- where Height, InnerRadus and OuterRadus are the cylinder height and radiuses in cm and
+ where Height, InnerRadus and OuterRadus are the cylinder height and radiuses in cm and
Axis, if present is the direction of the cylinder wrt to the beam direction [0,0,1]
e.g.:
abs = HollowCylinder(['Al',0.1],[10,2,4,[0,1,0],[0,0,0]])
@@ -494,9 +494,10 @@ class HollowCylinder(anAbsorptionShape):
@shape.setter
def shape(self,value):
- shape_dict = self._set_list_property(value,'HollowCylinder',
+ shape_dict = self._set_list_property(value,
+ 'HollowCylinder',
['Height','InnerRadius','OuterRadius'],
- ['Axis','Center'],[[0.,1.,0.],[0.,0.,0.]])
+ ['Axis','Center'],[[0.,1.,0.],[0.,0.,0.]]) # noqa: E127
#
self._ShapeDescription = shape_dict
if len(shape_dict) != 0:
@@ -552,7 +553,7 @@ class HollowCylinder(anAbsorptionShape):
##---------------------------------------------------------------------------------------------------
class Sphere(anAbsorptionShape):
"""Define the absorbing sphere and calculate absorption corrections from this sphere
-
+
Usage:
abs = Sphere(SampleMaterial,SphereParameters)
The SampleMaterial is the list or dictionary as described on anAbsorptionShape class
@@ -597,8 +598,9 @@ class Sphere(anAbsorptionShape):
#
@shape.setter
def shape(self,value):
- shape_dict = self._set_list_property(value,'Sphere',['Radius'],
- ['Center'],[[0.,0.,0.]])
+ shape_dict = self._set_list_property(value,
+ 'Sphere',['Radius'],
+ ['Center'],[[0.,0.,0.]]) # noqa: E127
self._ShapeDescription = shape_dict
if len(shape_dict) != 0:
@@ -628,7 +630,7 @@ class Sphere(anAbsorptionShape):
AbsorptionCorrections method is invoked with the parameters provided.
"""
if len(kwarg) == 0:
- adsrbtn_correctios = SphericalAbsorption(\
+ adsrbtn_correctios = SphericalAbsorption(
correction_base_ws,SphericalSampleRadius=self._ShapeDescription['Radius'])
else:
self._add_xml_sphere(correction_base_ws)
diff --git a/scripts/Inelastic/Direct/DirectEnergyConversion.py b/scripts/Inelastic/Direct/DirectEnergyConversion.py
index 8b1be3dd18a..19a994716a9 100644
--- a/scripts/Inelastic/Direct/DirectEnergyConversion.py
+++ b/scripts/Inelastic/Direct/DirectEnergyConversion.py
@@ -547,7 +547,7 @@ class DirectEnergyConversion(object):
pass # no absolute units corrections
# ensure that the sample_run name is intact with the sample workspace
PropertyManager.sample_run.synchronize_ws(deltaE_ws_sample)
- if not prop_man.correct_absorption_on is None: # noqa E714
+ if not prop_man.correct_absorption_on is None: # noqa
abs_shape = prop_man.correct_absorption_on
deltaE_ws_sample = abs_shape.correct_absorption(deltaE_ws_sample,prop_man.abs_corr_info)
#
diff --git a/scripts/Inelastic/Direct/PropertiesDescriptors.py b/scripts/Inelastic/Direct/PropertiesDescriptors.py
index 4b0726a84f6..9d9fbbaa859 100644
--- a/scripts/Inelastic/Direct/PropertiesDescriptors.py
+++ b/scripts/Inelastic/Direct/PropertiesDescriptors.py
@@ -1732,10 +1732,10 @@ class AbsCorrInfo(PropDescriptor):
self._algo_selector('is_fast',is_fast)
else:
- raise(KeyError,\
- 'AbsCorrInfo accepts only a dictionary '
- 'with AbsorptionCorrections algorithm properties '
- 'or string representation of such dictionary')
+ raise(KeyError,
+ 'AbsCorrInfo accepts only a dictionary ' # noqa
+ 'with AbsorptionCorrections algorithm properties ' # noqa
+ 'or string representation of such dictionary') # noqa
if self._is_fast:
algo_name = 'AdsorptionCorrection'
@@ -1812,9 +1812,9 @@ def list_checker(val,list_in,mess_base):
if val in list_in:
return val
else:
- raise(ValueError,\
- '{0} property can only have values from the set of: {1}'\
- .format(mess_base,str(list_in)))
+ raise(ValueError,
+ '{0} property can only have values from the set of: {1}' # noqa
+ .format(mess_base,str(list_in))) # noqa
# -----------------------------------------------------------------------------------------
# END Descriptors for PropertyManager itself
diff --git a/scripts/Inelastic/Direct/ReductionWrapper.py b/scripts/Inelastic/Direct/ReductionWrapper.py
index fe996aad8de..5b85498a094 100644
--- a/scripts/Inelastic/Direct/ReductionWrapper.py
+++ b/scripts/Inelastic/Direct/ReductionWrapper.py
@@ -258,7 +258,7 @@ class ReductionWrapper(object):
red_ws = ExtractSpectra(test_ws,WorkspaceIndexList=spectra_to_correct)
else:
decrement = n_spectra
-
+
prop_man = self.reducer.prop_man
abs_shape = prop_man.correct_absorption_on
start_time = time.time()
@@ -762,10 +762,12 @@ def iliad(reduce):
return rez
return iliad_wrapper
-
#
+
+
def custom_operation(custom_fun):
DirectEnergyConversion.__setattr__()
+
def custom_fun_wrapper(*args):
# execute decorated function
ws = custom_fun(*args)
--
GitLab