From cadf6ad943208282c7a5c3afe91c20c02090dc56 Mon Sep 17 00:00:00 2001 From: scott snyder <snyder@bnl.gov> Date: Mon, 25 Sep 2017 17:10:50 +0200 Subject: [PATCH] SiSpacePointFormation: DataModel -> AthLinks. Remove reference to obsolete package DataModel. Former-commit-id: 9ddc28c314583feaf98a2a20d17f17258b65d693 --- .../InDetRecAlgs/SiSpacePointFormation/CMakeLists.txt | 6 +++--- .../SiSpacePointFormation/SiTrackerSpacePointFinder.h | 2 +- .../InDetRecAlgs/SiSpacePointFormation/cmt/requirements | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/CMakeLists.txt b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/CMakeLists.txt index 39c3924e5e9..95bdc597741 100644 --- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/CMakeLists.txt +++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/CMakeLists.txt @@ -8,7 +8,7 @@ atlas_subdir( SiSpacePointFormation ) # Declare the package's dependencies: atlas_depends_on_subdirs( PUBLIC Control/AthenaBaseComps - Control/DataModel + Control/AthContainers DetectorDescription/GeoPrimitives DetectorDescription/Identifier GaudiKernel @@ -32,11 +32,11 @@ atlas_add_library( SiSpacePointFormationLib src/*.cxx PUBLIC_HEADERS SiSpacePointFormation INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} - LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps DataModel GeoPrimitives Identifier GaudiKernel InDetReadoutGeometry InDetPrepRawData TrkSpacePoint VxVertex SiSpacePointToolLib + LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthContainers GeoPrimitives Identifier GaudiKernel InDetReadoutGeometry InDetPrepRawData TrkSpacePoint VxVertex SiSpacePointToolLib PRIVATE_LINK_LIBRARIES CxxUtils AtlasDetDescr xAODEventInfo InDetIdentifier ) atlas_add_component( SiSpacePointFormation src/components/*.cxx INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} - LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps DataModel GeoPrimitives Identifier GaudiKernel InDetReadoutGeometry InDetPrepRawData SiSpacePointToolLib TrkSpacePoint VxVertex CxxUtils AtlasDetDescr xAODEventInfo InDetIdentifier SiSpacePointFormationLib ) + LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthContainers GeoPrimitives Identifier GaudiKernel InDetReadoutGeometry InDetPrepRawData SiSpacePointToolLib TrkSpacePoint VxVertex CxxUtils AtlasDetDescr xAODEventInfo InDetIdentifier SiSpacePointFormationLib ) diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h index cd00b0c1032..f261e55e189 100755 --- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h +++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h @@ -49,7 +49,7 @@ #include "AthenaBaseComps/AthAlgorithm.h" #include "GaudiKernel/ToolHandle.h" #include "GaudiKernel/ServiceHandle.h" -#include "DataModel/DataVector.h" +#include "AthContainers/DataVector.h" #include "Identifier/Identifier.h" #include "SiSpacePointTool/SiSpacePointMakerTool.h" diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/cmt/requirements b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/cmt/requirements index a532a53b194..78a603f93a7 100755 --- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/cmt/requirements +++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/cmt/requirements @@ -9,7 +9,7 @@ use AtlasPolicy AtlasPolicy-* #use AtlasCLHEP AtlasCLHEP-* External use GaudiInterface GaudiInterface-* External use AthenaBaseComps AthenaBaseComps-* Control -use DataModel DataModel-* Control +use AthContainers AthContainers-* Control use Identifier Identifier-* DetectorDescription use InDetReadoutGeometry InDetReadoutGeometry-* InnerDetector/InDetDetDescr use SiSpacePointTool SiSpacePointTool-* InnerDetector/InDetRecTools -- GitLab