merge the devel-rrf branch into the master branch
This commit is contained in:
parent
55f70cd526
commit
a35884b86c
@ -4,6 +4,8 @@
|
||||
|
||||
changes since 0.15.0
|
||||
===================================
|
||||
NEW 2016-01-22 add RRF fit option. At the same time, the version has been
|
||||
increased to 0.16.0. For details see the documentation.
|
||||
FIXED 2015-10-29 TMusrRunHeader didn't map a double vector properly into a
|
||||
string. The last element was a copy of the 2nd last instead
|
||||
if the proper last. This is now fixed. Fixed also some
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
AC_REVISION([m4_esyscmd_s([git describe --always])])
|
||||
|
||||
AC_PREREQ(2.63)
|
||||
AC_INIT([musrfit],[0.15.0],[andreas.suter@psi.ch])
|
||||
AC_INIT([musrfit],[0.16.0],[andreas.suter@psi.ch])
|
||||
AC_CONFIG_AUX_DIR(admin)
|
||||
AC_CANONICAL_HOST
|
||||
#AC_MSG_RESULT([${host} ${host_cpu} ${host_vendor} ${host_os}])
|
||||
@ -35,7 +35,7 @@ dnl -----------------------------------------------
|
||||
|
||||
#release versioning
|
||||
MUSR_MAJOR_VERSION=0
|
||||
MUSR_MINOR_VERSION=15
|
||||
MUSR_MINOR_VERSION=16
|
||||
MUSR_MICRO_VERSION=0
|
||||
|
||||
#release versioning
|
||||
|
||||
178
doc/examples/test-asy-HAL9500-RRF.msr
Normal file
178
doc/examples/test-asy-HAL9500-RRF.msr
Normal file
@ -0,0 +1,178 @@
|
||||
MnSi, FLC68.2, 50 K
|
||||
###############################################################
|
||||
FITPARAMETER
|
||||
# Nr. Name Value Step Pos_Error Boundaries
|
||||
1 rate_1 1.680 0.019 none
|
||||
2 field_1 1589.71 0.20 none
|
||||
3 rate_2 1.863 0.065 none
|
||||
4 field_2 788.86 0.49 none
|
||||
|
||||
5 alpha_f15 1.0029 0.0015 none
|
||||
6 frac_f15 0.7350 0.0090 none
|
||||
7 asym_f15 0.2713 0.0043 none 0 none
|
||||
8 phase_f15 79.37 0.80 none
|
||||
|
||||
9 alpha_f26 0.9996 0.0015 none
|
||||
10 frac_f26 0.7408 0.0085 none
|
||||
11 asym_f26 0.3029 0.0046 none 0 none
|
||||
12 phase_f26 30.22 0.73 none
|
||||
|
||||
13 alpha_f37 1.0003 0.0015 none
|
||||
14 frac_f37 0.88 0.23 none
|
||||
15 asym_f37 0.0126 0.0045 none 0 none
|
||||
16 phase_f37 58.0 15.0 none
|
||||
|
||||
17 alpha_f48 0.9999 0.0015 none
|
||||
18 frac_f48 0.7344 0.0084 none
|
||||
19 asym_f48 0.2929 0.0043 none 0 none
|
||||
20 phase_f48 -33.13 0.76 none
|
||||
|
||||
21 alpha_b15 0.9991 0.0013 none
|
||||
22 frac_b15 0.7439 0.0077 none
|
||||
23 asym_b15 0.2807 0.0038 none 0 none
|
||||
24 phase_b15 164.98 0.68 none
|
||||
|
||||
25 alpha_b26 1.0003 0.0013 none
|
||||
26 frac_b26 0.7331 0.0078 none
|
||||
27 asym_b26 0.2810 0.0038 none 0 none
|
||||
28 phase_b26 119.49 0.70 none
|
||||
|
||||
29 alpha_b37 0.9989 0.0012 none
|
||||
30 frac_b37 0.7504 0.0078 none
|
||||
31 asym_b37 0.2755 0.0037 none 0 none
|
||||
32 phase_b37 102.07 0.69 none
|
||||
|
||||
33 alpha_b48 0.9990 0.0012 none
|
||||
34 frac_b48 0.7391 0.0080 none
|
||||
35 asym_b48 0.2763 0.0039 none 0 none
|
||||
36 phase_b48 37.66 0.67 none
|
||||
|
||||
###############################################################
|
||||
THEORY
|
||||
asymmetry fun1
|
||||
simplExpo 1 (rate)
|
||||
TFieldCos map3 fun3 (phase frequency)
|
||||
+
|
||||
asymmetry fun2
|
||||
simplExpo 3 (rate)
|
||||
TFieldCos map3 fun4 (phase frequency)
|
||||
|
||||
###############################################################
|
||||
FUNCTIONS
|
||||
fun1 = map1 * map2
|
||||
fun2 = (1 - map1) * map2
|
||||
fun3 = gamma_mu * par2
|
||||
fun4 = gamma_mu * par4
|
||||
|
||||
###############################################################
|
||||
GLOBAL
|
||||
fittype 3 (asymmetry RRF fit)
|
||||
fit 0.0005 6
|
||||
rrf_freq 7.15 T
|
||||
rrf_packing 300
|
||||
rrf_phase 0.00
|
||||
|
||||
###############################################################
|
||||
# Fw1-Fw5 +++++++
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
alpha 5
|
||||
map 6 7 8 0 0 0 0 0 0 0 0
|
||||
forward 2
|
||||
backward 6
|
||||
background 500 15000 500 15000 # estimated bkg: 0.0492 / 0.0501
|
||||
data 20158 409500 20130 409500
|
||||
t0 20108.0 20080.0
|
||||
|
||||
# Fw2-Fw6 +++++++
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
alpha 9
|
||||
map 10 11 12 0 0 0 0 0 0 0 0
|
||||
forward 3
|
||||
backward 7
|
||||
background 500 15000 500 15000 # estimated bkg: 0.0501 / 0.0451
|
||||
data 20138 409500 20121 409500
|
||||
t0 20088.0 20071.0
|
||||
|
||||
# Fw3-Fw7 +++++++
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
alpha 13
|
||||
map 14 15 16 0 0 0 0 0 0 0 0
|
||||
forward 3
|
||||
backward 8
|
||||
background 500 15000 500 15000 # estimated bkg: 0.0501 / 0.0449
|
||||
data 20111 409500 20116 409500
|
||||
t0 20061.0 20066.0
|
||||
|
||||
# Fw4-Fw8 +++++++
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
alpha 17
|
||||
map 18 19 20 0 0 0 0 0 0 0 0
|
||||
forward 5
|
||||
backward 9
|
||||
background 500 15000 500 15000 # estimated bkg: 0.0560 / 0.0462
|
||||
data 20121 409500 20082 409500
|
||||
t0 20071.0 20032.0
|
||||
|
||||
# Bw1-Bw5 +++++++
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
alpha 21
|
||||
map 22 23 24 0 0 0 0 0 0 0 0
|
||||
forward 10
|
||||
backward 14
|
||||
background 500 15000 500 15000 # estimated bkg: 0.0641 / 0.0806
|
||||
data 20072 409500 20067 409500
|
||||
t0 20022.0 20017.0
|
||||
|
||||
# Bw2-Bw6 +++++++
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
alpha 25
|
||||
map 26 27 28 0 0 0 0 0 0 0 0
|
||||
forward 11
|
||||
backward 15
|
||||
background 500 15000 500 15000 # estimated bkg: 0.0689 / 0.0768
|
||||
data 20076 409500 20069 409500
|
||||
t0 20026.0 20019.0
|
||||
|
||||
# Bw3-Bw7 +++++++
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
alpha 29
|
||||
map 30 31 32 0 0 0 0 0 0 0 0
|
||||
forward 12
|
||||
backward 16
|
||||
background 500 15000 500 15000 # estimated bkg: 0.0769 / 0.0795
|
||||
data 20060 409500 20069 409500
|
||||
t0 20010.0 20019.0
|
||||
|
||||
# Bw4-Bw8 +++++++
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
alpha 33
|
||||
map 34 35 36 0 0 0 0 0 0 0 0
|
||||
forward 13
|
||||
backward 17
|
||||
background 500 15000 500 15000 # estimated bkg: 0.0761 / 0.0702
|
||||
data 20063 409500 20089 409500
|
||||
t0 20013.0 20039.0
|
||||
|
||||
###############################################################
|
||||
COMMANDS
|
||||
#MAX_LIKELIHOOD
|
||||
PRINT_LEVEL 2
|
||||
MINIMIZE
|
||||
#MINOS
|
||||
SAVE
|
||||
|
||||
###############################################################
|
||||
PLOT 3 (asymmetry RRF plot)
|
||||
runs 1 2 3 4 5 6 7 8
|
||||
range 0 9.07 -0.5 0.5
|
||||
|
||||
###############################################################
|
||||
FOURIER
|
||||
units Gauss # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
|
||||
fourier_power 11
|
||||
apodization STRONG # NONE, WEAK, MEDIUM, STRONG
|
||||
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE
|
||||
|
||||
###############################################################
|
||||
STATISTIC --- 2016-01-18 16:23:00
|
||||
chisq = 7402.2, NDF = 6516, chisq/NDF = 1.135997
|
||||
235
doc/examples/test-histo-HAL9500-RRF.msr
Normal file
235
doc/examples/test-histo-HAL9500-RRF.msr
Normal file
@ -0,0 +1,235 @@
|
||||
MnSi, FLC68.2, 50 K
|
||||
###############################################################
|
||||
FITPARAMETER
|
||||
# Nr. Name Value Step Pos_Error Boundaries
|
||||
1 Rate_1 1.678 0.018 none
|
||||
2 Field_1_RRF 1589.66 0.19 none
|
||||
3 Rate_2 1.948 0.064 none
|
||||
4 Field_2_RRF 788.93 0.47 none
|
||||
|
||||
5 Asym_1 0.3102 0.0067 none
|
||||
6 Frc_1 0.728 0.012 none
|
||||
7 Phase_1 57.3 1.1 none
|
||||
|
||||
8 Asym_2 0.3073 0.0066 none
|
||||
9 Frc_2 0.748 0.012 none
|
||||
10 Phase_2 30.6 1.0 none
|
||||
|
||||
11 Asym_3 0.3245 0.0065 none
|
||||
12 Frc_3 0.728 0.011 none
|
||||
13 Phase_3 18.70 0.96 none
|
||||
|
||||
14 Asym_4 0.3290 0.0062 none
|
||||
15 Frc_4 0.733 0.011 none
|
||||
16 Phase_4 339.27 0.96 none
|
||||
|
||||
17 Asym_5 0.3213 0.0062 none
|
||||
18 Frc_5 0.730 0.011 none
|
||||
19 Phase_5 282.5 1.0 none
|
||||
|
||||
20 Asym_6 0.3424 0.0072 none
|
||||
21 Frc_6 0.726 0.012 none
|
||||
22 Phase_6 211.3 1.0 none
|
||||
|
||||
23 Asym_7 0.3321 0.0069 none
|
||||
24 Frc_7 0.731 0.012 none
|
||||
25 Phase_7 161.7 1.1 none
|
||||
|
||||
26 Asym_8 0.3219 0.0067 none
|
||||
27 Frc_8 0.730 0.012 none
|
||||
28 Phase_8 133.7 1.1 none
|
||||
|
||||
29 Asym_9 0.3030 0.0058 none
|
||||
30 Frc_9 0.730 0.011 none
|
||||
31 Phase_9 158.87 0.97 none
|
||||
|
||||
32 Asym_10 0.3046 0.0057 none
|
||||
33 Frc_10 0.731 0.011 none
|
||||
34 Phase_10 129.97 0.97 none
|
||||
|
||||
35 Asym_11 0.2898 0.0055 none
|
||||
36 Frc_11 0.754 0.011 none
|
||||
37 Phase_11 101.80 0.96 none
|
||||
|
||||
38 Asym_12 0.3013 0.0055 none
|
||||
39 Frc_12 0.740 0.010 none
|
||||
40 Phase_12 43.00 0.88 none
|
||||
|
||||
41 Asym_13 0.3009 0.0054 none
|
||||
42 Frc_13 0.747 0.010 none
|
||||
43 Phase_13 351.72 0.88 none
|
||||
|
||||
44 Asym_14 0.3054 0.0053 none
|
||||
45 Frc_14 0.729 0.010 none
|
||||
46 Phase_14 289.91 0.91 none
|
||||
|
||||
47 Asym_15 0.2931 0.0053 none
|
||||
48 Frc_15 0.740 0.010 none
|
||||
49 Phase_15 282.39 0.94 none
|
||||
|
||||
50 Asym_16 0.2814 0.0058 none
|
||||
51 Frc_16 0.729 0.011 none
|
||||
52 Phase_16 212.89 0.99 none
|
||||
|
||||
###############################################################
|
||||
THEORY
|
||||
asymmetry fun1
|
||||
simplExpo 1 (rate)
|
||||
TFieldCos map3 fun3 (phase frequency)
|
||||
+
|
||||
asymmetry fun2
|
||||
simplExpo 3 (rate)
|
||||
TFieldCos map3 fun4 (phase frequency)
|
||||
|
||||
###############################################################
|
||||
FUNCTIONS
|
||||
fun1 = map1 * map2
|
||||
fun2 = map1 * (1 - map2)
|
||||
fun3 = par2 * gamma_mu
|
||||
fun4 = par4 * gamma_mu
|
||||
|
||||
###############################################################
|
||||
GLOBAL
|
||||
fittype 1 (single histogram RRF fit)
|
||||
rrf_freq 7.15 T
|
||||
rrf_packing 300
|
||||
rrf_phase 0.00
|
||||
fit 0.0005 10
|
||||
|
||||
###############################################################
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 5 6 7 0 0 0 0 0 0 0 0
|
||||
forward 2
|
||||
background 100 18000 # estimated bkg: 0.0476
|
||||
data 20208 409500
|
||||
t0 20108.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 8 9 10 0 0 0 0 0 0 0 0
|
||||
forward 3
|
||||
background 100 18000 # estimated bkg: 0.0490
|
||||
data 20188 409500
|
||||
t0 20088.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 11 12 13 0 0 0 0 0 0 0 0
|
||||
forward 4
|
||||
background 100 18000 # estimated bkg: 0.0582
|
||||
data 20161 409500
|
||||
t0 20061.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 14 15 16 0 0 0 0 0 0 0 0
|
||||
forward 5
|
||||
background 100 18000 # estimated bkg: 0.0553
|
||||
data 20171 409500
|
||||
t0 20071.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 17 18 19 0 0 0 0 0 0 0 0
|
||||
forward 6
|
||||
background 100 18000 # estimated bkg: 0.0515
|
||||
data 20180 409500
|
||||
t0 20080.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 20 21 22 0 0 0 0 0 0 0 0
|
||||
forward 7
|
||||
background 100 18000 # estimated bkg: 0.0458
|
||||
data 20171 409500
|
||||
t0 20071.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 23 24 25 0 0 0 0 0 0 0 0
|
||||
forward 8
|
||||
background 100 18000 # estimated bkg: 0.0466
|
||||
data 20166 409500
|
||||
t0 20066.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 26 27 28 0 0 0 0 0 0 0 0
|
||||
forward 9
|
||||
background 100 18000 # estimated bkg: 0.0457
|
||||
data 20132 409500
|
||||
t0 20032.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 29 30 31 0 0 0 0 0 0 0 0
|
||||
forward 10
|
||||
background 100 18000 # estimated bkg: 0.0635
|
||||
data 20122 409500
|
||||
t0 20022.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 32 33 34 0 0 0 0 0 0 0 0
|
||||
forward 11
|
||||
background 100 18000 # estimated bkg: 0.0685
|
||||
data 20126 409500
|
||||
t0 20026.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 35 36 37 0 0 0 0 0 0 0 0
|
||||
forward 12
|
||||
background 100 18000 # estimated bkg: 0.0752
|
||||
data 20110 409500
|
||||
t0 20010.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 38 39 40 0 0 0 0 0 0 0 0
|
||||
forward 13
|
||||
background 100 18000 # estimated bkg: 0.0760
|
||||
data 20113 409500
|
||||
t0 20013.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 41 42 43 0 0 0 0 0 0 0 0
|
||||
forward 14
|
||||
background 100 18000 # estimated bkg: 0.0809
|
||||
data 20117 409500
|
||||
t0 20017.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 44 45 46 0 0 0 0 0 0 0 0
|
||||
forward 15
|
||||
background 100 18000 # estimated bkg: 0.0755
|
||||
data 20119 409500
|
||||
t0 20019.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 47 48 49 0 0 0 0 0 0 0 0
|
||||
forward 16
|
||||
background 100 18000 # estimated bkg: 0.0796
|
||||
data 20119 409500
|
||||
t0 20019.0
|
||||
#--------------------------------------------------------------
|
||||
RUN data/tdc_hifi_2014_00153 PIE3 PSI PSI-MDU (name beamline institute data-file-format)
|
||||
map 50 51 52 0 0 0 0 0 0 0 0
|
||||
forward 17
|
||||
background 100 18000 # estimated bkg: 0.0702
|
||||
data 20139 409500
|
||||
t0 20039.0
|
||||
|
||||
###############################################################
|
||||
COMMANDS
|
||||
#MAX_LIKELIHOOD
|
||||
PRINT_LEVEL 2
|
||||
MINIMIZE
|
||||
#MINOS
|
||||
SAVE
|
||||
|
||||
###############################################################
|
||||
PLOT 1 (single histo RRF plot)
|
||||
runs 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
|
||||
range 0 9.07 -0.5 0.5
|
||||
|
||||
###############################################################
|
||||
FOURIER
|
||||
units Gauss # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
|
||||
fourier_power 12
|
||||
apodization MEDIUM # NONE, WEAK, MEDIUM, STRONG
|
||||
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE
|
||||
#range 7.1 7.5
|
||||
|
||||
###############################################################
|
||||
STATISTIC --- 2016-01-14 13:24:36
|
||||
chisq = 22007.6, NDF = 20700, chisq/NDF = 1.063168
|
||||
Loading…
x
Reference in New Issue
Block a user