Skip to content

[RF] RooProduct schema-evolved i/o bug fix #12071

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

Merged
guitargeek merged 2 commits into from
Jan 22, 2023
Merged

[RF] RooProduct schema-evolved i/o bug fix #12071

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
ef1b511
[RF] RooProduct schema-evolved i/o bug fix
will-cern Jan 20, 2023
4cbe892
[RF] Fix implementation error from typo in `RooGenProdProj`
guitargeek Jan 22, 2023
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
2 changes: 1 addition & 1 deletion roofit/roofitcore/src/RooGenProdProj.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ RooGenProdProj::RooGenProdProj(const RooGenProdProj& other, const char* name) :
_compSetN.add(*_compSetOwnedN) ;

_compSetOwnedD = new RooArgSet;
other._compSetD.snapshot(*_compSetOwnedN);
other._compSetD.snapshot(*_compSetOwnedD);
_compSetD.add(*_compSetOwnedD) ;

for (RooAbsArg * arg : *_compSetOwnedN) {
Expand Down
4 changes: 3 additions & 1 deletion roofit/roofitcore/src/RooProduct.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,10 +535,12 @@ void RooProduct::ioStreamerPass2() {
RooAbsProxy * p0 = getProxy(0);
if(p0 == nullptr) {
_proxyList.AddAt(&_compRSet, 0);
p0 = &_compRSet;
}
RooAbsProxy * p1 = getProxy(1);
if(p1 == nullptr) {
_proxyList.AddAt(&_compCSet, 1);
p1 = &_compCSet;
}

// If the proxies in the proxy list still don't correspond to _compRSet and
Expand Down Expand Up @@ -566,7 +568,7 @@ void RooProduct::ioStreamerPass2() {
};

expectProxyIs(0, p0, &_compRSet, "_compRSet");
expectProxyIs(1, p1, &_compCSet, "_compSSet");
expectProxyIs(1, p1, &_compCSet, "_compCSet");
}


Expand Down