diff --git a/DDCore/include/DD4hep/GeoHandler.h b/DDCore/include/DD4hep/GeoHandler.h index 3f3bb964b1e7522e10e0b15580cb30ee6d46d5ce..976ecbd9690a77873267ff9a899849b73d3636a4 100644 --- a/DDCore/include/DD4hep/GeoHandler.h +++ b/DDCore/include/DD4hep/GeoHandler.h @@ -96,7 +96,6 @@ namespace dd4hep { protected: bool m_propagateRegions; std::map<int, std::set<const TGeoNode*> >* m_data; - std::map<int, std::set<std::pair<const TGeoNode*,const TGeoNode*> > >* m_places; /// Internal helper to collect geometry information from traversal GeoHandler& i_collect(const TGeoNode* parent, diff --git a/DDCore/src/GeoHandler.cpp b/DDCore/src/GeoHandler.cpp index 590c5db8d58aec26770453139e5a274f9a95dd32..690542eccc1092ae22b0cc0fc581040ba8428cfe 100644 --- a/DDCore/src/GeoHandler.cpp +++ b/DDCore/src/GeoHandler.cpp @@ -53,13 +53,11 @@ namespace { /// Default constructor GeoHandler::GeoHandler() : m_propagateRegions(false) { m_data = new map<int,set<const TGeoNode*> >(); - m_places = new map<int, set<pair<const TGeoNode*,const TGeoNode*> > >(); } /// Initializing constructor GeoHandler::GeoHandler(map<int,set<const TGeoNode*> >* ptr) : m_propagateRegions(false), m_data(ptr) { - m_places = new map<int, set<pair<const TGeoNode*,const TGeoNode*> > >(); } /// Default destructor @@ -67,9 +65,6 @@ GeoHandler::~GeoHandler() { if (m_data) delete m_data; m_data = nullptr; - if ( m_places ) - delete m_places; - m_places = nullptr; } map<int,set<const TGeoNode*> >* GeoHandler::release() { @@ -89,7 +84,6 @@ GeoHandler& GeoHandler::collect(DetElement element) { DetElement par = element.parent(); TGeoNode* par_node = par.isValid() ? par.placement().ptr() : nullptr; m_data->clear(); - m_places->clear(); return i_collect(par_node, element.placement().ptr(), 0, Region(), LimitSet()); } @@ -97,7 +91,6 @@ GeoHandler& GeoHandler::collect(DetElement element, GeometryInfo& info) { DetElement par = element.parent(); TGeoNode* par_node = par.isValid() ? par.placement().ptr() : nullptr; m_data->clear(); - m_places->clear(); i_collect(par_node, element.placement().ptr(), 0, Region(), LimitSet()); for (auto i = m_data->rbegin(); i != m_data->rend(); ++i) { const auto& mapped = (*i).second; @@ -154,8 +147,6 @@ GeoHandler& GeoHandler::i_collect(const TGeoNode* parent, } } (*m_data)[level].emplace(current); - (*m_places)[level].emplace(make_pair(parent,current)); - //printf("GeoHandler: collect level:%d %s\n",level,current->GetName()); if (num_children > 0) { for (int i = 0; i < num_children; ++i) { TGeoNode* node = (TGeoNode*) nodes->At(i);