Re #16871 Another attempt to fix Python3 differences

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)
     #
 

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)
     #
 

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)
 #----------------------------------------------------------------------------------------------------------------------
 

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)
 #-------------------------------------------------------------------------------------------------#
 

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
 

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):