refs #7108. Fix system tests.

mantidproject · May 16, 2013 · 257c256 · 257c256
1 parent 5246d67
commit 257c256
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py b/Code/Mantid/Framework/PythonInterface/plugins/algorithms/ConjoinFiles.py
@@ -17,6 +17,7 @@ def name(self):
         return "ConjoinFiles"
 
     def __load(self, directory, instr, run, loader, exts, wksp):
+        filename = None
         for ext in exts:
             filename = "%s_%s%s" % (instr, str(run), ext)
             if len(directory) > 0:
@@ -25,11 +26,12 @@ def __load(self, directory, instr, run, loader, exts, wksp):
                     continue
             try:
                 self.log().information("Trying to load '%s'" % filename)
-                loader(filename, wksp)
+                loader(Filename=filename, OutputWorkspace=wksp)
                 return
             except Exception, e:
+                logger.information(str(e))
                 pass
-        raise RuntimeError("Failed to load run %s" % str(run))              
+        raise RuntimeError("Failed to load run %s from file %s" % (str(run), filename))              
 
     def PyInit(self):
         greaterThanZero = IntArrayBoundedValidator()
@@ -44,7 +46,7 @@ def PyExec(self):
         runs = self.getProperty("RunNumbers")
         instr = config.getInstrument().shortName()
         directory = self.getPropertyValue("Directory").strip()
-
+        
         # change here if you want something other than gsas files
         exts = ['.txt', '.gsa']
         loader = LoadGSS
@@ -59,7 +61,8 @@ def PyExec(self):
             else:
                 self.__load(directory, instr, run, loader, exts, run)
                 ConjoinWorkspaces(InputWorkspace1=wksp, InputWorkspace2=run, CheckOverlapping=False)
-                DeleteWorkspace(run)
+                if mtd.doesExist(run):
+                    DeleteWorkspace(run)
 
         self.setProperty("OutputWorkspace", mtd[wksp])