Cleanup..
This commit is contained in:
parent
7377b9bb93
commit
b4896af8d0
11
src/external/MuSRFitGUI/MSR.pm
vendored
11
src/external/MuSRFitGUI/MSR.pm
vendored
@ -87,6 +87,11 @@ sub CreateMSR {
|
||||
$FITMINTYPE = "SCAN\nSIMPLEX";
|
||||
}
|
||||
|
||||
# Proper way
|
||||
if ( $All{"Minimization"} ne "" && $All{"ErrorCalc"} ne "" && $Step ne "PLOT" ) {
|
||||
$FITMINTYPE = $All{"Minimization"}."\n".$All{"ErrorCalc"};
|
||||
}
|
||||
|
||||
|
||||
# First create the THEORY Block
|
||||
my ($Full_T_Block,$Paramcomp_ref)=MSR::CreateTheory(@FitTypes);
|
||||
@ -428,6 +433,12 @@ sub CreateMSRSingleHist {
|
||||
$FITMINTYPE = "SCAN\nSIMPLEX";
|
||||
}
|
||||
|
||||
# Proper way
|
||||
if ( $All{"Minimization"} ne "" && $All{"ErrorCalc"} ne "" && $Step ne "PLOT" ) {
|
||||
$FITMINTYPE = $All{"Minimization"}."\n".$All{"ErrorCalc"};
|
||||
}
|
||||
|
||||
|
||||
# First create the THEORY Block
|
||||
my ($Full_T_Block,$Paramcomp_ref)=MSR::CreateTheory(@FitTypes);
|
||||
my @Paramcomp = @$Paramcomp_ref;
|
||||
|
||||
2084
src/external/MuSRFitGUI/MuSRFit.pl
vendored
2084
src/external/MuSRFitGUI/MuSRFit.pl
vendored
File diff suppressed because it is too large
Load Diff
641
src/external/MuSRFitGUI/MuSRFit.ui
vendored
641
src/external/MuSRFitGUI/MuSRFit.ui
vendored
@ -22,8 +22,8 @@
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>23</width>
|
||||
<height>246</height>
|
||||
<width>21</width>
|
||||
<height>275</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="caption">
|
||||
@ -1962,360 +1962,140 @@
|
||||
<attribute name="title">
|
||||
<string>Fitting</string>
|
||||
</attribute>
|
||||
<widget class="QTextEdit">
|
||||
<widget class="QLayoutWidget">
|
||||
<property name="name">
|
||||
<cstring>FitTextOutput</cstring>
|
||||
<cstring>layout34</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>5</x>
|
||||
<y>130</y>
|
||||
<y>10</y>
|
||||
<width>545</width>
|
||||
<height>230</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="overwriteMode">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QButtonGroup">
|
||||
<property name="name">
|
||||
<cstring>Minimization</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>7</x>
|
||||
<y>1</y>
|
||||
<width>115</width>
|
||||
<height>128</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Minimization</string>
|
||||
</property>
|
||||
<property name="exclusive">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="radioButtonExclusive">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="selectedId" stdset="0">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QRadioButton">
|
||||
<property name="name">
|
||||
<cstring>MINIMIZE</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>16</x>
|
||||
<y>30</y>
|
||||
<width>83</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Minimize</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QRadioButton">
|
||||
<property name="name">
|
||||
<cstring>MIGRAD</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>16</x>
|
||||
<y>59</y>
|
||||
<width>83</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Migrad</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QRadioButton">
|
||||
<property name="name">
|
||||
<cstring>SIMPLEX</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>16</x>
|
||||
<y>88</y>
|
||||
<width>83</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Simplex</string>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QButtonGroup">
|
||||
<property name="name">
|
||||
<cstring>PlotOptions</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>241</x>
|
||||
<y>1</y>
|
||||
<width>196</width>
|
||||
<height>128</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Options</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>AlignTop</set>
|
||||
</property>
|
||||
<property name="exclusive">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="radioButtonExclusive">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="selectedId" stdset="0">
|
||||
<number>-1</number>
|
||||
</property>
|
||||
<widget class="QLayoutWidget">
|
||||
<property name="name">
|
||||
<cstring>layout27</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>3</x>
|
||||
<y>18</y>
|
||||
<width>190</width>
|
||||
<height>94</height>
|
||||
</rect>
|
||||
</property>
|
||||
<vbox>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QLayoutWidget">
|
||||
<property name="name">
|
||||
<cstring>layout25</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QLabel">
|
||||
<property name="name">
|
||||
<cstring>textLabel1_4</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>X Range</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit">
|
||||
<property name="name">
|
||||
<cstring>Xi</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit">
|
||||
<property name="name">
|
||||
<cstring>Xf</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</hbox>
|
||||
</widget>
|
||||
<widget class="QLayoutWidget">
|
||||
<property name="name">
|
||||
<cstring>layout26</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QLabel">
|
||||
<property name="name">
|
||||
<cstring>textLabel1_4_2</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Y Range</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit">
|
||||
<property name="name">
|
||||
<cstring>Yi</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit">
|
||||
<property name="name">
|
||||
<cstring>Yf</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</hbox>
|
||||
</widget>
|
||||
<widget class="QCheckBox">
|
||||
<property name="name">
|
||||
<cstring>ltc</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Life time correction</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</vbox>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QLayoutWidget">
|
||||
<property name="name">
|
||||
<cstring>layout28</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>438</x>
|
||||
<y>1</y>
|
||||
<width>115</width>
|
||||
<height>125</height>
|
||||
<height>350</height>
|
||||
</rect>
|
||||
</property>
|
||||
<vbox>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QPushButton">
|
||||
<widget class="QLayoutWidget">
|
||||
<property name="name">
|
||||
<cstring>go</cstring>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy>
|
||||
<hsizetype>7</hsizetype>
|
||||
<vsizetype>0</vsizetype>
|
||||
<horstretch>1</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>85</width>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>95</width>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Fit</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="default">
|
||||
<bool>true</bool>
|
||||
<cstring>layout33</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QComboBox" row="0" column="1">
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>MINIMIZE</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>MIGRAD</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>SIMPLEX</string>
|
||||
</property>
|
||||
</item>
|
||||
<property name="name">
|
||||
<cstring>Minimization</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" row="0" column="2">
|
||||
<property name="name">
|
||||
<cstring>textLabel1_4</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>X Range</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" row="1" column="4">
|
||||
<property name="name">
|
||||
<cstring>Yf</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" row="1" column="0">
|
||||
<property name="name">
|
||||
<cstring>textLabel1_5_2</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Error estimation</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" row="0" column="3">
|
||||
<property name="name">
|
||||
<cstring>Xi</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" row="1" column="2">
|
||||
<property name="name">
|
||||
<cstring>textLabel1_4_2</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Y Range</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QComboBox" row="1" column="1">
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>HESSE</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>MINOS</string>
|
||||
</property>
|
||||
</item>
|
||||
<property name="name">
|
||||
<cstring>ErrorCalc</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" row="0" column="0">
|
||||
<property name="name">
|
||||
<cstring>textLabel1_5</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Minimization type</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" row="1" column="3">
|
||||
<property name="name">
|
||||
<cstring>Yi</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" row="0" column="4">
|
||||
<property name="name">
|
||||
<cstring>Xf</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
|
||||
<property name="name">
|
||||
<cstring>ltc</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Life time correction</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</grid>
|
||||
</widget>
|
||||
<widget class="QPushButton">
|
||||
<widget class="QTextEdit">
|
||||
<property name="name">
|
||||
<cstring>PlotMSR</cstring>
|
||||
<cstring>FitTextOutput</cstring>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy>
|
||||
<hsizetype>7</hsizetype>
|
||||
<vsizetype>0</vsizetype>
|
||||
<horstretch>1</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>85</width>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>95</width>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Plot</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="default">
|
||||
<property name="overwriteMode">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</vbox>
|
||||
</widget>
|
||||
<widget class="QButtonGroup">
|
||||
<property name="name">
|
||||
<cstring>ErrorCalc</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>128</x>
|
||||
<y>1</y>
|
||||
<width>107</width>
|
||||
<height>128</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Error</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>AlignTop|AlignLeft</set>
|
||||
</property>
|
||||
<property name="exclusive">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="radioButtonExclusive">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="selectedId" stdset="0">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<widget class="QRadioButton">
|
||||
<property name="name">
|
||||
<cstring>MINOS</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>19</x>
|
||||
<y>59</y>
|
||||
<width>69</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Minos</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QRadioButton">
|
||||
<property name="name">
|
||||
<cstring>HESSE</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>19</x>
|
||||
<y>30</y>
|
||||
<width>69</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Hesse</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget">
|
||||
<property name="name">
|
||||
@ -3876,40 +3656,6 @@
|
||||
</widget>
|
||||
</hbox>
|
||||
</widget>
|
||||
<widget class="QPushButton">
|
||||
<property name="name">
|
||||
<cstring>ShowT0</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>451</x>
|
||||
<y>190</y>
|
||||
<width>95</width>
|
||||
<height>30</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>95</width>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>95</width>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Show</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="default">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
</widget>
|
||||
</widget>
|
||||
@ -3929,11 +3675,16 @@
|
||||
<separator/>
|
||||
<action name="fileExitAction"/>
|
||||
</item>
|
||||
<item text="Actions" name="Actions">
|
||||
<action name="Fit"/>
|
||||
<action name="Plot"/>
|
||||
<action name="T0"/>
|
||||
</item>
|
||||
<item text="Parameters" name="Parameters">
|
||||
<action name="parametersExport_AsAction"/>
|
||||
<action name="parametersAppend_ToAction"/>
|
||||
</item>
|
||||
<item text="&Edit" name="editMenu">
|
||||
<item text="Edit" name="Edit">
|
||||
<action name="editUndoAction"/>
|
||||
<action name="editRedoAction"/>
|
||||
<separator/>
|
||||
@ -3962,12 +3713,23 @@
|
||||
<string>Tools</string>
|
||||
</property>
|
||||
<action name="fileOpenAction"/>
|
||||
<action name="fileExitAction"/>
|
||||
<action name="fileChangeDirAction"/>
|
||||
<action name="fileSaveAction"/>
|
||||
<action name="filePrintAction"/>
|
||||
</toolbar>
|
||||
<toolbar dock="2">
|
||||
<property name="name">
|
||||
<cstring>Toolbar</cstring>
|
||||
</property>
|
||||
<property name="label">
|
||||
<string>Toolbar</string>
|
||||
</property>
|
||||
<action name="Fit"/>
|
||||
<action name="Plot"/>
|
||||
<action name="T0"/>
|
||||
<action name="filePrintAction"/>
|
||||
<action name="fileExitAction"/>
|
||||
<action name="parametersExport_AsAction"/>
|
||||
<action name="parametersAppend_ToAction"/>
|
||||
</toolbar>
|
||||
</toolbars>
|
||||
<actions>
|
||||
@ -4007,6 +3769,9 @@
|
||||
<property name="accel">
|
||||
<string>Ctrl+O</string>
|
||||
</property>
|
||||
<property name="visible">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</action>
|
||||
<action>
|
||||
<property name="name">
|
||||
@ -4032,6 +3797,9 @@
|
||||
<property name="name">
|
||||
<cstring>fileSaveAsAction</cstring>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image4</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Save MSR &As...</string>
|
||||
</property>
|
||||
@ -4050,7 +3818,7 @@
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image4</iconset>
|
||||
<iconset>image5</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Print</string>
|
||||
@ -4066,6 +3834,9 @@
|
||||
<property name="name">
|
||||
<cstring>fileExitAction</cstring>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image6</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Exit</string>
|
||||
</property>
|
||||
@ -4084,7 +3855,7 @@
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image5</iconset>
|
||||
<iconset>image7</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Undo</string>
|
||||
@ -4104,7 +3875,7 @@
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image6</iconset>
|
||||
<iconset>image8</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Redo</string>
|
||||
@ -4124,7 +3895,7 @@
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image7</iconset>
|
||||
<iconset>image9</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Cut</string>
|
||||
@ -4144,7 +3915,7 @@
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image8</iconset>
|
||||
<iconset>image10</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Copy</string>
|
||||
@ -4164,7 +3935,7 @@
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image9</iconset>
|
||||
<iconset>image11</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Paste</string>
|
||||
@ -4181,7 +3952,7 @@
|
||||
<cstring>editFindAction</cstring>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image10</iconset>
|
||||
<iconset>image12</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Find</string>
|
||||
@ -4200,6 +3971,9 @@
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image13</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Contents</string>
|
||||
</property>
|
||||
@ -4217,6 +3991,9 @@
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image14</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Index</string>
|
||||
</property>
|
||||
@ -4263,10 +4040,10 @@
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>File exist check</string>
|
||||
<string>Change name</string>
|
||||
</property>
|
||||
<property name="menuText">
|
||||
<string>File exist check</string>
|
||||
<string>Change name</string>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string>Enable/Disable checking for MSR files.</string>
|
||||
@ -4290,6 +4067,9 @@
|
||||
<property name="name">
|
||||
<cstring>fileChangeDirAction</cstring>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image15</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Change dir</string>
|
||||
</property>
|
||||
@ -4315,23 +4095,35 @@
|
||||
<property name="name">
|
||||
<cstring>parametersExport_AsAction</cstring>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image16</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Export As...</string>
|
||||
<string>Export As...</string>
|
||||
</property>
|
||||
<property name="menuText">
|
||||
<string>&Export As...</string>
|
||||
</property>
|
||||
<property name="accel">
|
||||
<string>Alt+E</string>
|
||||
</property>
|
||||
</action>
|
||||
<action>
|
||||
<property name="name">
|
||||
<cstring>parametersAppend_ToAction</cstring>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image17</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Append To...</string>
|
||||
<string>Append To...</string>
|
||||
</property>
|
||||
<property name="menuText">
|
||||
<string>&Append To...</string>
|
||||
</property>
|
||||
<property name="accel">
|
||||
<string>Alt+A</string>
|
||||
</property>
|
||||
</action>
|
||||
<action>
|
||||
<property name="name">
|
||||
@ -4343,6 +4135,9 @@
|
||||
<property name="text">
|
||||
<string>Fit and Plot</string>
|
||||
</property>
|
||||
<property name="accel">
|
||||
<string>Ctrl+F</string>
|
||||
</property>
|
||||
</action>
|
||||
<action>
|
||||
<property name="name">
|
||||
@ -4352,22 +4147,28 @@
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image11</iconset>
|
||||
<iconset>image18</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Plot</string>
|
||||
</property>
|
||||
<property name="accel">
|
||||
<string>Ctrl+P</string>
|
||||
</property>
|
||||
</action>
|
||||
<action>
|
||||
<property name="name">
|
||||
<cstring>T0</cstring>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image12</iconset>
|
||||
<iconset>image19</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Show t0 and Bg Bins</string>
|
||||
</property>
|
||||
<property name="accel">
|
||||
<string>Ctrl+T</string>
|
||||
</property>
|
||||
</action>
|
||||
</actions>
|
||||
<images>
|
||||
@ -4375,39 +4176,60 @@
|
||||
<data format="PNG" length="268">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d349444154388db594510e84200c44a7864bd9fb673c16fe50b7a95501dd97104983435b06842422ab6ab5f946ca6941074b0ca813cd36eaa5f89f050049811352d53aac8a96b165640256fe468ac546b33eb5c298ededa3f05b1655adbef4b8c062a3e92fbc117d83643ebe6275d53dd1dd637345af3b3e3bbcb8e19470763b23ddc2de3924c58b676d2a67897b717f4b25dcd848f5a3b9e4f8c651dd200992c86205680f4f82c555b51e6b92fe5a2502c0cc3bd40a13b98a133faf17cb286639833fc4db56bce17fafdb9762deeb438fd0083bbf3298df1bba5b870000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image1">
|
||||
<data format="PNG" length="184">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000007f49444154388ded95510a0021084475d9db041ec0e8fa5ecbfdda852d4b11fa6b2028a3570c53a188c00edd7d819935b2504470357f5945559d36000022720f60823d11910b1fac88a894f2f599592d5b52e05aeb6f6cc153e0d6da50ebe12930e2321039f09b0c6fb3542a223ae0033ee085cc2b1d790b3ce1ae3f6f9b150f6d5433af47a4f4c20000000049454e44ae426082</data>
|
||||
<data format="PNG" length="770">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000002c949444154388db5934b4854511cc67fe7dc73c7999cb41acb6a2a22d28aa227f6448808a38248905ab80a5ab46a5154eb20dab4691591460815d42283a0508a088328911e584932a5e318448e363377661cefcc3d2d46f175291dea8303f77e177ef73bff87d05a33a6fb0f9e8cbfcc40a6bf6c456d4d559fdb3735d53874703f7e9f39c9b36d48a7219582541a52294d2cf989fe4838dcdcda5e595b53d53d95236794cc04af77c229cafb6b2af7625b035f9a5bdb37160406f078c6a145debc57b6c0c7aa95fbb0ad81f7cdaded3b0b02c378e231b096693c450e81b23dd8d6c0abbb8fded417041e83fb464bd11bfe4a22f915afb78fe0b215283b7abba9a9692db834ef6f92127c3ec18eadeb49a52014d2dad142680ddf87faa2f3156b81ae592706500a8687211281a2d07d61765e43291062428042c0bf42dd44da5a31142c2f7b44c5ba0e0cc361fee007b5e0dbd395aee0914cd6d67f5893781c92af2f52b9eb25745c462a8930159ecf37a93ffeab74dbe29ef3ee605b99b118c462104f8065413209090b8686c04ac2c8ea73647ac2541cce61f834d214545487c9468768eb2eb9012ecd532abf108e035a43ce197f7634385d0ff144db8846e3941787f16eaa0204b9de105f9adf663795d8d59d27e69e74052b9507693d19aa1d30128dcc3b520d7a116801467ef6e4e2201bced42a34fbac96e7bba7838dc98927c2b586d4e606c2af3f203ede2358b714a93538a03323bcb9d2928da4fd977f76b4dc9e3ec7223fab72b4fa5313cf2d5f82ec7d4ae9b1a5e40606c9748530fc7e7426c7f6b30794bcfaa4a2ae4d77ff75dca404c30073b4f64a41b6ff19233d7dfc183c0ad2440b49cc7f9ae4bbcfba7ca1deeddabc3f4988fc4f02758d64ac18c1920089c70dc86486d2ea8d5c7f5123bc62f0c2a9d982c76428c59c790100d4964b0c5b718a3df9cbfb4a03995927765371700dc52e7e412b3d13fd37f0b45234debaf34fc0bf01fe532119ee8d4b590000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image2">
|
||||
<data format="PNG" length="231">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000ae49444154388db594510ec3200c436db45371b6691fd3cee66bb18f5135a219235af04f442b5e2c03a124ec50d942dd09be4537d45a9b5d4be2f85f1243e06393d748126d53661d9e854a624ac6633c40cff8576e51280010406b0d00dab104b9c69d19e887774201f64ebc7c8f342fc678b0ce553cc76b752e37e368d69edc8c2df4f58c01ef8f4f7533fe176a1e482ef4e2380b6ac0b9d0d36a57161430833e130aacdef62f9acd8ab4793cea0d051970cdbc4f01b20000000049454e44ae426082</data>
|
||||
<data format="PNG" length="1072">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003f749444154388db5955f68d56518c73fe7777ed333dd3f67fecb74c722ed62f9071223332c5620062d0982a88bec22888aeac242322d2b2808b12e022fb4a0eea216155de46866641bcaccd4e2b464736ecef36f673be7fcfebc7f9eb78b6dce95125ef8c2c3fbc0fb3c9ff7e179bf0f6fc239c78d58de0da10289eb4d78f5cdeeb41877a86696b7b65cd62b3e7a7f63e96a71d755f16b6f75bfd4dc98eaddfe54ebe6ed4fb636599143d70c76ce5dd3a6d6ae777ad6eedcdbd3dbd935e2aa55e7b259ed4647adfbf860c63df3c24fed57e3265a9efec3b56f5e8808280bda08cac017df0f95c26fd7ccdbf3def13de95b9a763ff8400b8df53518e3d0da628c23954af2fabbdda5b1f178c5e707ee9fd192c4a61de7dcbedd2b5006220bca40ac61a82f64e058866d6dcbb86b5d335a835260ed34d839c7df8315f67e78aae387d3899739b5b97f0aecff5b6e46c170cf10f526e28d17d730a716acbd7a1b451cad2b9bd8b4aeb95da4f069e729a6c156a6c1a5f3214327fa79b82d4d7a79ed35df0560b462d8df71099c43ebb9648aa3fb5873642d22e01cfe95d58c8f8c73cffa25ff0b2d5585adbb32b4dd7b33b72eab4304d2ab16a7cb55fb8a3694f67f70bcdeb7329de02d5dc8ce83a7d9b05e7016ac58ac15c438c43acca4ffddaf451edbd2c2ac054d1c190011989d82df7ac7ea073bfbb240d78c567c753847faf605ac5eea33efa63904e20895235410448e400b5104cfae5c4c5ce3d3736e029af0a03010923dd66f914a9a847b7b06f8f0d12c99cf5a2964358df37da40e7265c89761e0225446211f433e0bc592259f8b090a152e9ec9521aae96881283d4db5578aecb376602fa634fc8a63b1ba84d41cdc21a7a33e32c58de40e602f40dc048ce90cb5b2ee50db9bc21288584a52aa5e1519c721090c5b73ed8b3641eeaf765526e47ba8b6cdbd84c55e0520c59af813f4f5ac42509228752102921568e2816f2b9001d68983b176c0cc490544d383900e08915c6abf0fbd9128fb7d59129c285224440b12c8c5584583b22e5501a4a639a919100ebcfc64bcd9e2997a469c4d231a963387caccc7dab1b19a9409d0f4b525067a16189cf585161fc04cd6268d011f58b14b735259138468218136bc2c0902bc8fc81419da57fcb4900df5847d72f05763cba883bea276f9e075a431439b4f68863431c5b94f250ca278a0c5afb44512d4ad5a0548a2f8f8ecdffe4bcfbe6b274ab81a17fa0cc231b660e85e781ef7b2493093ccf9bf4bdcbbee74d9c4df93f9f0941dcd753f97e61b8ca734fb4fc67ba92c9097338440cb1d284514c186a824011c53151a8d15a88b5a1efaf002e6cedb80cc64bd079a2c8ddcf8fe1c42102884344b056b05a30c6608d608dc1188bd1163132b18ba51a38085cc79585256ed467fa0f0f457af9307ab8bf0000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image3">
|
||||
<data format="PNG" length="230">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000ad49444154388dd595310e842010453f8686c482f3d0ccc58c85f16234731e0b922d770b3386150d62d084d7100cbe7cc6411433e309340038e7be35a5ccacb44ce6691d8711f0de178988687b878800005da590093abfe418132c3efdb2cd25a9904d6c82850936791e4b81b59452ce4be2bb644bb14f7695c712b7274e6a3c4f69ebe488bbe1547cb6b09477db6d18cb45fb5dde3ed2f18feae89bb4d76eed8995dc79b5ae2766567fe2dafc0045362bc8717a5b490000000049454e44ae426082</data>
|
||||
<data format="PNG" length="763">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000002c249444154388dd5943d8f1c4510869fd99d35773ef0c705c8329203021001827f8090900810883f003111227506d14504fc03624840204182217300423210fa641964c9be1577bb33bbd3dd55d5d504333bc7c96b3b764badaaee19bdfdf4dbd50d4f5bab36c90f3ffefa515d4f0f5433b37a42d376c4a464cbccea29661911c52ca36aa86ea271e79f39f3a3c577cd62f5f1cf373e5f00d41be1ba9e1ebcf4cab54b5071edea3e9f7ef10dcb2670e1b95d3efbe4fdc7d27d7fe3167fdebafdc1b75ffd02f0e119e194942e0ad5b0899bbf1f72f9c279ea7af2c46d2f9a0e07dcf3bb23e82691617b55d50bef5fdce3e517aff0c295cb4f14163196cb1529c938772a2c8aa831a97ac2b7df7895abcf5f64ffd2b38f15752f2c9b96e5a2c12c3f2c9cc410cd94629c341defbdf53aa5144a81f9713be4fd7813cd8c939396a307c774216266db887b2bba98f8ed8f3ba865cc32967dc8bdaf889c1131624834cb96f53a707cd212a33c8a581155421c4aca725f529607ff8d98941885b65d11ba484a424a8a88106324e72dc23a58e1ee9cdf3d87651f6ad7a88ae30693929996ccce6cca64f71cb349c56c3ae12804521272f647111b3bcfcc78e7cdd7707742104248a4a4a8da6097f5072d36f62fbffe8979488ff718c02c1342220441d5b6089f5d208920a2dbad484911cd981a77effecbfdfb0daa365c611daeb08ef698f5e23b3b35290a49d2766119c84c95aa2aecedd588802ad475a1ae613a2d98c16452502d5455011c1988ddb7799c94d5ba239bb15a45168b6ea4ea094f1f21111d1fa1d9ac1aac90edc43124d6eb407147d570cfe4fc7037eba3bb8d42fd42b29d38c4440809bc606694e2b8f7bdcff330ee63ce9bbca022a828ee5b88c33ab25eb4e46cac56cbf1e44fabe0ec21aae6f19f75db90ba35bead8e8fe78bebf7fe7e701053e2f65f87e45c46e29c0ba5f8ffe64ebfb917ee1dcee982e2ce759edaf61f121ae0ff0b36cf4c0000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image4">
|
||||
<data format="PNG" length="709">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000028c49444154388d8d95af7bdb301086dfec0938319bc530b061350c2cf458cb5a18b83f6181a363a3851debd8020b1dd6b01a0adacc62772c03b21de7d7b38a28962eef7dbaef2c4fcab2e4d268db762f22a4697ab46e6600a82a0021049224c1393719c74d2f52011121cff30174ba371280f7fe2ce62a18a0aaaa33d8692255c539f779f02580999d25e8e753f8972bdcbd990dc1ce399c7347f5eeeb2f2267f5bdaa5855499284b66d1191c1a8f1b874fccf28c6ccce3a620ced935d32f7aae25ecd25a5e375553dea90ff82ebba663e9f9365d955786fe476bb2584b01749c8b274a8f5115855f7de7baa5d851482880c80d3b957dad62d6559d284869b9b9b7d5114a4693a99f46f9eaaeeabca13ea063580cb4a019ca408020e7ced797fdfd13435aac6623167b55a45c5bdd2e2ee0e97a6a81a9872668b1920946c79e32f4b5bb2fcc8a9aa1da8e1808ff70f7ee933d3086d78f8fa40324baeaaec4745c54f7ee0f1ecd8f1222f14fe9e97f699ba0e1846e33dd3d0049e9eeeafba7b3a5252ee5852221414dcdede9248466b35cf2fbf092190ce52a606785fc77e340311628e9848041c2e56dc14c4f1cdbe738f27b38c1d1598916659dcefdc99b6758d1789f53463f0cd4174b13b89335001e29a00de1a8c7887f8aa1a3c7174edd62f580fc486a650a229b19d87c8a173a4f7743414658a80b5a33f6827761c688028d8e98ec3aca53b677f36f27cc9176ca47210abf1d1baf908eafab00eda01bb72ce663356aba7a8d87bdf5b0562100408d139b388915e951d601c6a8e1922b05eafc9b26c329dcfe7bc6ddef8b3d9a06ac4fb47386a3e193dcb01399cb3eba6f57a4d9ee71380e195aeeb7afffabaa1e9be5f8a76a61c9c397c3540b58dbf83912f731e1f1f592c16c325f40f010f7cb0f1b5c3040000000049454e44ae426082</data>
|
||||
<data format="PNG" length="1079">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003fe49444154388dd593cb6b5d551487bf73ee39378f9bf7a3a6e94b694b2bb65a1111a13a102b82edc0fe0d0a82e0d006670e041d8aa8d38238d18120522cad5207c596da121f55aad69b3ed2a4499a9b7bef39679fbdd77e38484c93b60a1dba266bb3f8f1b1d66fed15711fb1f03ed5643cfdc00dbcf96a73aa7db53d75e9a3b9b3c78f1e38c9dc9ddae47ec07137bbba7686fdd591ebd1e0de57b635ebd36f0767fb4ef0cd3b074ea2d681bf3e7eee485c8927ac78d224a6d9cad1c6e2ac234d2a586b31c662ade3d78e0f93a7fb8fd7b8f62951fb045d0b8f76deca8b873f0b2f77c217ebc169357d77c7cecdc49598cd63831c79ef738cb13c30dac7c46b2fad0a8364985f5e27f6319440d3b37875961fd28387cf3716a68137d64da7b5509486521b004e9fff83d9f926aa346b64015b3f4a7564065add20fdf8762fbf15db311bf7e0bd3b7497c7462c461c61a53032d8c3eeed1b7968ebe8aac8e737201c230a03a03ba0eca2b950e5f7aea768b60a8cc85dfb488cb118b144d172e1e073fbd83a3ecc86e1de956603be718ab8a30ed910f80a2eebc36e7a9cf9eb63349b0dac75f7020b462cce7b1aad82c32f3e4108811002f38b6d708afef65754077b60b102ba83765ee5726d2f4bb94315e5bf812d228e565672eea73ad63aac7588f558e718f5177876cf34a8412080d4b8382d7ca92d8b799b526b9cfb8f8e556910eb1071cbd93a82e43c367686a46f1c16045c42d1709cbab9911b91c31883526bc1fb60f9365c62c461c4e17da0d655c5a6cb9d6a6de9e347366d0b607a0003b687bfaecdd0ecdb4d8f4bb99917686d70ce03fb52a00ba80226d15a3022f4f674f2c2fe4770ce5396069535e96c9ea636340a6d03a146de70c896e739f4e43318717cfcc9318a4221622ac0c81a27d25856bedb3fdee6b922cf4ba45ca223aa1345034037f8216e3522dae916546968b532f2bc4015eade1e6b2d88388a4253af2f3037d746c452b10d86c7c7408621aae26ccccfd714533d31aa9ca2b33341a912630cdef93bb93e316229b5c11a431c07babb13440249d6c2fbed50dd859319ea93df32dbb117224f9ac684e011238811bc5f053b960f5e275a0bedaca05a89c9b29266b340c4d2b1344f36344054445c3e53e7eccc832c25bdd84c61ad234d638c118c15bcf70168ad403d4c8644294d912b7c9a206271cee1bd23cb0cdf7f779eeeca247fb60650dd9bf062f1dee19c238a02ce59bcb3048287c97cad17b1521aa50c6569b0d61282c77b8f379672fa0a57cc18a677332184d59193a442b59ae2bc47ac5b6bc5ede5a9a2245b6a6192983c6f216211b198da06f48e03844a8d542cb03c490860ad43298d6ab7d0457eafe591cccf2e4e4c5d9e9e10112e5eb884f7cb9d39e757dfb7f3fadaec95065a5bbc8fdeba8bfcbf8bbf01e870cbc9b35858b90000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image5">
|
||||
<data format="PNG" length="212">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000009b49444154388ded943b0e80200c865be3a91889c7320e8463998ebd164e68417949184cfcc7b67c6de803991946681a42fdc152734bb052e49eecd600e845a3b4a19f0aa5c83187ce1230967c1f541cc363602931ede47ce5b73ff64112caac31059509d7edb23d362f86a6803965a7e22db408ae6d5a33b8075eb52025b8f75b73d9b0e7bad14e4e4e82ec49d74aa7a0009d15e7f4bdebf6834f1d172546d17f21be920000000049454e44ae426082</data>
|
||||
<data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388d9594db6fd44514c73ff3bb75dbdda55d8cdbb4200a4d4b5bd3284414a3084568dad81062a4120dbef237c083c4575f89a40f3e61a231a24f3ed912de08acb484b281a42c50ed65d3d2ad2cddcbefd7df5c7ce805b6ed72f92693c99c73e6332733678ea08a868753d9643291a8e607b87327933a79b2ef93cd7c4eb54ddbb62593eded6f5aebed4a1bb43118037373b99d8000cc4b838dd9108bd206a50d5269841068adaa6daf0e564a56852a6d10168461f8ea60299f82d743a532d8a632e615325655a14a6bb43648b95415bce171007a7a7adaa50cab427d3f444b85effbd1cececebae766dcdbdbfb9952eac3e3c74f7cdedcdcdca6b5b656a1f21968e087282951c2c6f3dcc4d9b3e7e66fdd1abd3132f2f75f9665fd3e3c3c7c0740f4f7f7dbfbf77f343e30f0f52ecff3009899f987a20f7bde7b8750ad420d7eb0020d15b59ec395cb431c3d7c00216c8c31e4f3790607cfff3238f8c357764b4bcbe93367be3d1589d4605916966571efe104bb3adea5bca409424d28354a19841058b68de3ba282c8837a30bb3048161b154c2b53ddada3abac6c646869c0307ba4f47223515f7f3b010a1d18daeada58662682849f09541ea657be07a88ffeed3f8fa16ae67eff17e63070d0d0d44a3d12f9caeaeaeb71cc75ea9044db9ec93091338f316c510c6f386d9122c7fb0f5b2d9bf6038f186c7e19d7bd6acdbb7efd8ed04c192e7ba0e524a826009cf7399d0af71e39ee0fa5c35e053150a314e45dcb5b5ebda2493c94627951a092391244d4d0992c9048e03ffced771fbfe73796b9ab7b7108d462814cacccc2c90cb3d616e6e5e394250544ad74f4de5989aca2184e0fcbe38813d4f513a3cf605b99221f34813ab11ec480812b5501f815a11e2a91257afce561ca6b57aec044139178d469a974d86a1a13f37cdac61659e591915be8604fbf67dbc4c309a7c7e61c629169f4c45a3b55d004b4b3ed7ae5da1b5b595d6d6d697ba8a542a455d5d9c43878e02b0b8f804dff7279d5ceed1cf42a8be582c8eef1bfafafa3972e453b66e6d780172591d1d5d64b359e2f10860313dfdc04c4e4efee1c462b15fc7c76fffd8dd7db4a6be3ecac1837decddfb36e2f9c50080948a64b289bb7727a8af8f03904e8f6632994cdab978f162984ea7db6ede1cfd2e168bed3e766ce00321366f4eeba1522a1cc7e6c183fbfea54b3f5dcf66a7c72e5f1efe1ea8eca7172efcd6bbb858322f52184a532e07a650289b7cbe68d2e971d3dddddff92caba21fd7d579dfccce2e305b593d1b648c414a8952cb230c435cd7fd1238b71af33f85d71e86e22fe4ea0000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image6">
|
||||
<data format="PNG" length="204">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000009349444154388ded943d0e80200c46a9f1548cc4631907c2b148c75e0b27b0226083b2f12d24d03efa0740446a849621d409e65af30df418f6a36c4c64400a063e155a639038d52ed01a433c4b11a3bfa02d47be72bb3ca854e3987e2b5d2203255829d3aee6b522fd04cee1bf82df1add05964c4f023b2b73928e64758e9d55ca6cf20791eb560ade90daeb930ae67f3cc10f9d5ba746085c06e1e50000000049454e44ae426082</data>
|
||||
<data format="PNG" length="1168">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000045749444154388da595cd4f545718c67fe79c3b7760669896f1624305044394882c2c289258a31235367161e28a85d1a50b57a64b57eaae24eac2855b13fa078864ecc684b882513a52c5548b16ac7c88c0ccbdcc1733e77471ef8cd836ddf82627e74deeb9cf79cef37e891fa125a4d4b55d8e33642965f30556ae544ab32b2b239b95ca552ba4d4b52b274f5ec8e7f3acb82e18f3d9612904524aa410a86097ffdc033f5a576797e1c24f0f1f627538ced0462ec7c2eedd247a7b3f0315d59f844085c3082110e5325208df0fbe55fd8de7cf89a6d37438ce90654969afb82e0d9d9de872f933a6d18e0eec8e0ec24d4d44120900363e7e64636989dcab57c4d6d7610b70b8bd9d522a8525a56d19c018c366368bdedc04c0aaaf67db891334f6f4fc4bc798e310731ce8eee6cf8909542a45bd312025a258440881012c8c0163286532a862113b1261e7a54bd4050c7f7bf4880fcf9e51595a221e0e63353793e8e9a17d60809d070fe2eedac5fbbb7769b22cd8dc44001883a58d411bc3eae424897dfbf8e6dc39ea120972990cbf0c0fb3fdfd7b5a62315feb6211e9bac8d7af79934ed33c344483e3a00e1f663399c4360603686390c6185f8a850542d1284e7f3f0063376ed03e3b4b63a582f13cbe3a791275f428854c063c0f7b7a9accbd7b00741e39c2bbc646c8e51081b4b29a5c4a299a4e9d02e0d7fbf789a7d358f93cc675a96f6fc7397d9ab633677c00d705cfc3a452ac8e8f0310efeb23b7b484010cf88ca510584a11efee06607674946dd92c3a9bc5b82e52a95af07428049e07ae8bf03c542a05c0f6ce4e5617176b8c2d13e8128ec789b6b501907ff9125128604a254c2804c5e2a7b42895c0f3fccb8ca19c4efb8c5b5ac8d8363baac0da1844c0b86af54aa1a4f41720b5fe94dfc660698d34c6afbc2d955a0cfc5af0300691cbe1cdcf0310d9bbd707550a2b28dbad85b3b59ced3d7b00c8be7bc7d7e53246eb207881c64a2972333300b40c0e82945801ebad8c8dd648295141efb00e1d0260656686ede130d582933ad0584989974c02b0efec59d67b7b6b7294a6a6f0e6e6587bfb96fc9327a880b17de000e1c14100e692499c0058578109800b8f1fb3383606c077d7af93efebf319e7f3642f5e64fefc790e84423e687f3ff6952b00bc1e1be3dbe9692c29315aa3ab5921c07fb6526cdcbac5c6fefd449b9be9be7993b9070f084d4c60bd79431b10eaea420c0c1039760c006f6181b9dbb7f93e164308810ea410c3b19839dad949241cae3d9d860642972fd3fac30ffc9ffd3e3acad29d3bf48642d84a218460796d8d9f2727fd74ab6a5c5bf93c6a78983fc6c791c78f93e8ea22dedaea477f7e9e959919fe4a26d9f1e2058722915adbac32d6c66055b42ee50b05bb311aada5587552c49f3e454d4d510096c36136ca651aca659a6c9b56cb426c01ad36fc0febeb54b42e596b85c2c862267341030df5f5ff391daa7b34e8b5cbd533e0377afc69b392cdf2767999b54261c4d2c65c4d2d2e125f5d1d92427cd130d5c694b2a5d28836e6eadf44cbf02c068658550000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image7">
|
||||
<data format="PNG" length="214">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000009d49444154388dcdd4410e80200c04c0d6f8aa9e7936e7fd169e9a20222ca0d15e4c340eeda64101c81bb5b53e9a591a794fc32bf51f988981826b10005d8219600af6f2aed918444494d9e31c64a7f8762bbccb91ccc98c63ca9f8fc08e79b76631310774ee8a9880701a1f080a04ede1b7700d2d0f68e155b88732f80566d15e0ded3193ed145c566bba7df4e7bceb5664d5bb221f77366fea129aa903bb2561adb1d6f6e70000000049454e44ae426082</data>
|
||||
<data format="PNG" length="628">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000023b49444154388dedd54f68d30014c7f16fd2ac71eb562b1b76b021ab0c640c598720881e36f02244d8403d88487af5e09fb183f71d15c744c483909d77b1d0c0f030eac59b87ce8b30d0669b75d35517d7d4a66dfe78a8741b5dd5293b0806dee5c7cb87e4e525117cdfe7200ef140d47f1216144569085f0ea5545146f3cacc9e5dbc98f813b8e18a17ba52aa9d439b3a99255ad85417ba52ea5fc3f391d488e3a2dd1bcb31341863ea4a804eb9a0cd47f68fd761bd2319773dffd9ddf3ef091de961690d2c37cc9d0b3e87e592a67724f7858b007a682e8eefa413a7d7228edccbd21af5cadb61ae9da9100c789a1e9afb6d5ce0f2561c414c9fea9723c7a352d3c6ad6285e7af0570ed8452ba3afb6bf8d2974dc460a4450e012005e0dc89ed0663a35600d56a151c0b6058b1af677e064bf8de38ae4df59b5d3bd977a63f7d8dc6c3adb506cf876af1a389202640340194b2da14d5834fe340ba618f75e989d679b447edefdece5ebd03d75acd00a38a73c36c8a4a8f6f83380d241be1c0a3110287d283fd51a41dcbb8b8ec4271c504668059c5bb6900e8e2c33e600cb805f401268218dbf3cdd3850769da7a47068eb5eecaf305d8d82c41691dbc4a2d94daa0250c8850fa602288a38a3f91d97b0d7c6f9ce24af6cd6a5f241695eb71bb0cedddad40ac9e551cc87d2e836598c0a8e24f64a0c9474861d20486b18c4c7639879107ab0c7675bbf205c8ae97c8adbe05cb48023185c9fa43dd7314bbc6c27df5c7fce288c1daad574c00037801ccec04ebf0ff3fc881c3df0122e6e0f16d7121140000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image8">
|
||||
<data format="PNG" length="268">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d349444154388db595b10e83300c44cf88af8a18d9f91936d485aa7fd5d99fd5eb5099461093109493bc70c9f3c94984a82a5aa86b4205200078b64055a51a4ca6d922520deff7109335230911e155f806f652d7c2b751a412ffbeada700d531d9ac60c62bc887e33f5d78f75f24878a1bee3dd3302c08e17d48b681491e2a96e74d531aeede0a8379be79f3dc01f8005810c28b3696a25b71e6db9c4d21bca93acaadc4a943b546b7137baa4e9c6bde2c716769bc8a13e72a569f7bff763fab679c53f58caf6c2a511178ff088af6b4fa997e01dfa4987b8b9435470000000049454e44ae426082</data>
|
||||
<data format="PNG" length="683">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000027249444154388ded95df4b936114c73fefebfc91ad7cd72f35a2e6af6976b3821002c95d54173d928a6517112d22080451bce84fe832af03dd455751294c08ea620baa9b88d68d6939b7a05a3ae75edd66737bf7be5dcca653340dbc087ae0c0c339e7fbe11c78ce7924c330d88923ef08f59f044b428875ce97f56ebba9841eb99816c07abb768cb17933afc247017c5a8c81e68fadae2d835fec772bb2c4d0b1bdd1b65b6766693e594975a5394fe07917e2f19b38eecf753edda0fd5ca435b829f899e2b6cb129ebb2de3cad9d3351417156edaeaf3d7e3dcf336a89a4ed5c5f956756ddc0430ba67c48e6e783a1afd8a7f5ae2c98339c6228700282f8d71a9f11bf5d68328fb0ee484d69a06ba66fdcac30fd5c380635dc5742d2a487200508020c803c0888877040146cd4fadc00dd07b2ed8c28afdf8919c38a3a519f46acc25648788777af3c197178691e43624b95724aedcdfa8f5d1dd8f140cdd535721d9ed35a539ff6428c5fba9b44b2c5e75e6833be7a248b243fcbce6db105aec6a59be2a48f2d0896a8b72d89275a809783b1ef561e8bdab352691bc6ed90898850eda31340f263398b295c693904c65e3258550b8cb624f670c0f002915f494fac701114b377d18ba132d4e7da54453ad448502a9cc8a9daa82a65a89f23209b44515437714d86cb63fb1b1e96edf27ce7f8944636d45256514c8a065f22d18867028a082e110da1ddf96475a64ba5d6492ce4020c0cc0224d32b36390d91ef132a86e610996e1f6c735708a3cf859e7286befa998d414a83a91948842700da85d1977b00db5e42827e17bae68cfcf013985e221d9d00700afabdabf3fe6abb2dc35dc483bfa1aeb539d2ff1f64c7c1bf00249101a1f694e3ca0000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image9">
|
||||
<data format="PNG" length="293">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000ec49444154388db5954d0e83201085df989e6a1237bd96c44583d7eaa6c95c6bba402dc850d0d29798093ff3cd13044944f00fddbe0d32b31efb44845ac0b439b62000a0512f159056b1a1156ab53759f9044001c03f3c0007c0c3cd6e07c52ee3b6353f764e00f438495ef50de59133780c1e420883219e51396ffd2a7c3289476e04a77906f83318bfdeb9986ab02b5f89a9d6cd2bc3dd9c27d94a37cf5ce3a313d5a988235aa03a6587275be3129c68c9a071c1005f54e44ecd8e6bae2d7837c7477817c756d19f1d5b058996be6bdccdb1a5ddc07ad16bf9f17a568057aafdf3989f85ebfdbbaae0ab7a030d36e3e74e2086d10000000049454e44ae426082</data>
|
||||
<data format="PNG" length="1033">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003d049444154388d9d955b485b771cc7bfe7e4e4666d76cc6c35316a6493d43af134bad9d5871a686765945a3a18658345287bf0654b614cf6522aac0f9badb5b0be6c6bf230f2d23253ac506869ed982dbde1d9c6d84acd929ae8b471e6e45c7339c9d9c316ebad78f9c11ffefcfedfff87dfe57f21344d0300100481f56c74f42e6db55a6e170a1ad3dedeb4e686228f5c97b6dcfc6d6d8d4ca1a0ad2ba43643b55a2ddd04014892b26aeddab571afc9643c05a06ed36092fc2f41515c0ef6fb47bd36db0ebfd56a79a1dd0c58146564b3790882b4e81b18087aebeaec7eb7bb1e1c276c15ac40961588a20c00e8ebbbe8ddb3c7e5dfbf9f01cf2b98987812286a37550a4150204969f0bc841327ce780f1c78d3dfdaba0bf1780257affec49224e1db62c4326439039e97d0d9f9b6dfe5aac5d4d41c2e5d1a611716784f6fef316e4b11cb721ae3e3bfc0e5aac5eedd4e44a3b3b87cf9260bc073e1c2496ea9764df0ad3e47b7514f30063d60a0106dfe22160080e9c82452a94a1c3ab417d1e82c82c1ebaca6c1130c9ee656329681aff43a9c96520c37ed0353be4b0fbc42418c007f9caff94497c7d0033389fa967d0885ee201c8eb38a92f18c8c0cac82020051bc82811e075db5b31039d895a3130903645e87329b0e966603c438409a74b833d582470fdf4232fa1893dc8eb2b5a08b4f4471f2ed870eff079dbcf7cf78099effa3efe93a1b0f3c3d57d351c590b7cd8d06c06c0044027fff2c23ab681067733e009c06849a3e8f712bc18ba7a2daaa78f56a168f7ea7ce779d8d070020c169acc2e7015945219641f8ba009bc788ca660aaec32583af779afd469a8c3cecaf665646be087ed598c1c2bc064ed09e157d29491bdc56a22217cfe1fe9534bbad1c402e07e34e0d543e0f63a986fa77f4346526865fda3c51062ab667515d963ef5d5117badbd1c4c7383d2812c89b19b3a161a3caa9c4f422c60e61eb87412be7c01476a5bd05dd3a0396f7ce6e83ef8753cb40afc38563ae6ae943a8eef5da061c6a730eb31395d8a07bf1a03aa0adf7b17e3dc5fdfdb918f698886a9d3edfdb10080c06fe71c9146b7ea5432140360355848eb8e0e8ddb071987d45d62023da79858394b0d7dfcc374a0a8915279280b2a12491d5bf4852388bee1ce38958c6eed52f4df98e100f4fc3f00a456960d89e78836d8d3cef9a4e9230063dfbc5f45d3a519468ea950322f69de46ecc9336a4c1373687b8df77ef9ae7d584faa136e074f3f9d24a1645f940158728e37f2e70d1eb33b2b2cd989e3adf37431574120f0dd5d5be8e48f334781352ec846c00070e6b09d2933e5869b2b046752d1839ddb1ed011f0f58dcc704bc1ff02755cb448a18033c40000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image10">
|
||||
<data format="PNG" length="658">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000025949444154388db59521931b3910469fb7027a98c42c2838cb6cb686031d689685f95d86816b66c385033dcc0305354c62dd6c021c576d2e97f3a672fb21a94bf5f449ad6e2dfabee723f4f02154e0d3db4929654e299173a69a01e04488311263a4699ac51f8373ce737f3ee36360bdfb0c4eaef194185ecfa494d86c36b3f7fe5df045dff7e49ce7979717369f3b365f760098196a8a6154abf4df8e4836b6dbedbb9c3fa8eadc9f7bbaafcfb4db0e33c392a0690963a0f642c98576db41f00cc3f0aeab784829e16364d37500485e525266b2814946c43cd247ac56e2a6654c8952ca7c1f3c4db49b35866105d298487e4443219330293408960d4490e0c839df776caa38ef2856c8cd44594f8813ac188e0878521d51a76020ae619aa6bbe04f00550d11401503304372a4b1404e3dda26c063a50202d755ffed180cccae49b3db181a13f278a6b4198280292660b52022f7c1c107524a985e81560dc3c896b05031c0ca35a65529a51263bc0f8e3192fb0b5a15b37a051443cc43126aadfc3808354f0404e7dc3b1c87b008de33bcbea2802a80923853dc8813a1944a29151b126ddbe28327e73cabea6f9fdd03c06ab5c215a8c7338d298d35f8658344871804035e2f3c3d3df1f8f8b84863e2743ab1dfefc939ff2b7c716b9baa3a0fc3c09812e2049a6b82ac54c4a0eb3a4208b7529e8fc72387c301e71cbbdd8ed56af553a92ffed98f4b2973ce995a2b2282f7fe96ac5ffa434a69fee19aaeeb7edafc17f09f4a55e7d3e9c4e17060b95cf2fcfccc7abd5efc35f8a6cbe532eff77ba66962bbddfebde3b72aa5cc87c30155fd7fc16ff5617fde773b427a020f23b15a0000000049454e44ae426082</data>
|
||||
<data format="PNG" length="462">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000019549444154388da594cd6e82401485cf1dc6f8205d1a9b98b8eed2751fc0b7d37d7d1013928a8b26f60d8c69b448c90c73baa0a0c0f0637a120284e1dc73ef7c2024b1df7f121d0ac31d96cb57e95ad3104944d181f732266392181e8f5f3c9dce8ca20357ab3792c4d043f98a05812008044add1ecfe7cf58af379d9dddcb6b0c002282200800e4a3d86edf0160b0b9eeacaa14b22cc362f182f3f91b974b8cfdfe635062af719e363f2ba510c7099224ad8ce65f894508e71caed71f28a5a094c26c366d50e4a3c66b6cad83b50e719c204d0d00603279f23c8fffba9862bddef0debcd11b99a74cd31424311a058dc243a869186719cb945aeb928cbafaa8a98c82248c311091f2e8dab02e6a2ac6cee5e67d1a424d258e3159e5e53ebc0a6a8cc9a0b582d6b79cb5c416a48074e526fa54a7663c1e81d4b0f6b6be342e4620428848eb48daa821f3f72ac661b84318ee5a5b9ecda6e5759d9aa22b6b5dd3b8ef5f5b7c696dd438e74a420a0dfff8d14e4d5e0095c40f193f42cd83890b6a58a1c6d7c560e33a35f7aadf033dbfcd427dd4f8f40bcc2c550346d4fe540000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image11">
|
||||
<data format="PNG" length="265">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d049444154388dcd94d10ac33008458fa33f55ff1ffb59d9c3e6c89c496dd860174a214daf87ab89981900aada00cc4ce8e4ebf1db68bf4bdcf8db12a09dee5a315e2556d5368a01e0b68cd415f0b73f005bdcb83f3f1c139a5e4e1de93f8c578963b1d4f830935db555a84739bf19f766f2c099ceea6562efb8179a4d4089b8378d3f8fcc7d3d924f9b57c97a3415af39ae362b23eee77738c75795c506e1e465397a1c598e336df0884192ea195dd5bc7c09c5a37e76099533bedad8ffbb8fcfb4417ede5d59c3accb395b871f12df0112aeaae89a42dc160000000049454e44ae426082</data>
|
||||
<data format="PNG" length="740">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000002ab49444154388d8d953b6854411486bfb9f78680c6204202e283588845445704254acc8a36a6b2b7b0486d2104b130b1b15110b14a9a2882a5165a2485882f108455221ae3ab301811821a13b377ef6bceb1b8fbca6677b33f1cb8cc9cfbcd7fce0c33863aba7af5ce0d20533da6caf4c58b67cfd7e6aa6a3dc45a8d8e8edf1e1fbfafb51a1bbba7232363b76ba18dc27cb8d9bbd9315c3686ccb35fc7362f751ccd0c0f9fc1f783550b0641c8ad5b0fe9fcf7723adbf5e2af2ad37bcebd5f5341499e1fe893edfdc7331d3b76b27457e9ebdbcbfcfc42dde4bebe7dbc7cfe23b3edf42e56be7fcabebed69b3d7861e6405d309d5b32dd877a0088ac0fc0dcdccf86ad8a6cc886ad1bd9d0bd87f9371f338df2bc483d344acb3e31203c7efaa02114e06456d3fc30264a9c8679e6d1f57ecd0e0d3485cd7c1b6a3a9fcbcd323474caac72ecfb82c441a37fcadabfbfa7fc1d454a92082b2b3e8e93ba9e9898d26ab8e3172c1a054da356ae6b705d07d7adb4e2f0e15e2626a6b40a2c4814348d7a32863238979be5d5ab99b273002f085b6b452d1428b641181c3cc2d2529ee5e53cefde7d05c0539155e56a21063f86c482142bebaae7d6608cc1750d8b8b050a8500d7adec9fa72a48148228fa270fb1b4ecd818b05689638be7b988547aee21828405f4b70fb15d17aa0a715c3a1505c230a1bdbd0d550f6b2ba652c78bcb683e6c09aa9aba0cc31055686b730110518ca96a05d622bf97d785964a8f63258aa2f467cf452475992482e354f7384c90286e092c02719c608c2987e3388828ae6b4892caddec51dabc16646dfd8bdd18ca0b95c10b7f1d0af988f6b6f54f435cb5b9a5a356edb25ade95c9cfe6d2e06eedda943404668b7794882d6e60fa4a48f19cd77b9d3c802b935fccdaa98adebefda6d6969ca66e537865ac16ee35039694cbcd92cbcdb6925ad67f2579adb1850abe460000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image12">
|
||||
<data format="PNG" length="1226">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000049149444154388d95955b6c944518869f99ffb487eef66f69cb967ad10a36f180161488312660823131206a888844b6953b1b0991182f38085c34484c4189180e6d4940b83042d110a03156083448a2e5868294166a0b2d14da6e77973dfcff3f5ed036b484aa6f3237339327ef7cdf9777040fe9d0a113a586e16dcc229608a96c8142d704caa555b96affd2a56f6ee731da5cd7a2ce9c6ba3696f950010a3070d0d3f465d5dd406823e3b909383df6f21a504c0711c52f1388958ac359da4b2aaea9dd689e085abea5477570f6da7d68bcd752d4a00ecdc79306a04647d41718450288869ea689a0680ebb818a681a66924e2096e76760c0e0d38b3aaab3fb8fe38f70b57d5295953535fea48b7b6a038826d87b17373c8cf0b93678708858218a681937500985290474959992db44cfd44d8da1dcd2abaf1980268da5b25a4eb2656dbf9613b18f4130cfa098773c80d87b04339b88e4b61411e81800fd3d401881417915f60cfdfb2e59b8a51e8c75b4faaaeee3bf4f4f4f3d2bbb50a40a6ddcc127b4a3e8661e0f399f87d1621bf9fdc6010cff330759d40c04730e0c7efb3300d9dd2e9a564b3c32b47c143b1240303c3a45269945200e852aa52cb34d07589142010689a462c91c4f25958a681a73ca4940821504a11298e904a25c71c5fbbd683e33864d359e2b11800d23035344d4308c1502c41f7addb74fc7d93bb4343847302189a86a9eb63cb320c4c5d279dbe3f56df96c3d5654ed6211e8bd1fedb1601a00fc71208f160eafc3e0bddd09140382787a06591ca64d0751d5d4aa49428a5703c8f6432f570efaeffd9b8563cbc21fbfaee5e775d1729250383c3643359345dc3f55c92990c9aa661681ac6885353d7e9edb9493c9e796496c781fb7b078fdee8e804c0b20c1cd7c3f51e34402090234e0d4dc3320c745da7e96413c3c3eefe49c1f1b8d874fad7b383e97416bfcf429362b2fb74767472b1b58d9292270727053737ef1beced8e57fe7ce418e94c169fcf04c0f5140a85e779789e47d675b9fc573b5feff896f2f20ac2e160c564600da0b3b3f572d05776b1fdeaa537ecdc90af706a11baae21857810264270f2f809be3ff0033366bc4049c9340aad7bcb3e9979e58bf766074a0ffe3edc38113ceeddf3e77f649b6676636124b4243f2f50aa6902905cbd72a3399b35f6cf9933af359d4edbb6bc5d5f9e3c523ab722c440673b6db7fc0dcbeb6e553e627bc39eb3ead515bb14e09bb4c023faeefde2813b17d6a964db36d57ff86575fe335bed5a563c2e3f2440cbf92bdceebd0d90aafef294aa58b44d4d064edc674dcb9146ac3c9bc0f36f317df6d33c372d19ad5954fc48388dea8905d1ddaa7cc1c649c100eb5f8f440f7f3a53b97d752a79a946f51f9aa77ea90eabcf5f8bd40388ad072ea83b7713f4df8bd1b069f1e4b33641ab5f89442b6615d57fb87e0de9fe9b242f3672e1741b3fb5061b6457cf3d4623efc5b7bf52f0e09b59b8aaee5f5def38dbdb70fa5c5fe59e0ddbb18a4a08cc5cccb3739f4249232a13c9f458e431921967ceb5d1ddd5f39f5cd7ffd1d7d072beb772f7ba5a1c7f3efb8e43b06205624174b74a2653a4efa7c7a5d3ffd5ca8aa9f57ebf8ceacf2ca7b33775f41f5687e4181c28b9610000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image13">
|
||||
<data format="PNG" length="1130">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000043149444154388d8d954d6c545514c77ff7beef992953a04829691952401a44890944d2f8d584a5a189bb26ee202a316eba926008892b6263a20b17ccd25437268d6b5335418d2921f801a122525b18a14c69a7d39979f3debc7b5cbc692d20c849cee6dcfff9dfffbdf79c7315ff63874f8a2f42179013c0185612a17cf1ac0a1f97a71eb530784a3a8161631812a10fc81b81c4501198159814c3c4a50fd5d213110f9e921c30a214a3394f0a3d1b710a5b8cda964fd01a4a4b1637e6b594ee99787e59cf44891a1361fcf2476ae591c42fbe2f79239cb135c707b69bcc91e760603b6c0884e55a8c91141ef82e73775b7c7541f1c334f5e5d03e97184e4f7fac2a0f11b7957e90f5e4ed23fb5beeabfb6d02c7103663f219cdf62e1b6963a7e7221cc7c26033351df2d9792b2a2db99f8a70eaf74f52e57a9de0115b73ecf01e715f79c64621acd423067a5dfa7b5c7c5713b4fd40bfcfd64e4514b7787e77c0eb871237e326c744185925d3ab0fa514a3852d267b7097a2112bca958867777a049ea6d684cb7370f106cc96c108746db0e9d964510d6177afcfc17eb24a31baf38474ae573c1c3852d8d70bad44b15885aca7f05d8d11f8e3365cbf0337cb3075ad45b91201d011686a21dcab42efe6840e3f29186118c03e7c527c6318ca677072be62b99eee94f56c5a09342298be05cd388dc7cd3a819b01a0160a3f5e35dcae68ea9143e02947aa0cf5bd255fd8ede2efcb78a8a8a558aca5049586c5bd1aac84506da4b10ea7c6e0804d2eb03102df5e365c29596b8f94f55122f489d065033911f2be63580eff05016b9b00584985a32ffbf43de521c0d4b584af7fbdbf0d7c078c9017919c9d9834d88c61a10a6b35b53ec16af0c64b2e3bb67ab412f8e6b784cfbf57ac84faa10e1349096c11aa02956a6861590f800031c2d66e4dcfa694e2c275c3973f29c258afe1551bdb0c01910a8aaa6d600198ad3591ac87524a1051a97049d3b4d25896a2da80f357d34ad0ff31652a3504cc2cc282be785685c630596b482c2268a5b034d81a6c2bf5bb558ba93f35df5d81b9721a731e7011a152333130592a3aa19dde0b13b526efd59bb2a77ba342ad5723902431956a0bad3459df2791fbe58ac09d25c34a2833c004b41be4e731b514276aacb4686aca34c978906d7bc6130ef4c5bc7628e0e80b01837b15397ffd3a2471c85ff3ad5a2b91b152d1595a236e0b1b5f6ed8c55f667594c40d7c5708da89aeebd1329a3849ef36f052f75d218e1a4c5d9768a9ae8a20e3ab7cf79de9e977252fc299cdd9e8f8be5ec9f4776b1cc7c1b66047173836cccc4318431c35992e09976e24f5f9aa730e385d2a7a0f8fcd55dbf58ee404463c2b19edceb70a7bbb1bceb68db6f283008046a3cead722c57fef6e35b8bd64c18eb3190f152d17bf4a05f6f8513d229c2b00843266dd3bc88a4758a99052641264a45f7c9bea607adf74df145d86c443a4040a40ab2502a3a8ffd4cff01b1e10a7293d99fd30000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image14">
|
||||
<data format="PNG" length="617">89504e470d0a1a0a0000000d4948445200000018000000180806000000e0773df8000002304944415448899dd5cb4e54411006e06f865114af3131021a160671e365a16f6074e9d2b8d52089f125e6397c099fc157d095181315508c1708a00383302eba8ef4f41c06b4929399aeaefaebeffaebf4e1f0d6446fc8338e1368a191273622b9cf590fde8e27071ef04d602c7234c279165d6c61b7006f245f3b966d788c0d6ce3c5dededffd192ca1d30cef6a59b9609f27cfe13be6f11a37fb0b80299c4633077b87c99a2259ebdaf03c087d09961f4a749cc251344ab66f6a8a445f2b966d7819204d6cd614e8b3ba8998c1497be28f85afda7f88db386750e859dc91a66aa412b9ceaee2137ec57a2c4e77317296305f9cec093ee32d16d11956a0aec8b138d948f2f781cf6239c0ab9cdd830a94457a01be5d80cf65cc972a700647b2ce72e1f723b4818f39f36ae33005ca222335fb9b588bdff2451d7abf94cf65693c2732df23d9d494e0ad21ac9f611d1dfcc6cfec041b92365311bb10b103ec0f12f9aebdbeee482d588fffdd88b9214dcf4a10e9b35283a7c5ba156c97a529f911c0dd343d6d788533e26aa86399f7f2bec1be5f9366bf4a6e4ab76fb5ff00b7c23730349506f702601157a479ae6c42ba3d37a516f4a46b7d1a972266357c03ed6ee03c2e487dfe1afeb522ee3ade4b42f78269f55693da583ba22d49b4e8abad489e94c4ad6c1cdfa489da09a04ec48b75edb0b422a8abbfefe5098ee3887e117b516ca8b532d03c714beafdb424de4a46e29f6cbf0f7d03a3d2676f340aaed947c8ff2950ed551f9c9e217d1e667f0045acd1dd3ebdd4130000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image15">
|
||||
<data format="PNG" length="955">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000038249444154388db595cf6b5c5514c73fef4766d2264da631050b46a2558a229404b156ba70e142dd982c4411174a0b5d360b8566515c28d1aac5a62e142be44f502c2e249616ab062948b4859aa84d6968da24f3266f6632efcd7be7be7b5c4c7e27820573e172e072cee79efbbdf79ee3a82adb31dc6da102cebd38bffbe16821b33a92cb797d8b35e9193af9fcf8469f6505fe73c6ef9d1eed6bded134f54a7f6fdf91d70f21c68edc4b529bc6a9e10bdd439f7c7ff1dbeffed0eaa268a9946818a67ae187291d183c3fb055c6aa8aa3aa3c33f8dba61bfcf9fd03cec79f5e1a686b6f7ee7c5e79e287476b42092618cc5188bdfe472f68b1fc3bb738b3d9f9f7ee9e65a308073e8c4b8befdda7e520b92412250295598bb3ec90b4f3fc0c127bb71802c538c59051b638912e1d4f0c5afcf9de9efdf08f60bcd3e8f3cda8cd806f4d6d5dbec886679f3c85314da73a8824823e8c4c89ffc7ea34296296a15df7798fccbebe3f0378ad8905ffa762f6fe0db2511a205c3c44fd7e8d9bf87dec3bd9bb43e76f61a8b99cf076f1da41a432c5017701cf8756c868f3e1b2bacf577f6be31a6fbbadaa8046576e67dda77e5510b6a2d995534534ad5847d0f1638f6ea635cfe1bc21a9423a8d521b85964f2f204778a77e0eacbce8a14071e6ee3fcc9c711a0584ad8d39127026a066a4923b8568730822bd38d2c130395b2303d7e8b606a8ee6bc070a478f7ff52c7009c057ab08500382cca1584c6969cf315f81bb25989987b0aa04654350ce28570d335321c1d41c2ac9ead9ad0538be066c51a00e78bb734c5c5fa4a99c6376014aa1128442b164982f09f381500d6392b0066a01c88c12546350e5cbe1fefe7367967e9eaa9202b185990588fc56a66e27a402621491f5d388c55a0baad42261ae5cc7e45b604331f3330b31301d36b4cc1ca85b1729a7a4e2929886a689402a4a9629990841b18af57278ad6d0d66b601eca098143a73b04ba1c381fbee6f222cc658944e4f087d21cc0b959694a852673188616f335621cb12acb58cceae7f9ebeab4a570eba7240ebea3da4dd4d248941049204441cd2d425497622d2449208692aa4a941c4307a657da174ed1685de75c1f33c7cdfc5f3dc15ebba8db565eb79ded2ba0b763dc7e55f1a88e7392b419ee7e1baee12d4c5f39c25bb3a37827db55b935d175cd7453523953a71bd4e14c5c4f598384a88e2987a9c20598611b309ecf0d0d0ffd6f4f4c6e08ad0ce7635d37f00f4b819f9e3b0a8920000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image16">
|
||||
<data format="PNG" length="278">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000dd49444154388dbd55ed0e8430082b892f35de3ff5b1b81f8ac1c93ed4bb6b62dc269452492624d183aa5adc931455357fd7f1240500962cb115dc3af742f1dbd24a7a8b29c51e7347c494e2275d5d14bf253c887fe5b100187afc887834c7198aaaad0301278fbf69cbffe6d89115ac2de85972dbe31284f47c7e3415333fafa9b85416d54445d564cfaf631d161f922009dbd77b8059e8ccd756756b217f6a2a049048269b85c7b9ef23d2a988c5484255bb85b398a1e28cb4b6208bb94c454886b7e84459eb06d8ba5d53c7baaf58f5f4c3321f6f290ef7588b670a1fe923b36c6e54b07f0000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image17">
|
||||
<data format="PNG" length="297">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000f049444154388dbd926b1283300884978e970af79ff558f487a2481313b52d334e1ec2025f1092383355b5782629aa6abe667f920200532db0e5dcbaf744f1dfd40a7a6a4315bbcf9522862abed3d547c54f0537e15f3116005dc6b7847b735cb3a26a73a78003e36f62f9df1cbbd512660467482e332ea19033ceb7a662e4f19a159784280b155593353efbba59fc4882246cddaf0e66a133df5bead642fcd0540820514c1684dbbd9fa34daaeaf90c100180888724769fbad57c5e8b88998b67e6355147e35d3412efa271cd4c7b5ce39ee43e15aac5c8f930fc51c039ee4c177491b101db1806e876101a33693efc1b7858d21f6a6c70020000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image18">
|
||||
<data format="PNG" length="319">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000010649444154388dad54d10e84200ceb0c3f65ff3ff5b3760f3283133c39af090959a0ebca864942c64a7aec37c92e071e60c90192b7899ea2b4970d304940434e12d3aca88a439163e788f237c92236abfa6245e0576f0180a40f89df9002c042f2547a3e1831031e5720c99668b737a567b54074c143aca48f0404a9a2c296b8cda844301a9ad11d03ce6d2ac9d869ad3690254bb25c4dc9ca7a6a3b89be5af8b3c72411777b36952ec3005b2d19d8ad31d262df83372b54f8a01207e05e17fa0b92f6919664d5d7fc906812b8f6bfe378bce61e6af8b0767aa4efa654d2e177014eaffe6afa827425bdd44cafc739e36fbf5b7eec61bba5a1300096ff838cad99c0a90199c1079e7cbe7ec1d5a3e00000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image19">
|
||||
<data format="PNG" length="245">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000bc49444154388dd595c10dc2300c45bf512fdd82392cb14817e90c5da4a3f8ca383d8693d15720366941c03f3572f26cfd38ae5cced7824acbba0900ccd35878dd233133388401bcae63afe8d45bc9ef8155f5c1738e45f1101c41cd4cb2e42978593799a7b1d417e7f04c03839ec15b07bdea56a25d97676692557eb82b5a7e1f0247557ff78170abb5e2bbc091b8b7f9010df1b13eb827003ee4b1aa96b4e2ccdf5abef78fc726b78c7ff7dac01200f761528fc6bd5080fe79efd60d86746ad3b710aeb60000000049454e44ae426082</data>
|
||||
</image>
|
||||
</images>
|
||||
@ -4454,24 +4276,6 @@
|
||||
<receiver>MuSRFitform</receiver>
|
||||
<slot>CallMSRCreate()</slot>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>PlotMSR</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MuSRFitform</receiver>
|
||||
<slot>GoPlot()</slot>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>ShowT0</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MuSRFitform</receiver>
|
||||
<slot>ShowMuSRT0()</slot>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>go</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MuSRFitform</receiver>
|
||||
<slot>GoFit()</slot>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>musrfit_tabs</sender>
|
||||
<signal>selected(const QString&)</signal>
|
||||
@ -4562,6 +4366,12 @@
|
||||
<receiver>MuSRFitform</receiver>
|
||||
<slot>ShowMuSRT0()</slot>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>Plot</sender>
|
||||
<signal>activated()</signal>
|
||||
<receiver>MuSRFitform</receiver>
|
||||
<slot>GoPlot()</slot>
|
||||
</connection>
|
||||
</connections>
|
||||
<tabstops>
|
||||
<tabstop>musrfit_tabs</tabstop>
|
||||
@ -4578,10 +4388,6 @@
|
||||
<tabstop>BINS</tabstop>
|
||||
<tabstop>FitAsyType</tabstop>
|
||||
<tabstop>LRBF</tabstop>
|
||||
<tabstop>MINIMIZE</tabstop>
|
||||
<tabstop>HESSE</tabstop>
|
||||
<tabstop>go</tabstop>
|
||||
<tabstop>PlotMSR</tabstop>
|
||||
<tabstop>FitTextOutput</tabstop>
|
||||
<tabstop>ShParam_1_1</tabstop>
|
||||
<tabstop>ShParam_1_2</tabstop>
|
||||
@ -4639,7 +4445,6 @@
|
||||
<tabstop>Bg24</tabstop>
|
||||
<tabstop>Data14</tabstop>
|
||||
<tabstop>Data24</tabstop>
|
||||
<tabstop>ShowT0</tabstop>
|
||||
</tabstops>
|
||||
<includes>
|
||||
<include location="local" impldecl="in implementation">MuSRFit.ui.h</include>
|
||||
|
||||
29
src/external/MuSRFitGUI/MuSRFit.ui.h
vendored
29
src/external/MuSRFitGUI/MuSRFit.ui.h
vendored
@ -384,30 +384,12 @@ void MuSRFitform::CreateAllInput()
|
||||
}
|
||||
|
||||
# Get minimization process
|
||||
my $Min = Minimization->selectedId();
|
||||
if ($Min==0) {
|
||||
$All{"Minimization"}= "MINIMIZE";
|
||||
$All{"go"}="MIGRAD";
|
||||
}
|
||||
elsif ($Min==1) {
|
||||
$All{"Minimization"}= "MIGRAD";
|
||||
$All{"go"}="MIGRAD";
|
||||
}
|
||||
elsif ($Min==2) {
|
||||
$All{"Minimization"}= "SIMPLEX";
|
||||
$All{"go"}="SIMPLAEX";
|
||||
}
|
||||
$All{"Minimization"} = Minimization->currentText();
|
||||
$All{"go"}=$All{"Minimization"};
|
||||
|
||||
# Get Error calculation process
|
||||
my $Err = ErrorCalc->selectedId();
|
||||
if ($Err==0) {
|
||||
$All{"ErrorCalc"}= "HESSE";
|
||||
# $All{"go"}="MIGRAD";
|
||||
}
|
||||
elsif ($Err==1) {
|
||||
$All{"ErrorCalc"}= "MINOS";
|
||||
$All{"go"}="MINOS";
|
||||
}
|
||||
$All{"ErrorCalc"} = ErrorCalc->currentText();
|
||||
$All{"go"}=$All{"ErrorCalc"};
|
||||
|
||||
# Return Hash with all important values
|
||||
return %All;
|
||||
@ -646,8 +628,8 @@ void MuSRFitform::TabChanged()
|
||||
void MuSRFitform::GoFit()
|
||||
{
|
||||
my %All=CreateAllInput();
|
||||
musrfit_tabs->setCurrentPage(1);
|
||||
CallMSRCreate();
|
||||
# musrfit_tabs->setCurrentTab(1);
|
||||
my $FILENAME=$All{"FILENAME"}.".msr";
|
||||
if (-e $FILENAME) {
|
||||
my $cmd="musrfit -t $FILENAME";
|
||||
@ -687,6 +669,7 @@ void MuSRFitform::GoPlot()
|
||||
void MuSRFitform::ShowMuSRT0()
|
||||
{
|
||||
my %All=CreateAllInput();
|
||||
musrfit_tabs->setCurrentPage(6);
|
||||
# Create MSR file and then run musrt0
|
||||
CallMSRCreate();
|
||||
my $FILENAME=$All{"FILENAME"}.".msr";
|
||||
|
||||
11
src/external/MuSRFitGUI/devel/MSR.pm
vendored
11
src/external/MuSRFitGUI/devel/MSR.pm
vendored
@ -87,6 +87,11 @@ sub CreateMSR {
|
||||
$FITMINTYPE = "SCAN\nSIMPLEX";
|
||||
}
|
||||
|
||||
# Proper way
|
||||
if ( $All{"Minimization"} ne "" && $All{"ErrorCalc"} ne "" && $Step ne "PLOT" ) {
|
||||
$FITMINTYPE = $All{"Minimization"}."\n".$All{"ErrorCalc"};
|
||||
}
|
||||
|
||||
|
||||
# First create the THEORY Block
|
||||
my ($Full_T_Block,$Paramcomp_ref)=MSR::CreateTheory(@FitTypes);
|
||||
@ -428,6 +433,12 @@ sub CreateMSRSingleHist {
|
||||
$FITMINTYPE = "SCAN\nSIMPLEX";
|
||||
}
|
||||
|
||||
# Proper way
|
||||
if ( $All{"Minimization"} ne "" && $All{"ErrorCalc"} ne "" && $Step ne "PLOT" ) {
|
||||
$FITMINTYPE = $All{"Minimization"}."\n".$All{"ErrorCalc"};
|
||||
}
|
||||
|
||||
|
||||
# First create the THEORY Block
|
||||
my ($Full_T_Block,$Paramcomp_ref)=MSR::CreateTheory(@FitTypes);
|
||||
my @Paramcomp = @$Paramcomp_ref;
|
||||
|
||||
569
src/external/MuSRFitGUI/devel/MuSRFit.ui
vendored
569
src/external/MuSRFitGUI/devel/MuSRFit.ui
vendored
@ -22,8 +22,8 @@
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>23</width>
|
||||
<height>246</height>
|
||||
<width>21</width>
|
||||
<height>275</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="caption">
|
||||
@ -1962,360 +1962,140 @@
|
||||
<attribute name="title">
|
||||
<string>Fitting</string>
|
||||
</attribute>
|
||||
<widget class="QTextEdit">
|
||||
<widget class="QLayoutWidget">
|
||||
<property name="name">
|
||||
<cstring>FitTextOutput</cstring>
|
||||
<cstring>layout34</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>5</x>
|
||||
<y>130</y>
|
||||
<y>10</y>
|
||||
<width>545</width>
|
||||
<height>230</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="overwriteMode">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QButtonGroup">
|
||||
<property name="name">
|
||||
<cstring>Minimization</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>7</x>
|
||||
<y>1</y>
|
||||
<width>115</width>
|
||||
<height>128</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Minimization</string>
|
||||
</property>
|
||||
<property name="exclusive">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="radioButtonExclusive">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="selectedId" stdset="0">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QRadioButton">
|
||||
<property name="name">
|
||||
<cstring>MINIMIZE</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>16</x>
|
||||
<y>30</y>
|
||||
<width>83</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Minimize</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QRadioButton">
|
||||
<property name="name">
|
||||
<cstring>MIGRAD</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>16</x>
|
||||
<y>59</y>
|
||||
<width>83</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Migrad</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QRadioButton">
|
||||
<property name="name">
|
||||
<cstring>SIMPLEX</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>16</x>
|
||||
<y>88</y>
|
||||
<width>83</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Simplex</string>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QButtonGroup">
|
||||
<property name="name">
|
||||
<cstring>PlotOptions</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>241</x>
|
||||
<y>1</y>
|
||||
<width>196</width>
|
||||
<height>128</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Options</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>AlignTop</set>
|
||||
</property>
|
||||
<property name="exclusive">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="radioButtonExclusive">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="selectedId" stdset="0">
|
||||
<number>-1</number>
|
||||
</property>
|
||||
<widget class="QLayoutWidget">
|
||||
<property name="name">
|
||||
<cstring>layout27</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>3</x>
|
||||
<y>18</y>
|
||||
<width>190</width>
|
||||
<height>94</height>
|
||||
</rect>
|
||||
</property>
|
||||
<vbox>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QLayoutWidget">
|
||||
<property name="name">
|
||||
<cstring>layout25</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QLabel">
|
||||
<property name="name">
|
||||
<cstring>textLabel1_4</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>X Range</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit">
|
||||
<property name="name">
|
||||
<cstring>Xi</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit">
|
||||
<property name="name">
|
||||
<cstring>Xf</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</hbox>
|
||||
</widget>
|
||||
<widget class="QLayoutWidget">
|
||||
<property name="name">
|
||||
<cstring>layout26</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QLabel">
|
||||
<property name="name">
|
||||
<cstring>textLabel1_4_2</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Y Range</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit">
|
||||
<property name="name">
|
||||
<cstring>Yi</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit">
|
||||
<property name="name">
|
||||
<cstring>Yf</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</hbox>
|
||||
</widget>
|
||||
<widget class="QCheckBox">
|
||||
<property name="name">
|
||||
<cstring>ltc</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Life time correction</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</vbox>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QLayoutWidget">
|
||||
<property name="name">
|
||||
<cstring>layout28</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>438</x>
|
||||
<y>1</y>
|
||||
<width>115</width>
|
||||
<height>125</height>
|
||||
<height>350</height>
|
||||
</rect>
|
||||
</property>
|
||||
<vbox>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QPushButton">
|
||||
<widget class="QLayoutWidget">
|
||||
<property name="name">
|
||||
<cstring>go</cstring>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy>
|
||||
<hsizetype>7</hsizetype>
|
||||
<vsizetype>0</vsizetype>
|
||||
<horstretch>1</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>85</width>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>95</width>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Fit</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="default">
|
||||
<bool>true</bool>
|
||||
<cstring>layout33</cstring>
|
||||
</property>
|
||||
<grid>
|
||||
<property name="name">
|
||||
<cstring>unnamed</cstring>
|
||||
</property>
|
||||
<widget class="QComboBox" row="0" column="1">
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>MINIMIZE</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>MIGRAD</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>SIMPLEX</string>
|
||||
</property>
|
||||
</item>
|
||||
<property name="name">
|
||||
<cstring>Minimization</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" row="0" column="2">
|
||||
<property name="name">
|
||||
<cstring>textLabel1_4</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>X Range</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" row="1" column="4">
|
||||
<property name="name">
|
||||
<cstring>Yf</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" row="1" column="0">
|
||||
<property name="name">
|
||||
<cstring>textLabel1_5_2</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Error estimation</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" row="0" column="3">
|
||||
<property name="name">
|
||||
<cstring>Xi</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" row="1" column="2">
|
||||
<property name="name">
|
||||
<cstring>textLabel1_4_2</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Y Range</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QComboBox" row="1" column="1">
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>HESSE</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>MINOS</string>
|
||||
</property>
|
||||
</item>
|
||||
<property name="name">
|
||||
<cstring>ErrorCalc</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" row="0" column="0">
|
||||
<property name="name">
|
||||
<cstring>textLabel1_5</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Minimization type</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" row="1" column="3">
|
||||
<property name="name">
|
||||
<cstring>Yi</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" row="0" column="4">
|
||||
<property name="name">
|
||||
<cstring>Xf</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
|
||||
<property name="name">
|
||||
<cstring>ltc</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Life time correction</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</grid>
|
||||
</widget>
|
||||
<widget class="QPushButton">
|
||||
<widget class="QTextEdit">
|
||||
<property name="name">
|
||||
<cstring>PlotMSR</cstring>
|
||||
<cstring>FitTextOutput</cstring>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy>
|
||||
<hsizetype>7</hsizetype>
|
||||
<vsizetype>0</vsizetype>
|
||||
<horstretch>1</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>85</width>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>95</width>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Plot</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="default">
|
||||
<property name="overwriteMode">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</vbox>
|
||||
</widget>
|
||||
<widget class="QButtonGroup">
|
||||
<property name="name">
|
||||
<cstring>ErrorCalc</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>128</x>
|
||||
<y>1</y>
|
||||
<width>107</width>
|
||||
<height>128</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Error</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>AlignTop|AlignLeft</set>
|
||||
</property>
|
||||
<property name="exclusive">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="radioButtonExclusive">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="selectedId" stdset="0">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<widget class="QRadioButton">
|
||||
<property name="name">
|
||||
<cstring>MINOS</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>19</x>
|
||||
<y>59</y>
|
||||
<width>69</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Minos</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QRadioButton">
|
||||
<property name="name">
|
||||
<cstring>HESSE</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>19</x>
|
||||
<y>30</y>
|
||||
<width>69</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Hesse</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget">
|
||||
<property name="name">
|
||||
@ -3876,40 +3656,6 @@
|
||||
</widget>
|
||||
</hbox>
|
||||
</widget>
|
||||
<widget class="QPushButton">
|
||||
<property name="name">
|
||||
<cstring>ShowT0</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>451</x>
|
||||
<y>190</y>
|
||||
<width>95</width>
|
||||
<height>30</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>95</width>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>95</width>
|
||||
<height>30</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Show</string>
|
||||
</property>
|
||||
<property name="autoDefault">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="default">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget">
|
||||
<property name="name">
|
||||
@ -4547,11 +4293,16 @@
|
||||
<separator/>
|
||||
<action name="fileExitAction"/>
|
||||
</item>
|
||||
<item text="Actions" name="Actions">
|
||||
<action name="Fit"/>
|
||||
<action name="Plot"/>
|
||||
<action name="T0"/>
|
||||
</item>
|
||||
<item text="Parameters" name="Parameters">
|
||||
<action name="parametersExport_AsAction"/>
|
||||
<action name="parametersAppend_ToAction"/>
|
||||
</item>
|
||||
<item text="&Edit" name="editMenu">
|
||||
<item text="Edit" name="Edit">
|
||||
<action name="editUndoAction"/>
|
||||
<action name="editRedoAction"/>
|
||||
<separator/>
|
||||
@ -4581,11 +4332,21 @@
|
||||
</property>
|
||||
<action name="fileOpenAction"/>
|
||||
<action name="fileSaveAction"/>
|
||||
<action name="filePrintAction"/>
|
||||
<action name="fileExitAction"/>
|
||||
</toolbar>
|
||||
<toolbar dock="2">
|
||||
<property name="name">
|
||||
<cstring>Toolbar</cstring>
|
||||
</property>
|
||||
<property name="label">
|
||||
<string>Toolbar</string>
|
||||
</property>
|
||||
<action name="Fit"/>
|
||||
<action name="Plot"/>
|
||||
<action name="T0"/>
|
||||
<action name="filePrintAction"/>
|
||||
<action name="fileExitAction"/>
|
||||
<action name="parametersExport_AsAction"/>
|
||||
<action name="parametersAppend_ToAction"/>
|
||||
</toolbar>
|
||||
</toolbars>
|
||||
<actions>
|
||||
@ -4933,23 +4694,35 @@
|
||||
<property name="name">
|
||||
<cstring>parametersExport_AsAction</cstring>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image11</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Export As...</string>
|
||||
<string>Export As...</string>
|
||||
</property>
|
||||
<property name="menuText">
|
||||
<string>&Export As...</string>
|
||||
</property>
|
||||
<property name="accel">
|
||||
<string>Alt+E</string>
|
||||
</property>
|
||||
</action>
|
||||
<action>
|
||||
<property name="name">
|
||||
<cstring>parametersAppend_ToAction</cstring>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image12</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Append To...</string>
|
||||
<string>Append To...</string>
|
||||
</property>
|
||||
<property name="menuText">
|
||||
<string>&Append To...</string>
|
||||
</property>
|
||||
<property name="accel">
|
||||
<string>Alt+A</string>
|
||||
</property>
|
||||
</action>
|
||||
<action>
|
||||
<property name="name">
|
||||
@ -4961,6 +4734,9 @@
|
||||
<property name="text">
|
||||
<string>Fit and Plot</string>
|
||||
</property>
|
||||
<property name="accel">
|
||||
<string>Ctrl+F</string>
|
||||
</property>
|
||||
</action>
|
||||
<action>
|
||||
<property name="name">
|
||||
@ -4970,22 +4746,28 @@
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image11</iconset>
|
||||
<iconset>image13</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Plot</string>
|
||||
</property>
|
||||
<property name="accel">
|
||||
<string>Ctrl+P</string>
|
||||
</property>
|
||||
</action>
|
||||
<action>
|
||||
<property name="name">
|
||||
<cstring>T0</cstring>
|
||||
</property>
|
||||
<property name="iconSet">
|
||||
<iconset>image12</iconset>
|
||||
<iconset>image14</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Show t0 and Bg Bins</string>
|
||||
</property>
|
||||
<property name="accel">
|
||||
<string>Ctrl+T</string>
|
||||
</property>
|
||||
</action>
|
||||
</actions>
|
||||
<images>
|
||||
@ -5023,9 +4805,15 @@
|
||||
<data format="PNG" length="658">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000025949444154388db59521931b3910469fb7027a98c42c2838cb6cb686031d689685f95d86816b66c385033dcc0305354c62dd6c021c576d2e97f3a672fb21a94bf5f449ad6e2dfabee723f4f02154e0d3db4929654e299173a69a01e04488311263a4699ac51f8373ce737f3ee36360bdfb0c4eaef194185ecfa494d86c36b3f7fe5df045dff7e49ce7979717369f3b365f760098196a8a6154abf4df8e4836b6dbedbb9c3fa8eadc9f7bbaafcfb4db0e33c392a0690963a0f642c98576db41f00cc3f0aeab784829e16364d37500485e525266b2814946c43cd247ac56e2a6654c8952ca7c1f3c4db49b35866105d298487e4443219330293408960d4490e0c839df776caa38ef2856c8cd44594f8813ac188e0878521d51a76020ae619aa6bbe04f00550d11401503304372a4b1404e3dda26c063a50202d755ffed180cccae49b3db181a13f278a6b4198280292660b52022f7c1c107524a985e81560dc3c896b05031c0ca35a65529a51263bc0f8e3192fb0b5a15b37a051443cc43126aadfc3808354f0404e7dc3b1c87b008de33bcbea2802a80923853dc8813a1944a29151b126ddbe28327e73cabea6f9fdd03c06ab5c215a8c7338d298d35f8658344871804035e2f3c3d3df1f8f8b84863e2743ab1dfefc939ff2b7c716b9baa3a0fc3c09812e2049a6b82ac54c4a0eb3a4208b7529e8fc72387c301e71cbbdd8ed56af553a92ffed98f4b2973ce995a2b2282f7fe96ac5ffa434a69fee19aaeeb7edafc17f09f4a55e7d3e9c4e17060b95cf2fcfccc7abd5efc35f8a6cbe532eff77ba66962bbddfebde3b72aa5cc87c30155fd7fc16ff5617fde773b427a020f23b15a0000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image11">
|
||||
<data format="PNG" length="265">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d049444154388dcd94d10ac33008458fa33f55ff1ffb59d9c3e6c89c496dd860174a214daf87ab89981900aada00cc4ce8e4ebf1db68bf4bdcf8db12a09dee5a315e2556d5368a01e0b68cd415f0b73f005bdcb83f3f1c139a5e4e1de93f8c578963b1d4f830935db555a84739bf19f766f2c099ceea6562efb8179a4d4089b8378d3f8fcc7d3d924f9b57c97a3415af39ae362b23eee77738c75795c506e1e465397a1c598e336df0884192ea195dd5bc7c09c5a37e76099533bedad8ffbb8fcfb4417ede5d59c3accb395b871f12df0112aeaae89a42dc160000000049454e44ae426082</data>
|
||||
<data format="PNG" length="278">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000dd49444154388dbd55ed0e8430082b892f35de3ff5b1b81f8ac1c93ed4bb6b62dc269452492624d183aa5adc931455357fd7f1240500962cb115dc3af742f1dbd24a7a8b29c51e7347c494e2275d5d14bf253c887fe5b100187afc887834c7198aaaad0301278fbf69cbffe6d89115ac2de85972dbe31284f47c7e3415333fafa9b85416d54445d564cfaf631d161f922009dbd77b8059e8ccd756756b217f6a2a049048269b85c7b9ef23d2a988c5484255bb85b398a1e28cb4b6208bb94c454886b7e84459eb06d8ba5d53c7baaf58f5f4c3321f6f290ef7588b670a1fe923b36c6e54b07f0000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image12">
|
||||
<data format="PNG" length="297">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000f049444154388dbd926b1283300884978e970af79ff558f487a2481313b52d334e1ec2025f1092383355b5782629aa6abe667f920200532db0e5dcbaf744f1dfd40a7a6a4315bbcf9522862abed3d547c54f0537e15f3116005dc6b7847b735cb3a26a73a78003e36f62f9df1cbbd512660467482e332ea19033ceb7a662e4f19a159784280b155593353efbba59fc4882246cddaf0e66a133df5bead642fcd0540820514c1684dbbd9fa34daaeaf90c100180888724769fbad57c5e8b88998b67e6355147e35d3412efa271cd4c7b5ce39ee43e15aac5c8f930fc51c039ee4c177491b101db1806e876101a33693efc1b7858d21f6a6c70020000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image13">
|
||||
<data format="PNG" length="319">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000010649444154388dad54d10e84200ceb0c3f65ff3ff5b3760f3283133c39af090959a0ebca864942c64a7aec37c92e071e60c90192b7899ea2b4970d304940434e12d3aca88a439163e788f237c92236abfa6245e0576f0180a40f89df9002c042f2547a3e1831031e5720c99668b737a567b54074c143aca48f0404a9a2c296b8cda844301a9ad11d03ce6d2ac9d869ad3690254bb25c4dc9ca7a6a3b89be5af8b3c72411777b36952ec3005b2d19d8ad31d262df83372b54f8a01207e05e17fa0b92f6919664d5d7fc906812b8f6bfe378bce61e6af8b0767aa4efa654d2e177014eaffe6afa827425bdd44cafc739e36fbf5b7eec61bba5a1300096ff838cad99c0a90199c1079e7cbe7ec1d5a3e00000000049454e44ae426082</data>
|
||||
</image>
|
||||
<image name="image14">
|
||||
<data format="PNG" length="245">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000bc49444154388dd595c10dc2300c45bf512fdd82392cb14817e90c5da4a3f8ca383d8693d15720366941c03f3572f26cfd38ae5cced7824acbba0900ccd35878dd233133388401bcae63afe8d45bc9ef8155f5c1738e45f1101c41cd4cb2e42978593799a7b1d417e7f04c03839ec15b07bdea56a25d97676692557eb82b5a7e1f0247557ff78170abb5e2bbc091b8b7f9010df1b13eb827003ee4b1aa96b4e2ccdf5abef78fc726b78c7ff7dac01200f761528fc6bd5080fe79efd60d86746ad3b710aeb60000000049454e44ae426082</data>
|
||||
</image>
|
||||
</images>
|
||||
@ -5072,24 +4860,6 @@
|
||||
<receiver>MuSRFitform</receiver>
|
||||
<slot>CallMSRCreate()</slot>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>PlotMSR</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MuSRFitform</receiver>
|
||||
<slot>GoPlot()</slot>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>ShowT0</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MuSRFitform</receiver>
|
||||
<slot>ShowMuSRT0()</slot>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>go</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>MuSRFitform</receiver>
|
||||
<slot>GoFit()</slot>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>musrfit_tabs</sender>
|
||||
<signal>selected(const QString&)</signal>
|
||||
@ -5180,6 +4950,12 @@
|
||||
<receiver>MuSRFitform</receiver>
|
||||
<slot>ShowMuSRT0()</slot>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>Plot</sender>
|
||||
<signal>activated()</signal>
|
||||
<receiver>MuSRFitform</receiver>
|
||||
<slot>GoPlot()</slot>
|
||||
</connection>
|
||||
</connections>
|
||||
<tabstops>
|
||||
<tabstop>musrfit_tabs</tabstop>
|
||||
@ -5196,10 +4972,6 @@
|
||||
<tabstop>BINS</tabstop>
|
||||
<tabstop>FitAsyType</tabstop>
|
||||
<tabstop>LRBF</tabstop>
|
||||
<tabstop>MINIMIZE</tabstop>
|
||||
<tabstop>HESSE</tabstop>
|
||||
<tabstop>go</tabstop>
|
||||
<tabstop>PlotMSR</tabstop>
|
||||
<tabstop>FitTextOutput</tabstop>
|
||||
<tabstop>ShParam_1_1</tabstop>
|
||||
<tabstop>ShParam_1_2</tabstop>
|
||||
@ -5257,7 +5029,6 @@
|
||||
<tabstop>Bg24</tabstop>
|
||||
<tabstop>Data14</tabstop>
|
||||
<tabstop>Data24</tabstop>
|
||||
<tabstop>ShowT0</tabstop>
|
||||
</tabstops>
|
||||
<includes>
|
||||
<include location="local" impldecl="in implementation">MuSRFit.ui.h</include>
|
||||
|
||||
26
src/external/MuSRFitGUI/devel/MuSRFit.ui.h
vendored
26
src/external/MuSRFitGUI/devel/MuSRFit.ui.h
vendored
@ -384,30 +384,12 @@ void MuSRFitform::CreateAllInput()
|
||||
}
|
||||
|
||||
# Get minimization process
|
||||
my $Min = Minimization->selectedId();
|
||||
if ($Min==0) {
|
||||
$All{"Minimization"}= "MINIMIZE";
|
||||
$All{"go"}="MIGRAD";
|
||||
}
|
||||
elsif ($Min==1) {
|
||||
$All{"Minimization"}= "MIGRAD";
|
||||
$All{"go"}="MIGRAD";
|
||||
}
|
||||
elsif ($Min==2) {
|
||||
$All{"Minimization"}= "SIMPLEX";
|
||||
$All{"go"}="SIMPLAEX";
|
||||
}
|
||||
$All{"Minimization"} = Minimization->currentText();
|
||||
$All{"go"}=$All{"Minimization"};
|
||||
|
||||
# Get Error calculation process
|
||||
my $Err = ErrorCalc->selectedId();
|
||||
if ($Err==0) {
|
||||
$All{"ErrorCalc"}= "HESSE";
|
||||
# $All{"go"}="MIGRAD";
|
||||
}
|
||||
elsif ($Err==1) {
|
||||
$All{"ErrorCalc"}= "MINOS";
|
||||
$All{"go"}="MINOS";
|
||||
}
|
||||
$All{"ErrorCalc"} = ErrorCalc->currentText();
|
||||
$All{"go"}=$All{"ErrorCalc"};
|
||||
|
||||
# Return Hash with all important values
|
||||
return %All;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user