Fixed problem of labels reported when using counts vs pixel for data …

…peak/background/low-res and normalization peak/background/low-res. This refs #4303
mantidproject · May 18, 2012 · 14e3b1d · 14e3b1d
1 parent a840823
commit 14e3b1d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 9 deletions.
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/RefLReduction.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/RefLReduction.py
@@ -84,10 +84,6 @@ def PyExec(self):
         from reduction.instruments.reflectometer import wks_utility
 
         run_numbers = self.getProperty("RunNumbers")
-
-
-
-
 
         backSubMethod = 2   #1 uses RefRoi, 2 used own method
 

diff --git a/Code/Mantid/scripts/Interface/ui/reflectometer/data_refl_simple.ui b/Code/Mantid/scripts/Interface/ui/reflectometer/data_refl_simple.ui
@@ -240,7 +240,27 @@ p, li { white-space: pre-wrap; }
                    </property>
                    <item>
                     <property name="text">
-                     <string>H20</string>
+                     <string>Air (2&quot;)</string>
+                    </property>
+                   </item>
+                   <item>
+                    <property name="text">
+                     <string>Air (3&quot;)</string>
+                    </property>
+                   </item>
+                   <item>
+                    <property name="text">
+                     <string>Si</string>
+                    </property>
+                   </item>
+                   <item>
+                    <property name="text">
+                     <string>Sapphire</string>
+                    </property>
+                   </item>
+                   <item>
+                    <property name="text">
+                     <string>Quartz</string>
                     </property>
                    </item>
                   </widget>

diff --git a/Code/Mantid/scripts/Interface/ui/reflectometer/ui_data_refl_simple.py b/Code/Mantid/scripts/Interface/ui/reflectometer/ui_data_refl_simple.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data_refl_simple.ui'
 #
-# Created: Wed May 16 10:19:43 2012
+# Created: Fri May 18 11:57:23 2012
 #      by: PyQt4 UI code generator 4.7.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -114,6 +114,10 @@ def setupUi(self, Frame):
         self.incident_medium_combobox.setEditable(True)
         self.incident_medium_combobox.setObjectName("incident_medium_combobox")
         self.incident_medium_combobox.addItem("")
+        self.incident_medium_combobox.addItem("")
+        self.incident_medium_combobox.addItem("")
+        self.incident_medium_combobox.addItem("")
+        self.incident_medium_combobox.addItem("")
         self.horizontalLayout_22.addWidget(self.incident_medium_combobox)
         self.verticalLayout_4.addLayout(self.horizontalLayout_22)
         self.groupBox = QtGui.QGroupBox(self.scrollAreaWidgetContents)
@@ -136,8 +140,12 @@ def setupUi(self, Frame):
         self.horizontalLayout.addWidget(self.label)
         self.data_run_number_edit = QtGui.QLineEdit(self.groupBox)
         self.data_run_number_edit.setMaximumSize(QtCore.QSize(16777215, 16777215))
+        self.data_run_number_edit.setText("")
         self.data_run_number_edit.setObjectName("data_run_number_edit")
         self.horizontalLayout.addWidget(self.data_run_number_edit)
+        self.label_3 = QtGui.QLabel(self.groupBox)
+        self.label_3.setObjectName("label_3")
+        self.horizontalLayout.addWidget(self.label_3)
         self.verticalLayout.addLayout(self.horizontalLayout)
         self.horizontalLayout_3 = QtGui.QHBoxLayout()
         self.horizontalLayout_3.setSpacing(0)
@@ -1287,9 +1295,14 @@ def retranslateUi(self, Frame):
         self.refm_radio.setText(QtGui.QApplication.translate("Frame", "Magnetic Reflectometer (REF_M)", None, QtGui.QApplication.UnicodeUTF8))
         self.refl_radio.setText(QtGui.QApplication.translate("Frame", "Liquids Reflectometer (REF_L)", None, QtGui.QApplication.UnicodeUTF8))
         self.outdir_label_2.setText(QtGui.QApplication.translate("Frame", "Incident medium", None, QtGui.QApplication.UnicodeUTF8))
-        self.incident_medium_combobox.setItemText(0, QtGui.QApplication.translate("Frame", "H20", None, QtGui.QApplication.UnicodeUTF8))
+        self.incident_medium_combobox.setItemText(0, QtGui.QApplication.translate("Frame", "Air (2\")", None, QtGui.QApplication.UnicodeUTF8))
+        self.incident_medium_combobox.setItemText(1, QtGui.QApplication.translate("Frame", "Air (3\")", None, QtGui.QApplication.UnicodeUTF8))
+        self.incident_medium_combobox.setItemText(2, QtGui.QApplication.translate("Frame", "Si", None, QtGui.QApplication.UnicodeUTF8))
+        self.incident_medium_combobox.setItemText(3, QtGui.QApplication.translate("Frame", "Sapphire", None, QtGui.QApplication.UnicodeUTF8))
+        self.incident_medium_combobox.setItemText(4, QtGui.QApplication.translate("Frame", "Quartz", None, QtGui.QApplication.UnicodeUTF8))
         self.groupBox.setTitle(QtGui.QApplication.translate("Frame", "Data Set", None, QtGui.QApplication.UnicodeUTF8))
         self.label.setText(QtGui.QApplication.translate("Frame", "Run number", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_3.setText(QtGui.QApplication.translate("Frame", "ex: 70977   or  70977,70980", None, QtGui.QApplication.UnicodeUTF8))
         self.label_2.setText(QtGui.QApplication.translate("Frame", "Peak selection", None, QtGui.QApplication.UnicodeUTF8))
         self.data_peak_from_pixel_label.setText(QtGui.QApplication.translate("Frame", "from pixel", None, QtGui.QApplication.UnicodeUTF8))
         self.data_peak_from_pixel.setText(QtGui.QApplication.translate("Frame", "0", None, QtGui.QApplication.UnicodeUTF8))

diff --git a/Code/Mantid/scripts/reduction/instruments/reflectometer/data_manipulation.py b/Code/Mantid/scripts/reduction/instruments/reflectometer/data_manipulation.py
@@ -55,9 +55,9 @@ def counts_vs_pixel_distribution(file_path, is_pixel_y=True, callback=None,
             type = 'Background'
         ws_output_base =  type + " - " + basename
         if is_pixel_y is False:
-            x_title = "Y pixel"
-        else:
             x_title = "X pixel"
+        else:
+            x_title = "Y pixel"
     else:
         ws_output_base = "Counts vs Y pixel - %s" % basename
         x_title = "Y pixel"