Skip to content

[RF] Only report value servers as parameters in RooFit::Evaluator #20045

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[RF] Only report value servers as parameters in RooFit::Evaluator #20045

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion roofit/roofitcore/src/RooFit/Evaluator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ struct NodeInfo {
bool isCategory = false;
bool hasLogged = false;
bool computeInGPU = false;
bool isValueServer = false; // if this node is a value server to the top node
std::size_t outputSize = 1;
std::size_t lastSetValCount = std::numeric_limits<std::size_t>::max();
int lastCatVal = std::numeric_limits<int>::max();
Expand Down Expand Up @@ -207,6 +208,16 @@ Evaluator::Evaluator(const RooAbsReal &absReal, bool useGPU)
}
}

// Figure out which nodes are value servers to the top node
_nodes.back().isValueServer = true; // the top node itself
for (auto iter = _nodes.rbegin(); iter != _nodes.rend(); ++iter) {
if (!iter->isValueServer)
continue;
for (auto &serverInfo : iter->serverInfos) {
serverInfo->isValueServer = true;
}
}

syncDataTokens();

if (_useGPU) {
Expand Down Expand Up @@ -687,7 +698,7 @@ RooArgSet Evaluator::getParameters() const
{
RooArgSet parameters;
for (auto &nodeInfo : _nodes) {
if (nodeInfo.absArg->isFundamental()) {
if (nodeInfo.isValueServer && nodeInfo.absArg->isFundamental()) {
parameters.add(*nodeInfo.absArg);
}
}
Expand Down
Loading