From 73f03f484426fcfcf1aac673ffae19b907f25b11 Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Mon, 12 Aug 2019 15:35:59 +0200
Subject: [PATCH] Use proper future ROOT version
---
DDCore/src/gdml/GdmlPlugins.cpp | 4 ++--
examples/OpticalSurfaces/CMakeLists.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DDCore/src/gdml/GdmlPlugins.cpp b/DDCore/src/gdml/GdmlPlugins.cpp
index 64609519d..e17aaa631 100644
--- a/DDCore/src/gdml/GdmlPlugins.cpp
+++ b/DDCore/src/gdml/GdmlPlugins.cpp
@@ -177,7 +177,7 @@ static long gdml_extract(Detector& description, int argc, char** argv) {
if ( de.isValid() ) {
TGDMLWrite extract;
TUri uri(output.c_str());
-#if ROOT_VERSION_CODE >= ROOT_VERSION(7,19,0)
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6,20,0)
extract.WriteGDMLfile(&description.manager(), de.placement().ptr(), uri.GetRelativePart());
#else
extract.WriteGDMLfile(&description.manager(), de.volume().ptr(), uri.GetRelativePart());
@@ -225,7 +225,7 @@ static long gdml_extract(Detector& description, int argc, char** argv) {
if ( a._node ) {
TGDMLWrite extract;
TUri uri(output.c_str());
-#if ROOT_VERSION_CODE >= ROOT_VERSION(7,19,0)
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6,20,0)
extract.WriteGDMLfile(&description.manager(), a._node, uri.GetRelativePart());
#else
extract.WriteGDMLfile(&description.manager(), a._node->GetVolume(), uri.GetRelativePart());
diff --git a/examples/OpticalSurfaces/CMakeLists.txt b/examples/OpticalSurfaces/CMakeLists.txt
index 9870821ab..45005061c 100644
--- a/examples/OpticalSurfaces/CMakeLists.txt
+++ b/examples/OpticalSurfaces/CMakeLists.txt
@@ -70,7 +70,7 @@ dd4hep_add_test_reg( Surfaces_OpNovice_write_gdml
)
#
#
-if ( "${ROOT_VERSION}" VERSION_GREATER "6.19.00" )
+if ( "${ROOT_VERSION}" VERSION_GREATER_EQUAL "6.20.00" )
#
#---Testing: Load GDML and dump volumes
dd4hep_add_test_reg( Surfaces_OpNovice_read_gdml
--
GitLab