Merge branch 'sg.DetDescrCondTools-20201009' into 'master'

DetDescrCondTools+GeoModelSvc+IdDictDetDescrCnv+EventBookkeeperTools+ForwardIdCnv: Remove reference to StoreGate.h.

See merge request atlas/athena!37149

DetectorDescription/DetDescrCond/DetDescrCondTools/src/CoolStrFileSvc.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef DETDESCRCONDTOOLS_COOLSTRFILESVC_H
@@ -10,7 +10,7 @@
 #include "DetDescrCondTools/ICoolStrFileSvc.h"
 #include "AthenaBaseComps/AthService.h"
 
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
 class CoolStrFileSvc : public virtual ICoolStrFileSvc, public virtual AthService
 {
   template <class TYPE> class SvcFactory;

DetectorDescription/GeoModel/GeoModelSvc/src/RDBMaterialManager.cxx

@@ -10,7 +10,6 @@
 #include "GeoModelKernel/GeoElement.h"
 #include "GeoModelKernel/Units.h"
 
-#include "StoreGate/StoreGate.h"
 #include "StoreGate/DataHandle.h"
 
 #include "RDBAccessSvc/IRDBAccessSvc.h"

DetectorDescription/IdDictDetDescrCnv/src/AtlasIDDetDescrCnv.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -17,8 +17,8 @@
 #include "DetDescrCnvSvc/DetDescrConverter.h"
 #include "DetDescrCnvSvc/DetDescrAddress.h"
 #include "GaudiKernel/MsgStream.h"
-#include "StoreGate/StoreGate.h" 
 #include "AthenaKernel/StorableConversions.h"
+#include "StoreGate/StoreGateSvc.h"
 
 #include "IdDictDetDescr/IdDictManager.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
@@ -122,7 +122,7 @@ AtlasIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     } else {}
  
     // Get the dictionary manager from the detector store
-    const DataHandle<IdDictManager> idDictMgr;
+    const IdDictManager* idDictMgr;
     status = detStore->retrieve(idDictMgr, "IdDict");
     if (status.isFailure()) {
 	log << MSG::FATAL << "Could not get IdDictManager !" << endmsg;

DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -26,7 +26,6 @@
  
 #include "GaudiKernel/MsgStream.h"
 
-#include "StoreGate/StoreGate.h" 
 #include "AthenaKernel/StorableConversions.h"
 
 

Event/EventBookkeeperTools/src/FillEBCFromFlat.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef FILL_EBC_FROM_FLAT_H
 #define FILL_EBC_FROM_FLAT_H
 
 #include "GaudiKernel/ServiceHandle.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
 
 #include "SGTools/StlVectorClids.h"
 #include "SGTools/BuiltinsClids.h"

ForwardDetectors/ForwardIdCnv/src/ZdcIDDetDescrCnv.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -16,8 +16,8 @@
 
 #include "DetDescrCnvSvc/DetDescrConverter.h"
 #include "DetDescrCnvSvc/DetDescrAddress.h"
+#include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
-#include "StoreGate/StoreGate.h" 
 
 #include "IdDictDetDescr/IdDictManager.h"
 #include "ZdcIdentifier/ZdcID.h"
@@ -120,7 +120,7 @@ ZdcIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     } else {}
  
     // Get the dictionary manager from the detector store
-    const DataHandle<IdDictManager> idDictMgr;
+    const IdDictManager* idDictMgr = nullptr;
     status = detStore->retrieve(idDictMgr, "IdDict");
     if (status.isFailure()) {
 	log << MSG::FATAL << "Could not get IdDictManager !" << endmsg;