diff --git a/src/external/MuSRFitGUI/devel/MuSRFit.ui b/src/external/MuSRFitGUI/devel/MuSRFit.ui
index af9279c9..2d3edc17 100755
--- a/src/external/MuSRFitGUI/devel/MuSRFit.ui
+++ b/src/external/MuSRFitGUI/devel/MuSRFit.ui
@@ -8,7 +8,7 @@
0
0
- 579
+ 678
501
@@ -46,7 +46,7 @@
10
10
- 560
+ 660
400
@@ -60,7 +60,7 @@
- 560
+ 660
400
@@ -77,1582 +77,15 @@
RUNS
-
-
- groupBox7
-
-
-
- 11
- 100
- 538
- 164
-
-
-
-
-
-
- 0
- 0
- 0
-
-
- 239
- 243
- 247
-
-
- 255
- 255
- 255
-
-
- 247
- 249
- 251
-
-
- 119
- 121
- 123
-
-
- 159
- 161
- 164
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 173
- 176
- 179
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 128
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 0
-
-
-
-
- 128
- 128
- 128
-
-
- 239
- 243
- 247
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 255
-
-
- 119
- 121
- 123
-
-
- 159
- 161
- 164
-
-
- 128
- 128
- 128
-
-
- 255
- 255
- 255
-
-
- 128
- 128
- 128
-
-
- 255
- 255
- 255
-
-
- 173
- 176
- 179
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 128
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 192
-
-
- 128
- 0
- 128
-
-
-
-
- 0
- 0
- 0
-
-
- 239
- 243
- 247
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 255
-
-
- 119
- 121
- 123
-
-
- 159
- 161
- 164
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 173
- 176
- 179
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 128
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 192
-
-
- 128
- 0
- 128
-
-
-
-
-
- AncestorOrigin
-
-
- GroupBoxPanel
-
-
- Sunken
-
-
- 1
-
-
- 0
-
-
- Theory Function
-
-
- AlignTop
-
-
-
- layout42
-
-
-
- 8
- 21
- 520
- 125
-
-
-
-
- unnamed
-
-
- 5
-
-
- -
-
- Exponential
-
-
- -
-
- Gaussian
-
-
- -
-
- Stretch Exp.
-
-
- -
-
- Exponential Cos
-
-
- -
-
- Gaussian Cos
-
-
- -
-
- Stretch Cos
-
-
- -
-
- Lorentzian Dynamic KT
-
-
- -
-
- Gaussian Dynamic KT
-
-
- -
-
- Background
-
-
- -
-
- Lorentzian Kubo-Toyabe LF x Exp
-
-
- -
-
- Gaussian Kubo-Toyabe LF x Exp
-
-
- -
-
- Lorentzian Kubo-Toyabe LF x Str Exp
-
-
- -
-
- Gaussian Kubo-Toyabe LF x Str Exp
-
-
- -
-
- Meissner State Model
-
-
- -
-
- None
-
-
-
- FitType2
-
-
-
- 5
- 0
- 0
- 0
-
-
-
- 14
-
-
-
-
- TfsLabel
-
-
-
- 5
- 0
- 0
- 0
-
-
-
- Final Time
-
-
- Tfs
-
-
-
- -
-
- Exponential
-
-
- -
-
- Gaussian
-
-
- -
-
- Stretch Exp.
-
-
- -
-
- Exponential Cos
-
-
- -
-
- Gaussian Cos
-
-
- -
-
- Stretch Cos
-
-
- -
-
- Lorentzian Dynamic KT
-
-
- -
-
- Gaussian Dynamic KT
-
-
- -
-
- Background
-
-
- -
-
- Lorentzian Kubo-Toyabe LF x Exp
-
-
- -
-
- Gaussian Kubo-Toyabe LF x Exp
-
-
- -
-
- Lorentzian Kubo-Toyabe LF x Str Exp
-
-
- -
-
- Gaussian Kubo-Toyabe LF x Str Exp
-
-
- -
-
- Meissner State Model
-
-
- -
-
- None
-
-
-
- FitType1
-
-
-
- 5
- 0
- 0
- 0
-
-
-
- 20
-
-
- false
-
-
- false
-
-
-
-
- BINS
-
-
-
- 5
- 0
- 0
- 0
-
-
-
- 100
-
-
-
-
- Comp3Label
-
-
-
-
-
- 0
- 0
- 0
-
-
- 230
- 240
- 249
-
-
- 255
- 255
- 255
-
-
- 242
- 247
- 252
-
-
- 115
- 120
- 124
-
-
- 154
- 160
- 166
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 127
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 128
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 0
-
-
-
-
- 128
- 128
- 128
-
-
- 230
- 240
- 249
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 255
-
-
- 115
- 120
- 124
-
-
- 154
- 160
- 166
-
-
- 128
- 128
- 128
-
-
- 255
- 255
- 255
-
-
- 128
- 128
- 128
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 127
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 128
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 238
-
-
- 82
- 24
- 139
-
-
-
-
- 0
- 0
- 0
-
-
- 230
- 240
- 249
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 255
-
-
- 115
- 120
- 124
-
-
- 154
- 160
- 166
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 127
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 128
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 238
-
-
- 82
- 24
- 139
-
-
-
-
-
- Third Component
-
-
- FitType1_2_2
-
-
-
-
- Tis
-
-
-
- 5
- 0
- 0
- 0
-
-
-
- 0
-
-
-
-
- Tfs
-
-
-
- 5
- 0
- 0
- 0
-
-
-
- 8
-
-
-
-
- Comp1Label
-
-
-
-
-
- 0
- 0
- 0
-
-
- 230
- 240
- 249
-
-
- 255
- 255
- 255
-
-
- 242
- 247
- 252
-
-
- 115
- 120
- 124
-
-
- 154
- 160
- 166
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 127
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 128
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 0
-
-
-
-
- 128
- 128
- 128
-
-
- 230
- 240
- 249
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 255
-
-
- 115
- 120
- 124
-
-
- 154
- 160
- 166
-
-
- 128
- 128
- 128
-
-
- 255
- 255
- 255
-
-
- 128
- 128
- 128
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 127
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 128
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 238
-
-
- 82
- 24
- 139
-
-
-
-
- 0
- 0
- 0
-
-
- 230
- 240
- 249
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 255
-
-
- 115
- 120
- 124
-
-
- 154
- 160
- 166
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 127
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 128
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 238
-
-
- 82
- 24
- 139
-
-
-
-
-
- First Component
-
-
- FitType1
-
-
-
-
- BINSLabel
-
-
-
- 5
- 0
- 0
- 0
-
-
-
- Binning Factor
-
-
- BINS
-
-
-
-
- TisLabel
-
-
-
- 5
- 0
- 0
- 0
-
-
-
- Initial Time
-
-
- Tis
-
-
-
- -
-
- Exponential
-
-
- -
-
- Gaussian
-
-
- -
-
- Stretch Exp.
-
-
- -
-
- Exponential Cos
-
-
- -
-
- Gaussian Cos
-
-
- -
-
- Stretch Cos
-
-
- -
-
- Lorentzian Dynamic KT
-
-
- -
-
- Gaussian Dynamic KT
-
-
- -
-
- Background
-
-
- -
-
- Lorentzian Kubo-Toyabe LF x Exp
-
-
- -
-
- Gaussian Kubo-Toyabe LF x Exp
-
-
- -
-
- Lorentzian Kubo-Toyabe LF x Str Exp
-
-
- -
-
- Gaussian Kubo-Toyabe LF x Str Exp
-
-
- -
-
- Meissner State Model
-
-
- -
-
- None
-
-
-
- FitType3
-
-
-
- 5
- 0
- 0
- 0
-
-
-
- 14
-
-
-
-
- Comp2Label
-
-
-
-
-
- 0
- 0
- 0
-
-
- 230
- 240
- 249
-
-
- 255
- 255
- 255
-
-
- 242
- 247
- 252
-
-
- 115
- 120
- 124
-
-
- 154
- 160
- 166
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 127
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 128
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 0
-
-
-
-
- 128
- 128
- 128
-
-
- 230
- 240
- 249
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 255
-
-
- 115
- 120
- 124
-
-
- 154
- 160
- 166
-
-
- 128
- 128
- 128
-
-
- 255
- 255
- 255
-
-
- 128
- 128
- 128
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 127
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 128
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 238
-
-
- 82
- 24
- 139
-
-
-
-
- 0
- 0
- 0
-
-
- 230
- 240
- 249
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 255
-
-
- 115
- 120
- 124
-
-
- 154
- 160
- 166
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 0
-
-
- 255
- 255
- 255
-
-
- 255
- 255
- 127
-
-
- 0
- 0
- 0
-
-
- 0
- 0
- 128
-
-
- 255
- 255
- 255
-
-
- 0
- 0
- 238
-
-
- 82
- 24
- 139
-
-
-
-
-
- Second Component
-
-
- FitType1_2
-
-
-
-
-
-
-
- layout23
-
-
-
- 21
- 265
- 515
- 40
-
-
-
-
- unnamed
-
-
- 0
-
-
- 3
-
-
-
- FitAsyTypeLabel
-
-
-
- 5
- 0
- 0
- 0
-
-
-
- Fit type
-
-
-
- -
-
- Asymmetry
-
-
- -
-
- SingleHist
-
-
-
- FitAsyType
-
-
-
- 5
- 0
- 0
- 0
-
-
-
-
-
- LRBFLabel
-
-
-
- 5
- 0
- 0
- 0
-
-
-
- Histograms list
-
-
-
-
- LRBF
-
-
-
- 5
- 0
- 0
- 0
-
-
-
- 1,3
-
-
-
-
layout43
- 4
+ 3
3
- 545
+ 650
95
@@ -1681,96 +114,6 @@
RUN Numbers
-
-
- RunNumbers
-
-
-
- 15
- 25
- 505
- 26
-
-
-
-
- 0
- 0
- 0
- 0
-
-
-
-
- 0
- 23
-
-
-
- Numbers of RUNs to fit. Multiple runs are comma separated.
-
-
- Numbers of RUNs to fit. Multiple runs are comma separated.
-
-
-
- -
-
- 2009
-
-
- -
-
- 2008
-
-
- -
-
- 2007
-
-
- -
-
- 2006
-
-
- -
-
- 2005
-
-
- -
-
- 2004
-
-
-
- YEAR
-
-
-
- 420
- 55
- 100
- 26
-
-
-
-
- 0
- 0
- 0
- 0
-
-
-
-
- 0
- 20
-
-
-
YEARLabel
@@ -1862,6 +205,96 @@
On beam line
+
+ -
+
+ 2009
+
+
+ -
+
+ 2008
+
+
+ -
+
+ 2007
+
+
+ -
+
+ 2006
+
+
+ -
+
+ 2005
+
+
+ -
+
+ 2004
+
+
+
+ YEAR
+
+
+
+ 420
+ 55
+ 100
+ 26
+
+
+
+
+ 0
+ 0
+ 0
+ 0
+
+
+
+
+ 0
+ 20
+
+
+
+
+
+ RunNumbers
+
+
+
+ 15
+ 25
+ 505
+ 26
+
+
+
+
+ 0
+ 0
+ 0
+ 0
+
+
+
+
+ 0
+ 23
+
+
+
+ Numbers of RUNs to fit. Multiple runs are comma separated.
+
+
+ Numbers of RUNs to fit. Multiple runs are comma separated.
+
+
@@ -1954,10 +387,1582 @@
+
+
+ layout26
+
+
+
+ 3
+ 100
+ 650
+ 203
+
+
+
+
+ unnamed
+
+
+ 5
+
+
+
+ groupBox7
+
+
+
+
+
+ 0
+ 0
+ 0
+
+
+ 239
+ 243
+ 247
+
+
+ 255
+ 255
+ 255
+
+
+ 247
+ 249
+ 251
+
+
+ 119
+ 121
+ 123
+
+
+ 159
+ 161
+ 164
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 173
+ 176
+ 179
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 0
+
+
+
+
+ 128
+ 128
+ 128
+
+
+ 239
+ 243
+ 247
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 255
+
+
+ 119
+ 121
+ 123
+
+
+ 159
+ 161
+ 164
+
+
+ 128
+ 128
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 128
+ 128
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 173
+ 176
+ 179
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 192
+
+
+ 128
+ 0
+ 128
+
+
+
+
+ 0
+ 0
+ 0
+
+
+ 239
+ 243
+ 247
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 255
+
+
+ 119
+ 121
+ 123
+
+
+ 159
+ 161
+ 164
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 173
+ 176
+ 179
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 192
+
+
+ 128
+ 0
+ 128
+
+
+
+
+
+ AncestorOrigin
+
+
+ GroupBoxPanel
+
+
+ Sunken
+
+
+ 1
+
+
+ 0
+
+
+ Theory Function
+
+
+ AlignTop
+
+
+
+ layout42
+
+
+
+ 8
+ 21
+ 625
+ 125
+
+
+
+
+ unnamed
+
+
+ 5
+
+
+ -
+
+ Exponential
+
+
+ -
+
+ Gaussian
+
+
+ -
+
+ Stretch Exp.
+
+
+ -
+
+ Exponential Cos
+
+
+ -
+
+ Gaussian Cos
+
+
+ -
+
+ Stretch Cos
+
+
+ -
+
+ Lorentzian Dynamic KT
+
+
+ -
+
+ Gaussian Dynamic KT
+
+
+ -
+
+ Background
+
+
+ -
+
+ Lorentzian Kubo-Toyabe LF x Exp
+
+
+ -
+
+ Gaussian Kubo-Toyabe LF x Exp
+
+
+ -
+
+ Lorentzian Kubo-Toyabe LF x Str Exp
+
+
+ -
+
+ Gaussian Kubo-Toyabe LF x Str Exp
+
+
+ -
+
+ Meissner State Model
+
+
+ -
+
+ None
+
+
+
+ FitType2
+
+
+
+ 5
+ 0
+ 0
+ 0
+
+
+
+ 14
+
+
+
+
+ TfsLabel
+
+
+
+ 5
+ 0
+ 0
+ 0
+
+
+
+ Final Time
+
+
+ Tfs
+
+
+
+ -
+
+ Exponential
+
+
+ -
+
+ Gaussian
+
+
+ -
+
+ Stretch Exp.
+
+
+ -
+
+ Exponential Cos
+
+
+ -
+
+ Gaussian Cos
+
+
+ -
+
+ Stretch Cos
+
+
+ -
+
+ Lorentzian Dynamic KT
+
+
+ -
+
+ Gaussian Dynamic KT
+
+
+ -
+
+ Background
+
+
+ -
+
+ Lorentzian Kubo-Toyabe LF x Exp
+
+
+ -
+
+ Gaussian Kubo-Toyabe LF x Exp
+
+
+ -
+
+ Lorentzian Kubo-Toyabe LF x Str Exp
+
+
+ -
+
+ Gaussian Kubo-Toyabe LF x Str Exp
+
+
+ -
+
+ Meissner State Model
+
+
+ -
+
+ None
+
+
+
+ FitType1
+
+
+
+ 5
+ 0
+ 0
+ 0
+
+
+
+ 20
+
+
+ false
+
+
+ false
+
+
+
+
+ BINS
+
+
+
+ 5
+ 0
+ 0
+ 0
+
+
+
+ 100
+
+
+
+
+ Comp3Label
+
+
+
+
+
+ 0
+ 0
+ 0
+
+
+ 230
+ 240
+ 249
+
+
+ 255
+ 255
+ 255
+
+
+ 242
+ 247
+ 252
+
+
+ 115
+ 120
+ 124
+
+
+ 154
+ 160
+ 166
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 127
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 0
+
+
+
+
+ 128
+ 128
+ 128
+
+
+ 230
+ 240
+ 249
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 255
+
+
+ 115
+ 120
+ 124
+
+
+ 154
+ 160
+ 166
+
+
+ 128
+ 128
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 128
+ 128
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 127
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 238
+
+
+ 82
+ 24
+ 139
+
+
+
+
+ 0
+ 0
+ 0
+
+
+ 230
+ 240
+ 249
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 255
+
+
+ 115
+ 120
+ 124
+
+
+ 154
+ 160
+ 166
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 127
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 238
+
+
+ 82
+ 24
+ 139
+
+
+
+
+
+ Third Component
+
+
+ FitType1_2_2
+
+
+
+
+ Tis
+
+
+
+ 5
+ 0
+ 0
+ 0
+
+
+
+ 0
+
+
+
+
+ Tfs
+
+
+
+ 5
+ 0
+ 0
+ 0
+
+
+
+ 8
+
+
+
+
+ Comp1Label
+
+
+
+
+
+ 0
+ 0
+ 0
+
+
+ 230
+ 240
+ 249
+
+
+ 255
+ 255
+ 255
+
+
+ 242
+ 247
+ 252
+
+
+ 115
+ 120
+ 124
+
+
+ 154
+ 160
+ 166
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 127
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 0
+
+
+
+
+ 128
+ 128
+ 128
+
+
+ 230
+ 240
+ 249
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 255
+
+
+ 115
+ 120
+ 124
+
+
+ 154
+ 160
+ 166
+
+
+ 128
+ 128
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 128
+ 128
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 127
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 238
+
+
+ 82
+ 24
+ 139
+
+
+
+
+ 0
+ 0
+ 0
+
+
+ 230
+ 240
+ 249
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 255
+
+
+ 115
+ 120
+ 124
+
+
+ 154
+ 160
+ 166
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 127
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 238
+
+
+ 82
+ 24
+ 139
+
+
+
+
+
+ First Component
+
+
+ FitType1
+
+
+
+
+ BINSLabel
+
+
+
+ 5
+ 0
+ 0
+ 0
+
+
+
+ Binning Factor
+
+
+ BINS
+
+
+
+
+ TisLabel
+
+
+
+ 5
+ 0
+ 0
+ 0
+
+
+
+ Initial Time
+
+
+ Tis
+
+
+
+ -
+
+ Exponential
+
+
+ -
+
+ Gaussian
+
+
+ -
+
+ Stretch Exp.
+
+
+ -
+
+ Exponential Cos
+
+
+ -
+
+ Gaussian Cos
+
+
+ -
+
+ Stretch Cos
+
+
+ -
+
+ Lorentzian Dynamic KT
+
+
+ -
+
+ Gaussian Dynamic KT
+
+
+ -
+
+ Background
+
+
+ -
+
+ Lorentzian Kubo-Toyabe LF x Exp
+
+
+ -
+
+ Gaussian Kubo-Toyabe LF x Exp
+
+
+ -
+
+ Lorentzian Kubo-Toyabe LF x Str Exp
+
+
+ -
+
+ Gaussian Kubo-Toyabe LF x Str Exp
+
+
+ -
+
+ Meissner State Model
+
+
+ -
+
+ None
+
+
+
+ FitType3
+
+
+
+ 5
+ 0
+ 0
+ 0
+
+
+
+ 14
+
+
+
+
+ Comp2Label
+
+
+
+
+
+ 0
+ 0
+ 0
+
+
+ 230
+ 240
+ 249
+
+
+ 255
+ 255
+ 255
+
+
+ 242
+ 247
+ 252
+
+
+ 115
+ 120
+ 124
+
+
+ 154
+ 160
+ 166
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 127
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 0
+
+
+
+
+ 128
+ 128
+ 128
+
+
+ 230
+ 240
+ 249
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 255
+
+
+ 115
+ 120
+ 124
+
+
+ 154
+ 160
+ 166
+
+
+ 128
+ 128
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 128
+ 128
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 127
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 238
+
+
+ 82
+ 24
+ 139
+
+
+
+
+ 0
+ 0
+ 0
+
+
+ 230
+ 240
+ 249
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 255
+
+
+ 115
+ 120
+ 124
+
+
+ 154
+ 160
+ 166
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 0
+
+
+ 255
+ 255
+ 255
+
+
+ 255
+ 255
+ 127
+
+
+ 0
+ 0
+ 0
+
+
+ 0
+ 0
+ 128
+
+
+ 255
+ 255
+ 255
+
+
+ 0
+ 0
+ 238
+
+
+ 82
+ 24
+ 139
+
+
+
+
+
+ Second Component
+
+
+ FitType1_2
+
+
+
+
+
+
+
+ layout23
+
+
+
+ unnamed
+
+
+ 0
+
+
+ 3
+
+
+
+ FitAsyTypeLabel
+
+
+
+ 5
+ 0
+ 0
+ 0
+
+
+
+ Fit type
+
+
+
+ -
+
+ Asymmetry
+
+
+ -
+
+ SingleHist
+
+
+
+ FitAsyType
+
+
+
+ 5
+ 0
+ 0
+ 0
+
+
+
+
+
+ LRBFLabel
+
+
+
+ 5
+ 0
+ 0
+ 0
+
+
+
+ Histograms list
+
+
+
+
+ LRBF
+
+
+
+ 5
+ 0
+ 0
+ 0
+
+
+
+ 1,3
+
+
+
+
+
+
- TabPage
+ FittingPage
Fitting
@@ -1970,7 +1975,7 @@
5
10
- 545
+ 645
350
@@ -2099,7 +2104,7 @@
- SharingPahe
+ SharingPage
Sharing
@@ -2112,7 +2117,7 @@
5
5
- 545
+ 645
355
@@ -2777,7 +2782,7 @@
5
5
- 545
+ 645
355
@@ -2838,7 +2843,7 @@
- FittingPage
+ MSRPage
MSR File
@@ -2851,7 +2856,7 @@
5
5
- 545
+ 645
355
@@ -2880,7 +2885,7 @@
6
8
- 515
+ 630
100
@@ -2986,7 +2991,7 @@
- TabPage
+ FourierPage
Fourier
@@ -2999,7 +3004,7 @@
5
5
- 545
+ 645
94
@@ -3194,7 +3199,7 @@
- lineEdit28
+ FrqMin
@@ -3267,7 +3272,7 @@
- lineEdit28_2
+ FrqMax
@@ -3301,388 +3306,385 @@
- TabPage
+ T0Page
t0/Bg Bins
-
+
- layout27
+ unnamed
-
-
- 7
- 5
- 540
- 180
-
-
-
+
- unnamed
+ layout27
-
- 0
-
-
+
- groupHist0
+ unnamed
-
-
- 5
- 5
- 0
- 0
-
+
+ 0
-
-
- 0
- 0
-
-
-
-
-
-
+
- layout16_2
+ groupHist0
-
-
- 5
- 18
- 100
- 150
-
+
+
+ 5
+ 5
+ 0
+ 0
+
-
+
+
+ 0
+ 0
+
+
+
+
+
+
- unnamed_2
+ layout16_2
-
+
+
+ 5
+ 18
+ 100
+ 150
+
+
+
- textLabel2
+ unnamed_2
-
- t0
-
-
-
-
- textLabel2_2_2_3
-
-
- Bg1
-
-
-
-
- textLabel2_2_2
-
-
- Bg2
-
-
-
-
- textLabel2_2_2_2
-
-
- Data 1
-
-
-
-
- textLabel2_2_2_2_2
-
-
- Data 2
-
-
-
+
+
+ textLabel2
+
+
+ t0
+
+
+
+
+ textLabel2_2_2_3
+
+
+ Bg1
+
+
+
+
+ textLabel2_2_2
+
+
+ Bg2
+
+
+
+
+ textLabel2_2_2_2
+
+
+ Data 1
+
+
+
+
+ textLabel2_2_2_2_2
+
+
+ Data 2
+
+
+
+
-
-
-
- groupHist1
-
-
- Plain
-
-
- Hist1
-
-
+
- layout18
+ groupHist1
-
-
- 8
- 17
- 75
- 150
-
+
+ Plain
-
+
+ Hist1
+
+
- unnamed
+ layout18
-
- 0
+
+
+ 8
+ 17
+ 75
+ 150
+
-
- 0
-
-
+
- t01
+ unnamed
-
-
-
- Bg11
+
+ 0
-
-
-
- Bg21
+
+ 0
-
-
-
- Data11
-
-
-
-
- Data21
-
-
-
+
+
+ t01
+
+
+
+
+ Bg11
+
+
+
+
+ Bg21
+
+
+
+
+ Data11
+
+
+
+
+ Data21
+
+
+
+
-
-
-
- groupHist2
-
-
- true
-
-
- Plain
-
-
- Hist2
-
-
+
- layout18_2
+ groupHist2
-
-
- 8
- 17
- 75
- 150
-
+
+ true
-
+
+ Plain
+
+
+ Hist2
+
+
- unnamed_2
+ layout18_2
-
- 0
+
+
+ 8
+ 17
+ 75
+ 150
+
-
- 0
-
-
+
- t02
+ unnamed_2
-
-
-
- Bg12
+
+ 0
-
-
-
- Bg22
+
+ 0
-
-
-
- Data12
-
-
-
-
- Data22
-
-
-
+
+
+ t02
+
+
+
+
+ Bg12
+
+
+
+
+ Bg22
+
+
+
+
+ Data12
+
+
+
+
+ Data22
+
+
+
+
-
-
-
- groupHist3
-
-
- true
-
-
- Plain
-
-
- Hist3
-
-
+
- layout18_3
+ groupHist3
-
-
- 8
- 17
- 75
- 150
-
+
+ true
-
+
+ Plain
+
+
+ Hist3
+
+
- unnamed_2
+ layout18_3
-
- 0
+
+
+ 8
+ 17
+ 75
+ 150
+
-
- 0
-
-
+
- t03
+ unnamed_2
-
-
-
- Bg13
+
+ 0
-
-
-
- Bg23
+
+ 0
-
-
-
- Data13
-
-
-
-
- Data23
-
-
-
+
+
+ t03
+
+
+
+
+ Bg13
+
+
+
+
+ Bg23
+
+
+
+
+ Data13
+
+
+
+
+ Data23
+
+
+
+
-
-
-
- groupHist4
-
-
- true
-
-
- Plain
-
-
- Hist4
-
-
+
- layout18_4
+ groupHist4
-
-
- 8
- 17
- 75
- 150
-
+
+ true
-
+
+ Plain
+
+
+ Hist4
+
+
- unnamed_2
+ layout18_4
-
- 0
+
+
+ 8
+ 17
+ 75
+ 150
+
-
- 0
-
-
+
- t04
+ unnamed_2
-
-
-
- Bg14
+
+ 0
-
-
-
- Bg24
+
+ 0
-
-
-
- Data14
-
-
-
-
- Data24
-
-
-
+
+
+ t04
+
+
+
+
+ Bg14
+
+
+
+
+ Bg24
+
+
+
+
+ Data14
+
+
+
+
+ Data24
+
+
+
+
-
-
-
+
+
+
- TabPage
+ ConstPage
Constraints
- layout29
+ layout29_4
- 3
- 3
- 550
+ 5
+ 5
+ 645
355
- unnamed
+ unnamed_2
- textLabel2_2
+ textLabel2_2_5
@@ -3940,20 +3942,20 @@
- TheoryBlock
+ TheoryBlock_3
- layout25
+ layout25_6
- unnamed
+ unnamed_2
- CParamsCombo
+ CParamsCombo_3
@@ -3966,7 +3968,7 @@
- textLabel1_4
+ textLabel1_4_6
=
@@ -3974,7 +3976,7 @@
- ConstraintLine
+ ConstraintLine_3
@@ -3993,7 +3995,7 @@
- AddConstraint
+ AddConstraint_3
@@ -4011,7 +4013,7 @@
- textLabel2_2_3
+ textLabel2_2_3_4
@@ -4269,7 +4271,7 @@
- FunctionsBlock
+ FunctionsBlock_3
@@ -4293,6 +4295,14 @@
+ -
+
+
+
+
+
+
+
-
@@ -4302,17 +4312,11 @@
- -
-
-
-
-
-
-
-
-
+
+
-
@@ -4325,10 +4329,10 @@
- toolBar
+ FileToolBar
- Tools
+ File Menu
@@ -4338,10 +4342,10 @@
- Toolbar
+ ActionsToolBar
- Toolbar
+ Actions Menu
@@ -4655,13 +4659,16 @@
true
- true
+ false
- Change name
+ Overwrite MSR File
- Change name
+ Overwrite MSR File
+
+
+ Enable overwriting MSR files
Enable/Disable checking for MSR files.
@@ -4788,6 +4795,34 @@
Ctrl+T
+
+
+ optionsFourier
+
+
+ true
+
+
+ Fourier
+
+
+ Fourier
+
+
+
+
+ optionsT0
+
+
+ true
+
+
+ T0 and Bg bins
+
+
+ T0 and Bg bins
+
+
@@ -4882,12 +4917,6 @@
MuSRFitform
fileBrowse()
-
- ManualFile
- toggled(bool)
- MuSRFitform
- RunSelectionToggle()
-
InitParamTable
valueChanged(int,int)
@@ -5041,8 +5070,8 @@
FUnits
FApodization
FPlot
- lineEdit28
- lineEdit28_2
+ FrqMin
+ FrqMax
t01
Bg11
Bg21
diff --git a/src/external/MuSRFitGUI/devel/MuSRFit.ui.h b/src/external/MuSRFitGUI/devel/MuSRFit.ui.h
index ac7f856f..4bfa99eb 100755
--- a/src/external/MuSRFitGUI/devel/MuSRFit.ui.h
+++ b/src/external/MuSRFitGUI/devel/MuSRFit.ui.h
@@ -90,7 +90,12 @@ void Form1::filePrint()
void Form1::fileExit()
{
- Qt::Application::exit( 0 );
+ my $Ans = Qt::MessageBox::question( this, "Quit?","Are you sure you want to quit?","&Yes","&No","",0,1);
+ if ($Ans==0) {
+# Then quit
+ Qt::Application::exit( 0 );
+ }
+# Otherwize go back
}
void Form1::parametersExport()
@@ -207,31 +212,56 @@ void Form1::helpAbout()
void MuSRFitform::CreateAllInput()
{
-# TODO: Need to deliver shared parameters also
+# TODO: Need to automatically generage years list depending on beamline
my %All=();
-# From RUNS Tab
- $All{"TITLE"}= TITLE->text;
- $All{"FILENAME"}= FILENAME->text;
+
+# From RUNS Tab
+# Run data file
$All{"RunNumbers"} = RunNumbers->text;
$All{"RunFiles"} = RunFiles->text;
$All{"BeamLine"} = BeamLine->currentText;
$All{"RUNSType"} = ManualFile->isOn();
+ $All{"optionsFourier"} = optionsFourier->isOn();
+ $All{"optionsT0"} = optionsT0->isOn();
$All{"YEAR"} =YEAR->currentText;
+# Time range and BINS
$All{"Tis"} = Tis->text;
$All{"Tfs"} = Tfs->text;
$All{"BINS"} = BINS->text;
$All{"FitAsyType"} = FitAsyType->currentText;
$All{"LRBF"} = LRBF->text;
+ my @Hists = split(/,/, $All{"LRBF"} );
+# Lifetime corrections in enabled/visible only for SingleHis fits
+ if ( $All{"FitAsyType"} eq "Asymmetry" ) {
+ ltc->setHidden(1);
+ }
+ elsif ( $All{"FitAsyType"} eq "SingleHist" ) {
+ ltc->setHidden(0);
+ }
+
+# From Fitting Tab
+# Plot range
$All{"Xi"}=Xi->text;
$All{"Xf"}=Xf->text;
$All{"Yi"}=Yi->text;
$All{"Yf"}=Yf->text;
-
+# Life time correction
if (ltc->isChecked()) {
$All{"ltc"}="y";
} else {
$All{"ltc"}="n";
}
+# Minuit commands
+ if ( $All{"go"} eq "" ) {
+ $All{"go"}="PLOT";
+ }
+# Get minimization process
+ $All{"Minimization"} = Minimization->currentText();
+ $All{"go"}=$All{"Minimization"};
+
+# Get Error calculation process
+ $All{"ErrorCalc"} = ErrorCalc->currentText();
+ $All{"go"}=$All{"ErrorCalc"};
RunSelectionToggle();
my @RUNS = ();
@@ -241,13 +271,18 @@ void MuSRFitform::CreateAllInput()
$All{"RunNumbers"} =~ s/[\ \.\~\/\&\*\[\;\>\<\^\$\(\)\`\|\]\'\@]/,/g;
@RUNS = split( /,/, $All{"RunNumbers"} );
}
-
- my @Hists = split(/,/, $All{"LRBF"} );
-
+
+# From MSR File Tab
+ $All{"TITLE"}= TITLE->text;
+ $All{"FILENAME"}= FILENAME->text;
+
# From Fourier Tab
$All{"FUNITS"}= FUnits->currentText;
$All{"FAPODIZATION"}= FApodization->currentText;
$All{"FPLOT"}= FPlot->currentText;
+# Fourier range
+ $All{"FrqMin"}=FrqMin->text;
+ $All{"FrqMax"}=FrqMax->text;
# Get values of t0 and Bg/Data bins if given
my $NHist = 1;
@@ -379,17 +414,7 @@ void MuSRFitform::CreateAllInput()
$All{"FILENAME"}="TMP";
}
- if ( $All{"go"} eq "" ) {
- $All{"go"}="PLOT";
- }
-# Get minimization process
- $All{"Minimization"} = Minimization->currentText();
- $All{"go"}=$All{"Minimization"};
-
-# Get Error calculation process
- $All{"ErrorCalc"} = ErrorCalc->currentText();
- $All{"go"}=$All{"ErrorCalc"};
# Return Hash with all important values
return %All;
@@ -399,15 +424,37 @@ void MuSRFitform::CallMSRCreate()
{
use MSR;
my %All=CreateAllInput();
+
+# Check if the option for checking for existing files is selected
+ my $FileExistCheck= FileExistCheck->isOn();
+ my $FILENAME=$All{"FILENAME"}.".msr";
+ my $Answer=0;
if ($All{"RunNumbers"} ne "" || $All{"RunFiles"} ne "") {
- if ( $All{"FitAsyType"} eq "Asymmetry" ) {
- my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSR(\%All);
+ if ( $FileExistCheck==1 ) {
+ if (-e $FILENAME) {
+# Warning: MSR file exists
+# my $Warning = "Warning: MSR file $FILENAME Already exists!\nIf you continue it will overwriten.";
+ my $Warning = "Warning: MSR file $FILENAME Already exists!\nDo you want to overwrite it?";
+# my $WarningWindow = Qt::MessageBox::information( this, "Warning",$Warning);
+# $Answer =1,0 for yes and no
+ $Answer= Qt::MessageBox::warning( this, "Warning",$Warning, "&No", "&Yes", undef, 1,1);
+ }
+ } else {
+# Just overwrite file
+ $Answer=1;
}
- elsif ( $All{"FitAsyType"} eq "SingleHist" ) {
- my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSRSingleHist(\%All);
+
+ if ($Answer) {
+ if ( $All{"FitAsyType"} eq "Asymmetry" ) {
+ my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSR(\%All);
+ }
+ elsif ( $All{"FitAsyType"} eq "SingleHist" ) {
+ my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateMSRSingleHist(\%All);
+ }
+ UpdateMSRFileInitTable();
}
- UpdateMSRFileInitTable();
}
+ return $Answer;
}
void MuSRFitform::UpdateMSRFileInitTable()
@@ -583,7 +630,7 @@ void MuSRFitform::InitializeTab()
my $NParam=scalar keys( %PTable );
if ($NParam>$NRows) {
InitParamTable->setNumRows($NParam);
- }
+ }
# Fill the table with labels and values of parametr
for (my $PCount=0;$PCount<$NParam;$PCount++) {
@@ -603,24 +650,8 @@ void MuSRFitform::InitializeTab()
void MuSRFitform::TabChanged()
{
# TODO: First check if there are some runs given, otherwise disbale
-# TODO: Check if the MSR file exists and decide whether to use it or not
my %All=CreateAllInput();
- my $SlectedTab = musrfit_tabs->currentPageIndex;
-# Check if the option for checking for existing files is selected
- my $FileExistCheck= FileExistCheck->isOn();
- my $FILENAME=$All{"FILENAME"}.".msr";
- if ($All{"RunNumbers"} ne "" && $SlectedTab==4 && $FileExistCheck==1) {
- if (-e $FILENAME) {
-# Warning: MSR file exists
- my $Warning = "Warning: MSR file $FILENAME Already exists!\nIf you continue it will overwriten.";
- my $WarningWindow = Qt::MessageBox::information( this, "Warning",$Warning);
-# my $Answer= Qt::MessageBox::warning( this, "Warning",$Warning, "&No", "&Yes", undef, 1,1);
-# $Answer =1,0 for yes and no
-# print "Answer=$Answer\n";
- }
- }
-
# First make sure we have sharing initialized
ActivateShComp();
InitializeTab();
@@ -634,38 +665,43 @@ void MuSRFitform::GoFit()
{
my %All=CreateAllInput();
musrfit_tabs->setCurrentPage(1);
- CallMSRCreate();
- my $FILENAME=$All{"FILENAME"}.".msr";
- if (-e $FILENAME) {
- my $cmd="musrfit -t $FILENAME";
- my $pid = open(FTO,"$cmd 2>&1 |");
- while () {
- FitTextOutput->append("$_");
-# print "line= ".$_;
+ my $Answer=CallMSRCreate();
+ if ($Answer) {
+ my $FILENAME=$All{"FILENAME"}.".msr";
+ if (-e $FILENAME) {
+ my $cmd="musrfit -t $FILENAME";
+ my $pid = open(FTO,"$cmd 2>&1 |");
+ while () {
+ FitTextOutput->append("$_");
+ }
+ close(FTO);
+ $cmd="musrview $FILENAME &";
+ $pid = system($cmd);
+ } else {
+ FitTextOutput->append("Cannot find MSR file!");
}
- close(FTO);
- $cmd="musrview $FILENAME &";
- $pid = system($cmd);
- } else {
- FitTextOutput->append("Cannot find MSR file!");
- }
- FitTextOutput->append("-----------------------------------------------------------------------------------------------------------------------------");
+ FitTextOutput->append("-----------------------------------------------------------------------------------------------------------------------------");
# update MSR File tab and initialization table
- UpdateMSRFileInitTable();
+ UpdateMSRFileInitTable();
+ }
+
return;
}
void MuSRFitform::GoPlot()
{
my %All=CreateAllInput();
- CallMSRCreate();
+ my $Answer=CallMSRCreate();
my $FILENAME=$All{"FILENAME"}.".msr";
- if (-e $FILENAME) {
- my $cmd="musrview $FILENAME &";
- my $pid = system($cmd);
- } else {
- FitTextOutput->append("Cannot find MSR file!");
- FitTextOutput->append("-----------------------------------------------------------------------------------------------------------------------------");
+
+ if ($Answer) {
+ if (-e $FILENAME) {
+ my $cmd="musrview $FILENAME &";
+ my $pid = system($cmd);
+ } else {
+ FitTextOutput->append("Cannot find MSR file!");
+ FitTextOutput->append("-----------------------------------------------------------------------------------------------------------------------------");
+ }
}
return;
}
@@ -676,13 +712,16 @@ void MuSRFitform::ShowMuSRT0()
my %All=CreateAllInput();
musrfit_tabs->setCurrentPage(6);
# Create MSR file and then run musrt0
- CallMSRCreate();
- my $FILENAME=$All{"FILENAME"}.".msr";
- if (-e $FILENAME) {
- my $cmd="musrt0 $FILENAME &";
- my $pid = system($cmd);
- } else {
- print STDERR "Cannot find MSR file!\n";
+ my $Answer=CallMSRCreate();
+
+ if ($Answer) {
+ my $FILENAME=$All{"FILENAME"}.".msr";
+ if (-e $FILENAME) {
+ my $cmd="musrt0 $FILENAME &";
+ my $pid = system($cmd);
+ } else {
+ print STDERR "Cannot find MSR file!\n";
+ }
}
return;
}
@@ -725,6 +764,20 @@ void MuSRFitform::RunSelectionToggle()
RUNSAuto->setEnabled(1);
RUNSAuto->setHidden(0);
}
+
+# Also use this for other options
+# Fourier toggle
+ my $Fourier=optionsFourier->isOn();
+ if ($Fourier) {
+# Fourier tab visible
+# musrfit_tabs->addTab(FourierPage,"Fourier");
+# musrfit_tabs->showPage(FourierPage);
+# FourierPage->hide();
+ } else {
+# Fourier tab invisible
+# musrfit_tabs->removePage(FourierPage);
+# FourierPage->show();
+ }
}
void MuSRFitform::fileBrowse()
@@ -747,4 +800,3 @@ void MuSRFitform::fileBrowse()
}
RunFiles->setText($RunFiles);
}
-