diff --git a/TileCalorimeter/TileEvent/CMakeLists.txt b/TileCalorimeter/TileEvent/CMakeLists.txt index ccbf265b056c0c14c09564679ca5fb8afcb0bf1b..d7e2f632f7e74fac11cf605b1176fb3a9d4e2824 100644 --- a/TileCalorimeter/TileEvent/CMakeLists.txt +++ b/TileCalorimeter/TileEvent/CMakeLists.txt @@ -21,8 +21,7 @@ atlas_depends_on_subdirs( PUBLIC DetectorDescription/IdDictParser TileCalorimeter/TileCalib/TileCalibBlobObjs Calorimeter/CaloDetDescr - Calorimeter/CaloIdentifier - Control/SGTools ) + Calorimeter/CaloIdentifier ) # External dependencies: find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread ) @@ -33,13 +32,13 @@ atlas_add_library( TileEvent PUBLIC_HEADERS TileEvent PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} LINK_LIBRARIES CaloEvent AthContainers Identifier GaudiKernel TileIdentifier TileSimEvent StoreGateLib SGtests TileConditionsLib CaloDetDescrLib EventContainers - PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier SGTools TileCalibBlobObjs ) + PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier AthenaKernel TileCalibBlobObjs ) atlas_add_dictionary( TileEventDict TileEvent/TileEventDict.h TileEvent/selection.xml INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} CaloEvent AthContainers StoreGateLib SGtests Identifier GaudiKernel TileConditionsLib TileIdentifier TileSimEvent CaloDetDescrLib CaloIdentifier SGTools TileEvent EventContainers ) + LINK_LIBRARIES ${ROOT_LIBRARIES} CaloEvent AthContainers StoreGateLib SGtests Identifier GaudiKernel TileConditionsLib TileIdentifier TileSimEvent CaloDetDescrLib CaloIdentifier AthenaKernel TileEvent EventContainers ) atlas_add_test( TileRawChannelCollection_test diff --git a/TileCalorimeter/TileEvent/TileEvent/TileContainer.h b/TileCalorimeter/TileEvent/TileEvent/TileContainer.h index be65b06780d0675b16aff9b8685cad23e26e9cfd..1b05ff105b66b079efdcf0eddb4a214c0a8ffee4 100755 --- a/TileCalorimeter/TileEvent/TileEvent/TileContainer.h +++ b/TileCalorimeter/TileEvent/TileEvent/TileContainer.h @@ -87,7 +87,7 @@ CLASS_DEF(TileMuonReceiverContainer, 2954, 0) // explicitly declared inheritance information about template class // TileContainer<> , information may be read in -// http://acode-browser.usatlas.bnl.gov/lxr/source/atlas/Control/SGTools/SGTools/BaseInfo.h#0047 +// AthenaKernel/BaseInfo.h. namespace SG { template <class T> struct Bases<TileContainer<T> > { diff --git a/TileCalorimeter/TileEvent/src/TileContainer.cxx b/TileCalorimeter/TileEvent/src/TileContainer.cxx index 13bb12a454ec1274aeca89172fbbcb7907656897..37ed94238ed8a7de4bd091c7b6cf4f932010be86 100755 --- a/TileCalorimeter/TileEvent/src/TileContainer.cxx +++ b/TileCalorimeter/TileEvent/src/TileContainer.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ //***************************************************************************** @@ -25,6 +25,6 @@ #include "TileEvent/TileRawChannelContainer.h" #include "TileEvent/TileCellIDC.h" #include "TileEvent/TileBeamElemContainer.h" -#include "SGTools/BaseInfo.h" +#include "AthenaKernel/BaseInfo.h" SG_ADD_BASE (TileContainer<TileCell>, DataVector<TileCell>);