diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigBphysHypo/CMakeLists.txt
index 30c81384b27321e5506db496237b42442d1b5d1c..fd916210a70021cd345e042956e61b13a0a48eaf 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/CMakeLists.txt
@@ -66,3 +66,7 @@ atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/TriggerConfig*.py share/jobO*.py )
atlas_install_runtime( share/*.xml )
+# 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 )
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBphysElectronCounterConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBphysElectronCounterConfig.py
index 061dcc451de217fe243b58c128bba3950a656c27..3b33d86404cda4d1817661bd77d6317068c7bca8 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBphysElectronCounterConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBphysElectronCounterConfig.py
@@ -1,12 +1,10 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# include the python fragment to set up the default bphysics vertex fitter
-from TrigBphysHypo import TrigBphysVertexingConfig
+from TrigBphysHypo import TrigBphysVertexingConfig # noqa: F401
from TrigBphysHypo.TrigBphysHypoConf import TrigBphysElectronCounter
-from AthenaCommon.AppMgr import ToolSvc
-
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
from TrigBphysHypo.TrigBphysElectronCounterMonitoring import TrigBphysElectronCounterValidationMonitoring
from TrigBphysHypo.TrigBphysElectronCounterMonitoring import TrigBphysElectronCounterOnlineMonitoring
@@ -45,7 +43,7 @@ class TrigBphysElectronCounter_bNe (TrigBphysElectronCounterPy):
# set up PID - defined in TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPidTools
from TrigEgammaHypo.TrigEgammaPidTools import (ElectronToolName,BLooseISEMBits)
- if pidKey == None or not pidKey in ElectronToolName.keys() or not pidKey in BLooseISEMBits.keys() :
+ if pidKey is None or pidKey not in ElectronToolName.keys() or pidKey not in BLooseISEMBits.keys() :
log.info(" Setting up bphys electron chain with no electron PID requirement")
self.ApplyIsEM = False
else :
@@ -74,7 +72,7 @@ class TrigBphysElectronCounter_bBee (TrigBphysElectronCounterPy):
# set up PID - defined in TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPidTools
from TrigEgammaHypo.TrigEgammaPidTools import (ElectronToolName,BLooseISEMBits,ElectronIsEMBits)
- if pidKey == None or not pidKey in ElectronToolName.keys() :
+ if pidKey is None or pidKey not in ElectronToolName.keys() :
log.info(" Setting up bphys electron chain with no electron PID requirement")
self.ApplyIsEM = False
else :
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBphysMuonCounterConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBphysMuonCounterConfig.py
index 13ed7a6415d3b9a413b35d115a9dde78b3ab7c37..6eecde65077971ca92a4970b0dc41482a8b26730 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBphysMuonCounterConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBphysMuonCounterConfig.py
@@ -1,12 +1,10 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# include the python fragment to set up the default bphysics vertex fitter
-from TrigBphysHypo import TrigBphysVertexingConfig
+from TrigBphysHypo import TrigBphysVertexingConfig # noqa: F401
from TrigBphysHypo.TrigBphysHypoConf import TrigBphysMuonCounter
-from AthenaCommon.AppMgr import ToolSvc
-
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
from TrigBphysHypo.TrigBphysMuonCounterMonitoring import TrigBphysMuonCounterValidationMonitoring
from TrigBphysHypo.TrigBphysMuonCounterMonitoring import TrigBphysMuonCounterOnlineMonitoring
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBEEXFexConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBEEXFexConfig.py
index 5d90fa94a06339aee55e33e99ee7d5f769f696d3..a4d529a2a5ccb498ea5cc1833c99f021808a1035 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBEEXFexConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBEEXFexConfig.py
@@ -1,14 +1,11 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# vim: tabstop=4:shiftwidth=4:expandtab
# include the python fragment to set up the default bphysics vertex fitter
-from TrigBphysHypo.TrigBphysHypoConf import TrigBphysHelperUtilsTool
from TrigBphysHypo.TrigBphysHypoConf import TrigEFBEEXFex
-from TrigBphysHypo import TrigBphysVertexingConfig
+from TrigBphysHypo import TrigBphysVertexingConfig # noqa: F401
-from AthenaCommon.AppMgr import ToolSvc
-
class EFBEEXFex_1 (TrigEFBEEXFex):
__slots__ = []
def __init__(self, name = "EFBEEXFex_1"):
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuFexConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuFexConfig.py
index 9dfc2616efb547f6c512ab25bda4ca682297222f..ef7a92dd721cdf0a020a1a4b8a8e14e9fbeaa204 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuFexConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuFexConfig.py
@@ -1,13 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-# include the python fragment to set up the default bphysics vertex fitter
-#include("TrigBphysHypo/TrigBphysVertexingConfig.py")
-
-from TrigBphysHypo.TrigBphysHypoConf import TrigBphysHelperUtilsTool
-from TrigBphysHypo.TrigBphysHypoConf import TrigEFBMuMuFex
-from TrkVKalVrtFitter.TrkVKalVrtFitterConf import Trk__TrkVKalVrtFitter
-from TrigBphysHypo import TrigBphysVertexingConfig
+from TrigBphysHypo.TrigBphysHypoConf import TrigEFBMuMuFex
+from TrigBphysHypo import TrigBphysVertexingConfig # noqa: F401
from AthenaCommon.AppMgr import ToolSvc
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuHypoConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuHypoConfig.py
index f9194b7d7fbe5594029324091650939ab53fa584..44f75177fba828c17ad2ed418e22efd4340e7ea6 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuHypoConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from TrigBphysHypo.TrigBphysHypoConf import TrigEFBMuMuHypo
@@ -129,7 +129,7 @@ class EFBMuMuHypo_DiMu_DY20 (TrigEFBMuMuHypo):
class EFBMuMuHypo_DiMu_DY14 (TrigEFBMuMuHypo):
__slots__ = []
def __init__(self, name = "EFBMuMuHypo_DiMu_DY14"):
- super( TrigEFBMuMuHypo_DiMu_DY14, self ).__init__( name )
+ super( EFBMuMuHypo_DiMu_DY14, self ).__init__( name )
# AcceptAll flag: if true take events regardless of cuts
self.AcceptAll = False
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuXFexConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuXFexConfig.py
index 076d84525b5f6073ab5c0945d2f8d883215b0511..f53a76aec22254e21323a0dc756a9b3619b39417 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuXFexConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuXFexConfig.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# vim: tabstop=4:shiftwidth=4:expandtab
# include the python fragment to set up the default bphysics vertex fitter
-from TrigBphysHypo.TrigBphysHypoConf import TrigBphysHelperUtilsTool
from TrigBphysHypo.TrigBphysHypoConf import TrigEFBMuMuXFex
-from TrigBphysHypo import TrigBphysVertexingConfig
+from TrigBphysHypo import TrigBphysVertexingConfig # noqa: F401
from AthenaCommon.AppMgr import ToolSvc
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuXHypoConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuXHypoConfig.py
index bfda9c4250d06bad7e24d507c513cd08c6eacf7f..8784be00206c211493bffe3d5985b6dee134f113 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuXHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFBMuMuXHypoConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# vim: tabstop=4:shiftwidth=4:expandtab
from TrigBphysHypo.TrigBphysHypoConf import TrigEFBMuMuXHypo
@@ -76,10 +76,6 @@ class EFBMuMuXHypo_1 (TrigEFBMuMuXHypo):
self.D0Chi2Cut = 90.
- from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
- time = TrigTimeHistToolConfig("Time")
-
-
class EFBMuMuXHypo_allModes (EFBMuMuXHypo_1):
__slots__ = []
def __init__(self, name = "EFBMuMuXHypo_allModes"):
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFMultiMuFexConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFMultiMuFexConfig.py
index b529438ebefaf70f1337ce69cfebc2831c85f166..4721ab21832ab0056c87966746a0251a1dee9470 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFMultiMuFexConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFMultiMuFexConfig.py
@@ -1,12 +1,10 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# include the python fragment to set up the default bphysics vertex fitter
-from TrigBphysHypo import TrigBphysVertexingConfig
+from TrigBphysHypo import TrigBphysVertexingConfig # noqa: F401
from TrigBphysHypo.TrigBphysHypoConf import TrigEFMultiMuFex
-from AthenaCommon.AppMgr import ToolSvc
-
class EFMultiMuFex_DiMu (TrigEFMultiMuFex):
__slots__ = []
def __init__(self, name = "EFMultiMuFex_DiMu"):
@@ -127,30 +125,6 @@ class EFMultiMuFex_Tau3 (TrigEFMultiMuFex):
self.AthenaMonTools = [ validation, online, time ]
-class EFMultiMuFex_Tau3 (TrigEFMultiMuFex):
- __slots__ = []
- def __init__(self, name = "EFMultiMuFex_Tau3"):
- super( TrigEFMultiMuFex, self ).__init__( name )
-
- # AcceptAll flag: if true take events regardless of cuts
- self.AcceptAll = False
-
- # L2 Bmumu cuts
- self.LowerMassCut = 0.
- self.UpperMassCut = 2900.
- self.OppositeSign = False
- self.MuonAlgo = "TrigMuSuperEF"
- self.NMassMuon = 3
- self.CheckNinputTE = False
-
- from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
- time = TrigTimeHistToolConfig("Time")
- from TrigBphysHypo.TrigEFMultiMuFexMonitoring import TrigEFMultiMuFexValidationMonitoring
- validation = TrigEFMultiMuFexValidationMonitoring()
- from TrigBphysHypo.TrigEFMultiMuFexMonitoring import TrigEFMultiMuFexOnlineMonitoring
- online = TrigEFMultiMuFexOnlineMonitoring()
-
- self.AthenaMonTools = [ validation, online, time ]
class EFMultiMuFex_Tau2 (TrigEFMultiMuFex):
__slots__ = []
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFTrkMassFexConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFTrkMassFexConfig.py
index 1b6a6c69e0b6bfbd522d656ae3dbd52084946f2b..53aa3bb9de496fe6a2b8f9e331d0d9f45f592f65 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFTrkMassFexConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigEFTrkMassFexConfig.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# include the python fragment to set up the default bphysics vertex fitter
-from TrigBphysHypo import TrigBphysVertexingConfig
+from TrigBphysHypo import TrigBphysVertexingConfig # noqa: F401
from TrigBphysHypo.TrigBphysHypoConf import TrigEFTrkMassFex
-from __main__ import ToolSvc
# basic cut
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2BMuMuFexConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2BMuMuFexConfig.py
index b8caa6ca9cdd42c80f2cc4684add4230ce37dcb2..aa498d398d8770c579e7e269f3b5cbd8f9fdb464 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2BMuMuFexConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2BMuMuFexConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from TrigBphysHypo.TrigBphysHypoConf import TrigL2BMuMuFex
from TrigVertexFitter.TrigVertexFitterConf import TrigL2VertexFitter
@@ -368,34 +368,6 @@ class L2BMuMuFex_DiMu_DY14_noOS (TrigL2BMuMuFex):
self.AthenaMonTools = [ validation, online, time ]
-class L2BMuMuFex_DiMu_DY14_noOS (TrigL2BMuMuFex):
- __slots__ = []
- def __init__(self, name = "L2BMuMuFex_DiMu_DY14_noOS"):
- super( TrigL2BMuMuFex, self ).__init__( name )
-
- # AcceptAll flag: if true take events regardless of cuts
- self.AcceptAll = False
-
- # L2 Bmumu cuts
- # self.TrackPTthr = 1.4
- # self.TrackAlgoId = 2
- # self.pTsumTrackPair = 0.
- self.OppositeSign = False
- self.LowerMassCut = 14000.
- self.UpperMassCut = 140000.
- self.ApplyUpperMassCut = True
- self.doVertexFit = True
- self.TrigL2VertexFitter = L2VFitTool
- self.TrigVertexingTool = VertexTool
-
- from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
- time = TrigTimeHistToolConfig("Time")
- from TrigBphysHypo.TrigL2BMuMuFexMonitoring import TrigL2BMuMuFexValidationMonitoring
- validation = TrigL2BMuMuFexValidationMonitoring()
- from TrigBphysHypo.TrigL2BMuMuFexMonitoring import TrigL2BMuMuFexOnlineMonitoring
- online = TrigL2BMuMuFexOnlineMonitoring()
-
- self.AthenaMonTools = [ validation, online, time ]
class L2BMuMuFex_DiMu_7invm9_noOS (TrigL2BMuMuFex):
__slots__ = []
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2BMuMuXHypoConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2BMuMuXHypoConfig.py
index b4b52f78b8079a61c27748b4a9c002f5c1cf07e0..a570bef4fb22a62d5a1b5c76c8fbf05569707497 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2BMuMuXHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigL2BMuMuXHypoConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# -*- coding: utf-8 -*-
from TrigBphysHypo.TrigBphysHypoConf import TrigL2BMuMuXHypo
@@ -37,10 +37,6 @@ class L2BMuMuXHypo_1 (TrigL2BMuMuXHypo):
self.UpperDsMassCut = 2400.
- from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
- time = TrigTimeHistToolConfig("Time")
-
-
class L2BMuMuXHypo_EF (TrigL2BMuMuXHypo):
__slots__ = []
def __init__(self, name = "L2BMuMuXHypo_EF"):
@@ -72,7 +68,3 @@ class L2BMuMuXHypo_EF (TrigL2BMuMuXHypo):
self.UpperBcMassCut = 7050.
self.LowerDsMassCut = 1600.
self.UpperDsMassCut = 2400.
-
-
- from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
- time = TrigTimeHistToolConfig("Time")
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkFexConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkFexConfig.py
index 7ff7c6851f577e90bd81bf44b82f5324d00b7fa9..cfbe86cdbd1e968dfbe1d8d70f36ce80d3f9915a 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkFexConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkFexConfig.py
@@ -1,12 +1,10 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# include the python fragment to set up the default bphysics vertex fitter
-from TrigBphysHypo import TrigBphysVertexingConfig
+from TrigBphysHypo import TrigBphysVertexingConfig # noqa: F401
from TrigBphysHypo.TrigBphysHypoConf import TrigMultiTrkFex
-from AthenaCommon.AppMgr import ToolSvc
-
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
from TrigBphysHypo.TrigMultiTrkFexMonitoring import TrigMultiTrkFexValidationMonitoring
from TrigBphysHypo.TrigMultiTrkFexMonitoring import TrigMultiTrkFexOnlineMonitoring
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkHypoMTConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkHypoMTConfig.py
index 8bbe4391fcb359f21f747515acdc63bcca329323..a4c9ed1cb5460502254c9257c29141c43a3ddbc4 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkHypoMTConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkHypoMTConfig.py
@@ -1,48 +1,46 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-from TrigBphysHypo.TrigBphysHypoConf import TrigMultiTrkHypoMT,TrigMultiTrkHypoToolMT
+from TrigBphysHypo.TrigBphysHypoConf import TrigMultiTrkHypoMT, TrigMultiTrkHypoToolMT # noqa: F401
from TrigBphysHypo.TrigMultiTrkHypoMTMonitoringConfig import TrigMultiTrkHypoToolMTMonitoring
-from TriggerJobOpts.TriggerFlags import TriggerFlags
+from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName
+
+from AthenaCommon.Logging import logging
+log = logging.getLogger('TrigMultiTrkHypoMTConfig')
def findL2teBaseName(cName,topos):
- indices = []
- for topo in topos:
- indices.append(cName.find(topo))
- firstTopoOccurance = sorted(indices,key=int)[0]
+ indices = []
+ for topo in topos:
+ indices.append(cName.find(topo))
+ firstTopoOccurance = sorted(indices,key=int)[0]
- return cName[:firstTopoOccurance-1]
+ return cName[:firstTopoOccurance-1]
def TrigMultiTrkHypoToolMTFromDict( chainDict ):
- print chainDict
- config = TrigMultiTrkHypoMTConfig()
- tool=config.ConfigurationHypoTool( chainDict )
+ config = TrigMultiTrkHypoMTConfig()
+ tool = config.ConfigurationHypoTool( chainDict )
+
+ tool.MonTool = TrigMultiTrkHypoToolMTMonitoring('MonTool')
- addMonitoring( tool, TrigMultiTrkHypoToolMTMonitoring, "TrigMultiTrkHypoToolMT", chainDict['chainName'] )
-
return tool
-def TrigMultiTrkHypoToolFromName( name, thresholdsHLT ):
- from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName
+def TrigMultiTrkHypoToolFromName( name, thresholdsHLT ):
decoder = DictFromChainName()
decodedDict = decoder.analyseShortName(thresholdsHLT, [], "") # no L1 info
decodedDict['chainName'] = name # override
- print decodedDict
return TrigMultiTrkHypoToolMTFromDict( decodedDict )
-class TrigMultiTrkHypoMTConfig():
+class TrigMultiTrkHypoMTConfig(object):
def ConfigurationHypoTool( self, chainDict):
topoAlgs = chainDict['topo']
topoAlgs = chainDict['chainName']
- print '*************topos******************'
- print topoAlgs
#print findL2teBaseName(chainDict['chainName'],topoAlgs)
tool = TrigMultiTrkHypoToolMT( chainDict['chainName'] )
- print "TrigMultiTrkHypoToolMTConfig: Set for algorithm ", topoAlgs
+ log.debug("Set for algorithm %s", topoAlgs)
if 'nocut' in topoAlgs:
tool.AcceptAll = True
@@ -78,24 +76,13 @@ class TrigMultiTrkHypoMTConfig():
return tool
-def addMonitoring(tool, monClass, name, thresholdHLT ):
- try:
- if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring() or 'Cosmic' in TriggerFlags.enableMonitoring():
- tool.MonTool = monClass( name + "Monitoring_" + thresholdHLT )
- except AttributeError:
- tool.MonTool = ""
- print name, ' Monitoring Tool failed'
-
def getBphysThresholds(chainDict) :
mult = 0
- mult_without_noL1 = 0
trkmuons = []
fexNameExt = ""
for part in chainDict['chainParts'] :
mult = mult + int(part['multiplicity'])
- #if not 'noL1' in part['extra'] :
- # mult_without_noL1 = mult_without_noL1 + int(part['multiplicity'])
for dictpart in chainDict['chainParts']:
if 'mu' in dictpart['trigType']:
@@ -118,4 +105,4 @@ def getBphysThresholds(chainDict) :
thr = 900.
trkmuons.append(thr)
fexNameExt = fexNameExt + "_"+str(int(dictpart['threshold']))
- return trkmuons
\ No newline at end of file
+ return trkmuons
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkHypoMTMonitoringConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkHypoMTMonitoringConfig.py
index f7c9445d638ae4f840ada224244c8cfe5b3d7068..eb4e98f8af0877258718afc337dae4156b4adb74 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkHypoMTMonitoringConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkHypoMTMonitoringConfig.py
@@ -1,15 +1,11 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-#
-# PURPOSE: AthenaMT Migration
-#
from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
class TrigMultiTrkHypoAlgMTMonitoring(GenericMonitoringTool):
- def __init__ (self, name="TrigMultiTrkHypoAlgMTMonitoring"):
+ def __init__ (self, name):
super(TrigMultiTrkHypoAlgMTMonitoring, self).__init__(name)
- #self.defineTarget("Online")
- self.Histograms = [
+ self.Histograms = [
defineHistogram('pairMass', type='TH1F', path='EXPERT', title="mass of track pairs; m_{#mu#mu} [GeV]", xbins=200, xmin=0, xmax=100),
defineHistogram('nTrk', type='TH1F',path='EXPERT', title="number of tracks input; N tracks", xbins=100, xmin=0, xmax=100),
defineHistogram('accepted_highptNTrk', type='TH1F', path='EXPERT', title="Number of tracks selected; N selected tracks", xbins=100, xmin=0, xmax=100),
@@ -22,12 +18,11 @@ class TrigMultiTrkHypoAlgMTMonitoring(GenericMonitoringTool):
]
class TrigMultiTrkHypoToolMTMonitoring(GenericMonitoringTool):
- def __init__ (self, name="TrigMultiTrkHypoToolMTMonitoring"):
+ def __init__ (self, name):
super(TrigMultiTrkHypoToolMTMonitoring, self).__init__(name)
- #self.defineTarget("Online")
- self.Histograms = [
+ self.Histograms = [
defineHistogram('CutCounter', type='TH1F', path='EXPERT', title="mass of track pairs; m_{#mu#mu} [GeV]", xbins=5, xmin=-0.5, xmax=4.5),
defineHistogram('FitChi2', type='TH1F', path='EXPERT', title="chi2 fit of N tracks; fit chi2 of N selected tracks", xbins=100, xmin=0, xmax=100),
defineHistogram('VertexMass', type='TH1F', path='EXPERT', title="Number of tracks selected; N selected tracks", xbins=100, xmin=0, xmax=20),
defineHistogram('trackPts', type='TH1F', path='EXPERT', title="pair mass of N tracks; pair mass of N selected tracks [GeV]", xbins=100, xmin=0, xmax=20)
- ]
\ No newline at end of file
+ ]