Revert "Change import of mantidplot to mantiplotpy in applicable plac…

…es."

This reverts commit 432e2fd (Re #1037)
Back to mantidplot again. Re #4538.

Code/Mantid/scripts/Interface/reduction_gui/reduction/output_script.py

@@ -6,7 +6,7 @@
     from MantidFramework import *
     mtd.initialise()
     from reduction.command_interface import *
-    import mantidplotpy
+    import mantidplot
     IS_IN_MANTIDPLOT = True
 except:
     pass
@@ -23,6 +23,6 @@ def update(self):
             self.log_text = ReductionSingleton().log_text
             try:
                 for item in ReductionSingleton().output_workspaces:
-                    mantidplotpy.plotSpectrum(item, 0, True)
+                    mantidplot.plotSpectrum(item, 0, True)
             except:
-                raise RuntimeError, "Could not plot resulting output\n  %s" % sys.exc_value
+                raise RuntimeError, "Could not plot resulting output\n  %s" % sys.exc_value

Code/Mantid/scripts/Interface/reduction_gui/reduction/reflectometer/refl_advanced_script.py

@@ -20,7 +20,7 @@
 # Check whether we are running in MantidPlot
 IS_IN_MANTIDPLOT = False
 try:
-    import mantidplotpy
+    import mantidplot
     IS_IN_MANTIDPLOT = True
 except:
     pass
@@ -170,4 +170,4 @@ def reset(self):
 #        self.data_files = []
 #    
 
-
+

Code/Mantid/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_script.py

@@ -20,7 +20,7 @@
 # Check whether we are running in MantidPlot
 IS_IN_MANTIDPLOT = False
 try:
-    import mantidplotpy
+    import mantidplot
     IS_IN_MANTIDPLOT = True
 except:
     pass
@@ -157,4 +157,4 @@ def reset(self):
 #        self.data_files = []
 #    
 
-
+

Code/Mantid/scripts/Interface/reduction_gui/reduction/reflectometer/refl_norm_script.py

@@ -20,7 +20,7 @@
 # Check whether we are running in MantidPlot
 IS_IN_MANTIDPLOT = False
 try:
-    import mantidplotpy
+    import mantidplot
     IS_IN_MANTIDPLOT = True
 except:
     pass

Code/Mantid/scripts/Interface/reduction_gui/reduction/reflectometer/refl_parameters_script.py

@@ -20,7 +20,7 @@
 # Check whether we are running in MantidPlot
 IS_IN_MANTIDPLOT = False
 try:
-    import mantidplotpy
+    import mantidplot
     IS_IN_MANTIDPLOT = True
 except:
     pass

Code/Mantid/scripts/Interface/reduction_gui/reduction/sans/hfir_background_script.py

@@ -21,7 +21,7 @@
 # Check whether we are running in MantidPlot
 IS_IN_MANTIDPLOT = False
 try:
-    import mantidplotpy
+    import mantidplot
     IS_IN_MANTIDPLOT = True
 except:
     pass

Code/Mantid/scripts/Interface/reduction_gui/reduction/sans/hfir_detector_script.py

@@ -18,7 +18,7 @@
 # Check whether we are running in MantidPlot
 IS_IN_MANTIDPLOT = False
 try:
-    import mantidplotpy
+    import mantidplot
     IS_IN_MANTIDPLOT = True
 except:
     pass

Code/Mantid/scripts/Interface/reduction_gui/reduction/sans/hfir_sample_script.py

@@ -20,7 +20,7 @@
 # Check whether we are running in MantidPlot
 IS_IN_MANTIDPLOT = False
 try:
-    import mantidplotpy
+    import mantidplot
     IS_IN_MANTIDPLOT = True
 except:
     pass

Code/Mantid/scripts/SANS/ISISCommandInterface.py

@@ -15,7 +15,7 @@
 
 # disable plotting if running outside Mantidplot
 try:
-    import mantidplotpy
+    import mantidplot
 except:
     #this should happen when this is called from outside Mantidplot and only then, the result is that attempting to plot will raise an exception
     pass
@@ -396,7 +396,7 @@ def CompWavRanges(wavelens, plot=True):
         _refresh_singleton()
 
     if plot:
-        mantidplotpy.plotSpectrum(calculated, 0)
+        mantidplot.plotSpectrum(calculated, 0)
 
     #return just the workspace name of the full range
     return calculated[0]
@@ -429,7 +429,7 @@ def PhiRanges(phis, plot=True):
         _refresh_singleton()
 
     if plot:
-        mantidplotpy.plotSpectrum(calculated, 0)
+        mantidplot.plotSpectrum(calculated, 0)
 
     #return just the workspace name of the full range
     return calculated[0]
@@ -575,16 +575,16 @@ def PlotResult(workspace, canvas=None):
 
     try:
         if numSpecs == 1:
-            graph = mantidplotpy.plotSpectrum(workspace,0)
+            graph = mantidplot.plotSpectrum(workspace,0)
         else:        
-            graph = mantidplotpy.importMatrixWorkspace(workspace.getName()).plotGraph2D()
+            graph = mantidplot.importMatrixWorkspace(workspace.getName()).plotGraph2D()
 
     except NameError:
         issueWarning('Plot functions are not available, is this being run from outside Mantidplot?')
 
     if not canvas is None:
         #we were given a handle to an existing graph, use it
-        mantidplotpy.mergePlots(canvas, graph)
+        mantidplot.mergePlots(canvas, graph)
         graph = canvas
 
     return graph
@@ -743,7 +743,7 @@ def FindBeamCentre(rlow, rupp, MaxIter = 10, xstart = None, ystart = None):
         try :
             if not graph_handle:
                 #once we have a plot it will be updated automatically when the workspaces are updated
-                graph_handle = mantidplotpy.plotSpectrum(centre.QUADS, 0)
+                graph_handle = mantidplot.plotSpectrum(centre.QUADS, 0)
             graph_handle.activeLayer().setTitle(
                         centre.status_str(it, resX, resY))
         except :