put back some geom tutorials in geom category

tutorials/demos.py

@@ -33,18 +33,18 @@
 bar.AddButton( 'browser',       r'TPython::Exec( "b = ROOT.TBrowser()" );',          'Start the ROOT browser' )
 bar.AddButton( 'hsimple',       r'TPython::Exec( "' + to_run.format('hsimple.py') + '" );',   'Creating histograms/Ntuples on file', "button" )
 bar.AddButton( 'hsum',          r'TPython::Exec( "' + to_run.format('hist/hsum.py') + '" );',      'Filling Histograms and Some Graphics Options' )
-bar.AddButton( 'formula1',      r'TPython::Exec( "' + to_run.format('graphics/formula1.py') + '" );',  'Simple Formula and Functions' )
-bar.AddButton( 'surfaces',      r'TPython::Exec( "' + to_run.format('graphs/surfaces.py') + '" );',  'Surface Drawing Options' )
+bar.AddButton( 'formula1',      r'TPython::Exec( "' + to_run.format('visualisation/graphics/formula1.py') + '" );',  'Simple Formula and Functions' )
+bar.AddButton( 'surfaces',      r'TPython::Exec( "' + to_run.format('visualisation/graphs/surfaces.py') + '" );',  'Surface Drawing Options' )
 bar.AddButton( 'fillrandom',    r'TPython::Exec( "' + to_run.format('hist/fillrandom.py') + '" );','Histograms with Random Numbers from a Function' )
 bar.AddButton( 'fit1',          r'TPython::Exec( "' + to_run.format('math/fit/fit1.py') + '" );',      'A Simple Fitting Example' )
 bar.AddButton( 'multifit',      r'TPython::Exec( "' + to_run.format('math/fit/multifit.py') + '" );',  'Fitting in Subranges of Histograms' )
 bar.AddButton( 'h1draw',        r'TPython::Exec( "' + to_run.format('hist/h1ReadAndDraw.py') + '" );',    'Drawing Options for 1D Histograms' )
-bar.AddButton( 'graph',         r'TPython::Exec( "' + to_run.format('graphs/graph.py') + '" );',     'Example of a Simple Graph' )
-bar.AddButton( 'gerrors',       r'TPython::Exec( "' + to_run.format('graphs/gerrors.py') + '" );',   'Example of a Graph with Error Bars' )
-bar.AddButton( 'tornado',       r'TPython::Exec( "' + to_run.format('graphics/tornado.py') + '" );',   'Examples of 3-D PolyMarkers' )
-bar.AddButton( 'shapes',        r'TPython::Exec( "' + to_run.format('geom/shapes.py') + '" );',    'The Geometry Shapes' )
-bar.AddButton( 'geometry',      r'TPython::Exec( "' + to_run.format('geom/geometry.py') + '" );',  'Creation of the NA49 Geometry File' )
-bar.AddButton( 'na49view',      r'TPython::Exec( "' + to_run.format('geom/na49view.py') + '" );',  'Two Views of the NA49 Detector Geometry' )
+bar.AddButton( 'graph',         r'TPython::Exec( "' + to_run.format('visualisation/graphs/graph.py') + '" );',     'Example of a Simple Graph' )
+bar.AddButton( 'gerrors',       r'TPython::Exec( "' + to_run.format('visualisation/graphs/gerrors.py') + '" );',   'Example of a Graph with Error Bars' )
+bar.AddButton( 'tornado',       r'TPython::Exec( "' + to_run.format('visualisation/graphics/tornado.py') + '" );',   'Examples of 3-D PolyMarkers' )
+bar.AddButton( 'shapes',        r'TPython::Exec( "' + to_run.format('visualisation/geom/shapes.py') + '" );',    'The Geometry Shapes' )
+bar.AddButton( 'geometry',      r'TPython::Exec( "' + to_run.format('visualisation/geom/geometry.py') + '" );',  'Creation of the NA49 Geometry File' )
+bar.AddButton( 'na49view',      r'TPython::Exec( "' + to_run.format('visualisation/geom/na49view.py') + '" );',  'Two Views of the NA49 Detector Geometry' )
 bar.AddButton( 'ntuple1',       r'TPython::Exec( "' + to_run.format('io/tree/ntuple1.py') + '" );',   'Ntuples and Selections' )
 bar.AddSeparator()       # not implemented
 bar.AddButton( 'make ntuple',   r'TPython::Exec( "' + to_run.format('io/tree/csv2tntuple.py') + '" );',       'Convert a text file to an ntuple' )

tutorials/visualisation/geom/assembly.C → tutorials/geom/assembly.C

@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup tutorial_geom
+/// \ingroup tutorial_geometry
 /// Geometry detector assembly example
 ///
 /// \macro_image

tutorials/visualisation/geom/geodemo.C → tutorials/geom/geodemo.C

@@ -1,5 +1,5 @@
 /// \file
-/// \ingroup tutorial_geom
+/// \ingroup tutorial_geometry
 /// GUI to draw the geometry shapes.
 ///
 /// \macro_code

tutorials/geom/index.md

@@ -0,0 +1,3 @@
+\addtogroup tutorial_geometry
+
+These are the tutorials demonstrating different geometry features. To see more examples how to visualize geometry features see `tutorials/visualisation/geom/`(https://root.cern/doc/master/group__tutorial__geom.html).

tutorials/index.md

@@ -102,6 +102,10 @@ The `$ROOTSYS/tutorials` directory includes several sub-directories:
 \ingroup Tutorials
 \brief Examples showing how to use Machine Learning from ROOT. 
 
+\defgroup tutorial_geometry Geometry tutorials
+\ingroup Tutorials
+\brief Examples showing how to make use of geometry classes in ROOT.
+
 \defgroup tutorial_legacy Legacy tutorials
 \ingroup Tutorials
 \brief Legacy Tutorials

tutorials/visualisation/index.md

@@ -22,7 +22,7 @@
 
 \defgroup tutorial_geom Geometry tutorials
 \ingroup tutorial_visualisation
-\brief Various ROOT geometry package examples.
+\brief Various geometry visualisation examples.
 
 \defgroup tutorial_gui GUI tutorials
 \ingroup tutorial_visualisation