diff --git a/DDCore/src/DetectorImp.cpp b/DDCore/src/DetectorImp.cpp index 9ea6437be902638077b3d18fe351deb3084fcbb5..bf829dbe36c17c4e8dfdba0398614efa1dc02a6b 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 cd2547d055102d51326fa28c3e7183f596ba3762..542c1067a9557d605f63e1c1ef0b98d3bd6c1b6e 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 -------------------------------------