Re #10958 Fixed output workspace name

mantidproject · Jan 26, 2015 · eabee4d · eabee4d
1 parent e0e2f49
commit eabee4d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Code/Mantid/scripts/Inelastic/Direct/ReductionWrapper.py b/Code/Mantid/scripts/Inelastic/Direct/ReductionWrapper.py
@@ -1,5 +1,6 @@
 from mantid.simpleapi import *
 from mantid import config
+from mantid.kernel import funcreturns
 
 from PropertyManager import PropertyManager
 # this import is used by children
@@ -166,7 +167,6 @@ def reduce(self,input_file=None,output_directory=None):
             Wrap it into @iliad wrapper to switch input for 
             reduction properties between script and web variables
         """ 
-
         if input_file:
            self.reducer.sample_run = input_file
 
@@ -227,6 +227,12 @@ def iliad(reduce):
     """
     def iliad_wrapper(*args):
         #seq = inspect.stack()
+        # output workspace name.
+        try:
+            n,r = funcreturns.lhs_info('both')
+            out_ws_name = r[0]
+        except:
+            out_ws_name = None
 
         host = args[0]
         if len(args)>1:
@@ -255,11 +261,16 @@ def iliad_wrapper(*args):
         else:
             pass # we should set already set up variables using 
 
-
+ 
         rez = reduce(*args)
+
         # prohibit returning workspace to web services. 
         if host._run_from_web and not isinstance(rez,str):
             rez=""
+        else:
+          if out_ws_name and rez.name() != out_ws_name :
+              rez=RenameWorkspace(InputWorkspace=rez,OutputWorkspace=out_ws_name)
+
         return rez
 
     return iliad_wrapper

diff --git a/Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py b/Code/Mantid/scripts/Inelastic/Direct/RunDescriptor.py
@@ -212,7 +212,7 @@ def file_hint(self,run_num_str,filePath=None,fileExt=None,**kwargs):
         inst_name = RunDescriptor._holder.short_inst_name
         if 'file_hint' in kwargs:
             hint = kwargs['file_hint']
-            fname,old_ext=os.path.splitext(file_hint)
+            fname,old_ext=os.path.splitext(hint)
             if len(old_ext) == 0:
                 old_ext = self.get_file_ext()
         else: