Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid warnings when building with CMSSW 14_1_X #955

Merged
merged 2 commits into from
Jun 7, 2024
Merged

Avoid warnings when building with CMSSW 14_1_X #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa0e013
Avoid warnings when building with CMSSW 14_1_X
guitargeek May 1, 2024
d571f9b
Merge branch 'main' into main_warnings_14_1_X
anigamova Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<lib name="Smatrix"/>
<use name="boost_program_options"/>
<use name="boost_filesystem"/>
<flags CXXFLAGS="-DBOOST_BIND_GLOBAL_PLACEHOLDERS -Wno-free-nonheap-object"/>
<export>
<lib name="1"/>
</export>
30 changes: 18 additions & 12 deletions src/AtlasPdfs.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,7 +1461,8 @@ RooStarMomentMorph::CacheElem* RooStarMomentMorph::getCache(const RooArgSet* /*n
mypos[j] = new RooAddition(myposName.c_str(),myposName.c_str(),meanList,coefList2);
myrms[j] = new RooAddition(myrmsName.c_str(),myrmsName.c_str(),rmsList,coefList3);

ownedComps.add(RooArgSet(*myrms[j],*mypos[j])) ;
ownedComps.add(*myrms[j]) ;
ownedComps.add(*mypos[j]) ;
}
}

Expand All @@ -1486,18 +1487,23 @@ RooStarMomentMorph::CacheElem* RooStarMomentMorph::getCache(const RooArgSet* /*n
std::string slopeName = Form("%s_slope_%d_%d", GetName(),i,j);
std::string offsetName = Form("%s_offset_%d_%d",GetName(),i,j);

slope[sij(i,j)] = _useHorizMorph ?
(RooAbsReal*)new RooFormulaVar(slopeName.c_str(),"@0/@1",
RooArgList(*sigmarv[sij(i,j)],*myrms[j])) :
(RooAbsReal*)new RooConstVar(slopeName.c_str(),slopeName.c_str(),1.0); //


offsetVar[sij(i,j)] = _useHorizMorph ?
(RooAbsReal*)new RooFormulaVar(offsetName.c_str(),"@0-(@1*@2)",
RooArgList(*meanrv[sij(i,j)],*mypos[j],*slope[sij(i,j)])) :
(RooAbsReal*)new RooConstVar(offsetName.c_str(),offsetName.c_str(),0.0); //
if (_useHorizMorph) {
RooArgList slopeInputs;
slopeInputs.add(*sigmarv[sij(i,j)]);
slopeInputs.add(*myrms[j]);
slope[sij(i,j)] = new RooFormulaVar(slopeName.c_str(),"@0/@1", slopeInputs);
RooArgList offsetInputs;
offsetInputs.add(*meanrv[sij(i,j)]);
offsetInputs.add(*mypos[j]);
offsetInputs.add(*slope[sij(i,j)]);
offsetVar[sij(i,j)] = new RooFormulaVar(offsetName.c_str(),"@0-(@1*@2)", offsetInputs);
} else {
slope[sij(i,j)] = new RooConstVar(slopeName.c_str(),slopeName.c_str(),1.0);
offsetVar[sij(i,j)] = new RooConstVar(offsetName.c_str(),offsetName.c_str(),0.0);
}

ownedComps.add(RooArgSet(*slope[sij(i,j)],*offsetVar[sij(i,j)])) ;
ownedComps.add(*slope[sij(i,j)]);
ownedComps.add(*offsetVar[sij(i,j)]);

// linear transformations, so pdf can be renormalized easily
RooRealVar *var = (RooRealVar*)(_obsList[j]);
Expand Down
5 changes: 4 additions & 1 deletion src/CMSHistErrorPropagator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,10 @@ RooArgList * CMSHistErrorPropagator::setupBinPars(double poissonThreshold) {
RooRealVar *var = new RooRealVar(TString::Format("%s_bin%i_%s", this->GetName(), j, proc.c_str()), "", n_p_r, rmin, rmax);
RooConstVar *cvar = new RooConstVar(TString::Format("%g", 1. / n_p_r), "", 1. / n_p_r);
RooProduct *prod = new RooProduct(TString::Format("%s_prod", var->GetName()), "", RooArgList(*var, *cvar));
var->addOwnedComponents(RooArgSet(*prod, *cvar));
RooArgSet ownedComps;
ownedComps.add(*prod);
ownedComps.add(*cvar);
var->addOwnedComponents(ownedComps);
var->setAttribute("createPoissonConstraint");
res->addOwned(*var);
binpars_.add(*prod);
Expand Down
1 change: 1 addition & 0 deletions src/CMSHistFunc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,6 +713,7 @@ void CMSHistFunc::updateMomentFractions(double m) const {

case SineLinear:
mfrac = TMath::Sin(TMath::PiOver2() * mfrac);
[[fallthrough]];
// now fall through to Linear case

case Linear:
Expand Down
5 changes: 4 additions & 1 deletion src/CMSHistSum.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,10 @@ RooArgList * CMSHistSum::setupBinPars(double poissonThreshold) {
RooRealVar *var = new RooRealVar(TString::Format("%s_bin%i_%s", this->GetName(), j, proc.c_str()), "", n_p_r, rmin, rmax);
RooConstVar *cvar = new RooConstVar(TString::Format("%g", 1. / n_p_r), "", 1. / n_p_r);
RooProduct *prod = new RooProduct(TString::Format("%s_prod", var->GetName()), "", RooArgList(*var, *cvar));
var->addOwnedComponents(RooArgSet(*prod, *cvar));
RooArgSet ownedComps;
ownedComps.add(*prod);
ownedComps.add(*cvar);
var->addOwnedComponents(ownedComps);
var->setAttribute("createPoissonConstraint");
res->addOwned(*var);
binpars_.add(*prod);
Expand Down
1 change: 1 addition & 0 deletions src/CachingNLL.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,7 @@ cacheutils::CachingSimNLL::CachingSimNLL(RooSimultaneous *pdf, RooAbsData *data,
}

cacheutils::CachingSimNLL::CachingSimNLL(const CachingSimNLL &other, const char *name) :
RooAbsReal{other, name},
pdfOriginal_(other.pdfOriginal_),
dataOriginal_(other.dataOriginal_),
nuis_(other.nuis_),
Expand Down
4 changes: 2 additions & 2 deletions src/FitDiagnostics.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,8 +646,8 @@ void FitDiagnostics::getShapesAndNorms(RooAbsPdf *pdf, const RooArgSet &obs, std
if (!normProd) {
RooAbsReal* integral = shape->createIntegral(*myobs);
normProd = new RooProduct(normProdName, "", RooArgList(*integral, *coeff));
normProd->addOwnedComponents(RooArgSet(*integral));
coeff->addOwnedComponents(RooArgSet(*normProd));
normProd->addOwnedComponents(*integral);
coeff->addOwnedComponents(*normProd);
}

ns.norm = normProd;
Expand Down
3 changes: 1 addition & 2 deletions src/FnTimer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ std::string GetQualififedName(std::string const& str) {
++apos;
}
}
std::string cpy = str.substr(apos, bpos - apos);
return cpy;
return str.substr(apos, bpos - apos);
}


Expand Down
10 changes: 5 additions & 5 deletions src/GoodnessOfFit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,11 @@ bool GoodnessOfFit::runSaturatedModel(RooWorkspace *w, RooStats::ModelConfig *mc
if (constraints.getSize() > 0) {
RooArgList terms(constraints); terms.add(*saturatedPdfi);
RooProdPdf *prodpdf = new RooProdPdf(TString::Format("%s_constr", saturatedPdfi->GetName()), "", terms);
prodpdf->addOwnedComponents(RooArgSet(*saturatedPdfi));
prodpdf->addOwnedComponents(*saturatedPdfi);
saturatedPdfi = prodpdf;
}
satsim->addPdf(*saturatedPdfi, cat->getLabel());
satsim->addOwnedComponents(RooArgSet(*saturatedPdfi));
satsim->addOwnedComponents(*saturatedPdfi);
}
// Transfer the channel masks manually
RooSimultaneousOpt* satsimopt = dynamic_cast<RooSimultaneousOpt*>(satsim);
Expand All @@ -164,7 +164,7 @@ bool GoodnessOfFit::runSaturatedModel(RooWorkspace *w, RooStats::ModelConfig *mc
if (constraints.getSize() > 0) {
RooArgList terms(constraints); terms.add(*saturatedPdfi);
RooProdPdf *prodpdf = new RooProdPdf(TString::Format("%s_constr", saturatedPdfi->GetName()), "", terms);
prodpdf->addOwnedComponents(RooArgSet(*saturatedPdfi));
prodpdf->addOwnedComponents(*saturatedPdfi);
saturatedPdfi = prodpdf;
}
saturated.reset(saturatedPdfi);
Expand Down Expand Up @@ -426,8 +426,8 @@ RooAbsPdf * GoodnessOfFit::makeSaturatedPdf(RooAbsData &data) {
RooConstVar *norm = new RooConstVar(TString::Format("%s_norm", data.GetName()), "", data.sumEntries());
// we use RooAddPdf because this works with CachingNLL
RooAddPdf *ret = new RooAddPdf(TString::Format("%s_saturated", data.GetName()), "", RooArgList(*hpdf), RooArgList(*norm));
ret->addOwnedComponents(RooArgSet(*norm));
ret->addOwnedComponents(RooArgSet(*hpdf));
ret->addOwnedComponents(*norm);
ret->addOwnedComponents(*hpdf);
return ret;
}

Expand Down
2 changes: 1 addition & 1 deletion src/HZZ4L_RooCTauPdf_1D.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Double_t HZZ4L_RooCTauPdf_1D::evaluate() const
}
Int_t HZZ4L_RooCTauPdf_1D::getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, const char* /*rangeName*/) const
{
if (matchArgs(allVars,analVars,RooArgSet(*kd.absArg()))) return 1;
if (matchArgs(allVars,analVars,kd)) return 1;
return 0 ;
}
Double_t HZZ4L_RooCTauPdf_1D::analyticalIntegral(Int_t code, const char* rangeName) const
Expand Down
2 changes: 1 addition & 1 deletion src/HZZ4L_RooCTauPdf_1D_Expanded.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ Double_t HZZ4L_RooCTauPdf_1D_Expanded::evaluate() const
}
Int_t HZZ4L_RooCTauPdf_1D_Expanded::getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, const char* /*rangeName*/) const
{
if (matchArgs(allVars,analVars,RooArgSet(*kd.absArg()))) return 1;
if (matchArgs(allVars,analVars,kd)) return 1;
return 0 ;
}
Double_t HZZ4L_RooCTauPdf_1D_Expanded::analyticalIntegral(Int_t code, const char* rangeName) const
Expand Down
2 changes: 1 addition & 1 deletion src/HZZ4L_RooCTauPdf_2D.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Double_t HZZ4L_RooCTauPdf_2D::evaluate() const
}
Int_t HZZ4L_RooCTauPdf_2D::getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, const char* /*rangeName*/) const
{
if (matchArgs(allVars,analVars,RooArgSet(*kd.absArg(), *ksmd.absArg()))) return 1;
if (matchArgs(allVars,analVars,kd, ksmd)) return 1;
return 0 ;
}
Double_t HZZ4L_RooCTauPdf_2D::analyticalIntegral(Int_t code, const char* rangeName) const
Expand Down
2 changes: 1 addition & 1 deletion src/HZZ4L_RooSpinZeroPdf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ ClassImp(HZZ4L_RooSpinZeroPdf)
Int_t HZZ4L_RooSpinZeroPdf::getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, const char* /*rangeName*/) const
{

if (matchArgs(allVars,analVars,RooArgSet(*kd.absArg(), *kdint.absArg(), *ksmd.absArg()))) return 4 ;
if (matchArgs(allVars,analVars,kd, kdint, ksmd)) return 4 ;
//if (matchArgs(allVars,analVars,kd)) return 1 ;
//if (matchArgs(allVars,analVars,kdint)) return 2 ;
//if (matchArgs(allVars,analVars,ksmd)) return 3 ;
Expand Down
2 changes: 1 addition & 1 deletion src/HZZ4L_RooSpinZeroPdf_1D.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ ClassImp(HZZ4L_RooSpinZeroPdf_1D)
Int_t HZZ4L_RooSpinZeroPdf_1D::getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, const char* /*rangeName*/) const
{

// if (matchArgs(allVars,analVars,RooArgSet(*kd.absArg(), *kdint.absArg(), *ksmd.absArg()))) return 4 ;
// if (matchArgs(allVars,analVars,kd, kdint, ksmd)) return 4 ;
if (matchArgs(allVars,analVars,kd)) return 4 ;
//if (matchArgs(allVars,analVars,kdint)) return 2 ;
//if (matchArgs(allVars,analVars,ksmd)) return 3 ;
Expand Down
2 changes: 1 addition & 1 deletion src/HZZ4L_RooSpinZeroPdf_2D.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ ClassImp(HZZ4L_RooSpinZeroPdf_2D)
Int_t HZZ4L_RooSpinZeroPdf_2D::getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, const char* /*rangeName*/) const
{

if (matchArgs(allVars,analVars,RooArgSet(*kd.absArg(), *kdint.absArg(), *ksmd.absArg()))) return 4 ;
if (matchArgs(allVars,analVars,kd, kdint, ksmd)) return 4 ;
//if (matchArgs(allVars,analVars,kd)) return 1 ;
//if (matchArgs(allVars,analVars,kdint)) return 2 ;
//if (matchArgs(allVars,analVars,ksmd)) return 3 ;
Expand Down
2 changes: 1 addition & 1 deletion src/HZZ4L_RooSpinZeroPdf_phase.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ ClassImp(HZZ4L_RooSpinZeroPdf_phase)
Int_t HZZ4L_RooSpinZeroPdf_phase::getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, const char* /*rangeName*/) const
{

if (matchArgs(allVars,analVars,RooArgSet(*kd.absArg(), *kdint.absArg(), *ksmd.absArg()))) return 4 ;
if (matchArgs(allVars,analVars,kd, kdint, ksmd)) return 4 ;
//if (matchArgs(allVars,analVars,kd)) return 1 ;
//if (matchArgs(allVars,analVars,kdint)) return 2 ;
//if (matchArgs(allVars,analVars,ksmd)) return 3 ;
Expand Down
1 change: 0 additions & 1 deletion src/MultiDimFit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,6 @@ void MultiDimFit::doGrid(RooWorkspace *w, RooAbsReal &nll)
spacingOffsetY = 0.5;
}
unsigned int ipoint = 0;
//unsigned int nprint = ceil(0.005 * nTotal);

