From 061b52ea8770cc9cde57e556c516c9831c9de2fe Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Thu, 4 Jul 2019 14:55:32 +0200
Subject: [PATCH] Prepare DD4hep for Geant4 units in TGeo; Start digitization
package
---
DDCore/src/DetectorImp.cpp | 4 ++--
DDDigi/CMakeLists.txt | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/DDCore/src/DetectorImp.cpp b/DDCore/src/DetectorImp.cpp
index 9ea6437be..bf829dbe3 100644
--- a/DDCore/src/DetectorImp.cpp
+++ b/DDCore/src/DetectorImp.cpp
@@ -32,7 +32,7 @@
#include <mutex>
// ROOT inlcude files
-#include "TGeant4SystemOfUnits.h"
+#include "TGeoSystemOfUnits.h"
#include "TGeoCompositeShape.h"
#include "TGeoBoolNode.h"
#include "TGeoManager.h"
@@ -155,7 +155,7 @@ DetectorImp::DetectorImp()
DetectorImp::DetectorImp(const string& name)
: TNamed(), DetectorData(), DetectorLoad(this), m_buildType(BUILD_NONE)
{
- //TGeant4Unit::setUnitType(TGeant4Unit::kTGeant4Units);
+ //TGeoUnit::setUnitType(TGeoUnit::kTGeant4Units);
SetTitle("DD4hep detector description object");
set_unexpected( description_unexpected );
set_terminate( description_unexpected );
diff --git a/DDDigi/CMakeLists.txt b/DDDigi/CMakeLists.txt
index cd2547d05..542c1067a 100644
--- a/DDDigi/CMakeLists.txt
+++ b/DDDigi/CMakeLists.txt
@@ -19,12 +19,13 @@ dd4hep_add_package_library(DDDigi SOURCES src/*.cpp
[OPTIONAL TBB REQUIRED]
)
if( TBB_INCLUDE_DIR )
- dd4hep_print( "++> TBB_INCLUDE_DIR --> ${TBB_INCLUDE_DIR}")
- dd4hep_print( "++> TBB_LIBRARY --> ${TBB_LIBRARY}")
+ dd4hep_print( "|++> TBB_INCLUDE_DIR --> ${TBB_INCLUDE_DIR}")
+ dd4hep_print( "|++> TBB_LIBRARY --> ${TBB_LIBRARY}")
+ dd4hep_print( "|++> TBB found. DDDigi will run multi threaded.")
target_compile_definitions(DDDigi PUBLIC DD4HEP_USE_TBB)
target_link_libraries(DDDigi ${TBB_LIBRARY})
else()
- dd4hep_print( "++> TBB_INCLUDE_DIR --> ${TBB_INCLUDE_DIR}")
+ dd4hep_print( "|++> TBB not found. DDDigi will only work single threaded.")
endif()
#--------------------------- Legacy libraries -------------------------------------
--
GitLab