diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/CMakeLists.txt index d6786848fdd6cea6e68c9230538057ecdfac8fbc..b5a058c9c71cd08951ed97526aa58d50ffe5ee1b 100644 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/CMakeLists.txt +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/CMakeLists.txt @@ -1,22 +1,17 @@ -################################################################################ -# Package: InDetTrigVxSecondary -################################################################################ +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # Declare the package name: atlas_subdir( InDetTrigVxSecondary ) # External dependencies: -find_package( Eigen ) -find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread ) +find_package( ROOT COMPONENTS Core MathCore ) # Component(s) in the package: atlas_add_component( InDetTrigVxSecondary src/*.cxx src/components/*.cxx - INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} xAODTracking GaudiKernel VxSecVertex TrigInterfacesLib AthContainers GeoPrimitives IRegionSelector xAODBase InDetRecToolInterfaces TrkParameters TrkTrack VxVertex TrigInDetEvent TrigSteeringEvent InDetBeamSpotServiceLib TrigInDetToolInterfacesLib ) + INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} + LINK_LIBRARIES ${ROOT_LIBRARIES} xAODTracking CxxUtils GaudiKernel VxSecVertex TrigInterfacesLib AthContainers GeoPrimitives xAODBase InDetRecToolInterfaces TrkParameters TrkTrack VxVertex TrigInDetEvent TrigSteeringEvent InDetBeamSpotServiceLib TrigInDetToolInterfacesLib ) # Install files from the package: -atlas_install_headers( InDetTrigVxSecondary ) -atlas_install_python_modules( python/*.py ) - +atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/python/InDetTrigVxSecondary_LoadTools.py b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/python/InDetTrigVxSecondary_LoadTools.py index fc0a0f244bc153dea17954ae001598fa0aa2a891..97da7866c41e674182e2a2c1aef892a333962764 100644 --- a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/python/InDetTrigVxSecondary_LoadTools.py +++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/python/InDetTrigVxSecondary_LoadTools.py @@ -1,8 +1,7 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration from InDetTrigVxSecondary.InDetTrigVxSecondaryConf import InDet__TrigVxSecondary from InDetTrigVxSecondary.InDetTrigVxSecondaryConf import InDet__TrigVxSecondaryCombo -from GaudiKernel.Constants import VERBOSE,INFO,DEBUG class TrigVxSecondary_EF( InDet__TrigVxSecondary ): __slots__ = [] @@ -10,9 +9,7 @@ class TrigVxSecondary_EF( InDet__TrigVxSecondary ): super( InDet__TrigVxSecondary, self ).__init__( name ) from AthenaCommon.AppMgr import ToolSvc - from AthenaCommon.Include import include - from AthenaCommon.GlobalFlags import GlobalFlags - + # Start of offline vertex finder tool configuration from InDetVKalVxInJetTool.InDetVKalVxInJetToolConf import InDet__InDetVKalVxInJetTool @@ -59,8 +56,6 @@ class TrigVxSecondaryCombo_EF( InDet__TrigVxSecondaryCombo ): super( InDet__TrigVxSecondaryCombo, self ).__init__( name ) from AthenaCommon.AppMgr import ToolSvc - from AthenaCommon.Include import include - from AthenaCommon.GlobalFlags import GlobalFlags # Start of offline vertex finder tool configuration