diff --git a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/CMakeLists.txt index 32953b122f62115b9b3c6e025465a63df182c6f1..2d367bdae7cb11af81403295c58a9ee8ce91dffc 100644 --- a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/CMakeLists.txt +++ b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/CMakeLists.txt @@ -1,38 +1,17 @@ -################################################################################ -# Package: TrigT2HistoPrmVtx -################################################################################ +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # Declare the package name: atlas_subdir( TrigT2HistoPrmVtx ) -# Declare the package's dependencies: -atlas_depends_on_subdirs( PUBLIC - Event/xAOD/xAODTracking - Trigger/TrigSteer/TrigInterfaces - PRIVATE - Event/EventInfo - Event/EventPrimitives - Event/xAOD/xAODBase - GaudiKernel - InnerDetector/InDetConditions/BeamSpotConditionsData - Reconstruction/Particle - Trigger/TrigEvent/TrigInDetEvent - Trigger/TrigEvent/TrigNavigation - Trigger/TrigEvent/TrigSteeringEvent - Trigger/TrigTools/TrigTimeAlgs ) - # External dependencies: -find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread ) +find_package( ROOT COMPONENTS MathCore ) # Component(s) in the package: atlas_add_component( TrigT2HistoPrmVtx src/*.cxx src/components/*.cxx INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} xAODTracking TrigInterfacesLib EventInfo EventPrimitives xAODBase GaudiKernel Particle TrigInDetEvent TrigNavigationLib TrigSteeringEvent TrigTimeAlgsLib ) + LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps BeamSpotConditionsData CxxUtils EventInfo EventPrimitives GaudiKernel Particle StoreGateLib TrigInDetEvent TrigInterfacesLib TrigNavigationLib TrigSteeringEvent TrigTimeAlgsLib xAODBase xAODTracking ) # Install files from the package: -atlas_install_headers( TrigT2HistoPrmVtx ) -atlas_install_python_modules( python/*.py ) -atlas_install_joboptions( share/*.py ) - +atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 ) diff --git a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/python/TrigT2HistoPrmVtxComboConfig.py b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/python/TrigT2HistoPrmVtxComboConfig.py index 9619ac1698fd9ca339a24d60e9502f07c4c29192..3b7c71dddb7bfbc0c84f83ca8f53693f762e0ce3 100755 --- a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/python/TrigT2HistoPrmVtxComboConfig.py +++ b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/python/TrigT2HistoPrmVtxComboConfig.py @@ -1,11 +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 TrigT2HistoPrmVtx.TrigT2HistoPrmVtxConf import TrigT2HistoPrmVtxCombo - -from AthenaCommon.SystemOfUnits import mm, GeV - - class TrigT2HistoPrmVtxComboBase (TrigT2HistoPrmVtxCombo): __slots__ = [] def __init__(self, name): diff --git a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/share/TriggerConfig_TrigT2HistoPrmVtx.py b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/share/TriggerConfig_TrigT2HistoPrmVtx.py deleted file mode 100755 index 2c306d45f5d289775d75a3d2967971d76086d3bc..0000000000000000000000000000000000000000 --- a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/share/TriggerConfig_TrigT2HistoPrmVtx.py +++ /dev/null @@ -1,35 +0,0 @@ -include.block("TrigT2HistoPrmVtx/TriggerConfig_TrigT2HistoPrmVtx.py") -# -# Configure a suitable TrigT2HistoPrmVtx Algorithm instance -# -# Constructor arguments: -# level, type, threshold, isIsolated -# -# e.g. level=L2, type=muon, threshold=30, isIsolated=None -# level=EF, type=egamma, threshold=20, isIsolated=isolated -# -# Methods: -# instanceName() : returns name of algorithm instance -# classAndInstanceName() : returns a list of strings to be entered in the sequence file. This string -# defines the class and instance name -# - -class TriggerConfig_TrigT2HistoPrmVtx: - def __init__(self, level, type = None, threshold = None, isIsolated = None): - - if type == "jet": - self.__instname__ = "TrigT2HistoPrmVtx_jet_" - self.__sequence__ = "TrigT2HistoPrmVtx/TrigT2HistoPrmVtx/jet" - - self.__instname__ += level - - - def instanceName(self): - return self.__instname__ - - def classAndInstanceName(self): - return [ self.__sequence__ ] - -include( "TrigT2HistoPrmVtx/jobOfragment_TrigT2HistoPrmVtx.py") -include.block( "TrigT2HistoPrmVtx/jobOfragment_TrigT2HistoPrmVtx.py") - diff --git a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/share/jobOfragment_TrigT2HistoPrmVtx.py b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/share/jobOfragment_TrigT2HistoPrmVtx.py deleted file mode 100755 index c19cf8a5af4b632adadc9978291bdba781c3f988..0000000000000000000000000000000000000000 --- a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/share/jobOfragment_TrigT2HistoPrmVtx.py +++ /dev/null @@ -1,30 +0,0 @@ -#============================================================= -# -# TrigT2HistoPrmVtx job options -# -#============================================================== - - -#-------------------------------------------------- -# TrigT2HistoPrmVtx algorithm -#-------------------------------------------------- -theApp.Dlls += [ "TrigT2HistoPrmVtx" ] -TrigT2HistoPrmVtx_jet_L2 = Algorithm( "TrigT2HistoPrmVtx_jet_L2" ) - - -#-------------------------------------------------------------- -# Algorithm Private Options -#-------------------------------------------------------------- - - -# SET GENERAL PROPERTIES -# track reconstruction algorithm: SiTrack(1) IdScan(2) -TrigT2HistoPrmVtx_jet_L2.AlgoId = 1 - - -#============================================================== -# -# end of file -# -#============================================================== -