Skip to content

More updates after moving RNTuple from root7 flag #19983

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
merged 2 commits into from
Oct 1, 2025
Merged

More updates after moving RNTuple from root7 flag #19983

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
4a25c67
[gui] Always compile RNTuple providers
hahnjo Sep 25, 2025
fa21991
[tutorials] Simplify ROOT 7 vetos
hahnjo Sep 25, 2025
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
34 changes: 17 additions & 17 deletions gui/browsable/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,25 +107,25 @@ endif()

# provider for browsing and drawing of RNTuple

if(root7)
ROOT_LINKER_LIBRARY(ROOTNTupleBrowseProvider
src/RNTupleBrowseProvider.cxx
DEPENDENCIES
ROOTBrowsable
ROOTNTuple
ROOTNTupleBrowse
)
ROOT_LINKER_LIBRARY(ROOTNTupleBrowseProvider
src/RNTupleBrowseProvider.cxx
DEPENDENCIES
ROOTBrowsable
ROOTNTuple
ROOTNTupleBrowse
)

ROOT_LINKER_LIBRARY(ROOTNTupleDraw6Provider
src/RNTupleDraw6Provider.cxx
DEPENDENCIES
ROOTBrowsable
ROOTNTuple
ROOTNTupleBrowse
Gpad
ROOTTreeMap
)
ROOT_LINKER_LIBRARY(ROOTNTupleDraw6Provider
src/RNTupleDraw6Provider.cxx
DEPENDENCIES
ROOTBrowsable
ROOTNTuple
ROOTNTupleBrowse
Gpad
ROOTTreeMap
)

if(root7)
ROOT_LINKER_LIBRARY(ROOTNTupleDraw7Provider
src/RNTupleDraw7Provider.cxx
DEPENDENCIES
Expand Down
20 changes: 7 additions & 13 deletions tutorials/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@ if (NOT dataframe)
roofit/roofit/rf408_RDataFrameToRooFit.py
roofit/roofit/rf618_mixture_models.py # depends on analysis/dataframe/df106_HiggsToFourLeptons.py
)
# RNTuple tutorials depending on RDataFrame
list(APPEND dataframe_veto io/ntuple/ntpl004_dimuon.C)
list(APPEND dataframe_veto io/ntuple/ntpl008_import.C)
list(APPEND dataframe_veto io/ntuple/ntpl011_global_temperatures.C)
endif()

if(NOT sqlite)
Expand All @@ -141,6 +145,9 @@ if(NOT davix)
set(davix_veto
legacy/hist040_TH2Poly_europe.C hist/hist039_TH2Poly_usa.*
legacy/multicore/mp104_processH1.C analysis/parallel/mp_processSelector.C)
list(APPEND davix_veto io/ntuple/ntpl004_dimuon.C)
list(APPEND davix_veto io/ntuple/ntpl008_import.C)
list(APPEND davix_veto io/ntuple/ntpl011_global_temperatures.C)
endif()

if(NOT geom)
Expand Down Expand Up @@ -389,15 +396,7 @@ if(root7)
tutorials/visualisation/webgui/browserv7/filedialog.cxx
tutorials/visualisation/webgui/fitpanelv7/fitpanel6.cxx
)
if(NOT davix)
list(APPEND root7_veto io/ntuple/ntpl004_dimuon.C)
list(APPEND root7_veto io/ntuple/ntpl008_import.C)
list(APPEND root7_veto io/ntuple/ntpl011_global_temperatures.C)
endif()
if(NOT dataframe)
list(APPEND root7_veto io/ntuple/ntpl011_global_temperatures.C)
list(APPEND root7_veto io/ntuple/ntpl004_dimuon.C)
list(APPEND root7_veto io/ntuple/ntpl008_import.C)
list(APPEND root7_veto visualisation/rcanvas/df104.py)
list(APPEND root7_veto visualisation/rcanvas/df105.py)
endif()
Expand All @@ -413,13 +412,8 @@ else()
endif()
file(GLOB v7_veto_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ visualisation/webgui/browserv7/*.cxx visualisation/webgui/fitpanelv7/*.cxx visualisation/rcanvas/*.py visualisation/rcanvas/*.cxx)
list(APPEND root7_veto ${v7_veto_files})
# This depends on ntupleutil
list(APPEND root7_veto io/ntuple/ntpl008_import.C)
# This depends on RCanvas
list(APPEND root7_veto io/ntuple/ntpl011_global_temperatures.C)
if((NOT davix) OR (NOT dataframe))
list(APPEND root7_veto io/ntuple/ntpl004_dimuon.C)
endif()
endif()

#---These ones are disabled !!! ------------------------------------
Expand Down
Loading