LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Fixed chisqr calculation bug in BNMR

Browse Source
This commit is contained in:
Zaher Salman 2018-08-18 23:45:28 +02:00 committed by Zaher Salman
parent a2d47a09f8
commit 2b00c92139
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/classes/PFitterFcn.cpp
View File

@ -77,6 +77,7 @@ Double_t PFitterFcn::operator()(const std::vector<Double_t>& par) const
value += fRunListCollection->GetSingleHistoRRFChisq(par); value += fRunListCollection->GetSingleHistoRRFChisq(par);
value += fRunListCollection->GetAsymmetryChisq(par); value += fRunListCollection->GetAsymmetryChisq(par);
value += fRunListCollection->GetAsymmetryRRFChisq(par); value += fRunListCollection->GetAsymmetryRRFChisq(par);
value += fRunListCollection->GetAsymmetryBNMRChisq(par);
value += fRunListCollection->GetMuMinusChisq(par); value += fRunListCollection->GetMuMinusChisq(par);
value += fRunListCollection->GetNonMusrChisq(par); value += fRunListCollection->GetNonMusrChisq(par);
} else { // max likelihood } else { // max likelihood
@ -84,6 +85,7 @@ Double_t PFitterFcn::operator()(const std::vector<Double_t>& par) const
value += fRunListCollection->GetSingleHistoRRFMaximumLikelihood(par); value += fRunListCollection->GetSingleHistoRRFMaximumLikelihood(par);
value += fRunListCollection->GetAsymmetryMaximumLikelihood(par); value += fRunListCollection->GetAsymmetryMaximumLikelihood(par);
value += fRunListCollection->GetAsymmetryRRFMaximumLikelihood(par); value += fRunListCollection->GetAsymmetryRRFMaximumLikelihood(par);
value += fRunListCollection->GetAsymmetryBNMRMaximumLikelihood(par);
value += fRunListCollection->GetMuMinusMaximumLikelihood(par); value += fRunListCollection->GetMuMinusMaximumLikelihood(par);
value += fRunListCollection->GetNonMusrMaximumLikelihood(par); value += fRunListCollection->GetNonMusrMaximumLikelihood(par);
} }

10
src/external/libBNMR/ExpRlx-MUD.msr vendored
View File

@ -24,7 +24,7 @@ fun1 = 0.5 * map1 * map2
############################################################### ###############################################################
RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format) RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format)
fittype 5 (asymmetry fit) fittype 5 (beta-NMR fit)
alpha 1 alpha 1
forward 3 forward 3
backward 4 backward 4
@ -37,7 +37,7 @@ fit 0.5 8
packing 5 packing 5
RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format) RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format)
fittype 5 (asymmetry fit) fittype 5 (beta-NMR fit)
alpha 1 alpha 1
forward 5 forward 5
backward 6 backward 6
@ -57,7 +57,7 @@ HESSE
SAVE SAVE
############################################################### ###############################################################
PLOT 5 (asymmetry plot) PLOT 5 (beta-NMR asymmetry plot)
runs 1 2 runs 1 2
use_fit_ranges use_fit_ranges
view_packing 10 view_packing 10
@ -68,9 +68,9 @@ FOURIER
units MHz # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s' units MHz # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
fourier_power 12 fourier_power 12
apodization STRONG # NONE, WEAK, MEDIUM, STRONG apodization STRONG # NONE, WEAK, MEDIUM, STRONG
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL
phase 8 phase 8
#range FRQMIN FRQMAX #range FRQMIN FRQMAX
############################################################### ###############################################################
STATISTIC --- 2015-04-14 11:00:19 STATISTIC --- 2018-08-18 23:43:35
chisq = 399.5, NDF = 290, chisq/NDF = 1.377736 chisq = 399.5, NDF = 290, chisq/NDF = 1.377736