From fcf8725d0ce7b202d240543bf7e3a69425920edc Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Tue, 21 Sep 2021 15:34:11 +0200
Subject: [PATCH] Revert "Merge branch 'gaudi82.DetDescrCnvSvc-20210917' into
'master'"
This reverts merge request !46585
---
.../DetDescrCnvSvc/src/DetDescrCnvSvc.cxx | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx b/DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx
index c0beb1e4b511..c5f9af64e3fa 100755
--- a/DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx
+++ b/DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// Include files
@@ -122,15 +122,6 @@ DetDescrCnvSvc::initialize() {
log << MSG::INFO << "Found DetectorStore service" << endmsg;
}
- // Working around Gaudi Issue https://gitlab.cern.ch/gaudi/Gaudi/issues/82
- if (m_detStore->FSMState() < Gaudi::StateMachine::INITIALIZED) {
- log << MSG::INFO << "Explicitly initializing DetDescrCnvSvc" << endmsg;
- if (m_detStore->sysInitialize().isFailure()) {
- log << MSG::FATAL << "Error initializing DetectorStore !" << endmsg;
- return StatusCode::FAILURE;
- }
- }
-
// fill in the Addresses for Transient Detector Store objects
log << MSG::INFO << " filling proxies for detector managers " <<endmsg ;
--
GitLab