refs #7108. Missed old api calls.

mantidproject · May 15, 2013 · 841dffd · 841dffd
1 parent accd748
commit 841dffd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py
@@ -42,7 +42,7 @@ def PyExec(self):
         # generic stuff for running
         wksp = self.getPropertyValue("OutputWorkspace")
         runs = self.getProperty("RunNumbers")
-        instr = mtd.getSettings().facility().instrument().shortName()
+        instr = config.getInstrument().shortName()
         directory = self.getPropertyValue("Directory").strip()
 
         # change here if you want something other than gsas files
@@ -59,7 +59,7 @@ def PyExec(self):
             else:
                 self.__load(directory, instr, run, loader, exts, run)
                 ConjoinWorkspaces(InputWorkspace1=wksp, InputWorkspace2=run, CheckOverlapping=False)
-                mtd.deleteWorkspace(run)
+                DeleteWorkspace(run)
 
         self.setProperty("OutputWorkspace", mtd[wksp])