Re #10681 Minor comments and bugs found while changing system tests

mantidproject · Dec 5, 2014 · 042119f · 042119f
1 parent 8867180
commit 042119f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py b/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py
@@ -606,7 +606,7 @@ def convert_to_energy_transfer(self,wb_run=None,sample_run=None,ei_guess=None,re
 
         #the D.E.C. tries to be too clever so we have to fool it into thinking the raw file is already exists as a workspace
         sum_name=self.prop_man.instr_name+str(self.prop_man.sample_run[0])+'-sum'
-        sample_run =self.sum_files(sum_name, sample_run)
+        sample_run =self.sum_files(sum_name, self.prop_man.sample_run)
         common.apply_calibration(self.prop_man.instr_name,sample_run,self.prop_man.det_cal_file)
         self.prop_man.sample_run = sample_run
 

diff --git a/Code/Mantid/scripts/Inelastic/DirectPropertyManager.py b/Code/Mantid/scripts/Inelastic/DirectPropertyManager.py
@@ -54,7 +54,7 @@ def __get__(self,instance,owner=None):
         """ return rmm for vanadium """
         return 50.9415;
     def __set__(self,instance,value):
-        raise AttributeError(("Can not change vanadium rmm"));
+        raise AttributeError("Can not change vanadium rmm");
 #end VanadiumRMM
 #
 class DetCalFile(object):
@@ -246,7 +246,8 @@ def convert_to_list(self,spectra_list):
        return result
 
 #end SpectraToMonitorsList
-    # format to save data
+
+# format(s) to save data
 class SaveFormat(object):
    # formats available for saving
    save_formats = ['spe','nxspe','nxs'];

diff --git a/Code/Mantid/scripts/Inelastic/ReductionWrapper.py b/Code/Mantid/scripts/Inelastic/ReductionWrapper.py
@@ -93,9 +93,18 @@ def using_web_data(self):
 def iliad(F):
     def iliad_wrapper(*args):
         #seq = inspect.stack();
+
         host = args[0];
-        input_file = args[1];
-        output_directory = args[2];
+        if len(args)>1:
+            input_file = args[1];
+            if len(args)>2:
+                output_directory = args[2];
+            else:
+                output_directory =None
+        else:
+            input_file=None
+            output_directory=None
+
         use_web_variables= False;
         if host._web_var and output_directory:
             use_web_variables = True;

diff --git a/Code/Mantid/scripts/test/ReductionWrapperTest.py b/Code/Mantid/scripts/test/ReductionWrapperTest.py
@@ -59,22 +59,8 @@ def test_export_advanced_values(self):
         self.assertEqual(rv.standard_vars,main_prop);
         self.assertEqual(rv.advanced_vars,adv_prop);
 
-        # apply them to new properties.
-        #other_prop = self.prop_man;
-        #other_prop.set_input_parameters(**(rv.standard_vars));
-        #simple_prop = other_prop.getChangedProperties();
 
 
-        #other_prop.set_input_parameters(**(rv.advanced_vars));
-
-
-
-        # look what have changed and compare with initial data. 
-        #all_prop = other_prop.getChangedProperties();
-
-        #self.assertEqual(all_initial_prop,all_prop)
-        #self.assertEqual(adv_initial_prop,adv_prop)
-
         os.remove(file);
         fbase,fext = os.path.splitext(file)
         fcomp = fbase+'.pyc'