From aae8deb0c1569c37e82ab91ccd0d4c5a4313b7e3 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Fri, 5 Jul 2019 09:21:36 +0200
Subject: [PATCH] Fix issue https://github.com/AIDASoft/DD4hep/issues/521
---
DDCore/src/DetectorImp.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/DDCore/src/DetectorImp.cpp b/DDCore/src/DetectorImp.cpp
index bf829dbe3..7310d58f8 100644
--- a/DDCore/src/DetectorImp.cpp
+++ b/DDCore/src/DetectorImp.cpp
@@ -32,7 +32,9 @@
#include <mutex>
// ROOT inlcude files
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6,12,0)
#include "TGeoSystemOfUnits.h"
+#endif
#include "TGeoCompositeShape.h"
#include "TGeoBoolNode.h"
#include "TGeoManager.h"
@@ -155,7 +157,9 @@ DetectorImp::DetectorImp()
DetectorImp::DetectorImp(const string& name)
: TNamed(), DetectorData(), DetectorLoad(this), m_buildType(BUILD_NONE)
{
- //TGeoUnit::setUnitType(TGeoUnit::kTGeant4Units);
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6,20,0)
+ TGeoUnit::setUnitType(TGeoUnit::kTGeant4Units);
+#endif
SetTitle("DD4hep detector description object");
set_unexpected( description_unexpected );
set_terminate( description_unexpected );
--
GitLab