From 4061a6ab03d7472158dbba29b505a5bbb93bd62b Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Wed, 5 Feb 2020 10:33:28 +0100
Subject: [PATCH] Add support of tessellated shapes for ROOT > 6.19.0
---
DDCore/src/ShapeUtilities.cpp | 1 -
examples/ClientTests/CMakeLists.txt | 13 +++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/DDCore/src/ShapeUtilities.cpp b/DDCore/src/ShapeUtilities.cpp
index 7abc61e2e..ee00e6eb8 100644
--- a/DDCore/src/ShapeUtilities.cpp
+++ b/DDCore/src/ShapeUtilities.cpp
@@ -763,7 +763,6 @@ namespace dd4hep {
sh->~TGeoTessellated();
new(sh) TGeoTessellated(nam.c_str(), vertices);
sh->SetTitle(tit.c_str());
- int nfacet = 0;
for (int i=0; i<num_facet; ++i) {
int i0, i1, i2, i3;
int n_vtx = params[++i_par];
diff --git a/examples/ClientTests/CMakeLists.txt b/examples/ClientTests/CMakeLists.txt
index 754393b0f..ea2581cd6 100644
--- a/examples/ClientTests/CMakeLists.txt
+++ b/examples/ClientTests/CMakeLists.txt
@@ -189,10 +189,15 @@ dd4hep_add_test_reg( ClientTests_Save_ROOT_MiniTel_LONGTEST
REGEX_PASS "\\+\\+\\+ Successfully saved geometry data to file.")
#
# Test basic shapes by comparing mesh vertices with reference file
-foreach (test Box Cone ConeSegment Tube ElTube
- CutTube Hyperboloid Paraboloid EightPointSolid Eightpoint_Reflect_Volume Eightpoint_Reflect_DetElement
- Polycone Polyhedra PseudoTrap PseudoTrap2 Sphere Torus Tesselated
- Trap Trd1 Trd2 TruncatedTube ExtrudedPolygon)
+set(ClientTests_ShapeTests)
+list(APPEND ClientTests_ShapeTests Box Cone ConeSegment Tube ElTube CutTube Hyperboloid Paraboloid)
+list(APPEND ClientTests_ShapeTests EightPointSolid Eightpoint_Reflect_Volume Eightpoint_Reflect_DetElement)
+list(APPEND ClientTests_ShapeTests Polycone Polyhedra PseudoTrap PseudoTrap2 Sphere Torus Trap Trd1 Trd2)
+list(APPEND ClientTests_ShapeTests TruncatedTube ExtrudedPolygon)
+if(${ROOT_VERSION} VERSION_GREATER 6.19.00)
+list(APPEND ClientTests_ShapeTests Tesselated)
+endif()
+foreach (test ${ClientTests_ShapeTests})
dd4hep_add_test_reg( ClientTests_Check_Shape_${test}
COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_ClientTests.sh"
EXEC_ARGS geoDisplay file:${ClientTestsEx_INSTALL}/compact/Check_Shape_${test}.xml -load -destroy
--
GitLab