added to msr2data the flags --estimateN0 and --per-run-block-chisq. Adopted the musredit dialog accordingly. Removed the first/last option form the msr2data dialog since this is handled by the runlist.
This commit is contained in:
@@ -9,8 +9,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>552</width>
|
||||
<height>599</height>
|
||||
<width>584</width>
|
||||
<height>578</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@@ -25,8 +25,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>551</width>
|
||||
<height>131</height>
|
||||
<width>581</width>
|
||||
<height>111</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="font">
|
||||
@@ -47,93 +47,13 @@
|
||||
<widget class="QWidget" name="layoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<x>11</x>
|
||||
<y>30</y>
|
||||
<width>531</width>
|
||||
<height>97</height>
|
||||
<width>561</width>
|
||||
<height>70</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QLabel" name="fFirst_label">
|
||||
<property name="text">
|
||||
<string>First</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fFirst_lineEdit">
|
||||
<property name="toolTip">
|
||||
<string>start run number</string>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string>start run number</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Expanding</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="fLast_label">
|
||||
<property name="text">
|
||||
<string>Last</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fLast_lineEdit">
|
||||
<property name="toolTip">
|
||||
<string>end run number</string>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string>end run number</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Fixed</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>200</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="fOrFirstLast_label">
|
||||
<property name="text">
|
||||
<string><b>OR</b></string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::AutoText</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item>
|
||||
@@ -232,8 +152,8 @@ p, li { white-space: pre-wrap; }
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>130</y>
|
||||
<width>551</width>
|
||||
<y>110</y>
|
||||
<width>581</width>
|
||||
<height>71</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -245,8 +165,8 @@ p, li { white-space: pre-wrap; }
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>30</y>
|
||||
<width>531</width>
|
||||
<height>29</height>
|
||||
<width>561</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
||||
@@ -262,9 +182,12 @@ p, li { white-space: pre-wrap; }
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Fixed</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<width>30</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
@@ -297,8 +220,8 @@ p, li { white-space: pre-wrap; }
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>200</y>
|
||||
<width>551</width>
|
||||
<y>180</y>
|
||||
<width>581</width>
|
||||
<height>80</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -311,7 +234,7 @@ p, li { white-space: pre-wrap; }
|
||||
<x>10</x>
|
||||
<y>30</y>
|
||||
<width>531</width>
|
||||
<height>29</height>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_6">
|
||||
@@ -364,8 +287,8 @@ p, li { white-space: pre-wrap; }
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>280</y>
|
||||
<width>551</width>
|
||||
<y>260</y>
|
||||
<width>581</width>
|
||||
<height>80</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -378,7 +301,7 @@ p, li { white-space: pre-wrap; }
|
||||
<x>10</x>
|
||||
<y>30</y>
|
||||
<width>531</width>
|
||||
<height>29</height>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_7">
|
||||
@@ -419,8 +342,8 @@ p, li { white-space: pre-wrap; }
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>360</y>
|
||||
<width>551</width>
|
||||
<y>340</y>
|
||||
<width>581</width>
|
||||
<height>172</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -432,7 +355,7 @@ p, li { white-space: pre-wrap; }
|
||||
<rect>
|
||||
<x>6</x>
|
||||
<y>20</y>
|
||||
<width>541</width>
|
||||
<width>571</width>
|
||||
<height>116</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -473,6 +396,13 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="fEstimateN0_checkBox">
|
||||
<property name="text">
|
||||
<string>Estimate N0</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
@@ -517,6 +447,13 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="fWritePerRunBlockChisq_checkBox">
|
||||
<property name="text">
|
||||
<string>Write per-run-block Chisq</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
@@ -601,21 +538,24 @@ p, li { white-space: pre-wrap; }
|
||||
<rect>
|
||||
<x>170</x>
|
||||
<y>140</y>
|
||||
<width>371</width>
|
||||
<width>401</width>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string>parameter numbers to be exported, e.g. 1-16, or 1 3-7, etc.</string>
|
||||
</property>
|
||||
<property name="frame">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget" name="layoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>5</x>
|
||||
<y>540</y>
|
||||
<width>541</width>
|
||||
<y>520</y>
|
||||
<width>571</width>
|
||||
<height>51</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -669,8 +609,6 @@ p, li { white-space: pre-wrap; }
|
||||
</widget>
|
||||
</widget>
|
||||
<tabstops>
|
||||
<tabstop>fFirst_lineEdit</tabstop>
|
||||
<tabstop>fLast_lineEdit</tabstop>
|
||||
<tabstop>fRunList_lineEdit</tabstop>
|
||||
<tabstop>fRunListFileName_lineEdit</tabstop>
|
||||
<tabstop>fMsrFileExtension_lineEdit</tabstop>
|
||||
@@ -744,38 +682,6 @@ p, li { white-space: pre-wrap; }
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>fFirst_lineEdit</sender>
|
||||
<signal>textChanged(QString)</signal>
|
||||
<receiver>PMsr2DataDialog</receiver>
|
||||
<slot>runFirstEntered(QString)</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>82</x>
|
||||
<y>44</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>113</x>
|
||||
<y>504</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>fLast_lineEdit</sender>
|
||||
<signal>textChanged(QString)</signal>
|
||||
<receiver>PMsr2DataDialog</receiver>
|
||||
<slot>runLastEntered(QString)</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>229</x>
|
||||
<y>44</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>348</x>
|
||||
<y>500</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>fRunList_lineEdit</sender>
|
||||
<signal>textChanged(QString)</signal>
|
||||
|
||||
Reference in New Issue
Block a user