diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/PixelDetectorManager.h b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/PixelDetectorManager.h index 8af16653bcc2bb614de4ace91d35df560c55bcb3..3ef1f2ee12a519f68a083fd28b9fde7c969a909d 100755 --- a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/PixelDetectorManager.h +++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/PixelReadoutGeometry/PixelDetectorManager.h @@ -52,7 +52,9 @@ namespace InDetDD { /** Constructor */ PixelDetectorManager(StoreGateSvc* detStore); - + /** Constructor with name */ + PixelDetectorManager(StoreGateSvc* detStore, std::string name); + /** Destructor */ ~PixelDetectorManager(); diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelDetectorManager.cxx b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelDetectorManager.cxx index 2316a666c8bed4ab7ca654eae4ad9dc418f43f8e..462ed506f628b55f4eca17b2c763af92fb5ae292 100755 --- a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelDetectorManager.cxx +++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/src/PixelDetectorManager.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ #include "DetDescrConditions/AlignableTransformContainer.h" @@ -25,8 +25,8 @@ namespace InDetDD { const int FIRST_HIGHER_LEVEL = 1; - PixelDetectorManager::PixelDetectorManager(StoreGateSvc* detStore) - : SiDetectorManager(detStore, "Pixel"), + PixelDetectorManager::PixelDetectorManager(StoreGateSvc* detStore, std::string name) + : SiDetectorManager(detStore,name), m_idHelper(0), m_isLogical(false) // Change to true to change the definition of local module corrections { @@ -46,6 +46,9 @@ namespace InDetDD { m_alignableTransforms.resize(m_idHelper->wafer_hash_max()); } } + + PixelDetectorManager::PixelDetectorManager(StoreGateSvc* detStore) + : PixelDetectorManager(detStore, "Pixel"){ } PixelDetectorManager::~PixelDetectorManager() diff --git a/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/src/SCT_DetectorManager.cxx b/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/src/SCT_DetectorManager.cxx index 313a7923140a36479c0aeca3fdc3bf0cbf6c8461..03fba5f2e9def422ceb47c65af76b44ce89921fe 100755 --- a/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/src/SCT_DetectorManager.cxx +++ b/InnerDetector/InDetDetDescr/SCT_ReadoutGeometry/src/SCT_DetectorManager.cxx @@ -24,24 +24,7 @@ namespace InDetDD { SCT_DetectorManager::SCT_DetectorManager( StoreGateSvc* detStore ) - : SiDetectorManager(detStore, "SCT"), - m_idHelper(0), - m_isLogical(false) // Change to true to change the definition of local module corrections - { - // - // Initialized the Identifier helper. - // - StatusCode sc = detStore->retrieve(m_idHelper, "SCT_ID"); - if (sc.isFailure()) { - ATH_MSG_ERROR("Could not retrieve SCT id helper"); - } - // Initialize the collections. - if (m_idHelper) { - m_elementCollection.resize(m_idHelper->wafer_hash_max()); - m_alignableTransforms.resize(m_idHelper->wafer_hash_max()); - m_moduleAlignableTransforms.resize(m_idHelper->wafer_hash_max()/2); - } - } + : SCT_DetectorManager(detStore, "SCT") {} SCT_DetectorManager::SCT_DetectorManager( StoreGateSvc* detStore , std::string name) : SiDetectorManager(detStore,name),