diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.cxx b/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.cxx index 91d93b0140c1d9cc764a707d0ae57de42259c2a2..4c4197e6d11384b61fea78d095524b2c7a39b138 100644 --- a/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.cxx +++ b/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.cxx @@ -37,7 +37,9 @@ StatusCode BCM_DigitizationTool::initialize() { ATH_MSG_VERBOSE ( "initialize()"); - ATH_CHECK(m_mergeSvc.retrieve()); + if (m_onlyUseContainerName) { + ATH_CHECK(m_mergeSvc.retrieve()); + } // get random service ATH_CHECK(m_rndmGenSvc.retrieve()); diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.cxx index 0e5c1e425e33c10442718ef8567b47033d2f58e0..84d2494a5731107cc37ac2c193dd0531a016cfa8 100644 --- a/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.cxx +++ b/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.cxx @@ -22,7 +22,9 @@ PixelDigitizationTool::PixelDigitizationTool(const std::string &type, StatusCode PixelDigitizationTool::initialize() { ATH_MSG_DEBUG("PixelDigitizationTool::Initialize()"); - ATH_CHECK(m_mergeSvc.retrieve()); + if (m_onlyUseContainerName) { + ATH_CHECK(m_mergeSvc.retrieve()); + } ATH_CHECK(m_rndmSvc.retrieve()); ATH_CHECK(detStore()->retrieve(m_detID,"PixelID")); diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.cxx b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.cxx index 2a13de8399a018de347f625dc8e0a58914de3216..9d645308771a97e2787f4ad9c6a19c7a8e90c94f 100644 --- a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.cxx +++ b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.cxx @@ -166,7 +166,9 @@ StatusCode SCT_DigitizationTool::initServices() { // SiDigitization. ATH_CHECK(detStore()->retrieve(m_detID, "SCT_ID")); - ATH_CHECK(m_mergeSvc.retrieve()); + if (m_onlyUseContainerName) { + ATH_CHECK(m_mergeSvc.retrieve()); + } ATH_CHECK(m_rndmSvc.retrieve()); return StatusCode::SUCCESS; diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.cxx index de27acd0460831ac290a1d758f6eb973d4b3f654..8fc7010fee94bd26841008cf20515ca91be99815 100644 --- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.cxx +++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.cxx @@ -143,7 +143,9 @@ StatusCode TRTDigitizationTool::initialize() m_particleTable = p_PartPropSvc->PDT(); //locate the PileUpMergeSvc and initialize our local ptr - ATH_CHECK(m_mergeSvc.retrieve()); + if (m_onlyUseContainerName) { + ATH_CHECK(m_mergeSvc.retrieve()); + } //Retrieve TRT_StrawNeighbourService. ATH_CHECK(m_TRTStrawNeighbourSvc.retrieve());