Skip to content

Commit fdd0a9c

Browse files
committed
[tutorial] Move RCanvas tutorials to Visualization
1 parent fe190a3 commit fdd0a9c

25 files changed

+15
-22
lines changed

tutorials/CMakeLists.txt

+11-11
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ if(NOT xrootd)
193193
analysis/dataframe/df106_HiggsToFourLeptons.py
194194
analysis/dataframe/df107_SingleTopAnalysis.py
195195
roofit/roofit/rf618_mixture_models.py # depends on df106_HiggsToFourLeptons.py
196-
experimental/rcanvas/df104.py
197-
experimental/rcanvas/df105.py
196+
visualisation/rcanvas/df104.py
197+
visualisation/rcanvas/df105.py
198198
)
199199
endif()
200200

@@ -293,7 +293,7 @@ set(gui_veto math/fit/fitpanel_playback.C
293293
visualisation/webgui/panel/webpanel.cxx
294294
visualisation/webgui/webwindow/webwindow.cxx)
295295
if (NOT webgui)
296-
list(APPEND gui_veto visualisation/graphics/save_batch.C experimental/rcanvas/df104.py experimental/rcanvas/df105.py)
296+
list(APPEND gui_veto visualisation/graphics/save_batch.C visualisation/rcanvas/df104.py visualisation/rcanvas/df105.py)
297297
endif()
298298

299299
if (NOT ROOT_tmva_FOUND)
@@ -387,20 +387,20 @@ if(root7)
387387
list(APPEND root7_veto io/ntuple/ntpl011_global_temperatures.C)
388388
list(APPEND root7_veto io/ntuple/ntpl004_dimuon.C)
389389
list(APPEND root7_veto io/ntuple/ntpl008_import.C)
390-
list(APPEND root7_veto experimental/rcanvas/df104.py)
391-
list(APPEND root7_veto experimental/rcanvas/df105.py)
390+
list(APPEND root7_veto visualisation/rcanvas/df104.py)
391+
list(APPEND root7_veto visualisation/rcanvas/df105.py)
392392
endif()
393393
if(MSVC AND NOT win_broken_tests)
394394
#---EOS is not supported on Windows
395-
list(APPEND root7_veto experimental/rcanvas/df104.py)
396-
list(APPEND root7_veto experimental/rcanvas/df105.py)
397-
list(APPEND root7_veto experimental/rcanvas/rbox.py)
395+
list(APPEND root7_veto visualisation/rcanvas/df104.py)
396+
list(APPEND root7_veto visualisation/rcanvas/df105.py)
397+
list(APPEND root7_veto visualisation/rcanvas/rbox.py)
398398
endif()
399399
else()
400400
if(MSVC AND NOT win_broken_tests)
401401
list(APPEND root7_veto analysis/dataframe/df013_InspectAnalysis.C)
402402
endif()
403-
file(GLOB v7_veto_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ tutorials/visualisation/webgui/browserv7/*.cxx tutorials/visualisation/webgui/fitpanelv7/*.cxx experimental/rcanvas/*.py experimental/rcanvas/*.cxx)
403+
file(GLOB v7_veto_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ visualisation/webgui/browserv7/*.cxx visualisation/webgui/fitpanelv7/*.cxx visualisation/rcanvas/*.py visualisation/rcanvas/*.cxx)
404404
list(APPEND root7_veto ${v7_veto_files})
405405
endif()
406406

@@ -504,7 +504,7 @@ if(webgui)
504504
list(APPEND tutorials ${visualisation/tutorials_webcanv})
505505
endif()
506506
if(root7 AND webgui)
507-
file(GLOB_RECURSE tutorials_exp RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} experimental/*.cxx tutorials/visualisation/webgui/browserv7/*.cxx tutorials/visualisation/webgui/fitpanelv7/*.cxx)
507+
file(GLOB_RECURSE tutorials_exp RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} visualisation/rcanvas/*.cxx tutorials/visualisation/webgui/browserv7/*.cxx tutorials/visualisation/webgui/fitpanelv7/*.cxx)
508508
list(APPEND tutorials ${tutorials_exp})
509509
endif()
510510
file(GLOB tutorials_veto RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${all_veto})
@@ -632,7 +632,7 @@ file(GLOB long_running RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${long_running})
632632
set(NProcessors 4)
633633
set (multithreaded_all_cores
634634
analysis/dataframe/df10[2-7]*
635-
experimental/rcanvas/df10*
635+
visualisation/rcanvas/df10*
636636
)
637637
set (multithreaded
638638
${multithreaded_all_cores}

tutorials/experimental/index.md

-11
This file was deleted.

tutorials/visualisation/index.md

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
\ingroup tutorial_visualisation
3333
\brief Various examples showing the OpenGL graphics in ROOT.
3434

35+
\defgroup tutorial_rcanvas RCanvas examples
36+
\ingroup tutorial_visualisation
37+
\brief These are RCanvas examples.
38+
3539
\defgroup tutorial_cocoa Tutorials specific to Mac/Cocoa
3640
\ingroup tutorial_visualisation
3741
\brief Various examples showing graphics done with the Mac graphics system Cocoa.

0 commit comments

Comments
 (0)