Refactor remaining scripts

Refs #11144

Code/Mantid/scripts/LargeScaleStructures/ScalingFactorCalculation/sfCalculator.py

@@ -149,7 +149,7 @@ def _calculateFinalYAxis(self, bNumerator=True):
         ws_event_data = LoadEventNexus(Filename=nexus_file_numerator,
                                        OutputWorkspace='EventDataWks')
         mt1 = mtd['EventDataWks']
-        
+
         is_nexus_detector_rotated_flag = wks_utility.isNexusTakeAfterRefDate(ws_event_data.getRun().getProperty('run_start').value)
         if is_nexus_detector_rotated_flag:
             self.alpha_pixel_nbr = 304
@@ -376,7 +376,7 @@ def plotObject(instance):
              linestyle='',
              label='Exp. data')
 
-    if (instance.a is not None):
+    if instance.a is not None:
         x = linspace(10000, 22000, 100)
         _label = "%.3f + x*%.2e" % (instance.a, instance.b)
         plot(x, instance.a + instance.b * x, label=_label)

Code/Mantid/scripts/LargeScaleStructures/geometry_writer.py

@@ -2,7 +2,8 @@
 from xml.dom.minidom import getDOMImplementation
 from datetime import datetime
 import re
-class MantidGeom:
+
+class MantidGeom(object):
 
     def __init__(self, instname, valid_from=None):
         if valid_from is None:

Code/Mantid/scripts/PyChop/fluxGUI.py

@@ -13,6 +13,16 @@
 
 class MainWindow(QtGui.QMainWindow):
 
+    flux_matrix = None
+    flux_energies = None
+    res_matrix = None
+    res_energies = None
+    frequencies = None
+    ei = None
+    ei_min = None
+    ei_max = None
+    interpolation = None
+
     def __init__(self, parent=None):
         QtGui.QMainWindow.__init__(self,parent)
         self.ui = Ui_MainWindow()

Code/Mantid/scripts/reducer_singleton.py

@@ -35,7 +35,7 @@ def execute(self, reducer, inputworkspace=None, outputworkspace=None):
             @param inputworkspace: Name of the workspace to apply this step to
             @param outputworkspace: Name of the workspace to have as an output. If this is None it will be set to inputworkspace
         """
-        raise NotImplemented
+        raise NotImplementedError
 
 class Reducer(object):
     """
@@ -159,7 +159,7 @@ def reduce(self):
 
 
 
-class ReductionSingleton:
+class ReductionSingleton(object):
     """ Singleton reduction class """
 
     ## storage for the instance reference

Code/Mantid/scripts/reduction/__init__.py

@@ -1,3 +1,3 @@
-from reducer import *
-from instrument import *
-from find_data import find_data, find_file
+from reduction.reducer import *
+from reduction.instrument import *
+from reduction.find_data import find_data, find_file

Code/Mantid/scripts/reduction/command_interface.py

@@ -3,9 +3,9 @@
     List of user commands.
 """
 
-from reducer import Reducer
+from reduction.reducer import Reducer
 
-class ReductionSingleton:
+class ReductionSingleton(object):
     """ Singleton reduction class """
 
     ## storage for the instance reference

Code/Mantid/scripts/reduction/reducer.py

@@ -23,14 +23,14 @@
 import time
 import types
 import inspect
-from instrument import Instrument
+from reduction.instrument import Instrument
 import mantid
 from mantid import simpleapi
 import warnings
 import inspect
 import random
 import string
-from find_data import find_data
+from reduction.find_data import find_data
 
 
 ## Version number
@@ -538,7 +538,7 @@ def execute(self, reducer, inputworkspace=None, outputworkspace=None):
             @param inputworkspace: Name of the workspace to apply this step to
             @param outputworkspace: Name of the workspace to have as an output. If this is None it will be set to inputworkspace
         """
-        raise NotImplemented
+        raise NotImplementedError
 
 
 def extract_workspace_name(filepath, suffix=''):

Code/Mantid/scripts/reduction_workflow/command_interface.py

@@ -3,9 +3,9 @@
     List of user commands.
 """
 
-from reducer import Reducer
+from reduction_workflow.reducer import Reducer
 
-class ReductionSingleton:
+class ReductionSingleton(object):
     """ Singleton reduction class """
 
     ## storage for the instance reference