From edd2cc29d7991953b6536cbb4798d4c7f70c19c5 Mon Sep 17 00:00:00 2001 From: Carlo Varni <cvarni@lxplus033.cern.ch> Date: Fri, 18 Jan 2019 11:29:39 +0100 Subject: [PATCH] Adding L1 requirement in chain parsing --- .../TrigBjetHypo/python/TrigBjetEtHypoTool.py | 8 +++++--- .../TrigBjetHypo/python/TrigBjetHypoTool.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py index a18436ca9df..fb9689679ca 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 fd951d0e37d..4dc32518930 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 -- GitLab