From c7390f3936b7be0e65acdf3a98e243a290ceb858 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Thu, 16 Jul 2020 16:35:06 +0200
Subject: [PATCH] TrigBphysHypo: CMake cleanup
CMake cleanup and some flake8 fixes.
---
.../TrigBphysHypo/CMakeLists.txt | 53 +++----------------
.../python/TrigEFMultiMuHypoConfig.py | 28 +++++-----
.../python/TrigEFTrkMassHypoConfig.py | 16 +++---
.../python/TrigL2MultiMuHypoConfig.py | 12 ++---
.../python/TrigL2TrkMassHypoConfig.py | 16 +++---
5 files changed, 42 insertions(+), 83 deletions(-)
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigBphysHypo/CMakeLists.txt
index aefaf75e089..b9fea33fcd5 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/CMakeLists.txt
@@ -1,59 +1,18 @@
-################################################################################
-# Package: TrigBphysHypo
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigBphysHypo )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/AthLinks
- Control/AthViews
- Control/CxxUtils
- Control/StoreGate
- Event/FourMomUtils
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODBase
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigBphys
- Event/xAOD/xAODTrigMuon
- Event/xAOD/xAODTrigger
- GaudiKernel
- LumiBlock/LumiBlockComps
- InnerDetector/InDetConditions/BeamSpotConditionsData
- InnerDetector/InDetRecTools/InDetConversionFinderTools
- PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools
- Tracking/TrkVertexFitter/TrkVKalVrtFitter
- Trigger/TrigEvent/TrigBphysicsEvent
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigMuonEvent
- Trigger/TrigEvent/TrigNavigation
- Trigger/TrigEvent/TrigParticle
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigT1/TrigT1Interfaces
- Trigger/TrigTools/TrigInDetToolInterfaces
- Trigger/TrigSteer/DecisionHandling
- Trigger/TrigSteer/TrigCompositeUtils)
-
# External dependencies:
+find_package( CLHEP )
+find_package( ROOT COMPONENTS MathCore )
# Component(s) in the package:
atlas_add_component( TrigBphysHypo
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS
- LINK_LIBRARIES AthenaBaseComps AthenaKernel AthLinks BeamSpotConditionsData ElectronPhotonSelectorToolsLib InDetConversionFinderToolsLib DecisionHandlingLib FourMomUtils StoreGateLib xAODEventInfo xAODMuon xAODTracking xAODTrigBphys xAODTrigMuon GaudiKernel TrkVKalVrtFitterLib TrigBphysicsEvent TrigInDetEvent TrigMuonEvent TrigNavigationLib TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib AthViews TrigCompositeUtilsLib TrigT1Interfaces TrigParticle)
-
-#TrigParticle is needed for linking getRecentFeaturesLinks for some reason
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthLinks AthViews AthenaBaseComps AthenaKernel AthenaMonitoringKernelLib BeamSpotConditionsData DecisionHandlingLib ElectronPhotonSelectorToolsLib FourMomUtils InDetConversionFinderToolsLib LumiBlockCompsLib StoreGateLib TrigBphysicsEvent TrigCompositeUtilsLib TrigConfHLTData TrigInDetEvent TrigInDetToolInterfacesLib TrigInterfacesLib TrigNavigationLib TrigParticle TrigSteeringEvent TrigTimeAlgsLib TrkVKalVrtFitterLib xAODBase xAODEgamma xAODEventInfo xAODMuon xAODTracking xAODTrigBphys xAODTrigMuon xAODTrigger )
# Install files from the package:
-atlas_install_python_modules( python/*.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/TrigHypothesis/TrigBphysHypo/python/TrigEFMultiMuHypoConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFMultiMuHypoConfig.py
index 6a6d2294139..0869e600532 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFMultiMuHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFMultiMuHypoConfig.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 TrigBphysHypo.TrigBphysHypoConf import TrigEFMultiMuHypo
@@ -32,16 +32,16 @@ class EFMultiMuHypo_DiMu (TrigEFMultiMuHypo):
# AcceptAll flag: if true take events regardless of cuts
self.AcceptAll = False
-
+
# EF Bmumu cuts
self.LowerMassCut = 1500.
self.UpperMassCut = 14000.
self.ApplyUpperMassCut = True
self.Chi2VtxCut = 20.
-
+
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
validation = TrigEFMultiMuHypoValidationMonitoring()
online = TrigEFMultiMuHypoOnlineMonitoring()
self.AthenaMonTools = [ validation, online, time ]
@@ -53,17 +53,17 @@ class EFMultiMuHypo_DiMu2700 (TrigEFMultiMuHypo):
# AcceptAll flag: if true take events regardless of cuts
self.AcceptAll = False
-
+
#
self.OppositeSign = True
self.LowerMassCut = 100.
self.UpperMassCut = 2700.
self.ApplyUpperMassCut = True
self.Chi2VtxCut = 20.
-
+
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
validation = TrigEFMultiMuHypoValidationMonitoring()
online = TrigEFMultiMuHypoOnlineMonitoring()
self.AthenaMonTools = [ validation, online, time ]
@@ -75,17 +75,17 @@ class EFMultiMuHypo_DiMu6000 (TrigEFMultiMuHypo):
# AcceptAll flag: if true take events regardless of cuts
self.AcceptAll = False
-
+
#
self.OppositeSign = True
self.LowerMassCut = 100.
self.UpperMassCut = 6000.
self.ApplyUpperMassCut = True
self.Chi2VtxCut = 20.
-
+
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
validation = TrigEFMultiMuHypoValidationMonitoring()
online = TrigEFMultiMuHypoOnlineMonitoring()
self.AthenaMonTools = [ validation, online, time ]
@@ -97,7 +97,7 @@ class EFMultiMuHypo_DiMu_noCut (EFMultiMuHypo_DiMu):
self.ApplyChi2Cut = False
self.ApplyUpperMassCut = False
self.LowerMassCut = 0.
-
+
class EFMultiMuHypo_DiMu_noVtx (EFMultiMuHypo_DiMu):
__slots__ = []
def __init__(self, name = "EFMultiMuHypo_DiMu_noVtx"):
@@ -117,10 +117,10 @@ class EFMultiMuHypo_Vtx20 (TrigEFMultiMuHypo):
self.ApplyUpperMassCut = False
self.ApplyChi2Cut = True
self.Chi2VtxCut = 20.
-
+
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
validation = TrigEFMultiMuHypoValidationMonitoring()
online = TrigEFMultiMuHypoOnlineMonitoring()
self.AthenaMonTools = [ validation, online, time ]
@@ -134,7 +134,7 @@ class EFMultiMuHypo_Vtx60 (EFMultiMuHypo_Vtx20):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
validation = TrigEFMultiMuHypoValidationMonitoring()
online = TrigEFMultiMuHypoOnlineMonitoring()
self.AthenaMonTools = [ validation, online, time ]
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFTrkMassHypoConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFTrkMassHypoConfig.py
index 84e2afc356c..9b2e4088127 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFTrkMassHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFTrkMassHypoConfig.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 TrigBphysHypo.TrigBphysHypoConf import TrigEFTrkMassHypo
@@ -20,7 +20,7 @@ class EFTrkMassHypo_Jpsimumu (TrigEFTrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
# Jpsi FS
class EFTrkMassHypo_Jpsimumu_FS (TrigEFTrkMassHypo):
@@ -39,7 +39,7 @@ class EFTrkMassHypo_Jpsimumu_FS (TrigEFTrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
# Jpsi loose
@@ -60,7 +60,7 @@ class EFTrkMassHypo_Jpsimumu_loose (TrigEFTrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
# Jpsi looser
class EFTrkMassHypo_Jpsimumu_looser (TrigEFTrkMassHypo):
@@ -80,7 +80,7 @@ class EFTrkMassHypo_Jpsimumu_looser (TrigEFTrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
# Jpsi loose FS
@@ -100,7 +100,7 @@ class EFTrkMassHypo_Jpsimumu_loose_FS (TrigEFTrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
# Upsi FS
@@ -120,7 +120,7 @@ class EFTrkMassHypo_Upsimumu_FS (TrigEFTrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
@@ -141,7 +141,7 @@ class EFTrkMassHypo_Upsimumu_loose_FS (TrigEFTrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2MultiMuHypoConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2MultiMuHypoConfig.py
index a64a3d28222..4855e354a1d 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2MultiMuHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2MultiMuHypoConfig.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 TrigBphysHypo.TrigBphysHypoConf import TrigL2MultiMuHypo
@@ -22,7 +22,7 @@ class L2MultiMuHypo_DiMu (TrigL2MultiMuHypo):
validation = TrigL2MultiMuHypoValidationMonitoring()
from TrigBphysHypo.TrigL2MultiMuHypoMonitoring import TrigL2MultiMuHypoOnlineMonitoring
online = TrigL2MultiMuHypoOnlineMonitoring()
-
+
self.AthenaMonTools = [ validation, online, time ]
class L2MultiMuHypo_Jpsi (TrigL2MultiMuHypo):
@@ -45,7 +45,7 @@ class L2MultiMuHypo_Jpsi (TrigL2MultiMuHypo):
validation = TrigL2MultiMuHypoValidationMonitoring()
from TrigBphysHypo.TrigL2MultiMuHypoMonitoring import TrigL2MultiMuHypoOnlineMonitoring
online = TrigL2MultiMuHypoOnlineMonitoring()
-
+
self.AthenaMonTools = [ validation, online, time ]
class L2MultiMuHypo_Upsi (TrigL2MultiMuHypo):
@@ -68,7 +68,7 @@ class L2MultiMuHypo_Upsi (TrigL2MultiMuHypo):
validation = TrigL2MultiMuHypoValidationMonitoring()
from TrigBphysHypo.TrigL2MultiMuHypoMonitoring import TrigL2MultiMuHypoOnlineMonitoring
online = TrigL2MultiMuHypoOnlineMonitoring()
-
+
self.AthenaMonTools = [ validation, online, time ]
class L2MultiMuHypo_Tau (TrigL2MultiMuHypo):
@@ -91,7 +91,7 @@ class L2MultiMuHypo_Tau (TrigL2MultiMuHypo):
validation = TrigL2MultiMuHypoValidationMonitoring()
from TrigBphysHypo.TrigL2MultiMuHypoMonitoring import TrigL2MultiMuHypoOnlineMonitoring
online = TrigL2MultiMuHypoOnlineMonitoring()
-
+
self.AthenaMonTools = [ validation, online, time ]
class L2MultiMuHypo_Tau_passL2 (TrigL2MultiMuHypo):
@@ -114,6 +114,6 @@ class L2MultiMuHypo_Tau_passL2 (TrigL2MultiMuHypo):
validation = TrigL2MultiMuHypoValidationMonitoring()
from TrigBphysHypo.TrigL2MultiMuHypoMonitoring import TrigL2MultiMuHypoOnlineMonitoring
online = TrigL2MultiMuHypoOnlineMonitoring()
-
+
self.AthenaMonTools = [ validation, online, time ]
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2TrkMassHypoConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2TrkMassHypoConfig.py
index 31d0d8bd1c3..b30d1a8e199 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2TrkMassHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2TrkMassHypoConfig.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 TrigBphysHypo.TrigBphysHypoConf import TrigL2TrkMassHypo
@@ -20,7 +20,7 @@ class L2TrkMassHypo_Jpsimumu (TrigL2TrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
# Jpsi passL2
@@ -49,7 +49,7 @@ class L2TrkMassHypo_Jpsimumu_FS (TrigL2TrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
# Jpsi passL2
@@ -79,7 +79,7 @@ class L2TrkMassHypo_Jpsimumu_loose (TrigL2TrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
# Jpsi loose passL2
@@ -108,7 +108,7 @@ class L2TrkMassHypo_Jpsimumu_looser (TrigL2TrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
# Jpsi loose passL2
@@ -136,7 +136,7 @@ class L2TrkMassHypo_Jpsimumu_loose_FS (TrigL2TrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
@@ -164,7 +164,7 @@ class L2TrkMassHypo_Upsimumu_FS (TrigL2TrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
@@ -192,7 +192,7 @@ class L2TrkMassHypo_Upsimumu_loose_FS (TrigL2TrkMassHypo):
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
time = TrigTimeHistToolConfig("Time")
-
+
self.AthenaMonTools = [ validation, online, time ]
--
GitLab