diff --git a/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py b/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py index e9e9095d0a13b37209f49495bf9c9d037844bc7c..d8e59c109c317649ae1d8518bca1aefa5b0e321a 100644 --- a/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py +++ b/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py @@ -226,9 +226,9 @@ class ReduceLET_MultiRep2015(ReductionWrapper): def __init__(self,web_var=None): """Sets properties defaults for the instrument with Name""" ReductionWrapper.__init__(self,'LET',web_var) - Mt = MethodType(self.do_preprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_preprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_preprocessing',Mt) - Mt = MethodType(self.do_postprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_postprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_postprocessing',Mt) # diff --git a/Testing/SystemTests/tests/analysis/ISIS_MAPS_DGSReduction.py b/Testing/SystemTests/tests/analysis/ISIS_MAPS_DGSReduction.py index 5208a0ae996a0b4b00b34f2bac82ece619b3efd5..96f61daca9f6e4347404ccfa82bffc2b1fb2168e 100644 --- a/Testing/SystemTests/tests/analysis/ISIS_MAPS_DGSReduction.py +++ b/Testing/SystemTests/tests/analysis/ISIS_MAPS_DGSReduction.py @@ -77,9 +77,9 @@ class ReduceMAPS(ReductionWrapper): def __init__(self,web_var=None): """ sets properties defaults for the instrument with Name""" ReductionWrapper.__init__(self,'MAP',web_var) - Mt = MethodType(self.do_preprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_preprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_preprocessing',Mt) - Mt = MethodType(self.do_postprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_postprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_postprocessing',Mt) # diff --git a/Testing/SystemTests/tests/analysis/ISIS_MERLINReduction.py b/Testing/SystemTests/tests/analysis/ISIS_MERLINReduction.py index 465dd0bc27f067fe3f61f68c7818df22d1bb17de..c58f69b901710cea1b5ac0d8ae096e2ed696593f 100644 --- a/Testing/SystemTests/tests/analysis/ISIS_MERLINReduction.py +++ b/Testing/SystemTests/tests/analysis/ISIS_MERLINReduction.py @@ -163,9 +163,9 @@ class ReduceMERLIN(ReductionWrapper): def __init__(self,web_var=None): """ sets properties defaults for the instrument with Name""" ReductionWrapper.__init__(self,'MER',web_var) - Mt = MethodType(self.do_preprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_preprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_preprocessing',Mt) - Mt = MethodType(self.do_postprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_postprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_postprocessing',Mt) #---------------------------------------------------------------------------------------------------------------------- diff --git a/Testing/SystemTests/tests/analysis/ISIS_MariReduction.py b/Testing/SystemTests/tests/analysis/ISIS_MariReduction.py index 5d136fe589a820c5052c86545f1dc5bccb0d2ca9..205e08e74fe7e70368d83ab4f032ed16c09ed76a 100644 --- a/Testing/SystemTests/tests/analysis/ISIS_MariReduction.py +++ b/Testing/SystemTests/tests/analysis/ISIS_MariReduction.py @@ -132,9 +132,9 @@ class ReduceMARIFromFile(ReductionWrapper): def __init__(self,web_var_val=None): """ sets properties defaults for the instrument with Name""" ReductionWrapper.__init__(self,'MAR',web_var_val) - Mt = MethodType(self.do_preprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_preprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_preprocessing',Mt) - Mt = MethodType(self.do_postprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_postprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_postprocessing',Mt) #-------------------------------------------------------------------------------------------------# #-------------------------------------------------------------------------------------------------# @@ -251,9 +251,9 @@ class ReduceMARIFromWorkspace(ReductionWrapper): def __init__(self,web_var_val=None): """ sets properties defaults for the instrument with Name""" ReductionWrapper.__init__(self,'MAR',web_var_val) - Mt = MethodType(self.do_preprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_preprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_preprocessing',Mt) - Mt = MethodType(self.do_postprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_postprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_postprocessing',Mt) #---------------------------------------------------------------------------------------------------------------------- @@ -351,9 +351,9 @@ class ReduceMARIMon2Norm(ReductionWrapper): def __init__(self,web_var_val=None): """ sets properties defaults for the instrument with Name""" ReductionWrapper.__init__(self,'MAR',web_var_val) - Mt = MethodType(self.do_preprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_preprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_preprocessing',Mt) - Mt = MethodType(self.do_postprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_postprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_postprocessing',Mt) #---------------------------------------------------------------------------------------------------------------------- @@ -444,9 +444,9 @@ class MARIReductionSum(ReductionWrapper): def __init__(self,web_var_val=None): """ sets properties defaults for the instrument with Name""" ReductionWrapper.__init__(self,'MAR',web_var_val) - Mt = MethodType(self.do_preprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_preprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_preprocessing',Mt) - Mt = MethodType(self.do_postprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_postprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_postprocessing',Mt) #---------------------------------------------------------------------------------------------------------------------- @@ -546,9 +546,9 @@ class ReduceMARIMonitorsSeparate(ReductionWrapper): def __init__(self,web_var_val=None): """ sets properties defaults for the instrument with Name""" ReductionWrapper.__init__(self,'MAR',web_var_val) - Mt = MethodType(self.do_preprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_preprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_preprocessing',Mt) - Mt = MethodType(self.do_postprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_postprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_postprocessing',Mt) @@ -734,9 +734,9 @@ class ReduceMARIAutoEi(ReductionWrapper): def __init__(self,web_var_val=None): """ sets properties defaults for the instrument with Name""" ReductionWrapper.__init__(self,'MAR',web_var_val) - Mt = MethodType(self.do_preprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_preprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_preprocessing',Mt) - Mt = MethodType(self.do_postprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_postprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_postprocessing',Mt) #-------------------------------------------------------------------------------------------------# diff --git a/scripts/Inelastic/Direct/AbsorptionShapes.py b/scripts/Inelastic/Direct/AbsorptionShapes.py index 2f897113bc12831a0e3060257e4f53cf64a3ce73..ea3ac67de8188b81722bdc76397ae3e31b07a485 100644 --- a/scripts/Inelastic/Direct/AbsorptionShapes.py +++ b/scripts/Inelastic/Direct/AbsorptionShapes.py @@ -349,7 +349,7 @@ class Cylinder(anAbsorptionShape): def shape(self,value): shape_dict = self._set_list_property(value, 'Cylinder',['Height','Radius'], # noqa - ['Axis','Center'],[[0.,1.,0.],[0,0,0]]) # noqa + ['Axis','Center'],[[0.,1.,0.],[0.,0.,0.]]) # noqa self._ShapeDescription = shape_dict diff --git a/scripts/test/MariReduction.py b/scripts/test/MariReduction.py index 3e77abd91b83fb44196818a49dcee1dd7703f9e4..0c9c71c8b2c9d51fe7ea43d84e5ec8f940d02c66 100644 --- a/scripts/test/MariReduction.py +++ b/scripts/test/MariReduction.py @@ -266,9 +266,9 @@ class ReduceMARI(ReductionWrapper): def __init__(self,web_var=None): """ sets properties defaults for the instrument with Name""" ReductionWrapper.__init__(self,'MAR',web_var) - Mt = MethodType(self.do_preprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_preprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_preprocessing',Mt) - Mt = MethodType(self.do_postprocessing, self.reducer,DirectEnergyConversion) + Mt = MethodType(self.do_postprocessing, self.reducer) DirectEnergyConversion.__setattr__(self.reducer,'do_postprocessing',Mt) #-------------------------------------------------------------------------------------------------# def main(input_file=None,output_directory=None):