diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py index a18436ca9dfe66c14132e9adccd4c35036ecf823..fb9689679cae1c158c052358bc6bae2c1bde743f 100644 --- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py +++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py @@ -1,7 +1,7 @@ # Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration import re -re_Bjet = re.compile(r'^HLT_(?P<multiplicity>\d+)?j(?P<threshold>\d+)(?:_gsc(?P<gscThreshold>\d+))?(?:_b(?P<bTag>[^_]+)(?:_(?P<bConfig>split))?(?:_(?P<minEta>\d+)eta(?P<maxEta>\d+))?)?$') +re_Bjet = re.compile(r'^HLT_(?P<multiplicity>\d+)?j(?P<threshold>\d+)(?:_gsc(?P<gscThreshold>\d+))?(?:_b(?P<bTag>[^_]+)(?:_(?P<bConfig>split))?(?:_(?P<minEta>\d+)eta(?P<maxEta>\d+))?)?(?:_L1(?P<L1>.*))?$') from AthenaCommon.Logging import logging from AthenaCommon.SystemOfUnits import GeV @@ -19,7 +19,8 @@ def TrigBjetEtHypoToolFromName_j( name, conf ): 'bTag' : 'offperf', 'bConfig' : 'EF', 'minEta' : '0', - 'maxEta' : '320'} + 'maxEta' : '320', + 'L1' : None } chain = conf match = re_Bjet.match( chain ) @@ -50,7 +51,8 @@ def TrigBjetEtHypoToolFromName_gsc( name, conf ): 'bTag' : 'offperf', 'bConfig' : 'EF', 'minEta' : '0', - 'maxEta' : '320'} + 'maxEta' : '320', + 'L1' : None } chain = conf match = re_Bjet.match( chain ) diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py index fd951d0e37d8ca4dfecb803c723ea0f3ddd09d90..4dc32518930b5bda04905cc31eab1b683233ae7b 100644 --- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py +++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py @@ -1,7 +1,7 @@ # Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration import re -re_Bjet = re.compile(r'^HLT_(?P<multiplicity>\d+)?j(?P<threshold>\d+)(?:_gsc(?P<gscThreshold>\d+))?(?:_b(?P<bTag>[^_]+)(?:_(?P<bConfig>split))?(?:_(?P<minEta>\d+)eta(?P<maxEta>\d+))?)?$') +re_Bjet = re.compile(r'^HLT_(?P<multiplicity>\d+)?j(?P<threshold>\d+)(?:_gsc(?P<gscThreshold>\d+))?(?:_b(?P<bTag>[^_]+)(?:_(?P<bConfig>split))?(?:_(?P<minEta>\d+)eta(?P<maxEta>\d+))?)?(?:_L1(?P<L1>.*))?$') from AthenaCommon.Logging import logging from AthenaCommon.SystemOfUnits import GeV