Skip to content

[v630][RF] Backports of RooFit PRs to v6-30-00-patches: Part 10 #14768

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 3 commits into from
Feb 26, 2024
Merged

[v630][RF] Backports of RooFit PRs to v6-30-00-patches: Part 10 #14768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bd5723
[RF] Set workspace on imported RooFit objects
will-cern Feb 20, 2024
9ff4e10
[RF] Fix for display of canvases in jupyter notebooks with xroofit
will-cern Feb 20, 2024
ec4de4c
[cmake] Make Minuit2 build option deprecation warning less alarming
ferdymercury Feb 24, 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
8 changes: 7 additions & 1 deletion cmake/modules/RootBuildOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,12 +420,18 @@ foreach(opt afdsmgrd afs alien bonjour castor chirp cxx11 cxx14 cxx17 geocad gfa
endforeach()

#---Deprecated options------------------------------------------------------------------------
foreach(opt cxxmodules exceptions oracle pythia6 pythia6_nolink pyroot-python2 minuit2)
foreach(opt cxxmodules exceptions oracle pythia6 pythia6_nolink pyroot-python2)
if(${opt})
message(DEPRECATION ">>> Option '${opt}' is deprecated and will be removed in the next release of ROOT. Please contact root-dev@cern.ch should you still need it.")
endif()
endforeach()

foreach(opt minuit2)
if(NOT ${opt})
message(DEPRECATION ">>> Option '${opt}' is deprecated: in the future it will always be set to ON. In the next release of ROOT, you will no longer be able to disable this feature. Please contact root-dev@cern.ch should you still need disabling it.")
endif()
endforeach()

foreach(opt minuit2_omp minuit2_mpi)
if(${opt})
message(WARNING "The option '${opt}' can only be used to minimise thread-safe functions in Minuit2. It cannot be used for Histogram/Graph fitting and for RooFit. If you want to use Minuit2 with OpenMP or MPI support, it is better to build Minuit2 as a standalone library.")
Expand Down
1 change: 1 addition & 0 deletions roofit/roofitcore/src/RooWorkspace.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,7 @@ bool RooWorkspace::import(const RooAbsArg& inArg,
<< node->GetName() << endl ;
}
_allOwnedNodes.addOwned(std::unique_ptr<RooAbsArg>{node});
node->setWorkspace(*this);
if (_openTrans) {
_sandboxNodes.add(*node) ;
} else {
Expand Down
8 changes: 5 additions & 3 deletions roofit/xroofit/src/xRooNode.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8079,6 +8079,9 @@ class PadRefresher {
getLegend(false, true);
fPad->GetCanvas()->Paint();
fPad->GetCanvas()->Update();
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 30, 00)
fPad->GetCanvas()->ResetUpdated(); // stops previous canvas being replaced in a jupyter notebook
#endif
fPad->cd();
}
nExisting--;
Expand Down Expand Up @@ -8122,9 +8125,8 @@ void xRooNode::Draw(Option_t *opt)
if (gPad)
gPad->Clear();
xRooNLLVar::xRooHypoPoint(std::dynamic_pointer_cast<RooStats::HypoTestResult>(fComp)).Draw(opt);
if (gPad) {
gPad->GetCanvas()->Paint();
gPad->GetCanvas()->Update();
{
PadRefresher p(gPad); // refreshes the pad
}
gSystem->ProcessEvents();
return;
Expand Down