diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigFastTrackFinder/CMakeLists.txt
index 092618f1f8ec802b58c3147420e7e184e83a6da5..eb8283551736d80ee59ce2d56aa32c43e80d1f6d 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/CMakeLists.txt
@@ -1,52 +1,13 @@
-################################################################################
-# Package: TrigFastTrackFinder
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigFastTrackFinder )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- Tracking/TrkEvent/TrkEventPrimitives
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigTools/TrigInDetPattRecoTools
-
- PRIVATE
- Control/AthenaBaseComps
- Control/CxxUtils
- Control/StoreGate
- Control/AthenaMonitoringKernel
- DetectorDescription/IRegionSelector
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetRecEvent/InDetPrepRawData
- InnerDetector/InDetConditions/BeamSpotConditionsData
- InnerDetector/InDetRecEvent/InDetRIO_OnTrack
- InnerDetector/InDetRecEvent/SiSpacePointsSeed
- InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
- InnerDetector/InDetRecTools/InDetRecToolInterfaces
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkRIO_OnTrack
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/TrkTrackSummary
- Tracking/TrkTools/TrkToolInterfaces
- Tracking/TrkEvent/TrkEventUtils
- Trigger/TrigEvent/TrigInDetPattRecoEvent
- Trigger/TrigTools/TrigInDetToolInterfaces
- Trigger/TrigTools/TrigTimeAlgs )
-
-# External dependencies:
-find_package( TBB )
-
# Component(s) in the package:
atlas_add_component( TrigFastTrackFinder
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES ${TBB_LIBRARIES} GaudiKernel TrkEventPrimitives TrigInDetEvent TrigSteeringEvent TrigInterfacesLib TrigInDetPattRecoTools AthenaBaseComps IRegionSelector InDetIdentifier InDetPrepRawData InDetRIO_OnTrack SiSpacePointsSeed SiSPSeededTrackFinderData InDetRecToolInterfaces TrkParameters TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkToolInterfaces TrigInDetPattRecoEvent TrigTimeAlgsLib TrkEventUtils AthenaMonitoringKernelLib)
+ LINK_LIBRARIES AthenaBaseComps AthenaMonitoringKernelLib BeamSpotConditionsData CxxUtils GaudiKernel InDetIdentifier InDetPrepRawData InDetRIO_OnTrack InDetRecToolInterfaces SiSPSeededTrackFinderData SiSpacePointsSeed TrigInDetEvent TrigInDetPattRecoEvent TrigInDetPattRecoTools TrigInDetToolInterfacesLib TrigInterfacesLib TrigNavigationLib TrigSteeringEvent TrigTimeAlgsLib TrkEventPrimitives TrkEventUtils TrkParameters TrkRIO_OnTrack TrkToolInterfaces TrkTrack TrkTrackSummary )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
index 347af0cea78ae12ec2fb9d0c9c2474d4be23e4c7..d58a6beba186f69cecfb59f7535eb8707fb2d860 100755
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
@@ -171,7 +171,7 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder):
assert(remapped_type is not None)
#Global keys/names for collections
- from TrigInDetConfig.InDetTrigCollectionKeys import TrigTRTKeys, TrigPixelKeys, TrigSCTKeys
+ from TrigInDetConfig.InDetTrigCollectionKeys import TrigPixelKeys, TrigSCTKeys
self.useNewLayerNumberScheme = True
diff --git a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/CMakeLists.txt
index cfb045f36ab71b60aa337173bf78c4f2dc45df46..467995895baae5d9903427a4160b02b18f2995be 100644
--- a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/CMakeLists.txt
@@ -1,45 +1,13 @@
-################################################################################
-# Package: TrigL2LongLivedParticles
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigL2LongLivedParticles )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTrigger
- Trigger/TrigEvent/TrigMuonEvent
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigT1/TrigT1Interfaces
- Trigger/TrigTools/TrigTimeAlgs
- PRIVATE
- Calorimeter/CaloEvent
- Control/AthContainers
- Control/CxxUtils
- Event/FourMomUtils
- Event/xAOD/xAODJet
- Event/xAOD/xAODTracking
- GaudiKernel
- Reconstruction/Jet/JetEvent
- Tools/PathResolver
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigNavigation
- Trigger/TrigEvent/TrigParticle
- Trigger/TrigEvent/TrigSteeringEvent )
-
-# External dependencies:
-find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint )
-
# Component(s) in the package:
atlas_add_component( TrigL2LongLivedParticles
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} xAODTrigger TrigMuonEvent TrigInterfacesLib TrigT1Interfaces TrigTimeAlgsLib CaloEvent AthContainers CxxUtils FourMomUtils xAODJet xAODTracking GaudiKernel JetEvent PathResolver TrigCaloEvent TrigNavigationLib TrigParticle TrigSteeringEvent )
+ LINK_LIBRARIES AthContainers CaloEvent CxxUtils FourMomUtils GaudiKernel JetEvent PathResolver TrigInterfacesLib TrigNavigationLib TrigParticle TrigSteeringEvent TrigT1Interfaces TrigTimeAlgsLib xAODJet xAODTracking xAODTrigger )
# Install files from the package:
-atlas_install_headers( TrigL2LongLivedParticles )
-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/TrigL2LongLivedParticles/python/TrigL2LongLivedParticlesConfig.py b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/python/TrigL2LongLivedParticlesConfig.py
index 46f59b7efee1534260617daf81882b449c1e0dab..af66f7f55363ccbe928a8513e32145044848a529 100755
--- a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/python/TrigL2LongLivedParticlesConfig.py
+++ b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/python/TrigL2LongLivedParticlesConfig.py
@@ -1,4 +1,4 @@
-# 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 TrigL2LongLivedParticles.TrigL2LongLivedParticlesConf import MuonCluster
from TrigL2LongLivedParticles.TrigL2LongLivedParticlesConf import MuonClusterIsolation
@@ -6,9 +6,6 @@ from TrigL2LongLivedParticles.TrigL2LongLivedParticlesConf import TrigMuonJetFex
from TrigL2LongLivedParticles.TrigL2LongLivedParticlesConf import TrigJetSplitter
from TrigL2LongLivedParticles.TrigL2LongLivedParticlesConf import TrigBHremoval
-from AthenaCommon.GlobalFlags import globalflags
-from AthenaCommon.AppMgr import ServiceMgr
-
def getJetSplitterInstance( instance, logratio, pufixlogratio ):
diff --git a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/share/MuClusterJobOption.py b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/share/MuClusterJobOption.py
deleted file mode 100644
index e7eb759de9bbc549d3bf40577101c127b8d09b04..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/share/MuClusterJobOption.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#----------------------------------------------------
-# MuCluster options
-#----------------------------------------------------
-# Timing service libs.
-theApp.Dlls += [ "TrigTimeAlgs" ]
-theApp.ExtSvc += [ "TrigTimeSvc" ]
-
-# Algorithm
-theApp.Dlls += [ "TrigMuCluster" ]
-
-
-# Timer service conf.
-TrigTimerSvc = Service ( "TrigTimerSvc" )
-TrigTimerSvc.OutputLevel = 3
diff --git a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/share/jobOfragment_TrigMuCluster.py b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/share/jobOfragment_TrigMuCluster.py
deleted file mode 100644
index 54aee5fa63865d49a77458d705c18da8f2f1dba7..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/share/jobOfragment_TrigMuCluster.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#----------------------------------------------------
-# MuCluster options
-#----------------------------------------------------
-# Timing service libs.
-theApp.Dlls += [ "TrigTimeAlgs" ]
-theApp.ExtSvc += [ "TrigTimeSvc" ]
-
-# Algorithm
-theApp.Dlls += [ "TrigiMuCluster" ]
-
-# Timer service conf.
-TrigTimerSvc = Service ( "TrigTimerSvc" )
-TrigTimerSvc.OutputLevel = 3
diff --git a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonCluster.cxx b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonCluster.cxx
index 1c7a2cf2ab782d8e461a42ea9052192a07f57c65..3e605656681724677abbe54c23ce2a8e06dadd65 100644
--- a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonCluster.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonCluster.cxx
@@ -1,16 +1,14 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
MuonCluster.cxx
Muon cluster finding, creates an RoI cluster for track finding
*/
-#include "TMath.h"
#include <cmath>
#include <algorithm>
#include <sstream>
-#include "CLHEP/Units/SystemOfUnits.h"
#include "GaudiKernel/ITHistSvc.h"
#include "PathResolver/PathResolver.h"
#include "TrigInterfaces/FexAlgo.h"
diff --git a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonClusterIsolation.cxx b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonClusterIsolation.cxx
index d8d08fc90254ce5d7bcf78525119d74311a98ab3..f8c9b74554037437eb68096f4683d660cc73bece 100644
--- a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonClusterIsolation.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonClusterIsolation.cxx
@@ -1,15 +1,13 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
MuonClusterIsolation.cxx
*/
-#include "TMath.h"
#include <cmath>
#include <algorithm>
#include <sstream>
-#include "CLHEP/Units/SystemOfUnits.h"
#include "GaudiKernel/ITHistSvc.h"
#include "PathResolver/PathResolver.h"
#include "TrigInterfaces/FexAlgo.h"
@@ -308,7 +306,7 @@ HLT::ErrorCode MuonClusterIsolation::hltExecute(std::vector<std::vector<HLT::Tri
for(; track !=lasttrack; track++ ) {
- float pT = fabs(TMath::Sin((*track)->theta())/(*track)->qOverP());
+ float pT = fabs(std::sin((*track)->theta())/(*track)->qOverP());
if ( pT <= m_PtMinID) continue;
double eta = (*track)->eta();
diff --git a/Trigger/TrigAlgorithms/TrigL2MissingET/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigL2MissingET/CMakeLists.txt
index 91ba6d7c2e0514c69e183fe31dfa503800468235..e274321db3c371fb652c90b633cc5bb74f4e493c 100644
--- a/Trigger/TrigAlgorithms/TrigL2MissingET/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigL2MissingET/CMakeLists.txt
@@ -1,39 +1,16 @@
-################################################################################
-# Package: TrigL2MissingET
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigL2MissingET )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Calorimeter/CaloIdentifier
- DetectorDescription/IRegionSelector
- Event/xAOD/xAODTrigMissingET
- GaudiKernel
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArRecEvent
- LArCalorimeter/LArCabling
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigSteer/TrigInterfaces
- Control/CxxUtils
- Event/xAOD/xAODEventInfo
- Trigger/TrigAlgorithms/TrigT2CaloCommon
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigMissingEtEvent
- Trigger/TrigEvent/TrigNavigation
- Trigger/TrigT1/TrigT1Interfaces )
-
# External dependencies:
-find_package( CLHEP )
find_package( tdaq-common )
# Component(s) in the package:
atlas_add_component( TrigL2MissingET
src/*.cxx src/components/*.cxx
- INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} CaloIdentifier IRegionSelector xAODTrigMissingET GaudiKernel LArIdentifier LArRecEvent LArCablingLib TrigSteeringEvent TrigInterfacesLib CxxUtils xAODEventInfo TrigT2CaloCommonLib TrigCaloEvent TrigMissingEtEvent TrigNavigationLib TrigT1Interfaces )
+ INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} CaloIdentifier CxxUtils GaudiKernel IRegionSelector LArCablingLib LArIdentifier LArRecConditions LArRecEvent StoreGateLib TrigInterfacesLib TrigMissingEtEvent TrigNavigationLib TrigSteeringEvent TrigT1Interfaces TrigT2CaloCommonLib TrigTimeAlgsLib xAODEventInfo xAODTrigMissingET )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigAlgorithms/TrigL2MissingET/python/TrigL2MissingETMonitoring.py b/Trigger/TrigAlgorithms/TrigL2MissingET/python/TrigL2MissingETMonitoring.py
index f68a012d5183427364c27e6b8ee242a7f20d5974..c29f0f65a56e1715ebac8504f7e7d567413f7587 100755
--- a/Trigger/TrigAlgorithms/TrigL2MissingET/python/TrigL2MissingETMonitoring.py
+++ b/Trigger/TrigAlgorithms/TrigL2MissingET/python/TrigL2MissingETMonitoring.py
@@ -1,7 +1,8 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
################# Validation, DQ checks
from TrigMonitorBase.TrigGenericMonitoringToolConfig import defineHistogram, TrigGenericMonitoringToolConfig
+from builtins import range
bitNames = [ "ErrParityL1", # bit 0
"ErrL1mult", # bit 1
@@ -88,7 +89,7 @@ class T2CaloMissingETOnlineMonitoring(TrigGenericMonitoringToolConfig):
label_lbc=''
label_eba=''
label_ebc=''
- for i in xrange(64):
+ for i in range(64):
if i==63 :
label_la = '%(b)s%(n)02d' % {'b':'LBA', 'n':(i+1)}
label_lc = '%(b)s%(n)02d' % {'b':'LBC', 'n':(i+1)}
@@ -121,7 +122,7 @@ class T2CaloMissingETValidationMonitoring(TrigGenericMonitoringToolConfig):
label_lbc=''
label_eba=''
label_ebc=''
- for i in xrange(64):
+ for i in range(64):
if i==63 :
label_la = '%(b)s%(n)02d' % {'b':'LBA', 'n':(i+1)}
label_lc = '%(b)s%(n)02d' % {'b':'LBC', 'n':(i+1)}
diff --git a/Trigger/TrigAlgorithms/TrigL2MissingET/src/T2MissingET.cxx b/Trigger/TrigAlgorithms/TrigL2MissingET/src/T2MissingET.cxx
index a530a7cf1f47b439271e756a411a3ef8cb136607..9257d0daf1225c7daca3ca0741d1dd68eb580335 100755
--- a/Trigger/TrigAlgorithms/TrigL2MissingET/src/T2MissingET.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MissingET/src/T2MissingET.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// ********************************************************************
@@ -15,7 +15,6 @@
// ********************************************************************
#include "T2MissingET.h"
-#include "CLHEP/Units/SystemOfUnits.h"
#include "TrigT1Interfaces/RecEnergyRoI.h"
#include "TrigSteeringEvent/Enums.h"
#include "TrigMissingEtEvent/TrigMissingET.h"
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigMinBias/CMakeLists.txt
index 9d084ae94d29c74d0de61a345fbe229d622d9d88..67c066a1c687a23628c24d8fda10a7a04aec125f 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigMinBias/CMakeLists.txt
@@ -1,32 +1,12 @@
-################################################################################
-# Package: TrigMinBias
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigMinBias )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigMinBias
- Tracking/TrkEvent/TrkTrack
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigSteer/DecisionHandling
- Trigger/TrigSteer/TrigCompositeUtils
- Control/StoreGate
- GaudiKernel
- Tracking/TrkEvent/TrkParameters
- Trigger/TrigTools/TrigTimeAlgs
- Event/xAOD/xAODTrigger
- Control/AthenaMonitoringKernel
- Control/AthViews)
-
# Component(s) in the package:
atlas_add_component( TrigMinBias
src/*.cxx src/components/*.cxx
-
- LINK_LIBRARIES DecisionHandlingLib AthenaMonitoringKernelLib xAODTracking xAODTrigMinBias TrkTrack TrigInDetEvent TrigInterfacesLib StoreGateLib GaudiKernel TrkParameters TrigTimeAlgsLib AthViews TrigCompositeUtilsLib)
+ LINK_LIBRARIES AthViews AthenaBaseComps AthenaMonitoringKernelLib DecisionHandlingLib GaudiKernel TrigCompositeUtilsLib TrigInterfacesLib TrigTimeAlgsLib TrkParameters TrkTrack xAODTracking xAODTrigMinBias xAODTrigger )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py b/Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py
index 01a00dff4244fe4252122ffa616d9805352207e0..eb9c37eb12c52a0bf2e2abab8c6249d6df5f7727 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py
+++ b/Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
##
## @file Trigger/TrigAlgorithms/TrigMinBias/python/TrigMinBiasProperties.py
@@ -19,7 +19,6 @@ __all__ = [ "trigMinBiasProperties" ]
## Import
from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
-from AthenaCommon.JobProperties import jobproperties
##-----------------------------------------------------------------------------
## 1st step: define JobProperty classes
@@ -102,8 +101,8 @@ log = logging.getLogger( 'TrigMinBiasProperties.py' )
try:
from TriggerMenu import useNewTriggerMenu
useNewTM = useNewTriggerMenu()
- log.info("Using new TriggerMenu: %r" % useNewTM)
-except:
+ log.info("Using new TriggerMenu: %r", useNewTM)
+except Exception:
useNewTM = False
log.info("Using old TriggerMenuPython since TriggerMenu.useNewTriggerMenu can't be imported")
diff --git a/Trigger/TrigAlgorithms/TrigMissingETMuon/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigMissingETMuon/CMakeLists.txt
index 46abb9ca2a08efb9cfb55e73043a2f3c4b15ac1e..948fbc3cc95c48ca2a181e89849326d4dd7e345e 100644
--- a/Trigger/TrigAlgorithms/TrigMissingETMuon/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigMissingETMuon/CMakeLists.txt
@@ -1,34 +1,16 @@
-################################################################################
-# Package: TrigMissingETMuon
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigMissingETMuon )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Event/xAOD/xAODTrigMissingET
- Trigger/TrigSteer/TrigInterfaces
- Control/CxxUtils
- Event/EventInfo
- Event/xAOD/xAODMuon
- GaudiKernel
- Trigger/TrigEvent/TrigMissingEtEvent
- Trigger/TrigEvent/TrigMuonEvent
- Trigger/TrigEvent/TrigNavigation
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigT1/TrigT1Interfaces )
-
# External dependencies:
-find_package( CLHEP )
find_package( tdaq-common )
# Component(s) in the package:
atlas_add_component( TrigMissingETMuon
src/*.cxx src/components/*.cxx
- INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${CLHEP_LIBRARIES} xAODTrigMissingET TrigInterfacesLib CxxUtils EventInfo xAODMuon GaudiKernel TrigMissingEtEvent TrigMuonEvent TrigNavigationLib TrigSteeringEvent TrigT1Interfaces )
+ INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} CxxUtils EventInfo GaudiKernel TrigInterfacesLib TrigMissingEtEvent TrigNavigationLib TrigSteeringEvent TrigT1Interfaces xAODMuon xAODTrigMissingET )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigAlgorithms/TrigMissingETMuon/python/TrigMissingETMuonConfig.py b/Trigger/TrigAlgorithms/TrigMissingETMuon/python/TrigMissingETMuonConfig.py
index b88f30a9afbbc70cc78790b7f6e691ce1b76c4f3..4eb55c3e653cddc3f9426ad469d8f997c99b7272 100755
--- a/Trigger/TrigAlgorithms/TrigMissingETMuon/python/TrigMissingETMuonConfig.py
+++ b/Trigger/TrigAlgorithms/TrigMissingETMuon/python/TrigMissingETMuonConfig.py
@@ -1,4 +1,4 @@
-# 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 TrigMissingETMuon.TrigMissingETMuonConf import TrigMissingETMuon
@@ -11,11 +11,6 @@ class L2TrigMissingETMuon_Fex ( TrigMissingETMuon ) :
self.METLabel = "T2MissingET"
#self.MuonPtCut = 5.0
- # monitoring part. To switch off do in topOption TriggerFlags.enableMonitoring = []
- from TrigMissingETMuon.TrigMissingETMuonMonitoring import TrigMissingETMuonOnlineMonitoring, TrigMissingETMuonCosmicMonitoring, TrigMissingETMuonValidationMonitoring
- validation = TrigMissingETMuonValidationMonitoring()
- online = TrigMissingETMuonOnlineMonitoring()
- cosmic = TrigMissingETMuonCosmicMonitoring()
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
@@ -28,11 +23,6 @@ class L2CaloTrigMissingETMuon_Fex ( TrigMissingETMuon ) :
self.METLabel = "L2MissingET_FEB"
#self.MuonPtCut = 5.0
- # monitoring part. To switch off do in topOption TriggerFlags.enableMonitoring = []
- from TrigMissingETMuon.TrigMissingETMuonMonitoring import TrigMissingETMuonOnlineMonitoring, TrigMissingETMuonCosmicMonitoring, TrigMissingETMuonValidationMonitoring
- validation = TrigMissingETMuonValidationMonitoring()
- online = TrigMissingETMuonOnlineMonitoring()
- cosmic = TrigMissingETMuonCosmicMonitoring()
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
@@ -46,11 +36,6 @@ class EFTrigMissingETMuon_Fex ( TrigMissingETMuon ) :
self.METLabel = "TrigEFMissingET"
#self.MuonPtCut = 5.0
- # monitoring part. To switch off do in topOption TriggerFlags.enableMonitoring = []
- from TrigMissingETMuon.TrigMissingETMuonMonitoring import TrigMissingETMuonOnlineMonitoring, TrigMissingETMuonCosmicMonitoring, TrigMissingETMuonValidationMonitoring
- validation = TrigMissingETMuonValidationMonitoring()
- online = TrigMissingETMuonOnlineMonitoring()
- cosmic = TrigMissingETMuonCosmicMonitoring()
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
@@ -63,11 +48,6 @@ class EFTrigMissingETMuon_Fex_FEB ( TrigMissingETMuon ) :
self.METLabel = "TrigEFMissingET_FEB"
#self.MuonPtCut = 5.0
- # monitoring part. To switch off do in topOption TriggerFlags.enableMonitoring = []
- from TrigMissingETMuon.TrigMissingETMuonMonitoring import TrigMissingETMuonOnlineMonitoring, TrigMissingETMuonCosmicMonitoring, TrigMissingETMuonValidationMonitoring
- validation = TrigMissingETMuonValidationMonitoring()
- online = TrigMissingETMuonOnlineMonitoring()
- cosmic = TrigMissingETMuonCosmicMonitoring()
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
@@ -80,11 +60,6 @@ class EFTrigMissingETMuon_Fex_topocl ( TrigMissingETMuon ) :
self.METLabel = "TrigEFMissingET_topocl"
#self.MuonPtCut = 5.0
- # monitoring part. To switch off do in topOption TriggerFlags.enableMonitoring = []
- from TrigMissingETMuon.TrigMissingETMuonMonitoring import TrigMissingETMuonOnlineMonitoring, TrigMissingETMuonCosmicMonitoring, TrigMissingETMuonValidationMonitoring
- validation = TrigMissingETMuonValidationMonitoring()
- online = TrigMissingETMuonOnlineMonitoring()
- cosmic = TrigMissingETMuonCosmicMonitoring()
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
@@ -97,11 +72,6 @@ class EFTrigMissingETMuon_Fex_topoclPS ( TrigMissingETMuon ) :
self.METLabel = "TrigEFMissingET_topocl_PS"
#self.MuonPtCut = 5.0
- # monitoring part. To switch off do in topOption TriggerFlags.enableMonitoring = []
- from TrigMissingETMuon.TrigMissingETMuonMonitoring import TrigMissingETMuonOnlineMonitoring, TrigMissingETMuonCosmicMonitoring, TrigMissingETMuonValidationMonitoring
- validation = TrigMissingETMuonValidationMonitoring()
- online = TrigMissingETMuonOnlineMonitoring()
- cosmic = TrigMissingETMuonCosmicMonitoring()
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
@@ -115,11 +85,6 @@ class EFTrigMissingETMuon_Fex_Jets ( TrigMissingETMuon ) :
self.METLabel = "TrigEFMissingET_Jets"
#self.MuonPtCut = 5.0
- # monitoring part. To switch off do in topOption TriggerFlags.enableMonitoring = []
- from TrigMissingETMuon.TrigMissingETMuonMonitoring import TrigMissingETMuonOnlineMonitoring, TrigMissingETMuonCosmicMonitoring, TrigMissingETMuonValidationMonitoring
- validation = TrigMissingETMuonValidationMonitoring()
- online = TrigMissingETMuonOnlineMonitoring()
- cosmic = TrigMissingETMuonCosmicMonitoring()
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
@@ -132,11 +97,6 @@ class EFTrigMissingETMuon_Fex_topoclPUC ( TrigMissingETMuon ) :
self.METLabel = "TrigEFMissingET_topocl_PUC"
#self.MuonPtCut = 5.0
- # monitoring part. To switch off do in topOption TriggerFlags.enableMonitoring = []
- from TrigMissingETMuon.TrigMissingETMuonMonitoring import TrigMissingETMuonOnlineMonitoring, TrigMissingETMuonCosmicMonitoring, TrigMissingETMuonValidationMonitoring
- validation = TrigMissingETMuonValidationMonitoring()
- online = TrigMissingETMuonOnlineMonitoring()
- cosmic = TrigMissingETMuonCosmicMonitoring()
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
diff --git a/Trigger/TrigAlgorithms/TrigMissingETMuon/src/TrigMissingETMuon.cxx b/Trigger/TrigAlgorithms/TrigMissingETMuon/src/TrigMissingETMuon.cxx
index 944ac677b921740ae71cb7f0146201e3c4ba9a33..145b103191a5bba4e1c919eb1655ef7c2c15c923 100755
--- a/Trigger/TrigAlgorithms/TrigMissingETMuon/src/TrigMissingETMuon.cxx
+++ b/Trigger/TrigAlgorithms/TrigMissingETMuon/src/TrigMissingETMuon.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// ********************************************************************
@@ -22,7 +22,7 @@
#include "xAODMuon/MuonContainer.h"
-#include "CLHEP/Units/SystemOfUnits.h"
+#include "GaudiKernel/SystemOfUnits.h"
#include "TrigT1Interfaces/RecEnergyRoI.h"
#include "TrigSteeringEvent/Enums.h"
#include "TrigMissingEtEvent/TrigMissingET.h"
@@ -215,7 +215,7 @@ HLT::ErrorCode TrigMissingETMuon::hltExecute(std::vector<std::vector<HLT::Trigge
// Minimum pt cut
float Et = fabs(muon->pt());
- if (Et/CLHEP::GeV < m_muonptcut) continue;
+ if (Et/Gaudi::Units::GeV < m_muonptcut) continue;
// Reject muons without IDtracks
const xAOD::TrackParticle* idtrk = muon->trackParticle( xAOD::Muon::TrackParticleType::InnerDetectorTrackParticle );
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/CMakeLists.txt
index 5928d8088d20762f62f203db2a7823ce5062c915..ebdfbd90da319ee0ff12ca206e4874ce4125a524 100644
--- a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/CMakeLists.txt
@@ -1,30 +1,18 @@
-################################################################################
-# Package: TrigPartialEventBuilding
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name
atlas_subdir( TrigPartialEventBuilding )
-# Declare the package's dependencies
-atlas_depends_on_subdirs( PUBLIC
- Trigger/TrigSteer/DecisionHandling
- Trigger/TrigSteer/TrigCompositeUtils
- Trigger/TrigEvent/TrigSteeringEvent
- PRIVATE
- Control/CxxUtils )
-
# Component(s) in the package
atlas_add_library( TrigPartialEventBuildingLib
src/*.cxx
PUBLIC_HEADERS TrigPartialEventBuilding
- LINK_LIBRARIES DecisionHandlingLib TrigSteeringEvent TrigCompositeUtilsLib )
+ PRIVATE_LINK_LIBRARIES CxxUtils IRegionSelector
+ LINK_LIBRARIES AthenaBaseComps DecisionHandlingLib TrigCompositeUtilsLib TrigSteeringEvent )
atlas_add_component( TrigPartialEventBuilding
src/components/*.cxx
LINK_LIBRARIES TrigPartialEventBuildingLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
-# Tests
-#atlas_add_test( )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigAlgorithms/TrigT2BeamSpot/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigT2BeamSpot/CMakeLists.txt
index 4fd6a08a0b935019ba5d4040b03ca63f6b702bb7..082eba673cd8c903f0c65156caa7c149899acdf1 100644
--- a/Trigger/TrigAlgorithms/TrigT2BeamSpot/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigT2BeamSpot/CMakeLists.txt
@@ -1,40 +1,19 @@
-################################################################################
-# Package: TrigT2BeamSpot
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigT2BeamSpot )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigSteer/TrigInterfaces
- PRIVATE
- Control/AthContainers
- Event/EventInfo
- Event/EventPrimitives
- GaudiKernel
- InnerDetector/InDetConditions/BeamSpotConditionsData
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/TrkTrackSummary
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigNavigation
- Trigger/TrigTools/TrigInDetToolInterfaces
- 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( TrigT2BeamSpot
src/*.cxx
src/components/TrigT2*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringKernelLib TrigSteeringEvent TrigInterfacesLib AthContainers EventInfo EventPrimitives GaudiKernel TrkParameters TrkTrack TrkTrackSummary TrigInDetEvent TrigNavigationLib TrigTimeAlgsLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthenaBaseComps AthenaMonitoringKernelLib BeamSpotConditionsData EventPrimitives GaudiKernel StoreGateLib TrigInDetEvent TrigInDetToolInterfacesLib TrigInterfacesLib TrigNavigationLib TrigSteeringEvent TrigTimeAlgsLib TrkParameters TrkTrack TrkTrackSummary xAODEventInfo )
# Install files from the package:
-atlas_install_headers( TrigT2BeamSpot )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
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
-#
-#==============================================================
-
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt
index 340bff10e200dacc29858731146b31815d75bf74..b5617482676d9e88c8b89ba4d8f878505e73575e 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/CMakeLists.txt
@@ -1,38 +1,8 @@
-################################################################################
-# Package: TrigT2MinBias
-###############################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigT2MinBias )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Event/xAOD/xAODTrigMinBias
- ForwardDetectors/ZDC/ZdcEvent
- GaudiKernel
- TileCalorimeter/TileEvent
- Trigger/TrigAlgorithms/TrigT2CaloCommon
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigSteer/DecisionHandling
- Trigger/TrigSteer/TrigCompositeUtils
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigTools/TrigInDetToolInterfaces
- DetectorDescription/IRegionSelector
- Event/xAOD/xAODEventInfo
- ForwardDetectors/ZDC/ZdcConditions
- ForwardDetectors/ZDC/ZdcIdentifier
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetRawEvent/InDetRawData
- InnerDetector/InDetRecEvent/InDetPrepRawData
- TileCalorimeter/TileIdentifier
- Tracking/TrkEvent/TrkSpacePoint
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigTools/TrigTimeAlgs
- Event/xAOD/xAODTrigger
- Control/AthenaMonitoringKernel
- Control/AthViews )
-
# External dependencies:
find_package( tdaq-common )
@@ -40,9 +10,7 @@ find_package( tdaq-common )
atlas_add_component( TrigT2MinBias
src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
-
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} DecisionHandlingLib xAODTrigger xAODTrigMinBias ZdcEvent GaudiKernel TileEvent TrigT2CaloCommonLib TrigCaloEvent TrigInDetEvent TrigInterfacesLib IRegionSelector xAODEventInfo ZdcConditions ZdcIdentifier InDetIdentifier InDetRawData InDetPrepRawData TileIdentifier TrkSpacePoint TrigSteeringEvent TrigTimeAlgsLib AthViews TrigCompositeUtilsLib)
-
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthViews AthenaBaseComps AthenaMonitoringKernelLib CaloEvent CaloIdentifier DecisionHandlingLib GaudiKernel IRegionSelector InDetIdentifier InDetPrepRawData InDetRawData StoreGateLib TileByteStreamLib TileConditionsLib TileEvent TileIdentifier TrigCaloEvent TrigCompositeUtilsLib TrigInDetEvent TrigInDetToolInterfacesLib TrigInterfacesLib TrigSteeringEvent TrigT2CaloCommonLib TrigTimeAlgsLib TrkSpacePoint ZdcConditions ZdcEvent ZdcIdentifier xAODEventInfo xAODTrigMinBias xAODTrigger )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/MbtsConfig.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/MbtsConfig.py
index a6c2270a7c486b4979344f027c4013af23be24d4..efd8baa3af5ed6ce80c0e5590dab1757b4d170cb 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/MbtsConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/MbtsConfig.py
@@ -1,3 +1,4 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from TrigT2MinBias.TrigT2MinBiasConf import MbtsFexMT
from TrigT2MinBias.TrigT2MinBiasMonitoringMT import MbtsFexMTMonitoring
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
index 922b5d7cae532351f3323d8b8ac1adec280e5b4f..f72969c45a86fb1bd02add9fa56b466876be15a0 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# -*- coding: utf-8 -*-
from TrigT2MinBias.TrigT2MinBiasConf import T2ZdcFex, T2ZdcHypo
from TrigT2MinBias.TrigT2MinBiasConf import T2MbtsFex, T2MbtsHypo
from TrigT2MinBias.TrigT2MinBiasConf import TrigCountSpacePoints, TrigCountSpacePointsHypo
-from TrigT2MinBias.TrigT2MinBiasConf import TrigCountTrtHits, TrigCountTrtHitsHypo
# Monitoring
from TrigMonitorBase.TrigGenericMonitoringToolConfig import defineHistogram, TrigGenericMonitoringToolConfig
@@ -13,10 +12,6 @@ from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
# Properties for histogram dimensions
from TrigT2MinBias.TrigT2MinBiasProperties import trigT2MinBiasProperties
-from AthenaCommon.AppMgr import ToolSvc
-
-#ToolSvc += ospTool
-
fexes = {}
hypos = {}
@@ -1318,82 +1313,82 @@ fexes["L2MbZdcFex_LG"] = L2MbZdcFex_LG
class ZdcHypoMonitoring(TrigGenericMonitoringToolConfig):
- def __init__ (self, name="ZdcHypoMonitoring"):
- super(ZdcHypoMonitoring, self).__init__(name)
- self.defineTarget( ["Online", "Validation", "Cosmic"])
-
-
- self.Histograms += [ defineHistogram('MultiplicityZDC_A',
- type = 'TH1I',
- title = "Num ZDC Modules Side A",
- xbins = 5, xmin=-0.5, xmax=5.5)]
-
- self.Histograms += [ defineHistogram('MultiplicityZDC_C',
- type = 'TH1I',
- title = "Num ZDC Modules Side C",
- xbins = 5, xmin=-0.5, xmax=5.5)]
-
- self.Histograms += [ defineHistogram('TimeZDC_A',
- type = 'TH1F',
- title = "ZDC Mean Time Side A",
- xbins = 100, xmin=-10, xmax=10)]
-
- self.Histograms += [ defineHistogram('TimeZDC_C',
- type = 'TH1F',
- title = "ZDC Mean Time Side C",
- xbins = 100, xmin=-10, xmax=10)]
-
- self.Histograms += [ defineHistogram('SumEnergyZDC_A',
- type = 'TH1F',
- title = "ZDC Sum Energy Side A",
- xbins = 500, xmin=0, xmax=5000)]
-
- self.Histograms += [ defineHistogram('SumEnergyZDC_C',
- type = 'TH1F',
- title = "ZDC Sum Energy Side C",
- xbins = 500, xmin=0, xmax=5000)]
-
- self.Histograms += [ defineHistogram('TimeDiff_A_C',
- type = 'TH1F',
- title = "ZDC Time Diff (A-C)",
- xbins = 100, xmin=-10, xmax=10)]
+ def __init__ (self, name="ZdcHypoMonitoring"):
+ super(ZdcHypoMonitoring, self).__init__(name)
+ self.defineTarget( ["Online", "Validation", "Cosmic"])
+
+
+ self.Histograms += [ defineHistogram('MultiplicityZDC_A',
+ type = 'TH1I',
+ title = "Num ZDC Modules Side A",
+ xbins = 5, xmin=-0.5, xmax=5.5)]
+
+ self.Histograms += [ defineHistogram('MultiplicityZDC_C',
+ type = 'TH1I',
+ title = "Num ZDC Modules Side C",
+ xbins = 5, xmin=-0.5, xmax=5.5)]
+
+ self.Histograms += [ defineHistogram('TimeZDC_A',
+ type = 'TH1F',
+ title = "ZDC Mean Time Side A",
+ xbins = 100, xmin=-10, xmax=10)]
+
+ self.Histograms += [ defineHistogram('TimeZDC_C',
+ type = 'TH1F',
+ title = "ZDC Mean Time Side C",
+ xbins = 100, xmin=-10, xmax=10)]
+
+ self.Histograms += [ defineHistogram('SumEnergyZDC_A',
+ type = 'TH1F',
+ title = "ZDC Sum Energy Side A",
+ xbins = 500, xmin=0, xmax=5000)]
+
+ self.Histograms += [ defineHistogram('SumEnergyZDC_C',
+ type = 'TH1F',
+ title = "ZDC Sum Energy Side C",
+ xbins = 500, xmin=0, xmax=5000)]
+
+ self.Histograms += [ defineHistogram('TimeDiff_A_C',
+ type = 'TH1F',
+ title = "ZDC Time Diff (A-C)",
+ xbins = 100, xmin=-10, xmax=10)]
# after selection
- self.Histograms += [ defineHistogram('SelMultiplicityZDC_A',
- type = 'TH1I',
- title = "Num ZDC Modules Side A (After)",
- xbins = 5, xmin=-0.5, xmax=5.5)]
+ self.Histograms += [ defineHistogram('SelMultiplicityZDC_A',
+ type = 'TH1I',
+ title = "Num ZDC Modules Side A (After)",
+ xbins = 5, xmin=-0.5, xmax=5.5)]
- self.Histograms += [ defineHistogram('SelMultiplicityZDC_C',
- type = 'TH1I',
- title = "Num ZDC Modules Side C (After)",
- xbins = 5, xmin=-0.5, xmax=5.5)]
+ self.Histograms += [ defineHistogram('SelMultiplicityZDC_C',
+ type = 'TH1I',
+ title = "Num ZDC Modules Side C (After)",
+ xbins = 5, xmin=-0.5, xmax=5.5)]
- self.Histograms += [ defineHistogram('SelTimeZDC_A',
- type = 'TH1F',
- title = "ZDC Mean Time Side A (After)",
- xbins = 100, xmin=-10, xmax=10)]
+ self.Histograms += [ defineHistogram('SelTimeZDC_A',
+ type = 'TH1F',
+ title = "ZDC Mean Time Side A (After)",
+ xbins = 100, xmin=-10, xmax=10)]
- self.Histograms += [ defineHistogram('SelTimeZDC_C',
- type = 'TH1F',
- title = "ZDC Mean Time Side C (After)",
- xbins = 100, xmin=-10, xmax=10)]
+ self.Histograms += [ defineHistogram('SelTimeZDC_C',
+ type = 'TH1F',
+ title = "ZDC Mean Time Side C (After)",
+ xbins = 100, xmin=-10, xmax=10)]
- self.Histograms += [ defineHistogram('SelSumEnergyZDC_A',
- type = 'TH1F',
- title = "ZDC Sum Energy Side A (After)",
- xbins = 500, xmin=0, xmax=5000)]
+ self.Histograms += [ defineHistogram('SelSumEnergyZDC_A',
+ type = 'TH1F',
+ title = "ZDC Sum Energy Side A (After)",
+ xbins = 500, xmin=0, xmax=5000)]
- self.Histograms += [ defineHistogram('SelSumEnergyZDC_C',
- type = 'TH1F',
- title = "ZDC Sum Energy Side C (After)",
- xbins = 500, xmin=0, xmax=5000)]
+ self.Histograms += [ defineHistogram('SelSumEnergyZDC_C',
+ type = 'TH1F',
+ title = "ZDC Sum Energy Side C (After)",
+ xbins = 500, xmin=0, xmax=5000)]
- self.Histograms += [ defineHistogram('SelTimeDiff_A_C',
- type = 'TH1F',
- title = "ZDC Time Diff (A-C) (After)",
- xbins = 100, xmin=-10, xmax=10)]
+ self.Histograms += [ defineHistogram('SelTimeDiff_A_C',
+ type = 'TH1F',
+ title = "ZDC Time Diff (A-C) (After)",
+ xbins = 100, xmin=-10, xmax=10)]
@@ -1413,11 +1408,11 @@ L2MbZdcHypo_PT.TimeLogic = 0
L2MbZdcHypo_PT.EnergyLogic = 1
L2MbZdcHypo_PT.MultiplicityLogic = 0
L2MbZdcHypo_PT.TimeOffset = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_PT.Pedestal = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_PT.EnergyCalibration = [1., 1., 1., 1.,
- 1., 1., 1., 1.]
+ 1., 1., 1., 1.]
L2MbZdcHypo_PT.TimeModuleCut = 99999.
L2MbZdcHypo_PT.SumEnergyCut = [-1., 99999., -1., 99999.]
L2MbZdcHypo_PT.MultCut = [ -1 , -1 ]
@@ -1431,11 +1426,11 @@ L2MbZdcHypo_hip_low_sideA.TimeLogic = 0
L2MbZdcHypo_hip_low_sideA.EnergyLogic = 2 ## OR
L2MbZdcHypo_hip_low_sideA.MultiplicityLogic = 0
L2MbZdcHypo_hip_low_sideA.TimeOffset = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_low_sideA.Pedestal = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_low_sideA.EnergyCalibration = [1., 1., 1., 1.,
- 1., 1., 1., 1.]
+ 1., 1., 1., 1.]
L2MbZdcHypo_hip_low_sideA.TimeModuleCut = 99999.
L2MbZdcHypo_hip_low_sideA.SumEnergyCut = [180., 99999., 99999., -1] # 1<A<2 || 3<C<4
L2MbZdcHypo_hip_low_sideA.MultCut = [ -1 , -1 ]
@@ -1450,11 +1445,11 @@ L2MbZdcHypo_hip_low_sideC.TimeLogic = 0
L2MbZdcHypo_hip_low_sideC.EnergyLogic = 2 ## OR
L2MbZdcHypo_hip_low_sideC.MultiplicityLogic = 0
L2MbZdcHypo_hip_low_sideC.TimeOffset = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_low_sideC.Pedestal = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_low_sideC.EnergyCalibration = [1., 1., 1., 1.,
- 1., 1., 1., 1.]
+ 1., 1., 1., 1.]
L2MbZdcHypo_hip_low_sideC.TimeModuleCut = 99999.
L2MbZdcHypo_hip_low_sideC.SumEnergyCut = [99999.,-1., 180., 99999.] # 1<A<2 || 3<C<4
L2MbZdcHypo_hip_low_sideC.MultCut = [ -1 , -1 ]
@@ -1469,11 +1464,11 @@ L2MbZdcHypo_hip_hi_sideA.TimeLogic = 0
L2MbZdcHypo_hip_hi_sideA.EnergyLogic = 2 ## OR
L2MbZdcHypo_hip_hi_sideA.MultiplicityLogic = 0
L2MbZdcHypo_hip_hi_sideA.TimeOffset = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_hi_sideA.Pedestal = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_hi_sideA.EnergyCalibration = [1., 1., 1., 1.,
- 1., 1., 1., 1.]
+ 1., 1., 1., 1.]
L2MbZdcHypo_hip_hi_sideA.TimeModuleCut = 99999.
L2MbZdcHypo_hip_hi_sideA.SumEnergyCut = [300., 99999., 99999., -1.] # 1<A<2 || 3<C<4
L2MbZdcHypo_hip_hi_sideA.MultCut = [ -1 , -1 ]
@@ -1488,11 +1483,11 @@ L2MbZdcHypo_hip_hi_sideC.TimeLogic = 0
L2MbZdcHypo_hip_hi_sideC.EnergyLogic = 2 ## OR
L2MbZdcHypo_hip_hi_sideC.MultiplicityLogic = 0
L2MbZdcHypo_hip_hi_sideC.TimeOffset = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_hi_sideC.Pedestal = [0., 0., 0., 0.,
- 0., 0., 0., 0.]
+ 0., 0., 0., 0.]
L2MbZdcHypo_hip_hi_sideC.EnergyCalibration = [1., 1., 1., 1.,
- 1., 1., 1., 1.]
+ 1., 1., 1., 1.]
L2MbZdcHypo_hip_hi_sideC.TimeModuleCut = 99999.
L2MbZdcHypo_hip_hi_sideC.SumEnergyCut = [99999.,-1., 300., 99999.] # 1<A<2 || 3<C<4
L2MbZdcHypo_hip_hi_sideC.MultCut = [ -1 , -1 ]
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py
index 3da6332aeadad56300da18f9aa33f9f78803e344..e91b8a45cf1025789b76a4e4cd7e791e5d56da84 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py
@@ -1,3 +1,4 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
def SpCountMonitoring():
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py
index 706bb1496181b278ff04233ea9fc3ef659cdd6c9..35d055629aa7786b4af1fcfd5a2ef4ba95e51a5e 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
##
## @file Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasProperties.py
@@ -19,7 +19,6 @@ __all__ = [ "trigT2MinBiasProperties" ]
## Import
from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
-from AthenaCommon.JobProperties import jobproperties
##-----------------------------------------------------------------------------
## 1st step: define JobProperty classes
@@ -114,8 +113,8 @@ log = logging.getLogger( 'TrigT2MinBiasProperties.py' )
try:
from TriggerMenu import useNewTriggerMenu
useNewTM = useNewTriggerMenu()
- log.info("Using new TriggerMenu: %r" % useNewTM)
-except:
+ log.info("Using new TriggerMenu: %r", useNewTM)
+except Exception:
useNewTM = False
log.info("Using old TriggerMenuPython since TriggerMenu.useNewTriggerMenu can't be imported")
diff --git a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/CMakeLists.txt
index 9866464579148544440d293bde2d2f95d5795c7a..d6d65c95ff1c8f547b38ff2eaea31d05031354ac 100644
--- a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/CMakeLists.txt
@@ -1,34 +1,10 @@
-################################################################################
-# Package: TrigTRTHighTHitCounter
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigTRTHighTHitCounter )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- DetectorDescription/GeoPrimitives
- DetectorDescription/Identifier
- Event/xAOD/xAODTrigRinger
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetRecEvent/InDetPrepRawData
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigTools/TrigInDetToolInterfaces )
-
-# External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-include_directories(src)
-
# Component(s) in the package:
atlas_add_component( TrigTRTHighTHitCounter
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} GaudiKernel GeoPrimitives Identifier xAODTrigRinger InDetIdentifier InDetPrepRawData TrigCaloEvent TrigSteeringEvent TrigInterfacesLib EventContainers)
-
+ LINK_LIBRARIES CxxUtils GaudiKernel GeoPrimitives Identifier InDetIdentifier InDetPrepRawData TrigCaloEvent TrigInterfacesLib TrigSteeringEvent xAODTrigRinger )
diff --git a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHCounter.cxx b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHCounter.cxx
index 319e4a8aebd5201e525d8763301479ce5113b24b..59ab633ca4264d72ae4f9a4d170345f61c45104e 100644
--- a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHCounter.cxx
+++ b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHCounter.cxx
@@ -1,31 +1,22 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigTRTHTHCounter.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
+#include "CxxUtils/phihelper.h"
#include "InDetIdentifier/TRT_ID.h"
#include "Identifier/IdentifierHash.h"
#include "InDetPrepRawData/TRT_DriftCircleContainer.h"
#include "TrigCaloEvent/TrigEMCluster.h"
#include "xAODTrigRinger/TrigRNNOutput.h"
-#include "TMath.h"
#include "GeoPrimitives/GeoPrimitives.h"
#include<cmath>
#include<fstream>
-const double PI = TMath::Pi();
-const double TWOPI = 2.0*PI;
-
-//Function to return deltaPhi between -PI and PI
-double hth_delta_phi(const float& phi1, const float& phi2){
- float PHI=fabs(phi1-phi2);
- return (PHI<=PI)? PHI : TWOPI-PHI;
-}
-
//Function to calculate distance for road algorithm
float dist2COR(float R, float phi1, float phi2){
float PHI=fabs(phi1-phi2);
@@ -138,7 +129,7 @@ HLT::ErrorCode TrigTRTHTHCounter::hltExecute(const HLT::TriggerElement* inputTE,
//Sanity check of the ROI size
double deltaEta=fabs(roi->etaPlus()-roi->etaMinus());
- double deltaPhi=hth_delta_phi(roi->phiPlus(),roi->phiMinus());
+ double deltaPhi=CxxUtils::deltaPhi(roi->phiPlus(),roi->phiMinus());
float phiTolerance = 0.001;
float etaTolerance = 0.001;
@@ -200,12 +191,12 @@ HLT::ErrorCode TrigTRTHTHCounter::hltExecute(const HLT::TriggerElement* inputTE,
//First, define coarse wedges in phi, and count the TRT hits in these wedges
int countbin=0;
- if(hth_delta_phi(hphi, roi->phi()) < 0.1){
+ if(CxxUtils::deltaPhi(hphi, static_cast<float>(roi->phi())) < 0.1){
float startValue = roi->phi() - m_phiHalfWidth + coarseWedgeHalfWidth;
float endValue = roi->phi() + m_phiHalfWidth;
float increment = 2*coarseWedgeHalfWidth;
for(float roibincenter = startValue; roibincenter < endValue; roibincenter += increment){
- if (hth_delta_phi(hphi,roibincenter)<=coarseWedgeHalfWidth) {
+ if (CxxUtils::deltaPhi(hphi,roibincenter)<=coarseWedgeHalfWidth) {
if(hth) count_httrt_c.at(countbin) += 1.;
count_tottrt_c.at(countbin) += 1.;
break; //the hit has been assigned to one of the coarse wedges, so no need to continue the for loop
@@ -245,12 +236,12 @@ HLT::ErrorCode TrigTRTHTHCounter::hltExecute(const HLT::TriggerElement* inputTE,
//Now, define fine wedges in phi, centered around the best coarse wedge, and count the TRT hits in these fine wedges
for(size_t v=0;v<hit.size();v++){
int countbin=0;
- if(hth_delta_phi(hit[v].phi, center_pos_phi) < 0.01){
+ if(CxxUtils::deltaPhi(hit[v].phi, center_pos_phi) < 0.01){
float startValue = center_pos_phi - 3*coarseWedgeHalfWidth + fineWedgeHalfWidth;
float endValue = center_pos_phi + 3*coarseWedgeHalfWidth;
float increment = 2*fineWedgeHalfWidth;
for(float roibincenter = startValue; roibincenter < endValue; roibincenter += increment){
- if (hth_delta_phi(hit[v].phi,roibincenter)<=fineWedgeHalfWidth) {
+ if (CxxUtils::deltaPhi(hit[v].phi,roibincenter)<=fineWedgeHalfWidth) {
if(hit[v].isHT) count_httrt.at(countbin) += 1.;
count_tottrt.at(countbin) += 1.;
break; //the hit has been assigned to one of the fine wedges, so no need to continue the for loop
diff --git a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/components/TrigTRTHighTHitCounter_entries.cxx b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/components/TrigTRTHighTHitCounter_entries.cxx
index 78295f132f6baadb1f2a4d22709dbe7080179898..4a169e81de3718ce9c08ff61a00edc96af88478d 100644
--- a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/components/TrigTRTHighTHitCounter_entries.cxx
+++ b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/components/TrigTRTHighTHitCounter_entries.cxx
@@ -1,6 +1,5 @@
-#include "TrigTRTHTHCounter.h"
-#include "TrigTRTHTHhypo.h"
-
+#include "../TrigTRTHTHCounter.h"
+#include "../TrigTRTHTHhypo.h"
DECLARE_COMPONENT( TrigTRTHTHCounter )
DECLARE_COMPONENT( TrigTRTHTHhypo )
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigTauRec/CMakeLists.txt
index 342c04c011f9bf0692791b6afddb255fab677791..7e7c4c1cf1457ac5c207265681bd54ec317a424a 100644
--- a/Trigger/TrigAlgorithms/TrigTauRec/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigTauRec/CMakeLists.txt
@@ -1,41 +1,12 @@
-################################################################################
-# Package: TrigTauRec
-################################################################################
+#Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigTauRec )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- GaudiKernel
- InnerDetector/InDetConditions/BeamSpotConditionsData
- LumiBlock/LumiBlockComps
- Reconstruction/tauRecTools
- Trigger/TrigEvent/TrigParticle
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigTools/TrigTimeAlgs
- Calorimeter/CaloEvent
- Event/EventKernel
- Event/NavFourMom
- Event/xAOD/xAODJet
- Event/xAOD/xAODTau
- Event/xAOD/xAODTracking
- Reconstruction/Particle
- Tracking/TrkEvent/VxVertex
- Trigger/TrigT1/TrigT1Interfaces
- Control/AthAnalysisBaseComps)
-
# Component(s) in the package:
atlas_add_component( TrigTauRec
src/*.cxx src/components/*.cxx
- LINK_LIBRARIES GaudiKernel LumiBlockCompsLib tauRecToolsLib TrigParticle TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib CaloEvent EventKernel NavFourMom xAODJet xAODTau xAODTracking Particle VxVertex TrigT1Interfaces AthAnalysisBaseCompsLib)
+ LINK_LIBRARIES AthAnalysisBaseCompsLib AthenaBaseComps AthenaMonitoringKernelLib BeamSpotConditionsData CaloEvent EventKernel GaudiKernel LumiBlockCompsLib NavFourMom Particle StoreGateLib TrigInterfacesLib TrigParticle TrigSteeringEvent TrigT1Interfaces TrigTimeAlgsLib VxVertex tauRecToolsLib xAODJet xAODTau xAODTracking )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
-
-# Check python syntax:
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --enable-extension=ATL900,ATL901 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py
index 5e167771c31cfa0c676fb6adb67e5a0eb9fc6143..8585bf1ba90a0f8c786acf15594fd8e0b25103f3 100644
--- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py
+++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
""" TrigTauRec """
@@ -47,17 +47,16 @@ class TrigTauRecMerged_Tau (TrigTauRecMerged) :
tools.append(taualgs.getTauCommonCalcVars())
tools.append(taualgs.getTauSubstructure())
#tools.append(taualgs.getEnergyCalibrationLC(correctEnergy=False, correctAxis=True, postfix='_onlyAxis'))
-
for tool in tools:
tool.inTrigger = True
tool.calibFolder = 'TrigTauRec/00-11-02/'
-
+
self.Tools = tools
## add beam type flag
from AthenaCommon.BeamFlags import jobproperties
self.BeamType = jobproperties.Beam.beamType()
-
+
class TrigTauRecMerged_Tau2012 (TrigTauRecMerged) :
__slots__ = [ '_mytools']
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/share/TriggerConfig_TrigTauRec.py b/Trigger/TrigAlgorithms/TrigTauRec/share/TriggerConfig_TrigTauRec.py
deleted file mode 100755
index 07f42c1b38a1aceebff0949f8bf1e9955cea33b5..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigTauRec/share/TriggerConfig_TrigTauRec.py
+++ /dev/null
@@ -1,35 +0,0 @@
-include.block("TrigTauRec/TriggerConfig_TrigTauRec.py")
-#
-# Configure a suitable TrigTauRec 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 string to be entered in the sequence file. This string
-# defines the class and instance name
-#
-
-
-class TriggerConfig_TrigTauRec:
- def __init__(self, type = None, threshold = None, isIsolated = None):
-
- # currently only one option defined
-
- self.__instname__ = "TrigTauRec_h5_EF"
- self.__sequence__ = "TrigTauRec/TrigTauRec/h5"
-
- def instanceName(self):
- return self.__instname__
-
- def classAndInstanceName(self):
- return [ self.__sequence__ ]
-
-if TriggerFlags.TauSlice.doEFID() and TriggerFlags.TauSlice.doEFCalo():
- include("TrigTauRec/jobOfragment_TrigTauRec.py")
-elif TriggerFlags.TauSlice.doEFCalo():
- include("TrigTauRec/jobOfragment_TrigTauRec_noID.py")
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/share/jobOfragment_TrigTauRec.py b/Trigger/TrigAlgorithms/TrigTauRec/share/jobOfragment_TrigTauRec.py
deleted file mode 100755
index c07fadcd88b5c600fbaba205da00936f5c8b4d83..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigTauRec/share/jobOfragment_TrigTauRec.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# jobOptions file for tau Reconstruction
-
-theApp.Dlls += [ "tauRec", "TrigTauRec" ]
-theApp.Dlls += [ "CaloUtils"]
-
-
-#--------------------------------------------------------------
-# Algorithms Private Options
-#--------------------------------------------------------------
-#tower Maker sub-algorithms:
-TrigTauRec_h5_EF = Algorithm( "TrigTauRec_h5_EF" )
-
-TrigTauRec_h5_EF.toolNames = [
- "tauSeedBuilder/TrigTauSeeds",
- "tauTrack/TrigTauTracks",
- "tauCellBuilder/TrigTauCells",
- "tauCalibrateWeightTool/TrigTauCalibrate",
- ]
-
-
-
-# For data with noise, threshold on cells
-TrigTauRec_h5_EF.TrigTauSeeds.seedContainerName = "RoIEMCalo"
-TrigTauRec_h5_EF.TrigTauSeeds.UseCaloNoiseTool = FALSE
-TrigTauRec_h5_EF.TrigTauSeeds.UsePileUpNoise = FALSE
-TrigTauRec_h5_EF.TrigTauSeeds.useCaloCellList = 1
-
-# which tracks to use
-TrigTauRec_h5_EF.TrigTauTracks.TrackContainer = "TrigTauTrackCandidate"
-TrigTauRec_h5_EF.TrigTauTracks.VxPrimaryCandidate = "TrigTauVtxPrimaryCandidate"
-TrigTauRec_h5_EF.TrigTauTracks.TrackPTmin = 2000.0
-TrigTauRec_h5_EF.TrigTauTracks.TrackDist = 0.3
-
-# parameters required by tauCellBuilder tool:
-TrigTauRec_h5_EF.TrigTauCells.CellEthreshold = 200.0
-TrigTauRec_h5_EF.TrigTauCells.StripEthreshold = 200.0
-TrigTauRec_h5_EF.TrigTauCells.EMSumThreshold = 500.0
-TrigTauRec_h5_EF.TrigTauCells.EMSumRadius = 0.2
-
-#
-# select G4-jet weights
-TrigTauRec_h5_EF.TrigTauCalibrate.CellWeightTool="H1WeightToolCSC12"
-TrigTauRec_h5_EF.TrigTauCalibrate.pTNumberOfBins = 3
-TrigTauRec_h5_EF.TrigTauCalibrate.etaNumberOfBins = 3
-TrigTauRec_h5_EF.TrigTauCalibrate.pTPoints = [ 15000, 35000, 150000 ]
-TrigTauRec_h5_EF.TrigTauCalibrate.etaPoints = [ 0.25, 1.0, 2.0 ]
-TrigTauRec_h5_EF.TrigTauCalibrate.pTetaCorrectionsNtr1= [
- ## made with histo pT(tauMC)/pT(tauRec) vs pT vs eta, llh>2, ntr==1
- ##eta=0.0..0.5 0.5..1.5 1.5..2.5
- 0.8339, 0.8125, 0.8254, ## pt=-5 .. 30
- 0.8747, 0.8583, 0.8594, ## pt=30 .. 40
- 0.9088, 0.9013, 0.8922 ## pt=40 .. 1000
- ]
-TrigTauRec_h5_EF.TrigTauCalibrate.pTetaCorrectionsNtr23= [
- ## made with histo pT(tauMC)/pT(tauRec) vs pT vs eta, llh>2, ntr==2||3
- ##eta=0.0..0.5 0.5..1.5 1.5..2.5
- 0.9000, 0.8593, 0.9034, ## pt=-5 .. 30
- 0.9208, 0.8791, 0.9132, ## pt=30 .. 40
- 0.9359, 0.9231, 0.9033 ## pt=40 .. 1000
- ]
-TrigTauRec_h5_EF.TrigTauCalibrate.FudgeFactor = 1.011
-
-# Cut values in TrigTauCuts to select tau's
-#TrigTauRec_h5_EF.TrigTauCuts.NumTrackMin = 1 # Min. number tracks
-#TrigTauRec_h5_EF.TrigTauCuts.NumTrackMax = 3 # Max. number tracks
-#TrigTauRec_h5_EF.TrigTauCuts.EMRadiusMax = 0.15 # Max. EM radius
-#TrigTauRec_h5_EF.TrigTauCuts.IsolationFracMax = 0.3 # Max. isolation fraction
-#TrigTauRec_h5_EF.TrigTauCuts.EMFractionMin = 0.6 # Min. fraction of Et in the EM layers
-#TrigTauRec_h5_EF.TrigTauCuts.PtMaxTrackMin = 10000.0 # Min. Pt of the hardest track
-
-
-TrigTauRec_h5_EF.TrigTauTracks.tauRecTTCExtrapolator.Extrapolator='Trk::Extrapolator/InDetExtrapolator'
-TrigTauRec_h5_EF.TrigTauTracks.tauRecTTCExtrapolator.CaloDepthTool.DepthChoice = "entrance"
-
-from TrkVertexBilloirTools.TrkVertexBilloirToolsConf import Trk__FastVertexFitter
-TauRecFitterTool = Trk__FastVertexFitter(
- Extrapolator = "Trk::Extrapolator/InDetExtrapolator"
- )
-
-ToolSvc += TauRecFitterTool
-print TauRecFitterTool
-
-
-
-
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/share/jobOfragment_TrigTauRec_noID.py b/Trigger/TrigAlgorithms/TrigTauRec/share/jobOfragment_TrigTauRec_noID.py
deleted file mode 100755
index 8faa9bf41163acc18b2cd4ebe0e8e7386f453c53..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigTauRec/share/jobOfragment_TrigTauRec_noID.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# jobOptions file for tau Reconstruction
-
-theApp.Dlls += [ "tauRec", "TrigTauRec" ]
-theApp.Dlls += [ "CaloUtils"]
-
-
-#--------------------------------------------------------------
-# Algorithms Private Options
-#--------------------------------------------------------------
-#tower Maker sub-algorithms:
-TrigTauRec_h5_EF = Algorithm( "TrigTauRec_h5_EF" )
-
-TrigTauRec_h5_EF.toolNames = [
- "tauSeedBuilder/TrigTauSeeds",
- "tauCellBuilder/TrigTauCells",
- "tauCalibrateWeightTool/TrigTauCalibrate",
- ]
-TrigTauRec_h5_EF.toolContainers = [
- "TrigTauRec_h5_EF.TrigTauSeeds seedContainerName",
- ]
-
-
-# For data with noise, threshold on cells
-TrigTauRec_h5_EF.TrigTauSeeds.seedContainerName = "RoIEMCalo"
-TrigTauRec_h5_EF.TrigTauSeeds.UseCaloNoiseTool = FALSE
-TrigTauRec_h5_EF.TrigTauSeeds.UsePileUpNoise = FALSE
-TrigTauRec_h5_EF.TrigTauSeeds.useCaloCellList = 1
-
-# parameters required by tauCellBuilder tool:
-TrigTauRec_h5_EF.TrigTauCells.CellEthreshold = 200.0
-TrigTauRec_h5_EF.TrigTauCells.StripEthreshold = 200.0
-TrigTauRec_h5_EF.TrigTauCells.EMSumThreshold = 500.0
-TrigTauRec_h5_EF.TrigTauCells.EMSumRadius = 0.2
-
-# select G4-jet weights
-TrigTauRec_h5_EF.TrigTauCalibrate.CellWeightTool="H1WeightToolCSC12"
-TrigTauRec_h5_EF.TrigTauCalibrate.pTNumberOfBins = 3
-TrigTauRec_h5_EF.TrigTauCalibrate.etaNumberOfBins = 3
-TrigTauRec_h5_EF.TrigTauCalibrate.pTPoints = [ 15000, 35000, 150000 ]
-TrigTauRec_h5_EF.TrigTauCalibrate.etaPoints = [ 0.25, 1.0, 2.0 ]
-TrigTauRec_h5_EF.TrigTauCalibrate.pTetaCorrectionsNtr1= [
- ## made with histo pT(tauMC)/pT(tauRec) vs pT vs eta, llh>2, ntr==1
- ##eta=0.0..0.5 0.5..1.5 1.5..2.5
- 0.8339, 0.8125, 0.8254, ## pt=-5 .. 30
- 0.8747, 0.8583, 0.8594, ## pt=30 .. 40
- 0.9088, 0.9013, 0.8922 ## pt=40 .. 1000
- ]
-TrigTauRec_h5_EF.TrigTauCalibrate.pTetaCorrectionsNtr23= [
- ## made with histo pT(tauMC)/pT(tauRec) vs pT vs eta, llh>2, ntr==2||3
- ##eta=0.0..0.5 0.5..1.5 1.5..2.5
- 0.9000, 0.8593, 0.9034, ## pt=-5 .. 30
- 0.9208, 0.8791, 0.9132, ## pt=30 .. 40
- 0.9359, 0.9231, 0.9033 ## pt=40 .. 1000
- ]
-TrigTauRec_h5_EF.TrigTauCalibrate.FudgeFactor = 1.011
-
-
-
-
-
diff --git a/Trigger/TrigAlgorithms/TrigTileMuId/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigTileMuId/CMakeLists.txt
index 3ee6fd14a239cef488ddd6819926de6443067224..b890b0e4eed24b52805335a305bf558093f4df83 100644
--- a/Trigger/TrigAlgorithms/TrigTileMuId/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigTileMuId/CMakeLists.txt
@@ -1,38 +1,12 @@
-################################################################################
-# Package: TrigTileMuId
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigTileMuId )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- GaudiKernel
- MagneticField/MagFieldInterfaces
- TileCalorimeter/TileEvent
- TileCalorimeter/TileSvc/TileByteStream
- Trigger/TrigAlgorithms/TrigT2CaloCommon
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigMuonEvent
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigTools/TrigTimeAlgs
- Calorimeter/CaloIdentifier
- Control/AthenaKernel
- Control/AthenaMonitoring
- Control/CxxUtils
- DetectorDescription/RegionSelector
- Event/ByteStreamCnvSvcBase
- Event/ByteStreamData
- Generators/GeneratorObjects
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigT1/TrigT1Interfaces
- Trigger/TrigTools/TrigInDetToolInterfaces )
-
# Component(s) in the package:
atlas_add_component( TrigTileMuId
src/*.cxx src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel MagFieldInterfaces TileEvent TileByteStreamLib TrigT2CaloCommonLib TrigInDetEvent TrigMuonEvent TrigInterfacesLib TrigTimeAlgsLib CaloIdentifier AthenaKernel AthenaMonitoringLib RegionSelectorLib ByteStreamCnvSvcBaseLib ByteStreamData GeneratorObjects TrigSteeringEvent TrigT1Interfaces )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel ByteStreamCnvSvcBaseLib ByteStreamData CaloIdentifier CxxUtils GaudiKernel GeneratorObjects MagFieldInterfaces RegionSelectorLib TileByteStreamLib TileEvent TrigInDetEvent TrigInDetToolInterfacesLib TrigInterfacesLib TrigMuonEvent TrigSteeringEvent TrigT1Interfaces TrigT2CaloCommonLib TrigTimeAlgsLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigAlgorithms/TrigTileMuId/python/TrigTileLookForMuAlgConfig.py b/Trigger/TrigAlgorithms/TrigTileMuId/python/TrigTileLookForMuAlgConfig.py
index ace6a5264b60ed4913876af98e8f050652989d2c..db7f38cba623eef2e486f7d486f8e18c2b11eb99 100755
--- a/Trigger/TrigAlgorithms/TrigTileMuId/python/TrigTileLookForMuAlgConfig.py
+++ b/Trigger/TrigAlgorithms/TrigTileMuId/python/TrigTileLookForMuAlgConfig.py
@@ -1,13 +1,12 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
+from TrigTileMuId import TrigTileMuIdConf
from AthenaCommon.SystemOfUnits import MeV
-
-class TrigTileLookForMuAlg_L2(TrigTileLookForMuAlg):
+class TrigTileLookForMuAlg_L2(TrigTileMuIdConf.TrigTileLookForMuAlg):
__slot__ = []
def __init__(self, name='TrigTileLookForMuAlg_L2'):
- TrigTileLookForMuAlg.__init__(self, name)
+ TrigTileMuIdConf.TrigTileLookForMuAlg.__init__(self, name)
#self.ReadRoIsFromL1 = False
self.ReadRoIsFromL1 = True
@@ -123,10 +122,10 @@ class TrigTileLookForMuAlg_L2(TrigTileLookForMuAlg):
self.AthenaMonTools = [ time, cosmic, validation, online ]
-class TrigTileLookForMuAlg_All(TrigTileLookForMuAlg):
+class TrigTileLookForMuAlg_All(TrigTileMuIdConf.TrigTileLookForMuAlg):
__slot__ = []
def __init__(self, name='TrigTileLookForMuAlg_All'):
- TrigTileLookForMuAlg.__init__(self, name)
+ TrigTileMuIdConf.TrigTileLookForMuAlg.__init__(self, name)
#self.ReadRoIsFromL1 = False
self.ReadRoIsFromL1 = True
diff --git a/Trigger/TrigAlgorithms/TrigTileMuId/python/TrigTileMuFexConfig.py b/Trigger/TrigAlgorithms/TrigTileMuId/python/TrigTileMuFexConfig.py
index b6865f2149fd340d9e7bce09a77ac6986eadfdf4..a4bf841f2a42a736f3fddecff7204ead7e963f3e 100755
--- a/Trigger/TrigAlgorithms/TrigTileMuId/python/TrigTileMuFexConfig.py
+++ b/Trigger/TrigAlgorithms/TrigTileMuId/python/TrigTileMuFexConfig.py
@@ -1,12 +1,9 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-#from TrigTileMuId.TrigTileMuIdConf import TrigTileMuFex
-from AthenaCommon.GlobalFlags import globalflags
-from AthenaCommon.AppMgr import ServiceMgr
-from TrigTileMuId.TrigTileMuIdMonitoring import *
+from TrigTileMuId import TrigTileMuIdMonitoring
+from TrigTileMuId import TrigTileMuIdConf
-
-class TrigTileMuFexConfig (TrigTileMuFex):
+class TrigTileMuFexConfig (TrigTileMuIdConf.TrigTileMuFex):
__slot__ = []
def __new__( cls, *args, **kwargs ):
@@ -21,7 +18,7 @@ class TrigTileMuFexConfig (TrigTileMuFex):
def __init__(self, name, *args, **kwargs ):
super( TrigTileMuFexConfig, self ).__init__( name )
- TrigTileMuFex.__init__(self, name)
+ TrigTileMuIdConf.TrigTileMuFex.__init__(self, name)
self.UseAthenaFieldService = True
@@ -41,14 +38,14 @@ class TrigTileMuFexConfig (TrigTileMuFex):
self.DelPhi_Cut = 0.2
self.DelEta_Cut = 0.1
self.Pt_Cut = 2000.0
- # Unit(Pt) : MeV
+ # Unit(Pt) : MeV
self.GetTruthMuon = False
#self.GetTruthMuon = True
- validation = TrigTileMuFexValidationMonitoring()
- online = TrigTileMuFexOnlineMonitoring()
- cosmic = TrigTileMuFexCosmicMonitoring()
+ validation = TrigTileMuIdMonitoring.TrigTileMuFexValidationMonitoring()
+ online = TrigTileMuIdMonitoring.TrigTileMuFexOnlineMonitoring()
+ cosmic = TrigTileMuIdMonitoring.TrigTileMuFexCosmicMonitoring()
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
diff --git a/Trigger/TrigAlgorithms/TrigTileMuId/python/TrigTileRODMuAlgConfig.py b/Trigger/TrigAlgorithms/TrigTileMuId/python/TrigTileRODMuAlgConfig.py
index 2dacb30c122df3b008c44e1ae672ad74188ef97c..6e0088523f7578b327f0225ba0ee7c36e72aa9c3 100755
--- a/Trigger/TrigAlgorithms/TrigTileMuId/python/TrigTileRODMuAlgConfig.py
+++ b/Trigger/TrigAlgorithms/TrigTileMuId/python/TrigTileRODMuAlgConfig.py
@@ -1,10 +1,11 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+from TrigTileMuId import TrigTileMuIdConf
-class TrigTileRODMuAlg_L2(TrigTileRODMuAlg):
+class TrigTileRODMuAlg_L2(TrigTileMuIdConf.TrigTileRODMuAlg):
__slot__ = []
def __init__(self, name='TrigTileRODMuAlg_L2'):
- TrigTileRODMuAlg.__init__(self, name)
+ TrigTileMuIdConf.TrigTileRODMuAlg.__init__(self, name)
self.ReadRoIsFromL1 = True
#self.ReadRoIsFromL1 = False
@@ -44,10 +45,10 @@ class TrigTileRODMuAlg_L2(TrigTileRODMuAlg):
self.AthenaMonTools = [ time, cosmic, validation, online ]
-class TrigTileRODMuAlg_All(TrigTileRODMuAlg):
+class TrigTileRODMuAlg_All(TrigTileMuIdConf.TrigTileRODMuAlg):
__slot__ = []
def __init__(self, name='TrigTileRODMuAlg_All'):
- TrigTileRODMuAlg.__init__(self, name)
+ TrigTileMuIdConf.TrigTileRODMuAlg.__init__(self, name)
self.ReadRoIsFromL1 = True
#self.ReadRoIsFromL1 = False