diff --git a/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_absolute_units_script.py b/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_absolute_units_script.py
index 8424133db5b593fa8f4ec4c868f088f099d69857..de3ccd633d7db79dba4355df51c8cbfce82d7725 100644
--- a/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_absolute_units_script.py
+++ b/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_absolute_units_script.py
@@ -19,13 +19,33 @@ class AbsoluteUnitsScript(BaseScriptElement):
emin = -1.0
emax = 1.0
vandium_mass = 32.58
+ vanadium_rmm = 50.9415
sample_mass = 1.0
sample_rmm = 1.0
+ absunits_median_test_high = 1.2
+ absunits_median_test_low = 0.8
+ absunits_median_test_out_high = 100
+ absunits_median_test_out_low = 0.01
+ absunits_errorbar_criterion = 0.0
- def __init__(self):
+ def __init__(self, inst_name):
super(AbsoluteUnitsScript, self).__init__()
+ self.set_default_pars(inst_name)
self.reset()
+ def set_default_pars(self, inst_name):
+ import dgs_utils
+ ip = dgs_utils.InstrumentParameters(inst_name)
+ AbsoluteUnitsScript.emin = ip.get_parameter("monovan-integr-min")
+ AbsoluteUnitsScript.emax = ip.get_parameter("monovan-integr-max")
+ AbsoluteUnitsScript.vandium_mass = ip.get_parameter("vanadium-mass")
+ AbsoluteUnitsScript.vandium_rmm = ip.get_parameter("vanadium-rmm")
+ AbsoluteUnitsScript.absunits_median_test_out_high = ip.get_parameter("monovan_hi_bound")
+ AbsoluteUnitsScript.absunits_median_test_out_low = ip.get_parameter("monovan_lo_bound")
+ AbsoluteUnitsScript.absunits_median_test_high = ip.get_parameter("monovan_hi_frac")
+ AbsoluteUnitsScript.absunits_median_test_low = ip.get_parameter("monovan_lo_frac")
+ AbsoluteUnitsScript.absunits_errorbar_criterion = ip.get_parameter("diag_samp_sig")
+
def to_script(self):
script = ""
if self.do_absolute_units:
@@ -43,10 +63,22 @@ class AbsoluteUnitsScript(BaseScriptElement):
script += "AbsUnitsMaximumEnergy=%s,\n" % str(self.emax)
if self.vandium_mass != AbsoluteUnitsScript.vandium_mass:
script += "VanadiumMass=%s,\n" % str(self.vandium_mass)
+ if self.vanadium_rmm != AbsoluteUnitsScript.vanadium_rmm:
+ script += "VanadiumRmm=%s,\n" % str(self.vanadium_rmm)
if self.sample_mass != AbsoluteUnitsScript.sample_mass:
script += "SampleMass=%s,\n" % str(self.sample_mass)
if self.sample_rmm != AbsoluteUnitsScript.sample_rmm:
script += "SampleRmm=%s,\n" % str(self.sample_rmm)
+ if self.absunits_median_test_out_low != AbsoluteUnitsScript.absunits_median_test_out_low:
+ script += "AbsUnitsLowOutlier=%s,\n" % str(self.absunits_median_test_out_low)
+ if self.absunits_median_test_out_high != AbsoluteUnitsScript.absunits_median_test_out_high:
+ script += "AbsUnitsHighOutlier=%s,\n" % str(self.absunits_median_test_out_high)
+ if self.absunits_median_test_high != AbsoluteUnitsScript.absunits_median_test_high:
+ script += "AbsUnitsMedianTestHigh=%s,\n" % str(self.absunits_median_test_high)
+ if self.absunits_median_test_low != AbsoluteUnitsScript.absunits_median_test_low:
+ script += "AbsUnitsMedianTestLow=%s,\n" % str(self.absunits_median_test_low)
+ if self.absunits_errorbar_criterion != AbsoluteUnitsScript.absunits_errorbar_criterion:
+ script += "AbsUnitsErrorBarCriterion=%s,\n" % str(self.absunits_errorbar_criterion)
return script
def to_xml(self):
@@ -62,8 +94,14 @@ class AbsoluteUnitsScript(BaseScriptElement):
xml += " <minimum_energy>%s</minimum_energy>\n" % str(self.emin)
xml += " <maximum_energy>%s</maximum_energy>\n" % str(self.emax)
xml += " <vanadium_mass>%s</vanadium_mass>\n" % str(self.vandium_mass)
+ xml += " <vanadium_rmm>%s</vanadium_rmm>\n" % str(self.vandium_rmm)
xml += " <sample_mass>%s</sample_mass>\n" % str(self.sample_mass)
xml += " <sample_rmm>%s</sample_rmm>\n" % str(self.sample_rmm)
+ xml += " <median_test_outlier_low>%s</median_test_outlier_low>\n" % str(self.absunits_median_test_out_low)
+ xml += " <median_test_outlier_high>%s</median_test_outlier_high>\n" % str(self.absunits_median_test_out_high)
+ xml += " <median_test_low>%s</median_test_low>\n" % str(self.absunits_median_test_low)
+ xml += " <median_test_high>%s</median_test_high>\n" % str(self.absunits_median_test_high)
+ xml += " <errorbar_criterion>%s</errorbar_criterion>\n" % str(self.absunits_errorbar_criterion)
xml += "</AbsoluteUnits>\n"
return xml
@@ -100,12 +138,30 @@ class AbsoluteUnitsScript(BaseScriptElement):
self.vandium_mass = BaseScriptElement.getFloatElement(instrument_dom,
"vanadium_mass",
default=AbsoluteUnitsScript.vandium_mass)
+ self.vandium_rmm = BaseScriptElement.getFloatElement(instrument_dom,
+ "vanadium_rmm",
+ default=AbsoluteUnitsScript.vandium_rmm)
self.sample_mass = BaseScriptElement.getFloatElement(instrument_dom,
"sample_mass",
default=AbsoluteUnitsScript.sample_mass)
self.sample_rmm = BaseScriptElement.getFloatElement(instrument_dom,
"sample_rmm",
default=AbsoluteUnitsScript.sample_rmm)
+ self.absunits_median_test_out_low = BaseScriptElement.getFloatElement(instrument_dom,
+ "median_test_out_low",
+ default=AbsoluteUnitsScript.absunits_median_test_out_low)
+ self.absunits_median_test_out_high = BaseScriptElement.getFloatElement(instrument_dom,
+ "median_test_out_high",
+ default=AbsoluteUnitsScript.absunits_median_test_out_high)
+ self.absunits_median_test_low = BaseScriptElement.getFloatElement(instrument_dom,
+ "median_test_low",
+ default=AbsoluteUnitsScript.absunits_median_test_low)
+ self.absunits_median_test_high = BaseScriptElement.getFloatElement(instrument_dom,
+ "median_test_high",
+ default=AbsoluteUnitsScript.absunits_median_test_high)
+ self.absunits_errorbar_criterion = BaseScriptElement.getFloatElement(instrument_dom,
+ "errorbar_criterion",
+ default=AbsoluteUnitsScript.absunits_errorbar_criterion)
def reset(self):
"""
@@ -119,5 +175,11 @@ class AbsoluteUnitsScript(BaseScriptElement):
self.emin = AbsoluteUnitsScript.emin
self.emax = AbsoluteUnitsScript.emax
self.vandium_mass = AbsoluteUnitsScript.vandium_mass
+ self.vandium_rmm = AbsoluteUnitsScript.vandium_rmm
self.sample_mass = AbsoluteUnitsScript.sample_mass
- self.sample_rmm = AbsoluteUnitsScript.sample_rmm
\ No newline at end of file
+ self.sample_rmm = AbsoluteUnitsScript.sample_rmm
+ self.absunits_median_test_out_low = AbsoluteUnitsScript.absunits_median_test_out_low
+ self.absunits_median_test_out_high = AbsoluteUnitsScript.absunits_median_test_out_high
+ self.absunits_median_test_low = AbsoluteUnitsScript.absunits_median_test_low
+ self.absunits_median_test_high = AbsoluteUnitsScript.absunits_median_test_high
+ self.absunits_errorbar_criterion = AbsoluteUnitsScript.absunits_errorbar_criterion
diff --git a/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py b/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py
index cc76471c1b627fab47694028bfc3e6a0340ed875..bcb3d9f0f4a641fab715fdda8dab5f51cb44f7d8 100644
--- a/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py
+++ b/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_utils.py
@@ -23,6 +23,8 @@ class InstrumentParameters(object):
else:
if self.instrument_name != inst_name:
self._load_param_file(inst_name)
+ else:
+ print "Doing nothing"
def _load_param_file(self, inst_name):
InstrumentParameters.instrument_name = inst_name
diff --git a/Code/Mantid/scripts/Interface/reduction_gui/widgets/inelastic/dgs_absolute_units.py b/Code/Mantid/scripts/Interface/reduction_gui/widgets/inelastic/dgs_absolute_units.py
index 5403b47bd7909fda7f803aaf7e836d38139294d9..2ccf08a9b1b1c8d9cb2a4af7a3b6c2d77c97a21b 100644
--- a/Code/Mantid/scripts/Interface/reduction_gui/widgets/inelastic/dgs_absolute_units.py
+++ b/Code/Mantid/scripts/Interface/reduction_gui/widgets/inelastic/dgs_absolute_units.py
@@ -23,17 +23,30 @@ class AbsoluteUnitsWidget(BaseWidget):
self._content = AbsUnitsFrame(self)
self._layout.addWidget(self._content)
self.initialize_content()
+ self._instrument_name = settings.instrument_name
if state is not None:
self.set_state(state)
else:
- self.set_state(AbsoluteUnitsScript())
+ self.set_state(AbsoluteUnitsScript(self._instrument_name))
def initialize_content(self):
# Constraints
- dvp = QtGui.QDoubleValidator(self._content.ei_edit)
- dvp.setBottom(0.0)
- self._content.ei_edit.setValidator(dvp)
+ for widget in [
+ self._content.ei_edit,
+ self._content.van_rmm_edit,
+ self._content.sample_mass_edit,
+ self._content.sample_rmm_edit,
+ self._content.median_test_high_edit,
+ self._content.median_test_low_edit,
+ self._content.median_test_out_high_edit,
+ self._content.median_test_out_low_edit,
+ self._content.errorbar_crit_edit,
+ ]:
+
+ dvp = QtGui.QDoubleValidator(widget)
+ dvp.setBottom(0.0)
+ widget.setValidator(dvp)
# Connections
self.connect(self._content.absunits_van_browse, QtCore.SIGNAL("clicked()"),
@@ -71,14 +84,21 @@ class AbsoluteUnitsWidget(BaseWidget):
self._content.emin_edit.setText(QtCore.QString(str(state.emin)))
self._content.emax_edit.setText(QtCore.QString(str(state.emax)))
self._content.van_mass_edit.setText(QtCore.QString(str(state.vandium_mass)))
+ self._content.van_rmm_edit.setText(QtCore.QString(str(state.vandium_rmm)))
self._content.sample_mass_edit.setText(QtCore.QString(str(state.sample_mass)))
self._content.sample_rmm_edit.setText(QtCore.QString(str(state.sample_rmm)))
+ self._content.median_test_high_edit.setText(QtCore.QString(str(state.absunits_median_test_high)))
+ self._content.median_test_low_edit.setText(QtCore.QString(str(state.absunits_median_test_low)))
+ self._content.median_test_out_high_edit.setText(QtCore.QString(str(state.absunits_median_test_out_high)))
+ self._content.median_test_out_low_edit.setText(QtCore.QString(str(state.absunits_median_test_out_low)))
+ self._content.errorbar_crit_edit.setText(QtCore.QString(str(state.absunits_errorbar_criterion)))
+
def get_state(self):
"""
Returns an object with the state of the interface
"""
- a = AbsoluteUnitsScript()
+ a = AbsoluteUnitsScript(self._instrument_name)
a.do_absolute_units = self._content.absunits_gb.isChecked()
a.absunits_vanadium = self._content.absunits_van_edit.text()
a.grouping_file = self._content.grouping_file_edit.text()
@@ -87,7 +107,14 @@ class AbsoluteUnitsWidget(BaseWidget):
a.emin = util._check_and_get_float_line_edit(self._content.emin_edit)
a.emax = util._check_and_get_float_line_edit(self._content.emax_edit)
a.vanadium_mass = util._check_and_get_float_line_edit(self._content.van_mass_edit)
+ a.vanadium_rmm = util._check_and_get_float_line_edit(self._content.van_rmm_edit)
a.sample_mass = util._check_and_get_float_line_edit(self._content.sample_mass_edit)
a.sample_rmm = util._check_and_get_float_line_edit(self._content.sample_rmm_edit)
+ a.absunits_median_test_high = util._check_and_get_float_line_edit(self._content.median_test_high_edit)
+ a.absunits_median_test_low = util._check_and_get_float_line_edit(self._content.median_test_low_edit)
+ a.absunits_median_test_out_high = util._check_and_get_float_line_edit(self._content.median_test_out_high_edit)
+ a.absunits_median_test_out_low = util._check_and_get_float_line_edit(self._content.median_test_out_low_edit)
+ a.absunits_errorbar_criterion = util._check_and_get_float_line_edit(self._content.errorbar_crit_edit)
+
return a
diff --git a/Code/Mantid/scripts/Interface/ui/inelastic/dgs_absolute_units.ui b/Code/Mantid/scripts/Interface/ui/inelastic/dgs_absolute_units.ui
index e2003b73086c1842e81775ef25fe8739c7d8d8e8..9c6e1e1489c2f8a0cb4f835973e06f84fabfeccc 100644
--- a/Code/Mantid/scripts/Interface/ui/inelastic/dgs_absolute_units.ui
+++ b/Code/Mantid/scripts/Interface/ui/inelastic/dgs_absolute_units.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>1011</width>
- <height>514</height>
+ <height>704</height>
</rect>
</property>
<property name="windowTitle">
@@ -19,7 +19,7 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_5">
+ <layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<widget class="QGroupBox" name="absunits_gb">
<property name="title">
@@ -31,7 +31,7 @@
<property name="checked">
<bool>false</bool>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
+ <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QGroupBox" name="run_files_gb">
<property name="title">
@@ -318,7 +318,7 @@
</size>
</property>
<property name="text">
- <string>Vanadium mass</string>
+ <string>Vanadium Mass</string>
</property>
</widget>
</item>
@@ -347,6 +347,46 @@
</item>
</layout>
</item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
+ <item>
+ <widget class="QLabel" name="van_rmm_label">
+ <property name="minimumSize">
+ <size>
+ <width>225</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Vanadium RMM</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="van_rmm_edit">
+ <property name="maximumSize">
+ <size>
+ <width>100</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_10">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
@@ -437,21 +477,184 @@
</widget>
</item>
<item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>171</height>
- </size>
+ <widget class="QGroupBox" name="diag_gb">
+ <property name="title">
+ <string>Diagnostic Parameters</string>
</property>
- </spacer>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_10">
+ <item>
+ <widget class="QLabel" name="median_test_out_high_label">
+ <property name="text">
+ <string>Median high outliers</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="median_test_out_high_edit">
+ <property name="maximumSize">
+ <size>
+ <width>100</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="median_test_out_low_label">
+ <property name="text">
+ <string>Median low outliers</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="median_test_out_low_edit">
+ <property name="maximumSize">
+ <size>
+ <width>100</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_11">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_11">
+ <item>
+ <widget class="QLabel" name="median_test_high_label">
+ <property name="minimumSize">
+ <size>
+ <width>137</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Median test high</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="median_test_high_edit">
+ <property name="maximumSize">
+ <size>
+ <width>100</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="median_test_low_label">
+ <property name="minimumSize">
+ <size>
+ <width>132</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Median test low</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="median_test_low_edit">
+ <property name="maximumSize">
+ <size>
+ <width>100</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_12">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_12">
+ <item>
+ <widget class="QLabel" name="errorbar_crit_label">
+ <property name="minimumSize">
+ <size>
+ <width>137</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Errorbar criterion</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="errorbar_crit_edit">
+ <property name="maximumSize">
+ <size>
+ <width>100</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_13">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
</item>
</layout>
</widget>
</item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>962</width>
+ <height>81</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
<resources/>
diff --git a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_absolute_units.py b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_absolute_units.py
index 4aca47cd7be5b9f34e250ae9f0588108745d78f4..d7b869fda7e9c27760dfc6155d7fab0c531a1782 100644
--- a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_absolute_units.py
+++ b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_absolute_units.py
@@ -2,86 +2,91 @@
# Form implementation generated from reading ui file 'ui/inelastic/dgs_absolute_units.ui'
#
-# Created: Mon Jun 18 16:12:24 2012
-# by: PyQt4 UI code generator 4.7.4
+# Created: Wed Oct 3 15:57:47 2012
+# by: PyQt4 UI code generator 4.9.1
#
# WARNING! All changes made in this file will be lost!
from PyQt4 import QtCore, QtGui
+try:
+ _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+ _fromUtf8 = lambda s: s
+
class Ui_AbsUnitsFrame(object):
def setupUi(self, AbsUnitsFrame):
- AbsUnitsFrame.setObjectName("AbsUnitsFrame")
- AbsUnitsFrame.resize(1011, 514)
+ AbsUnitsFrame.setObjectName(_fromUtf8("AbsUnitsFrame"))
+ AbsUnitsFrame.resize(1011, 704)
AbsUnitsFrame.setFrameShape(QtGui.QFrame.StyledPanel)
AbsUnitsFrame.setFrameShadow(QtGui.QFrame.Raised)
- self.verticalLayout_5 = QtGui.QVBoxLayout(AbsUnitsFrame)
- self.verticalLayout_5.setObjectName("verticalLayout_5")
+ self.verticalLayout_6 = QtGui.QVBoxLayout(AbsUnitsFrame)
+ self.verticalLayout_6.setObjectName(_fromUtf8("verticalLayout_6"))
self.absunits_gb = QtGui.QGroupBox(AbsUnitsFrame)
self.absunits_gb.setCheckable(True)
self.absunits_gb.setChecked(False)
- self.absunits_gb.setObjectName("absunits_gb")
- self.verticalLayout_4 = QtGui.QVBoxLayout(self.absunits_gb)
- self.verticalLayout_4.setObjectName("verticalLayout_4")
+ self.absunits_gb.setObjectName(_fromUtf8("absunits_gb"))
+ self.verticalLayout_5 = QtGui.QVBoxLayout(self.absunits_gb)
+ self.verticalLayout_5.setObjectName(_fromUtf8("verticalLayout_5"))
self.run_files_gb = QtGui.QGroupBox(self.absunits_gb)
- self.run_files_gb.setObjectName("run_files_gb")
+ self.run_files_gb.setObjectName(_fromUtf8("run_files_gb"))
self.verticalLayout = QtGui.QVBoxLayout(self.run_files_gb)
- self.verticalLayout.setObjectName("verticalLayout")
+ self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
self.horizontalLayout = QtGui.QHBoxLayout()
- self.horizontalLayout.setObjectName("horizontalLayout")
+ self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
self.absunits_van_label = QtGui.QLabel(self.run_files_gb)
self.absunits_van_label.setMinimumSize(QtCore.QSize(225, 0))
- self.absunits_van_label.setObjectName("absunits_van_label")
+ self.absunits_van_label.setObjectName(_fromUtf8("absunits_van_label"))
self.horizontalLayout.addWidget(self.absunits_van_label)
self.absunits_van_edit = QtGui.QLineEdit(self.run_files_gb)
- self.absunits_van_edit.setObjectName("absunits_van_edit")
+ self.absunits_van_edit.setObjectName(_fromUtf8("absunits_van_edit"))
self.horizontalLayout.addWidget(self.absunits_van_edit)
self.absunits_van_browse = QtGui.QPushButton(self.run_files_gb)
- self.absunits_van_browse.setObjectName("absunits_van_browse")
+ self.absunits_van_browse.setObjectName(_fromUtf8("absunits_van_browse"))
self.horizontalLayout.addWidget(self.absunits_van_browse)
spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout.addItem(spacerItem)
self.verticalLayout.addLayout(self.horizontalLayout)
self.horizontalLayout_2 = QtGui.QHBoxLayout()
- self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+ self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2"))
self.grouping_file_label = QtGui.QLabel(self.run_files_gb)
self.grouping_file_label.setMinimumSize(QtCore.QSize(225, 0))
- self.grouping_file_label.setObjectName("grouping_file_label")
+ self.grouping_file_label.setObjectName(_fromUtf8("grouping_file_label"))
self.horizontalLayout_2.addWidget(self.grouping_file_label)
self.grouping_file_edit = QtGui.QLineEdit(self.run_files_gb)
- self.grouping_file_edit.setObjectName("grouping_file_edit")
+ self.grouping_file_edit.setObjectName(_fromUtf8("grouping_file_edit"))
self.horizontalLayout_2.addWidget(self.grouping_file_edit)
self.grouping_file_browse = QtGui.QPushButton(self.run_files_gb)
- self.grouping_file_browse.setObjectName("grouping_file_browse")
+ self.grouping_file_browse.setObjectName(_fromUtf8("grouping_file_browse"))
self.horizontalLayout_2.addWidget(self.grouping_file_browse)
spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_2.addItem(spacerItem1)
self.verticalLayout.addLayout(self.horizontalLayout_2)
self.horizontalLayout_3 = QtGui.QHBoxLayout()
- self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+ self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3"))
self.absunits_detvan_label = QtGui.QLabel(self.run_files_gb)
self.absunits_detvan_label.setMinimumSize(QtCore.QSize(225, 0))
- self.absunits_detvan_label.setObjectName("absunits_detvan_label")
+ self.absunits_detvan_label.setObjectName(_fromUtf8("absunits_detvan_label"))
self.horizontalLayout_3.addWidget(self.absunits_detvan_label)
self.absunits_detvan_edit = QtGui.QLineEdit(self.run_files_gb)
- self.absunits_detvan_edit.setObjectName("absunits_detvan_edit")
+ self.absunits_detvan_edit.setObjectName(_fromUtf8("absunits_detvan_edit"))
self.horizontalLayout_3.addWidget(self.absunits_detvan_edit)
self.absunits_detvan_browse = QtGui.QPushButton(self.run_files_gb)
- self.absunits_detvan_browse.setObjectName("absunits_detvan_browse")
+ self.absunits_detvan_browse.setObjectName(_fromUtf8("absunits_detvan_browse"))
self.horizontalLayout_3.addWidget(self.absunits_detvan_browse)
spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_3.addItem(spacerItem2)
self.verticalLayout.addLayout(self.horizontalLayout_3)
- self.verticalLayout_4.addWidget(self.run_files_gb)
+ self.verticalLayout_5.addWidget(self.run_files_gb)
self.integration_gb = QtGui.QGroupBox(self.absunits_gb)
- self.integration_gb.setObjectName("integration_gb")
+ self.integration_gb.setObjectName(_fromUtf8("integration_gb"))
self.verticalLayout_2 = QtGui.QVBoxLayout(self.integration_gb)
- self.verticalLayout_2.setObjectName("verticalLayout_2")
+ self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
self.horizontalLayout_4 = QtGui.QHBoxLayout()
- self.horizontalLayout_4.setObjectName("horizontalLayout_4")
+ self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4"))
self.ei_label = QtGui.QLabel(self.integration_gb)
self.ei_label.setMinimumSize(QtCore.QSize(225, 0))
- self.ei_label.setObjectName("ei_label")
+ self.ei_label.setObjectName(_fromUtf8("ei_label"))
self.horizontalLayout_4.addWidget(self.ei_label)
self.ei_edit = QtGui.QLineEdit(self.integration_gb)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -90,16 +95,16 @@ class Ui_AbsUnitsFrame(object):
sizePolicy.setHeightForWidth(self.ei_edit.sizePolicy().hasHeightForWidth())
self.ei_edit.setSizePolicy(sizePolicy)
self.ei_edit.setMaximumSize(QtCore.QSize(100, 16777215))
- self.ei_edit.setObjectName("ei_edit")
+ self.ei_edit.setObjectName(_fromUtf8("ei_edit"))
self.horizontalLayout_4.addWidget(self.ei_edit)
spacerItem3 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_4.addItem(spacerItem3)
self.verticalLayout_2.addLayout(self.horizontalLayout_4)
self.horizontalLayout_5 = QtGui.QHBoxLayout()
- self.horizontalLayout_5.setObjectName("horizontalLayout_5")
+ self.horizontalLayout_5.setObjectName(_fromUtf8("horizontalLayout_5"))
self.emin_label = QtGui.QLabel(self.integration_gb)
self.emin_label.setMinimumSize(QtCore.QSize(225, 0))
- self.emin_label.setObjectName("emin_label")
+ self.emin_label.setObjectName(_fromUtf8("emin_label"))
self.horizontalLayout_5.addWidget(self.emin_label)
self.emin_edit = QtGui.QLineEdit(self.integration_gb)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -108,12 +113,12 @@ class Ui_AbsUnitsFrame(object):
sizePolicy.setHeightForWidth(self.emin_edit.sizePolicy().hasHeightForWidth())
self.emin_edit.setSizePolicy(sizePolicy)
self.emin_edit.setMaximumSize(QtCore.QSize(100, 16777215))
- self.emin_edit.setObjectName("emin_edit")
+ self.emin_edit.setObjectName(_fromUtf8("emin_edit"))
self.horizontalLayout_5.addWidget(self.emin_edit)
spacerItem4 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_5.addItem(spacerItem4)
self.emax_label = QtGui.QLabel(self.integration_gb)
- self.emax_label.setObjectName("emax_label")
+ self.emax_label.setObjectName(_fromUtf8("emax_label"))
self.horizontalLayout_5.addWidget(self.emax_label)
self.emax_edit = QtGui.QLineEdit(self.integration_gb)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -122,60 +127,131 @@ class Ui_AbsUnitsFrame(object):
sizePolicy.setHeightForWidth(self.emax_edit.sizePolicy().hasHeightForWidth())
self.emax_edit.setSizePolicy(sizePolicy)
self.emax_edit.setMaximumSize(QtCore.QSize(100, 16777215))
- self.emax_edit.setObjectName("emax_edit")
+ self.emax_edit.setObjectName(_fromUtf8("emax_edit"))
self.horizontalLayout_5.addWidget(self.emax_edit)
spacerItem5 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_5.addItem(spacerItem5)
self.verticalLayout_2.addLayout(self.horizontalLayout_5)
- self.verticalLayout_4.addWidget(self.integration_gb)
+ self.verticalLayout_5.addWidget(self.integration_gb)
self.masses_gb = QtGui.QGroupBox(self.absunits_gb)
- self.masses_gb.setObjectName("masses_gb")
+ self.masses_gb.setObjectName(_fromUtf8("masses_gb"))
self.verticalLayout_3 = QtGui.QVBoxLayout(self.masses_gb)
- self.verticalLayout_3.setObjectName("verticalLayout_3")
+ self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
self.horizontalLayout_6 = QtGui.QHBoxLayout()
- self.horizontalLayout_6.setObjectName("horizontalLayout_6")
+ self.horizontalLayout_6.setObjectName(_fromUtf8("horizontalLayout_6"))
self.van_mass_label = QtGui.QLabel(self.masses_gb)
self.van_mass_label.setMinimumSize(QtCore.QSize(225, 0))
- self.van_mass_label.setObjectName("van_mass_label")
+ self.van_mass_label.setObjectName(_fromUtf8("van_mass_label"))
self.horizontalLayout_6.addWidget(self.van_mass_label)
self.van_mass_edit = QtGui.QLineEdit(self.masses_gb)
self.van_mass_edit.setMaximumSize(QtCore.QSize(100, 16777215))
- self.van_mass_edit.setObjectName("van_mass_edit")
+ self.van_mass_edit.setObjectName(_fromUtf8("van_mass_edit"))
self.horizontalLayout_6.addWidget(self.van_mass_edit)
spacerItem6 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_6.addItem(spacerItem6)
self.verticalLayout_3.addLayout(self.horizontalLayout_6)
+ self.horizontalLayout_9 = QtGui.QHBoxLayout()
+ self.horizontalLayout_9.setObjectName(_fromUtf8("horizontalLayout_9"))
+ self.van_rmm_label = QtGui.QLabel(self.masses_gb)
+ self.van_rmm_label.setMinimumSize(QtCore.QSize(225, 0))
+ self.van_rmm_label.setObjectName(_fromUtf8("van_rmm_label"))
+ self.horizontalLayout_9.addWidget(self.van_rmm_label)
+ self.van_rmm_edit = QtGui.QLineEdit(self.masses_gb)
+ self.van_rmm_edit.setMaximumSize(QtCore.QSize(100, 16777215))
+ self.van_rmm_edit.setObjectName(_fromUtf8("van_rmm_edit"))
+ self.horizontalLayout_9.addWidget(self.van_rmm_edit)
+ spacerItem7 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.horizontalLayout_9.addItem(spacerItem7)
+ self.verticalLayout_3.addLayout(self.horizontalLayout_9)
self.horizontalLayout_7 = QtGui.QHBoxLayout()
- self.horizontalLayout_7.setObjectName("horizontalLayout_7")
+ self.horizontalLayout_7.setObjectName(_fromUtf8("horizontalLayout_7"))
self.sample_mass_label = QtGui.QLabel(self.masses_gb)
self.sample_mass_label.setMinimumSize(QtCore.QSize(225, 0))
- self.sample_mass_label.setObjectName("sample_mass_label")
+ self.sample_mass_label.setObjectName(_fromUtf8("sample_mass_label"))
self.horizontalLayout_7.addWidget(self.sample_mass_label)
self.sample_mass_edit = QtGui.QLineEdit(self.masses_gb)
self.sample_mass_edit.setMinimumSize(QtCore.QSize(0, 0))
self.sample_mass_edit.setMaximumSize(QtCore.QSize(100, 16777215))
- self.sample_mass_edit.setObjectName("sample_mass_edit")
+ self.sample_mass_edit.setObjectName(_fromUtf8("sample_mass_edit"))
self.horizontalLayout_7.addWidget(self.sample_mass_edit)
- spacerItem7 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
- self.horizontalLayout_7.addItem(spacerItem7)
+ spacerItem8 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.horizontalLayout_7.addItem(spacerItem8)
self.verticalLayout_3.addLayout(self.horizontalLayout_7)
self.horizontalLayout_8 = QtGui.QHBoxLayout()
- self.horizontalLayout_8.setObjectName("horizontalLayout_8")
+ self.horizontalLayout_8.setObjectName(_fromUtf8("horizontalLayout_8"))
self.sample_rmm_label = QtGui.QLabel(self.masses_gb)
self.sample_rmm_label.setMinimumSize(QtCore.QSize(225, 0))
- self.sample_rmm_label.setObjectName("sample_rmm_label")
+ self.sample_rmm_label.setObjectName(_fromUtf8("sample_rmm_label"))
self.horizontalLayout_8.addWidget(self.sample_rmm_label)
self.sample_rmm_edit = QtGui.QLineEdit(self.masses_gb)
self.sample_rmm_edit.setMaximumSize(QtCore.QSize(100, 16777215))
- self.sample_rmm_edit.setObjectName("sample_rmm_edit")
+ self.sample_rmm_edit.setObjectName(_fromUtf8("sample_rmm_edit"))
self.horizontalLayout_8.addWidget(self.sample_rmm_edit)
- spacerItem8 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
- self.horizontalLayout_8.addItem(spacerItem8)
+ spacerItem9 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.horizontalLayout_8.addItem(spacerItem9)
self.verticalLayout_3.addLayout(self.horizontalLayout_8)
- self.verticalLayout_4.addWidget(self.masses_gb)
- spacerItem9 = QtGui.QSpacerItem(20, 171, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
- self.verticalLayout_4.addItem(spacerItem9)
- self.verticalLayout_5.addWidget(self.absunits_gb)
+ self.verticalLayout_5.addWidget(self.masses_gb)
+ self.diag_gb = QtGui.QGroupBox(self.absunits_gb)
+ self.diag_gb.setObjectName(_fromUtf8("diag_gb"))
+ self.verticalLayout_4 = QtGui.QVBoxLayout(self.diag_gb)
+ self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4"))
+ self.horizontalLayout_10 = QtGui.QHBoxLayout()
+ self.horizontalLayout_10.setObjectName(_fromUtf8("horizontalLayout_10"))
+ self.median_test_out_high_label = QtGui.QLabel(self.diag_gb)
+ self.median_test_out_high_label.setObjectName(_fromUtf8("median_test_out_high_label"))
+ self.horizontalLayout_10.addWidget(self.median_test_out_high_label)
+ self.median_test_out_high_edit = QtGui.QLineEdit(self.diag_gb)
+ self.median_test_out_high_edit.setMaximumSize(QtCore.QSize(100, 16777215))
+ self.median_test_out_high_edit.setObjectName(_fromUtf8("median_test_out_high_edit"))
+ self.horizontalLayout_10.addWidget(self.median_test_out_high_edit)
+ self.median_test_out_low_label = QtGui.QLabel(self.diag_gb)
+ self.median_test_out_low_label.setObjectName(_fromUtf8("median_test_out_low_label"))
+ self.horizontalLayout_10.addWidget(self.median_test_out_low_label)
+ self.median_test_out_low_edit = QtGui.QLineEdit(self.diag_gb)
+ self.median_test_out_low_edit.setMaximumSize(QtCore.QSize(100, 16777215))
+ self.median_test_out_low_edit.setObjectName(_fromUtf8("median_test_out_low_edit"))
+ self.horizontalLayout_10.addWidget(self.median_test_out_low_edit)
+ spacerItem10 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.horizontalLayout_10.addItem(spacerItem10)
+ self.verticalLayout_4.addLayout(self.horizontalLayout_10)
+ self.horizontalLayout_11 = QtGui.QHBoxLayout()
+ self.horizontalLayout_11.setObjectName(_fromUtf8("horizontalLayout_11"))
+ self.median_test_high_label = QtGui.QLabel(self.diag_gb)
+ self.median_test_high_label.setMinimumSize(QtCore.QSize(137, 0))
+ self.median_test_high_label.setObjectName(_fromUtf8("median_test_high_label"))
+ self.horizontalLayout_11.addWidget(self.median_test_high_label)
+ self.median_test_high_edit = QtGui.QLineEdit(self.diag_gb)
+ self.median_test_high_edit.setMaximumSize(QtCore.QSize(100, 16777215))
+ self.median_test_high_edit.setObjectName(_fromUtf8("median_test_high_edit"))
+ self.horizontalLayout_11.addWidget(self.median_test_high_edit)
+ self.median_test_low_label = QtGui.QLabel(self.diag_gb)
+ self.median_test_low_label.setMinimumSize(QtCore.QSize(132, 0))
+ self.median_test_low_label.setObjectName(_fromUtf8("median_test_low_label"))
+ self.horizontalLayout_11.addWidget(self.median_test_low_label)
+ self.median_test_low_edit = QtGui.QLineEdit(self.diag_gb)
+ self.median_test_low_edit.setMaximumSize(QtCore.QSize(100, 16777215))
+ self.median_test_low_edit.setObjectName(_fromUtf8("median_test_low_edit"))
+ self.horizontalLayout_11.addWidget(self.median_test_low_edit)
+ spacerItem11 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.horizontalLayout_11.addItem(spacerItem11)
+ self.verticalLayout_4.addLayout(self.horizontalLayout_11)
+ self.horizontalLayout_12 = QtGui.QHBoxLayout()
+ self.horizontalLayout_12.setObjectName(_fromUtf8("horizontalLayout_12"))
+ self.errorbar_crit_label = QtGui.QLabel(self.diag_gb)
+ self.errorbar_crit_label.setMinimumSize(QtCore.QSize(137, 0))
+ self.errorbar_crit_label.setObjectName(_fromUtf8("errorbar_crit_label"))
+ self.horizontalLayout_12.addWidget(self.errorbar_crit_label)
+ self.errorbar_crit_edit = QtGui.QLineEdit(self.diag_gb)
+ self.errorbar_crit_edit.setMaximumSize(QtCore.QSize(100, 16777215))
+ self.errorbar_crit_edit.setObjectName(_fromUtf8("errorbar_crit_edit"))
+ self.horizontalLayout_12.addWidget(self.errorbar_crit_edit)
+ spacerItem12 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.horizontalLayout_12.addItem(spacerItem12)
+ self.verticalLayout_4.addLayout(self.horizontalLayout_12)
+ self.verticalLayout_5.addWidget(self.diag_gb)
+ self.verticalLayout_6.addWidget(self.absunits_gb)
+ spacerItem13 = QtGui.QSpacerItem(962, 81, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+ self.verticalLayout_6.addItem(spacerItem13)
self.retranslateUi(AbsUnitsFrame)
QtCore.QMetaObject.connectSlotsByName(AbsUnitsFrame)
@@ -195,7 +271,14 @@ class Ui_AbsUnitsFrame(object):
self.emin_label.setText(QtGui.QApplication.translate("AbsUnitsFrame", "Energy range E Min", None, QtGui.QApplication.UnicodeUTF8))
self.emax_label.setText(QtGui.QApplication.translate("AbsUnitsFrame", "E Max", None, QtGui.QApplication.UnicodeUTF8))
self.masses_gb.setTitle(QtGui.QApplication.translate("AbsUnitsFrame", "Masses for Absolute Units", None, QtGui.QApplication.UnicodeUTF8))
- self.van_mass_label.setText(QtGui.QApplication.translate("AbsUnitsFrame", "Vanadium mass", None, QtGui.QApplication.UnicodeUTF8))
+ self.van_mass_label.setText(QtGui.QApplication.translate("AbsUnitsFrame", "Vanadium Mass", None, QtGui.QApplication.UnicodeUTF8))
+ self.van_rmm_label.setText(QtGui.QApplication.translate("AbsUnitsFrame", "Vanadium RMM", None, QtGui.QApplication.UnicodeUTF8))
self.sample_mass_label.setText(QtGui.QApplication.translate("AbsUnitsFrame", "Sample Mass", None, QtGui.QApplication.UnicodeUTF8))
self.sample_rmm_label.setText(QtGui.QApplication.translate("AbsUnitsFrame", "Sample RMM", None, QtGui.QApplication.UnicodeUTF8))
+ self.diag_gb.setTitle(QtGui.QApplication.translate("AbsUnitsFrame", "Diagnostic Parameters", None, QtGui.QApplication.UnicodeUTF8))
+ self.median_test_out_high_label.setText(QtGui.QApplication.translate("AbsUnitsFrame", "Median high outliers", None, QtGui.QApplication.UnicodeUTF8))
+ self.median_test_out_low_label.setText(QtGui.QApplication.translate("AbsUnitsFrame", "Median low outliers", None, QtGui.QApplication.UnicodeUTF8))
+ self.median_test_high_label.setText(QtGui.QApplication.translate("AbsUnitsFrame", "Median test high", None, QtGui.QApplication.UnicodeUTF8))
+ self.median_test_low_label.setText(QtGui.QApplication.translate("AbsUnitsFrame", "Median test low", None, QtGui.QApplication.UnicodeUTF8))
+ self.errorbar_crit_label.setText(QtGui.QApplication.translate("AbsUnitsFrame", "Errorbar criterion", None, QtGui.QApplication.UnicodeUTF8))