Merge branch 'feature/7547_dgs_utils_to_v2' into develop

Re #7547.
Conflicts:
	Code/Mantid/scripts/CMakeLists.txt

Code/Mantid/scripts/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 set ( TEST_PY_FILES 
       test/ReducerTest.py
       test/DgreduceTest.py

Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py

@@ -1,12 +1,9 @@
-# Forced to use version 1 API.
 IS_IN_MANTIDPLOT = False
 try:
     import mantidplot
-    from MantidFramework import *
-    mtd.initialise(False)
-    from mantidsimple import *
-    import mantidplot
-
+    from mantid.kernel import config
+    from mantid.api import AnalysisDataService
+    from mantid.simpleapi import LoadEmptyInstrument
     IS_IN_MANTIDPLOT = True
 except:
     pass
@@ -26,15 +23,14 @@ def __init__(self, inst_name):
 
     def _load_param_file(self, inst_name):
         InstrumentParameters.instrument_name = inst_name
-        ws_name = "__emptyInst_" + inst_name
         if IS_IN_MANTIDPLOT:
-            idf_loc = ConfigService().getInstrumentDirectory()
+            idf_loc = config.getInstrumentDirectory()
             idf_pattern = os.path.join(idf_loc, "%s_Definition*.xml") % inst_name
             import glob
             idf_files = glob.glob(idf_pattern)
-            output = LoadEmptyInstrument(Filename=idf_files[0], 
-                                         OutputWorkspace=ws_name)
-            InstrumentParameters._instrument = output.workspace().getInstrument()
+            emptyInst = LoadEmptyInstrument(Filename=str(idf_files[0]))
+            InstrumentParameters._instrument = emptyInst.getInstrument()
+            AnalysisDataService.remove(str(emptyInst)) # Don't need to keep workspace
 
     def _self_check(self):
         if self._instrument is None: