From b7c4adea66555aa9b53e85838f7c60649820db20 Mon Sep 17 00:00:00 2001 From: Markus Frank <Markus.Frank@cern.ch> Date: Wed, 5 Feb 2020 10:11:12 +0100 Subject: [PATCH] Add support of tessellated shapes for ROOT > 6.19.0 --- DDCore/src/Handle.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/DDCore/src/Handle.cpp b/DDCore/src/Handle.cpp index 998501ccf..4fa2e7cc4 100644 --- a/DDCore/src/Handle.cpp +++ b/DDCore/src/Handle.cpp @@ -368,7 +368,6 @@ DD4HEP_INSTANTIATE_HANDLE(TGeoNodeOffset); #include "TGeoParaboloid.h" #include "TGeoSphere.h" #include "TGeoTorus.h" -#include "TGeoTessellated.h" #include "TGeoBoolNode.h" #include "TGeoVolume.h" #include "TGeoCompositeShape.h" @@ -403,7 +402,12 @@ DD4HEP_INSTANTIATE_SHAPE_HANDLE(TGeoTrd1); DD4HEP_INSTANTIATE_SHAPE_HANDLE(TGeoTrd2); DD4HEP_INSTANTIATE_SHAPE_HANDLE(TGeoSphere); DD4HEP_INSTANTIATE_SHAPE_HANDLE(TGeoTorus); + +#if ROOT_VERSION_CODE > ROOT_VERSION(6,19,0) +#include "TGeoTessellated.h" DD4HEP_INSTANTIATE_SHAPE_HANDLE(TGeoTessellated); +#endif + DD4HEP_INSTANTIATE_SHAPE_HANDLE(TGeoHalfSpace); DD4HEP_INSTANTIATE_SHAPE_HANDLE(TGeoShapeAssembly); DD4HEP_INSTANTIATE_SHAPE_HANDLE(TGeoCompositeShape); -- GitLab