Script is now command line compatible. Now I need to adapt the GUI to…

… call this command line. This refs #5071.
mantidproject · May 2, 2012 · d28d6ba · d28d6ba
1 parent 6416581
commit d28d6ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/RefLReduction.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/RefLReduction.py
@@ -908,7 +908,7 @@ def PyExec(self):
 
             #if at least one non zero value found
             if data_x != []:
-                print '-> cleanup data (remove 0s)'
+                print '-> cleanup data (remove zeros)'
                 CreateWorkspace(OutputWorkspace=output_ws,
                                 DataX=data_x,
                                 DataY=data_y,

diff --git a/Code/Mantid/scripts/LargeScaleStructures/ScalingFactorCalculation/sfCalculator.py b/Code/Mantid/scripts/LargeScaleStructures/ScalingFactorCalculation/sfCalculator.py
@@ -615,7 +615,7 @@ def help():
 
 #if __name__ == '__main__':
 def calculate(string_runs=None, 
-              list_attenuator=None, 
+#              list_attenuator=None, 
               list_peak_back=None, 
               output_path=None,
               tof_range=None):  
@@ -631,8 +631,6 @@ def calculate(string_runs=None,
         The string runs has to be specified this way:
         string_runs = "run#1:nbr_attenuator, run#2:nbr_attenuator...."
         
-        list_attenuator: list of attenuators
-        
         the list_peak_back is specified this way:
         list_peak_back = 
             [[peak_min_run1, peak_max_run1, back_min_run1, back_max_run1],
@@ -653,7 +651,6 @@ def calculate(string_runs=None,
 #                     '55895', '55896', '55897', '55898', '55899', '55900', 
 #                     '55901', '55902']
         list_runs = ['55889', '55890', '55891', '55892', '55893', '55894'] 
-
         nexus_path = '/mnt/hgfs/j35/results/'
         pre = 'REF_L_'
         nexus_path_pre = nexus_path + pre
@@ -679,7 +676,7 @@ def calculate(string_runs=None,
 
     if (list_attenuator is None):
 #        list_attenuator = [0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4]
-        list_attenuator = [0, 1, 1, 1, 1,1];
+        list_attenuator = [0, 1, 1, 1, 1, 1];
 
     if (list_peak_back is None):
         list_peak_back = zeros((len(list_runs), 4))   #[peak_min, peak_max, back_min, back_max]