From e5c1450fc87d0cadc953d93740700bfe1824bd87 Mon Sep 17 00:00:00 2001 From: Zaher Salman Date: Sat, 18 Aug 2018 23:45:28 +0200 Subject: [PATCH] Fixed chisqr calculation bug in BNMR --- src/classes/PFitterFcn.cpp | 2 ++ src/external/libBNMR/ExpRlx-MUD.msr | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/classes/PFitterFcn.cpp b/src/classes/PFitterFcn.cpp index 07c4831a..378fd55d 100644 --- a/src/classes/PFitterFcn.cpp +++ b/src/classes/PFitterFcn.cpp @@ -80,6 +80,7 @@ Double_t PFitterFcn::operator()(const std::vector& par) const value += fRunListCollection->GetSingleHistoRRFChisq(par); value += fRunListCollection->GetAsymmetryChisq(par); value += fRunListCollection->GetAsymmetryRRFChisq(par); + value += fRunListCollection->GetAsymmetryBNMRChisq(par); value += fRunListCollection->GetMuMinusChisq(par); value += fRunListCollection->GetNonMusrChisq(par); } else { // max likelihood @@ -87,6 +88,7 @@ Double_t PFitterFcn::operator()(const std::vector& par) const value += fRunListCollection->GetSingleHistoRRFMaximumLikelihood(par); value += fRunListCollection->GetAsymmetryMaximumLikelihood(par); value += fRunListCollection->GetAsymmetryRRFMaximumLikelihood(par); + value += fRunListCollection->GetAsymmetryBNMRMaximumLikelihood(par); value += fRunListCollection->GetMuMinusMaximumLikelihood(par); value += fRunListCollection->GetNonMusrMaximumLikelihood(par); } diff --git a/src/external/libBNMR/ExpRlx-MUD.msr b/src/external/libBNMR/ExpRlx-MUD.msr index 404a46ef..da4e9a70 100644 --- a/src/external/libBNMR/ExpRlx-MUD.msr +++ b/src/external/libBNMR/ExpRlx-MUD.msr @@ -24,7 +24,7 @@ fun1 = 0.5 * map1 * map2 ############################################################### RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format) -fittype 5 (asymmetry fit) +fittype 5 (beta-NMR fit) alpha 1 forward 3 backward 4 @@ -37,7 +37,7 @@ fit 0.5 8 packing 5 RUN 045674 BNMR TRIUMF MUD (name beamline institute data-file-format) -fittype 5 (asymmetry fit) +fittype 5 (beta-NMR fit) alpha 1 forward 5 backward 6 @@ -57,7 +57,7 @@ HESSE SAVE ############################################################### -PLOT 5 (asymmetry plot) +PLOT 5 (beta-NMR asymmetry plot) runs 1 2 use_fit_ranges view_packing 10 @@ -68,9 +68,9 @@ FOURIER units MHz # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s' fourier_power 12 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 #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