Skip to content

Relocate the macro definition for XROOFIT_NAMESPACE_NAME #22679

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
will-cern wants to merge 10 commits into
base: master
Choose a base branch
from
+13 −21
Open

Relocate the macro definition for XROOFIT_NAMESPACE_NAME #22679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
76b2ec9
Update xRooFit
will-cern May 12, 2026
07c1fd5
add python library
will-cern May 12, 2026
6dbc5dc
ensure printValue is declared outside of namespace
will-cern May 13, 2026
147b45b
fix namespace issues
will-cern May 13, 2026
227f71b
more updates
will-cern May 14, 2026
867f62d
update
will-cern Jun 17, 2026
7952c83
update
will-cern Jun 19, 2026
3463a15
remove python dependency, determined at runtime now
will-cern Jun 19, 2026
58cc6e4
relocate definition of namespace name macro
will-cern Jun 22, 2026
f2c56c7
clang formatting and fix from master
will-cern Jun 22, 2026
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: 2 additions & 0 deletions roofit/xroofit/inc/RooFit/xRooFit/Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@
#ifdef XROOFIT_NAMESPACE
#define BEGIN_XROOFIT_NAMESPACE namespace XROOFIT_NAMESPACE {
#define END_XROOFIT_NAMESPACE } // namespace XROOFIT_NAMESPACE
#define XROOFIT_NAMESPACE_NAME XROOFIT_NAMESPACE
#else
#define BEGIN_XROOFIT_NAMESPACE
#define END_XROOFIT_NAMESPACE
#define XROOFIT_NAMESPACE_NAME
#endif

#endif
8 changes: 1 addition & 7 deletions roofit/xroofit/inc/RooFit/xRooFit/xRooNLLVar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,13 +514,7 @@ class xRooNLLVar : public std::shared_ptr<RooAbsReal> {

END_XROOFIT_NAMESPACE

#ifndef XROOFIT_NAMESPACE_NAME
#ifdef XROOFIT_NAMESPACE
#define XROOFIT_NAMESPACE_NAME XROOFIT_NAMESPACE
#else
#define XROOFIT_NAMESPACE_NAME
#endif
#endif

namespace cling {
std::string printValue(const XROOFIT_NAMESPACE_NAME::xRooNLLVar::xValueWithError *val);
std::string printValue(const std::map<std::string, XROOFIT_NAMESPACE_NAME::xRooNLLVar::xValueWithError> *m);
Expand Down
8 changes: 1 addition & 7 deletions roofit/xroofit/inc/RooFit/xRooFit/xRooNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,13 +559,7 @@ class xRooNode : public TNamed, public std::vector<std::shared_ptr<xRooNode>> {

END_XROOFIT_NAMESPACE

#ifndef XROOFIT_NAMESPACE_NAME
#ifdef XROOFIT_NAMESPACE
#define XROOFIT_NAMESPACE_NAME XROOFIT_NAMESPACE
#else
#define XROOFIT_NAMESPACE_NAME
#endif
#endif

namespace cling {
std::string printValue(const XROOFIT_NAMESPACE_NAME::xRooNode *val);
}
Expand Down
16 changes: 9 additions & 7 deletions roofit/xroofit/src/xRooHypoSpace.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,8 +910,8 @@ std::shared_ptr<TGraphErrors> xRooNLLVar::xRooHypoSpace::graph(
out->GetListOfFunctions()->Add(x, "F");
x = out->Clone("down");
x->SetBit(kCanDelete);
dynamic_cast<TAttFill*>(x)->SetFillColor(kBlack);
dynamic_cast<TAttFill*>(x)->SetFillStyle(nSigma == 2 ? 3005 : 3004);
dynamic_cast<TAttFill *>(x)->SetFillColor(kBlack);
dynamic_cast<TAttFill *>(x)->SetFillStyle(nSigma == 2 ? 3005 : 3004);
out->GetListOfFunctions()->Add(x, "F");
}
if (sOpt.Contains("ts")) {
Expand Down Expand Up @@ -1017,19 +1017,21 @@ std::shared_ptr<TGraphErrors> xRooNLLVar::xRooHypoSpace::graph(
for (int i = 0; i < out->GetN(); i++) {
if (i < out->GetN() - nPointsDown) {
up->SetPoint(up->GetN(), out->GetPointX(i), out->GetPointY(i) + out->GetErrorY(i) * (above ? 1. : -1.));
//down->SetPoint(down->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
// down->SetPoint(down->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. :
// -1.));
} else {
//up->SetPoint(up->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
// up->SetPoint(up->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
down->SetPoint(down->GetN(), out->GetPointX(i), out->GetPointY(i) + out->GetErrorY(i) * (above ? 1. : -1.));
}
}
// now go back round in reverse
for (int i = out->GetN()-1; i >= 0; i--) {
for (int i = out->GetN() - 1; i >= 0; i--) {
if (i < out->GetN() - nPointsDown) {
up->SetPoint(up->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
//down->SetPoint(down->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
// down->SetPoint(down->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. :
// -1.));
} else {
//up->SetPoint(up->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
// up->SetPoint(up->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
down->SetPoint(down->GetN(), out->GetPointX(i), out->GetPointY(i) - out->GetErrorY(i) * (above ? 1. : -1.));
}
}
Expand Down
Loading