From 9e4528d741ddde23b160cc218d0453fd2f86e191 Mon Sep 17 00:00:00 2001
From: Lorenzo Moneta <Lorenzo.Moneta@cern.ch>
Date: Wed, 28 Sep 2016 11:42:11 +0200
Subject: [PATCH] Fix a bug in the definition of the range for a coefficient
a1 in the Roofit tutorial and stressRooFit. The parameter was considered
constant instead should have been varying. Need to update stressRooFit file
since the fit now are different (parameter a1 is varying in the fit instead
of being constant )
---
test/stressRooFit.cxx | 2 +-
test/stressRooFit_tests.cxx | 14 +++++++-------
tutorials/roofit/rf201_composite.C | 2 +-
tutorials/roofit/rf202_extendedmlfit.C | 2 +-
tutorials/roofit/rf204_extrangefit.C | 2 +-
tutorials/roofit/rf205_compplot.C | 2 +-
tutorials/roofit/rf206_treevistools.C | 2 +-
tutorials/roofit/rf207_comptools.C | 2 +-
tutorials/roofit/rf407_latextables.C | 2 +-
tutorials/roofit/rf502_wspacewrite.C | 2 +-
tutorials/roofit/rf509_wsinteractive.C | 2 +-
tutorials/roofit/rf510_wsnamedsets.C | 2 +-
tutorials/roofit/rf511_wsfactory_basic.C | 4 ++--
tutorials/roofit/rf602_chi2fit.C | 2 +-
14 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/test/stressRooFit.cxx b/test/stressRooFit.cxx
index 45a23456d1e..b184049f4af 100644
--- a/test/stressRooFit.cxx
+++ b/test/stressRooFit.cxx
@@ -357,7 +357,7 @@ Int_t stressRooFit()
Bool_t doDump = kFALSE ;
Bool_t doTreeStore = kFALSE ;
- string refFileName = "http://root.cern.ch/files/stressRooFit_v534_ref.root" ;
+ string refFileName = "http://root.cern.ch/files/stressRooFit_v608_ref.root" ;
return stressRooFit(refFileName.c_str(),doWrite,doVerbose,oneTest,dryRun,doDump,doTreeStore);
}
diff --git a/test/stressRooFit_tests.cxx b/test/stressRooFit_tests.cxx
index c79f8844597..70f646413b0 100644
--- a/test/stressRooFit_tests.cxx
+++ b/test/stressRooFit_tests.cxx
@@ -938,7 +938,7 @@ public:
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",-0.2,-1.,1.) ;
RooChebychev bkg("bkg","Background",x,RooArgSet(a0,a1)) ;
@@ -1065,7 +1065,7 @@ public:
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",-0.2,-1.,1.) ;
RooChebychev bkg("bkg","Background",x,RooArgSet(a0,a1)) ;
// Sum the signal components into a composite signal p.d.f.
@@ -1273,7 +1273,7 @@ public:
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",-0.2,-1.,1.) ;
RooChebychev bkg("bkg","Background",x,RooArgSet(a0,a1)) ;
// Sum the signal components into a composite signal p.d.f.
@@ -1369,7 +1369,7 @@ public:
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",-0.2,-1.,1.) ;
RooChebychev bkg1("bkg1","Background 1",x,RooArgSet(a0,a1)) ;
// Build expontential pdf
@@ -4417,7 +4417,7 @@ public:
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",-0.2,-1.,1.) ;
RooChebychev bkg("bkg","Background",x,RooArgSet(a0,a1)) ;
// Sum the signal components into a composite signal p.d.f.
@@ -4810,7 +4810,7 @@ public:
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2) ;
+ RooRealVar a1("a1","a1",-0.2,-1.,1.) ;
RooChebychev bkg("bkg","Background",x,RooArgSet(a0,a1)) ;
// Sum the signal components into a composite signal p.d.f.
@@ -6028,7 +6028,7 @@ public:
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,-1,1.) ;
+ RooRealVar a1("a1","a1",-0.2,-1.,1.) ;
RooChebychev bkg("bkg","Background",x,RooArgSet(a0,a1)) ;
// Sum the signal components into a composite signal p.d.f.
diff --git a/tutorials/roofit/rf201_composite.C b/tutorials/roofit/rf201_composite.C
index ef3b6194d44..c2709e023d7 100644
--- a/tutorials/roofit/rf201_composite.C
+++ b/tutorials/roofit/rf201_composite.C
@@ -41,7 +41,7 @@ void rf201_composite()
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",0.2,0.,1.) ;
RooChebychev bkg("bkg","Background",x,RooArgSet(a0,a1)) ;
diff --git a/tutorials/roofit/rf202_extendedmlfit.C b/tutorials/roofit/rf202_extendedmlfit.C
index 88932406de9..9f37e38f7b9 100644
--- a/tutorials/roofit/rf202_extendedmlfit.C
+++ b/tutorials/roofit/rf202_extendedmlfit.C
@@ -41,7 +41,7 @@ void rf202_extendedmlfit()
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",0.2,0.,1.) ;
RooChebychev bkg("bkg","Background",x,RooArgSet(a0,a1)) ;
// Sum the signal components into a composite signal p.d.f.
diff --git a/tutorials/roofit/rf204_extrangefit.C b/tutorials/roofit/rf204_extrangefit.C
index be277c796d2..616e092ba2a 100644
--- a/tutorials/roofit/rf204_extrangefit.C
+++ b/tutorials/roofit/rf204_extrangefit.C
@@ -44,7 +44,7 @@ void rf204_extrangefit()
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",0.2,0.,1.) ;
RooChebychev bkg("bkg","Background",x,RooArgSet(a0,a1)) ;
// Sum the signal components into a composite signal p.d.f.
diff --git a/tutorials/roofit/rf205_compplot.C b/tutorials/roofit/rf205_compplot.C
index 85060012199..6f0499b60ac 100644
--- a/tutorials/roofit/rf205_compplot.C
+++ b/tutorials/roofit/rf205_compplot.C
@@ -44,7 +44,7 @@ void rf205_compplot()
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",0.2,0.,1.) ;
RooChebychev bkg1("bkg1","Background 1",x,RooArgSet(a0,a1)) ;
// Build exponential pdf
diff --git a/tutorials/roofit/rf206_treevistools.C b/tutorials/roofit/rf206_treevistools.C
index 7e211be80a4..f7ec2941ab5 100644
--- a/tutorials/roofit/rf206_treevistools.C
+++ b/tutorials/roofit/rf206_treevistools.C
@@ -43,7 +43,7 @@ void rf206_treevistools()
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",0.2,0.,1.) ;
RooChebychev bkg1("bkg1","Background 1",x,RooArgSet(a0,a1)) ;
// Build expontential pdf
diff --git a/tutorials/roofit/rf207_comptools.C b/tutorials/roofit/rf207_comptools.C
index b1986b75583..cbd3eac052e 100644
--- a/tutorials/roofit/rf207_comptools.C
+++ b/tutorials/roofit/rf207_comptools.C
@@ -41,7 +41,7 @@ void rf207_comptools()
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",0.2,0.,1.) ;
RooChebychev bkg1("bkg1","Background 1",x,RooArgSet(a0,a1)) ;
// Build exponential pdf
diff --git a/tutorials/roofit/rf407_latextables.C b/tutorials/roofit/rf407_latextables.C
index 72457d48938..d9f5084dd8d 100644
--- a/tutorials/roofit/rf407_latextables.C
+++ b/tutorials/roofit/rf407_latextables.C
@@ -43,7 +43,7 @@ void rf407_latextables()
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",0.2,0.,1.) ;
RooChebychev bkg1("bkg1","Background 1",x,RooArgSet(a0,a1)) ;
// Build expontential pdf
diff --git a/tutorials/roofit/rf502_wspacewrite.C b/tutorials/roofit/rf502_wspacewrite.C
index 4d8f1f3cc53..5e74784d849 100644
--- a/tutorials/roofit/rf502_wspacewrite.C
+++ b/tutorials/roofit/rf502_wspacewrite.C
@@ -44,7 +44,7 @@ void rf502_wspacewrite()
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",0.2,0,1.) ;
RooChebychev bkg("bkg","Background",x,RooArgSet(a0,a1)) ;
// Sum the signal components into a composite signal p.d.f.
diff --git a/tutorials/roofit/rf509_wsinteractive.C b/tutorials/roofit/rf509_wsinteractive.C
index 3aa718d3152..17f966b41c3 100644
--- a/tutorials/roofit/rf509_wsinteractive.C
+++ b/tutorials/roofit/rf509_wsinteractive.C
@@ -119,7 +119,7 @@ void fillWorkspace(RooWorkspace& w)
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",0.2,0.,1.) ;
RooChebychev bkg("bkg","Background",x,RooArgSet(a0,a1)) ;
// Sum the signal components into a composite signal p.d.f.
diff --git a/tutorials/roofit/rf510_wsnamedsets.C b/tutorials/roofit/rf510_wsnamedsets.C
index affb5931d81..dc3d994b9ea 100644
--- a/tutorials/roofit/rf510_wsnamedsets.C
+++ b/tutorials/roofit/rf510_wsnamedsets.C
@@ -94,7 +94,7 @@ void fillWorkspace(RooWorkspace& w)
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",0.2,0.,1.) ;
RooChebychev bkg("bkg","Background",x,RooArgSet(a0,a1)) ;
// Sum the signal components into a composite signal p.d.f.
diff --git a/tutorials/roofit/rf511_wsfactory_basic.C b/tutorials/roofit/rf511_wsfactory_basic.C
index f0d51cb3884..6537ce38456 100644
--- a/tutorials/roofit/rf511_wsfactory_basic.C
+++ b/tutorials/roofit/rf511_wsfactory_basic.C
@@ -45,7 +45,7 @@ void rf511_wsfactory_basic(Bool_t compact=kFALSE)
// Use object factory to build p.d.f. of tutorial rs502_wspacewrite
w->factory("Gaussian::sig1(x[-10,10],mean[5,0,10],0.5)") ;
w->factory("Gaussian::sig2(x,mean,1)") ;
- w->factory("Chebychev::bkg(x,{a0[0.5,0.,1],a1[-0.2,0.,1.]})") ;
+ w->factory("Chebychev::bkg(x,{a0[0.5,0.,1],a1[0.2,0.,1.]})") ;
w->factory("SUM::sig(sig1frac[0.8,0.,1.]*sig1,sig2)") ;
w->factory("SUM::model(bkgfrac[0.5,0.,1.]*bkg,sig)") ;
@@ -55,7 +55,7 @@ void rf511_wsfactory_basic(Bool_t compact=kFALSE)
// - Contracted to a single line recursive expression,
// - Omitting explicit names for components that are not referred to explicitly later
- w->factory("SUM::model(bkgfrac[0.5,0.,1.]*Chebychev::bkg(x[-10,10],{a0[0.5,0.,1],a1[-0.2,0.,1.]}),"
+ w->factory("SUM::model(bkgfrac[0.5,0.,1.]*Chebychev::bkg(x[-10,10],{a0[0.5,0.,1],a1[0.2,0.,1.]}),"
"SUM(sig1frac[0.8,0.,1.]*Gaussian(x,mean[5,0,10],0.5), Gaussian(x,mean,1)))") ;
}
diff --git a/tutorials/roofit/rf602_chi2fit.C b/tutorials/roofit/rf602_chi2fit.C
index 0bd45faa8bc..4f988219de1 100644
--- a/tutorials/roofit/rf602_chi2fit.C
+++ b/tutorials/roofit/rf602_chi2fit.C
@@ -43,7 +43,7 @@ void rf602_chi2fit()
// Build Chebychev polynomial p.d.f.
RooRealVar a0("a0","a0",0.5,0.,1.) ;
- RooRealVar a1("a1","a1",-0.2,0.,1.) ;
+ RooRealVar a1("a1","a1",0.2,0.,1.) ;
RooChebychev bkg("bkg","Background",x,RooArgSet(a0,a1)) ;
// Sum the signal components into a composite signal p.d.f.
--
GitLab