Skip to content

Commit 9597890

Browse files
committed
[tutorials] Simplify ROOT 7 vetos
1 parent 9566777 commit 9597890

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

tutorials/CMakeLists.txt

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ if (NOT dataframe)
127127
roofit/roofit/rf408_RDataFrameToRooFit.py
128128
roofit/roofit/rf618_mixture_models.py # depends on analysis/dataframe/df106_HiggsToFourLeptons.py
129129
)
130+
# RNTuple tutorials depending on RDataFrame
131+
list(APPEND dataframe_veto io/ntuple/ntpl004_dimuon.C)
132+
list(APPEND dataframe_veto io/ntuple/ntpl008_import.C)
133+
list(APPEND dataframe_veto io/ntuple/ntpl011_global_temperatures.C)
130134
endif()
131135

132136
if(NOT sqlite)
@@ -141,6 +145,9 @@ if(NOT davix)
141145
set(davix_veto
142146
legacy/hist040_TH2Poly_europe.C hist/hist039_TH2Poly_usa.*
143147
legacy/multicore/mp104_processH1.C analysis/parallel/mp_processSelector.C)
148+
list(APPEND davix_veto io/ntuple/ntpl004_dimuon.C)
149+
list(APPEND davix_veto io/ntuple/ntpl008_import.C)
150+
list(APPEND davix_veto io/ntuple/ntpl011_global_temperatures.C)
144151
endif()
145152

146153
if(NOT geom)
@@ -389,15 +396,7 @@ if(root7)
389396
tutorials/visualisation/webgui/browserv7/filedialog.cxx
390397
tutorials/visualisation/webgui/fitpanelv7/fitpanel6.cxx
391398
)
392-
if(NOT davix)
393-
list(APPEND root7_veto io/ntuple/ntpl004_dimuon.C)
394-
list(APPEND root7_veto io/ntuple/ntpl008_import.C)
395-
list(APPEND root7_veto io/ntuple/ntpl011_global_temperatures.C)
396-
endif()
397399
if(NOT dataframe)
398-
list(APPEND root7_veto io/ntuple/ntpl011_global_temperatures.C)
399-
list(APPEND root7_veto io/ntuple/ntpl004_dimuon.C)
400-
list(APPEND root7_veto io/ntuple/ntpl008_import.C)
401400
list(APPEND root7_veto visualisation/rcanvas/df104.py)
402401
list(APPEND root7_veto visualisation/rcanvas/df105.py)
403402
endif()
@@ -413,13 +412,8 @@ else()
413412
endif()
414413
file(GLOB v7_veto_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ visualisation/webgui/browserv7/*.cxx visualisation/webgui/fitpanelv7/*.cxx visualisation/rcanvas/*.py visualisation/rcanvas/*.cxx)
415414
list(APPEND root7_veto ${v7_veto_files})
416-
# This depends on ntupleutil
417-
list(APPEND root7_veto io/ntuple/ntpl008_import.C)
418415
# This depends on RCanvas
419416
list(APPEND root7_veto io/ntuple/ntpl011_global_temperatures.C)
420-
if((NOT davix) OR (NOT dataframe))
421-
list(APPEND root7_veto io/ntuple/ntpl004_dimuon.C)
422-
endif()
423417
endif()
424418

425419
#---These ones are disabled !!! ------------------------------------

0 commit comments

Comments
 (0)