diff --git a/src/classes/PRunAsymmetryBNMR.cpp b/src/classes/PRunAsymmetryBNMR.cpp index 9cef0f21..20910117 100644 --- a/src/classes/PRunAsymmetryBNMR.cpp +++ b/src/classes/PRunAsymmetryBNMR.cpp @@ -1507,8 +1507,8 @@ Bool_t PRunAsymmetryBNMR::GetProperT0(PRawRunData* runData, PMsrGlobalBlock *glo } // fill in the T0's from the msr-file (if present) - for (Int_t j=0; jGetAddT0BinSize(i); j++) { - fAddT0s[i-1][j] = fRunInfo->GetAddT0Bin(i, j); + for (Int_t j=0; jGetAddT0BinSize(i-1); j++) { + fAddT0s[i-1][j] = fRunInfo->GetAddT0Bin(i-1, j); } // fill in the T0's from the data file, if not already present in the msr-file diff --git a/src/external/libBNMR/ExpRlx-hel.msr b/src/external/libBNMR/ExpRlx-hel.msr index 048996bc..d0a5650c 100644 --- a/src/external/libBNMR/ExpRlx-hel.msr +++ b/src/external/libBNMR/ExpRlx-hel.msr @@ -4,17 +4,17 @@ FITPARAMETER ############################################################### # No Name Value Err Min Max 1 Alpha 1.11592 0.00035 none - 2 Asy 0.05869 0.00091 none 0 0.2 + 2 Asy 0.05868 0.00091 none 0 0.2 3 T 1 0 none 4 Rlx 1.142 0.023 none 0 15000 5 One 1 0 none - 6 FlHel -1.047 0.022 none -2 0 + 6 FlHel -1.048 0.022 none -2 0 ############################################################### THEORY ############################################################### asymmetry fun1 -userFcn .libs/libBNMR.so ExpRlx 3 4 +userFcn libBNMR.so ExpRlx 3 4 ############################################################### FUNCTIONS @@ -27,7 +27,7 @@ fittype 2 (asymmetry fit) alpha 1 forward 3 backward 4 -data 11 1000 11 1000 +data 11 910 11 910 background 1 9 1 9 # estimated bkg: 8.0000 / 9.6250 t0 10.0 10.0 10.0 10.0 map 2 5 0 0 0 0 0 0 0 0 @@ -39,7 +39,7 @@ fittype 2 (asymmetry fit) alpha 1 forward 5 backward 6 -data 11 1000 11 1000 +data 11 910 11 910 background 1 9 1 9 # estimated bkg: 11.6250 / 15.6250 t0 10.0 10.0 10.0 10.0 map 2 6 0 0 0 0 0 0 0 0 @@ -68,5 +68,5 @@ plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_RE phase 8 #range FRQMIN FRQMAX ############################################################### -STATISTIC --- 2018-08-20 22:01:15 +STATISTIC --- 2019-05-03 17:05:58 chisq = 566.6, NDF = 346, chisq/NDF = 1.637584 diff --git a/src/external/libBNMR/ExpRlx.msr b/src/external/libBNMR/ExpRlx.msr index 59c94244..646bb1b9 100644 --- a/src/external/libBNMR/ExpRlx.msr +++ b/src/external/libBNMR/ExpRlx.msr @@ -12,15 +12,15 @@ FITPARAMETER THEORY ############################################################### asymmetry 2 -userFcn .libs/libBNMR.so ExpRlx 3 4 +userFcn libBNMR.so ExpRlx 3 4 ############################################################### RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format) fittype 5 (beta-NMR fit) -#alpha 1 +alpha 1 forward 3 5 backward 4 6 -data 11 1000 11 1000 +data 11 910 11 910 background 1 9 1 9 # estimated bkg: 8.0000 / 9.6250 t0 10.0 10.0 10.0 10.0 map 0 0 0 0 0 0 0 0 0 0 @@ -49,5 +49,5 @@ plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_RE phase 8 #range FRQMIN FRQMAX ############################################################### -STATISTIC --- 2018-08-20 22:02:02 +STATISTIC --- 2019-05-03 17:06:29 chisq = 419.1, NDF = 173, chisq/NDF = 2.422357 diff --git a/src/external/libBNMR/SExpRlx-hel.msr b/src/external/libBNMR/SExpRlx-hel.msr index 7165dd2c..450832fc 100644 --- a/src/external/libBNMR/SExpRlx-hel.msr +++ b/src/external/libBNMR/SExpRlx-hel.msr @@ -15,7 +15,7 @@ FITPARAMETER THEORY ############################################################### asymmetry fun1 -userFcn .libs/libBNMR.so SExpRlx 3 4 5 +userFcn /usr/local/lib/libBNMR.so SExpRlx 3 4 5 ############################################################### FUNCTIONS @@ -69,5 +69,5 @@ plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_RE phase 8 #range FRQMIN FRQMAX ############################################################### -STATISTIC --- 2018-08-20 21:59:04 +STATISTIC --- 2019-05-01 11:29:06 chisq = 358.6, NDF = 345, chisq/NDF = 1.039300 diff --git a/src/external/libBNMR/SExpRlx.msr b/src/external/libBNMR/SExpRlx.msr index 5ed46968..84ceaf73 100644 --- a/src/external/libBNMR/SExpRlx.msr +++ b/src/external/libBNMR/SExpRlx.msr @@ -4,7 +4,7 @@ FITPARAMETER ############################################################### # No Name Value Err Min Max 1 Alpha 0.9 1.0 none - 2 Asy 0.115 0.011 none 0 0.2 + 2 Asy 0.115 0.012 none 0 0.2 3 T 1 0 none 4 Rlx 4.16 0.88 none 0 100 5 Beta 0.433 0.031 none 0.3 2 @@ -21,7 +21,7 @@ fittype 5 (beta-NMR fit) alpha 1 forward 3 5 backward 4 6 -data 11 1000 11 1000 +data 11 910 11 910 background 1 9 1 9 # estimated bkg: 8.0000 / 9.6250 t0 10.0 10.0 10.0 10.0 map 0 0 0 0 0 0 0 0 0 0 @@ -50,5 +50,5 @@ plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_RE phase 8 #range FRQMIN FRQMAX ############################################################### -STATISTIC --- 2018-08-24 16:52:40 - chisq = 210.2, NDF = 171, chisq/NDF = 1.229343 +STATISTIC --- 2019-05-03 17:07:01 + chisq = 210.2, NDF = 171, chisq/NDF = 1.229344