From 0e539031db7b74e1874f64f039e02dfc3560a814 Mon Sep 17 00:00:00 2001
From: Frank Gaede <frank.gaede@desy.de>
Date: Thu, 1 Mar 2018 19:14:27 +0100
Subject: [PATCH] rm deprecetd c'tor MaterialManager()
---
DDRec/include/DDRec/MaterialManager.h | 10 ++++++----
DDRec/src/MaterialManager.cpp | 4 ----
DDRec/src/gear/createGearForILD.cpp | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/DDRec/include/DDRec/MaterialManager.h b/DDRec/include/DDRec/MaterialManager.h
index d10c11c0c..c84a03188 100644
--- a/DDRec/include/DDRec/MaterialManager.h
+++ b/DDRec/include/DDRec/MaterialManager.h
@@ -32,10 +32,12 @@ namespace dd4hep {
/// Instantiate the MaterialManager for this (world) volume
MaterialManager(Volume world);
- /// default c'tor
- [[gnu::deprecated("use MaterialManager(Volume world) instead")]]
- MaterialManager();
-
+#if defined(G__ROOT)
+ MaterialManager() = default ;
+#else
+ MaterialManager() = delete ;
+#endif
+
~MaterialManager();
/** Get a vector with all the materials between the two points p0 and p1 with the corresponding thicknesses -
diff --git a/DDRec/src/MaterialManager.cpp b/DDRec/src/MaterialManager.cpp
index 2f753a303..7331880f2 100644
--- a/DDRec/src/MaterialManager.cpp
+++ b/DDRec/src/MaterialManager.cpp
@@ -18,10 +18,6 @@ namespace dd4hep {
}
- MaterialManager::MaterialManager() : _mV(0), _m( Material() ), _p0(),_p1(),_pos() {
-
- _tgeoMgr = Detector::getInstance().world().volume()->GetGeoManager();
- }
MaterialManager::~MaterialManager(){
diff --git a/DDRec/src/gear/createGearForILD.cpp b/DDRec/src/gear/createGearForILD.cpp
index 193dcbc0e..3a4f75544 100644
--- a/DDRec/src/gear/createGearForILD.cpp
+++ b/DDRec/src/gear/createGearForILD.cpp
@@ -100,7 +100,7 @@ namespace dd4hep{
// handle->addMaterial( "VXDSupportMaterial", 2.075865162e+01, 1.039383117e+01, 2.765900000e+02, 1.014262421e+03, 3.341388059e+03) ;
// -------- better: get right averaged material from first ladder: ------------------
- MaterialManager matMgr ;
+ MaterialManager matMgr( Detector::getInstance().world().volume() ) ;
const rec::ZPlanarData::LayerLayout& l = vxd->layers[0] ;
--
GitLab