// loop through the grid
for (unsigned int i = 0; i < nX; ++i) {
Expand Down
1 change: 1 addition & 0 deletions src/SimpleCacheSentry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ SimpleCacheSentry::SimpleCacheSentry(const RooAbsArg &func, const RooArgSet *obs
}

SimpleCacheSentry::SimpleCacheSentry(const SimpleCacheSentry &other, const char *newname) :
RooAbsArg{other, newname},
_deps("deps",this,other._deps)
{
}
Expand Down
2 changes: 1 addition & 1 deletion src/SimpleProdPdf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ RooAbsReal* SimpleProdPdf::createIntegral(const RooArgSet& iset, const RooArgSet
RooAbsReal *iInt = pdfVec.at(i)->createIntegral(*iVarsVec.at(i), nset, cfg, rangeName);
iInt->SetName(intName);
if (dynamic_cast<RooHistPdf*>(pdfVec.at(i))) {
pdfVec.at(i)->addOwnedComponents(RooArgSet(*iInt));
pdfVec.at(i)->addOwnedComponents(*iInt);
}
terms.add(*iInt);
}
Expand Down
24 changes: 20 additions & 4 deletions src/TH1Keys.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,18 @@ TH1Keys::TH1Keys(const char *name,const char *title,Int_t nbinsx,Double_t xlow,D
x_(new RooRealVar("x", "x", min_, max_)),
w_(new RooRealVar("w", "w", 1.0)),
point_(*x_),
dataset_(new RooDataSet(name, title, {*x_, *w_}, RooFit::WeightVar("w"))),
underflow_(0.0), overflow_(0.0),
globalScale_(1.0),
options_(options),
rho_(rho),
cache_(new TH1F("",title,nbinsx,xlow,xup)),
isCacheGood_(true)
{
RooArgSet vars;
vars.add(*x_);
vars.add(*w_);
dataset_ = new RooDataSet(name, title, vars, "w");

cache_->SetDirectory(0);
fDimension = 1;
x_->setBins(nbinsx);
Expand All @@ -40,14 +44,18 @@ TH1Keys::TH1Keys(const char *name,const char *title,Int_t nbinsx,const Float_t
x_(new RooRealVar("x", "x", min_, max_)),
w_(new RooRealVar("w", "w", 1.0)),
point_(*x_),
dataset_(new RooDataSet(name, title, {*x_, *w_}, RooFit::WeightVar("w"))),
underflow_(0.0), overflow_(0.0),
globalScale_(1.0),
options_(options),
rho_(rho),
cache_(new TH1F("",title,nbinsx,xbins)),
isCacheGood_(true)
{
RooArgSet vars;
vars.add(*x_);
vars.add(*w_);
dataset_ = new RooDataSet(name, title, vars, "w");

cache_->SetDirectory(0);
fDimension = 1;
std::vector<Double_t> boundaries(nbinsx+1);
Expand All @@ -61,14 +69,18 @@ TH1Keys::TH1Keys(const char *name,const char *title,Int_t nbinsx,const Double_t
x_(new RooRealVar("x", "x", min_, max_)),
w_(new RooRealVar("w", "w", 1.0)),
point_(*x_),
dataset_(new RooDataSet(name, title, {*x_, *w_}, RooFit::WeightVar("w"))),
underflow_(0.0), overflow_(0.0),
globalScale_(1.0),
options_(options),
rho_(rho),
cache_(new TH1F("",title,nbinsx,xbins)),
isCacheGood_(true)
{
RooArgSet vars;
vars.add(*x_);
vars.add(*w_);
dataset_ = new RooDataSet(name, title, vars, "w");

cache_->SetDirectory(0);
fDimension = 1;
x_->setBinning(RooBinning(nbinsx, xbins));
Expand All @@ -81,14 +93,18 @@ TH1Keys::TH1Keys(const TH1Keys &other) :
x_(new RooRealVar("x", "x", min_, max_)),
w_(new RooRealVar("w", "w", 1.0)),
point_(*x_),
dataset_(new RooDataSet(other.GetName(), other.GetTitle(), {*x_, *w_}, RooFit::WeightVar("w"))),
underflow_(other.underflow_), overflow_(other.overflow_),
globalScale_(other.globalScale_),
options_(other.options_),
rho_(other.rho_),
cache_((TH1*)other.cache_->Clone()),
isCacheGood_(other.isCacheGood_)
{
RooArgSet vars;
vars.add(*x_);
vars.add(*w_);
dataset_ = new RooDataSet(other.GetName(), other.GetTitle(), vars, "w");

other.Copy(*this);
fDimension = 1;
x_->setBinning(other.x_->getBinning());
Expand Down
2 changes: 1 addition & 1 deletion src/VBFHZZ4L_RooSpinZeroPdf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ ClassImp(VBFHZZ4L_RooSpinZeroPdf)
Int_t VBFHZZ4L_RooSpinZeroPdf::getAnalyticalIntegral(RooArgSet& allVars, RooArgSet& analVars, const char* /*rangeName*/) const
{

if (matchArgs(allVars,analVars,RooArgSet(*kd.absArg(), *kdint.absArg(), *ksmd.absArg()))) return 4 ;
if (matchArgs(allVars,analVars,kd, kdint, ksmd)) return 4 ;

return 0 ;

Expand Down
22 changes: 18 additions & 4 deletions src/VerticalInterpHistPdf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ FastVerticalInterpHistPdf2Base::initBase() const
}

FastVerticalInterpHistPdf2::FastVerticalInterpHistPdf2(const char *name, const char *title, const RooRealVar &x, const TList & funcList, const RooArgList& coefList, Double_t smoothRegion, Int_t smoothAlgo) :
FastVerticalInterpHistPdf2Base(name,title,RooArgSet(x),funcList,coefList,smoothRegion,smoothAlgo),
FastVerticalInterpHistPdf2Base(name,title,x,funcList,coefList,smoothRegion,smoothAlgo),
_x("x","Independent variable",this,const_cast<RooRealVar&>(x)),
_cache(), _cacheNominal(), _cacheNominalLog()
{
Expand All @@ -841,8 +841,19 @@ FastVerticalInterpHistPdf2::FastVerticalInterpHistPdf2(const char *name, const c
}
}

namespace {

RooArgSet createRooArgSet(RooAbsArg const& arg1, RooAbsArg const& arg2) {
RooArgSet out;
out.add(arg1);
out.add(arg2);
return out;
}

} // namespace

FastVerticalInterpHistPdf2D2::FastVerticalInterpHistPdf2D2(const char *name, const char *title, const RooRealVar &x, const RooRealVar &y, bool conditional, const TList & funcList, const RooArgList& coefList, Double_t smoothRegion, Int_t smoothAlgo) :
FastVerticalInterpHistPdf2Base(name,title,RooArgSet(x,y),funcList,coefList,smoothRegion,smoothAlgo),
FastVerticalInterpHistPdf2Base(name,title,createRooArgSet(x, y),funcList,coefList,smoothRegion,smoothAlgo),
_x("x","Independent variable",this,const_cast<RooRealVar&>(x)),
_y("y","Independent variable",this,const_cast<RooRealVar&>(y)),
_conditional(conditional),
Expand All @@ -864,7 +875,7 @@ FastVerticalInterpHistPdf2::FastVerticalInterpHistPdf2(const FastVerticalInterpH
_cache(), _cacheNominal(), _cacheNominalLog()
{
initBase();
other.getVal(RooArgSet(_x.arg()));
other.getVal(_x.arg());
_morphs = other._morphs;
_cache = other._cache;
_cacheNominal = other._cacheNominal;
Expand All @@ -880,7 +891,10 @@ FastVerticalInterpHistPdf2D2::FastVerticalInterpHistPdf2D2(const FastVerticalInt
_cache(), _cacheNominal(), _cacheNominalLog()
{
initBase();
other.getVal(RooArgSet(_x.arg(), _y.arg()));
RooArgSet normSet;
normSet.add(_x.arg());
normSet.add(_y.arg());
other.getVal(normSet);
_morphs = other._morphs;
_cache = other._cache;
_cacheNominal = other._cacheNominal;
Expand Down
Loading