Fixed bug that did not allow the user to use more than 1 data file. T…

…his refs #4303
mantidproject · May 18, 2012 · a840823 · a840823
1 parent a1a2ae9
commit a840823
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/RefLReduction.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/RefLReduction.py
@@ -84,6 +84,10 @@ def PyExec(self):
         from reduction.instruments.reflectometer import wks_utility
 
         run_numbers = self.getProperty("RunNumbers")
+
+
+
+
 
         backSubMethod = 2   #1 uses RefRoi, 2 used own method
 
@@ -152,6 +156,8 @@ def PyExec(self):
 
         # Load the data into its workspace
         allow_multiple = True        
+        print run_numbers
+
         if len(run_numbers)>1 and allow_multiple:
 
             for _run in run_numbers:

diff --git a/Code/Mantid/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_script.py b/Code/Mantid/scripts/Interface/reduction_gui/reduction/reflectometer/refl_data_script.py
@@ -61,10 +61,11 @@ def to_script(self, for_automated_reduction=False):
             @param execute: if true, the script will be executed
         """
 
-        if for_automated_reduction:
-            script =  "RefLReduction(RunNumbers=[%s],\n" % ','.join([str(i) for i in self.data_files])
-        else:
-            script =  "RefLReduction(RunNumbers=[int(%s)],\n" % str(self.data_files[0])
+#        if for_automated_reduction:
+#            script =  "RefLReduction(RunNumbers=[%s],\n" % ','.join([str(i) for i in self.data_files])
+#        else:
+#            script =  "RefLReduction(RunNumbers=[int(%s)],\n" % str(self.data_files[0])
+        script =  "RefLReduction(RunNumbers=[%s],\n" % ','.join([str(i) for i in self.data_files])
         script += "              NormalizationRunNumber=%d,\n" % self.norm_file
         script += "              SignalPeakPixelRange=%s,\n" % str(self.DataPeakPixels)
         script += "              SubtractSignalBackground=%s,\n" % str(self.DataBackgroundFlag)

diff --git a/Code/Mantid/scripts/Interface/ui/reflectometer/data_refl_simple.ui b/Code/Mantid/scripts/Interface/ui/reflectometer/data_refl_simple.ui
@@ -294,6 +294,16 @@ p, li { white-space: pre-wrap; }
                         <height>16777215</height>
                        </size>
                       </property>
+                      <property name="text">
+                       <string/>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QLabel" name="label_3">
+                      <property name="text">
+                       <string>ex: 70977   or  70977,70980</string>
+                      </property>
                      </widget>
                     </item>
                    </layout>