Skip to content

Commit

Permalink
Further improve categorizations
Browse files Browse the repository at this point in the history
  • Loading branch information
martamaja10 committed Nov 27, 2024
1 parent 8f21f74 commit 72f6365
Show file tree
Hide file tree
Showing 366 changed files with 62 additions and 57 deletions.
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ if(ROOT_opengl_FOUND)
configure_file(stressGraphics.ref stressGraphics.ref COPYONLY)
endif()
configure_file(stressGraphics_web.ref stressGraphics_web.ref COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../tutorials/graphics/earth.dat earth.dat COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../tutorials/visualisation/graphics/earth.dat earth.dat COPYONLY)
ROOT_ADD_TEST(test-stressgraphics
ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}
COMMAND stressGraphics -b -k -p=sge
Expand Down
2 changes: 1 addition & 1 deletion test/stressGraphics.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1969,7 +1969,7 @@ void earth()
TH2F *h3 = new TH2F("h03","Sinusoidal",50, -180, 180, 50, -90.5, 90.5);
TH2F *h4 = new TH2F("h04","Parabolic", 50, -180, 180, 50, -90.5, 90.5);
std::ifstream in;
in.open("../tutorials/graphics/earth.dat");
in.open("../tutorials/visualisation/graphics/earth.dat");
if (!in) {
in.clear();
in.open("earth.dat");
Expand Down
68 changes: 34 additions & 34 deletions tutorials/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ if (NOT dataframe)
# RDataFrame
list(APPEND dataframe_veto dataframe/*.C dataframe/*.py)
# RDataFrame tutorial in graphs
list(APPEND dataframe_veto data_visualisation/graphs/timeSeriesFromCSV_TDF.C)
list(APPEND dataframe_veto visualisation/graphs/timeSeriesFromCSV_TDF.C)
# TMVA tutorials dependent on RDataFrame
list(APPEND dataframe_veto tmva/tmva*.C)
list(APPEND dataframe_veto tmva/TMVA_SOFIE_RDataFrame*.C)
Expand Down Expand Up @@ -131,15 +131,15 @@ if(MACOSX_VERSION VERSION_EQUAL 10.13)
endif()

if(NOT geom)
set(geom_veto data_visualisation/geom/*.C)
set(geom_veto visualisation/geom/*.C)
endif()

if(NOT ROOT_proof_FOUND)
set(proof_veto roostats/StandardFrequentistDiscovery.C)
endif()

if(NOT ROOT_spectrum_FOUND)
set(spectrum_veto data_visualisation/spectrum/*.C)
set(spectrum_veto legacy/spectrum/*.C)
endif()

if(NOT ROOT_roofit_FOUND)
Expand Down Expand Up @@ -240,11 +240,11 @@ endif()

if(NOT ROOT_opengl_FOUND)
set(opengl_veto tree/staff.C
data_visualisation/gl/*.C)
visualisation/gl/*.C)
endif()

if(NOT GRAPHVIZ_FOUND)
set(gviz_veto data_visualisation/graphs/graphstruct.C)
set(gviz_veto visualisation/graphs/graphstruct.C)
endif()

if(NOT TBB_FOUND AND NOT builtin_tbb)
Expand All @@ -264,30 +264,30 @@ if(ROOT_CLASSIC_BUILD)
endif()

if(NOT gdml)
set(gdml_veto data_visualisation/geom/gdml/testoptical.C)
set(gdml_veto visualisation/geom/gdml/testoptical.C)
endif()

#---These ones requires a display to run-----------------------------
set(gui_veto fit/fitpanel_playback.C
data_visualisation/cocoa/*.C
data_visualisation/geom/building.C data_visualisation/geom/cheongwadae.C data_visualisation/geom/geom*.C data_visualisation/geom/lego.C data_visualisation/geom/robot.C data_visualisation/geom/south_gate.C data_visualisation/geom/station*.C data_visualisation/geom/tank.C data_visualisation/geom/webdemo.C data_visualisation/geom/web_cms.cxx
data_visualisation/gl/glViewerExercise.C data_visualisation/gl/glViewerLOD.C data_visualisation/gl/gviz3d.C data_visualisation/gl/nucleus.C data_visualisation/gl/viewer3DLocal.C data_visualisation/gl/viewer3DMaster.C
data_visualisation/gui/*.C
visualisation/cocoa/*.C
visualisation/geom/building.C visualisation/geom/cheongwadae.C visualisation/geom/geom*.C visualisation/geom/lego.C visualisation/geom/robot.C visualisation/geom/south_gate.C visualisation/geom/station*.C visualisation/geom/tank.C visualisation/geom/webdemo.C visualisation/geom/web_cms.cxx
visualisation/gl/glViewerExercise.C visualisation/gl/glViewerLOD.C visualisation/gl/gviz3d.C visualisation/gl/nucleus.C visualisation/gl/viewer3DLocal.C visualisation/gl/viewer3DMaster.C
visualisation/gui/*.C
hist/exec1.C
hist/exec2.C
hist/tprofile2polyRealistic.C
hist/tprofile2polyRealisticModuleError.C
data_visualisation/image/*.C
data_visualisation/graphics/psview.C graphics/gtime.C
data_visualisation/graphics/graph_edit_playback.C
visualisation/image/*.C
visualisation/graphics/psview.C visualisation/graphics/gtime.C
visualisation/graphics/graph_edit_playback.C
roostats/ModelInspector.C
tree/tvdemo.C
data_visualisation/eve/*.C
data_visualisation/webgui/geom/geom_threejs.cxx
data_visualisation/webgui/panel/webpanel.cxx
data_visualisation/webgui/webwindow/webwindow.cxx)
visualisation/eve7/eve/*.C
visualisation/webgui/geom/geom_threejs.cxx
visualisation/webgui/panel/webpanel.cxx
visualisation/webgui/webwindow/webwindow.cxx)
if (NOT webgui)
list(APPEND gui_veto data_visualisation/graphics/save_batch.C rcanvas/df104.py rcanvas/df105.py)
list(APPEND gui_veto visualisation/graphics/save_batch.C rcanvas/df104.py rcanvas/df105.py)
endif()

if (NOT ROOT_tmva_FOUND)
Expand Down Expand Up @@ -352,7 +352,7 @@ else()
endif()

if (NOT ROOT_vecgeom_FOUND)
set(vecgeom_veto data_visualisation/geom/tessellatedNav.C)
set(vecgeom_veto visualisation/geom/tessellatedNav.C)
endif()

if(root7)
Expand Down Expand Up @@ -416,7 +416,7 @@ set(extra_veto
tree/h1analysis*.C # these are not a tutorial but classes used in run_h1analysis.C
tree/h1chain.C
http/*.C
eve7/*.C
visualisation/eve7/*.C
r/rootlogon.C)

if(MSVC AND NOT llvm13_broken_tests)
Expand All @@ -433,14 +433,14 @@ if(MSVC AND NOT llvm13_broken_tests)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
list(APPEND extra_veto
dataframe/df007_snapshot.C
data_visualisation/graphics/earth.C
data_visualisation/graphs/motorcycle.C
visualisation/graphics/earth.C
visualisation/graphs/motorcycle.C
v7/ntuple/ntpl001_staff.C)
endif()
endif()

set(all_veto hsimple.C
data_visualisation/geom/geometry.C
visualisation/geom/geometry.C
${extra_veto}
${gdml_veto}
${gui_veto}
Expand Down Expand Up @@ -474,8 +474,8 @@ set(all_veto hsimple.C

file(GLOB_RECURSE tutorials RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.C)
if(webgui)
file(GLOB_RECURSE data_visualisation/tutorials_webcanv RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} data_visualisation/webcanv/*.cxx)
list(APPEND tutorials ${data_visualisation/tutorials_webcanv})
file(GLOB_RECURSE visualisation/tutorials_webcanv RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} visualisation/webcanv/*.cxx)
list(APPEND tutorials ${visualisation/tutorials_webcanv})
endif()
if(root7 AND webgui)
file(GLOB_RECURSE tutorials_v7 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} v7/*.cxx)
Expand All @@ -501,11 +501,11 @@ endif()

#---Special return code------------------------------------------------
set(returncode_1 fit/fit2a.C
data_visualisation/graphics/earth.C
data_visualisation/graphics/pavetext.C
data_visualisation/graphics/tmathtext.C graphics/tmathtext2.C
data_visualisation/graphs/exclusiongraph.C
data_visualisation/graphs/graphstruct.C
visualisation/graphics/earth.C
visualisation/graphics/pavetext.C
visualisation/graphics/tmathtext.C visualisation/graphics/tmathtext2.C
visualisation/graphs/exclusiongraph.C
visualisation/graphs/graphstruct.C
hist/ContourList.C
hist/hbars.C
hist/th2polyBoxes.C
Expand Down Expand Up @@ -538,13 +538,13 @@ set(benchmarks-depends tutorial-hsimple
tutorial-fit-myfit
tutorial-hist-h1ReadAndDraw
tutorial-hist-FirstContour
tutorial-geom-na49view
tutorial-visualisation-geom-na49view
tutorial-tree-ntuple1
tutorial-tree-spider
tutorial-io-hadd
tutorial-io-loopdir
tutorial-io-copyFiles)
set(geom-na49view-depends tutorial-geom-geometry)
set(visualisation-geom-na49view-depends tutorial-visualisation-geom-geometry)
set(multicore-mt102_readNtuplesFillHistosAndFit-depends tutorial-multicore-mt101_fillNtuples)
set(multicore-mp102_readNtuplesFillHistosAndFit-depends tutorial-multicore-mp101_fillNtuples)
set(multicore-mp105_processEntryList-depends tutorial-multicore-mp104_processH1)
Expand Down Expand Up @@ -632,7 +632,7 @@ file(GLOB multithreaded RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${multithreaded})
ROOT_ADD_TEST(tutorial-hsimple COMMAND ${ROOT_root_CMD} -b -l -n -q ${CMAKE_CURRENT_SOURCE_DIR}/hsimple.C
PASSRC 255 FAILREGEX "Error in" "error:" "warning: Failed to call" LABELS tutorial ENVIRONMENT ${TUTORIAL_ENV})
if(ROOT_geom_FOUND)
ROOT_ADD_TEST(tutorial-geom-geometry COMMAND ${ROOT_root_CMD} -b -l -n -q ${CMAKE_CURRENT_SOURCE_DIR}/data_visualisation/geom/geometry.C
ROOT_ADD_TEST(tutorial-visualisation-geom-geometry COMMAND ${ROOT_root_CMD} -b -l -n -q ${CMAKE_CURRENT_SOURCE_DIR}/visualisation/geom/geometry.C
FAILREGEX "Error in" "error:" "warning: Failed to call" LABELS tutorial ENVIRONMENT ${TUTORIAL_ENV})
endif()
# define Python GNN parsing tutorial needed to run before
Expand Down Expand Up @@ -745,7 +745,7 @@ if(ROOT_pyroot_FOUND)
pyroot/numberEntry.py # requires GUI
legacy/pyroot/*py # legacy ...
histfactory/makeQuickModel.py # not a tutorial
data_visualisation/eve/lineset.py # requires GUI
visualisation/eve7/eve/lineset.py # requires GUI
sql/sqlcreatedb.py # same as the C++ case
sql/sqlfilldb.py # same as the C++ case
sql/sqlselect.py # same as the C++ case
Expand Down
2 changes: 1 addition & 1 deletion tutorials/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The `$ROOTSYS/tutorials` directory includes several sub-directories:
\ingroup Tutorials
\brief These examples show various features of [RDataFrame](classROOT_1_1RDataFrame.html): ROOT's declarative analysis interface.

\defgroup tutorial_data_vis Data visualisation tutorials
\defgroup tutorial_visualisation Visualisation tutorials
\ingroup Tutorials
\brief All examples related to visually representing the data, including graphs, event displays, web graphics, GUIs and more.

Expand Down
8 changes: 8 additions & 0 deletions tutorials/legacy/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,11 @@ Some of ROOT's tutorials demonstrate interfaces that are not recommended anymore
ROOT or C++ itself now offer superior ones. These have been moved here "for the record".

@}

\defgroup tutorial_spectrum Spectrum tutorials
\ingroup tutorial_legacy
\brief Examples showing the TSpectrum and TSpectrumPainter usage.

\defgroup tutorial_splot TSPlot tutorials
\ingroup tutorial_legacy
\brief This tutorial illustrates the use of class TSPlot.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions tutorials/visualisation/eve7/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
\addtogroup tutorial_eve

\defgroup tutorial_eve_old Old event display tutorials
\ingroup tutorial_eve
\brief Examples showing the usage of the old (but not obsolete) event display classes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ TCanvas *earth(){
TH2F *hw = new TH2F("hw","Mollweide", 180, -180, 180, 181, -90.5, 90.5);

TString dat = gROOT->GetTutorialDir();
dat.Append("/graphics/earth.dat");
dat.Append("/visualisation/graphics/earth.dat");
dat.ReplaceAll("/./","/");

ifstream in;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 72f6365

Please sign in to comment.