Adding Eta requirement on EtHypoTool for AthenaMT

In order to avoid hypo configuration bugs, as reported in ATR-18970, the eta requirement has been added to the EtHypoTool in the b-jet AthenaMT code.

Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py

 # 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))?)?$')
+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
@@ -17,7 +17,10 @@ def TrigBjetEtHypoToolFromName_j( name, conf ):
                      'multiplicity' : '1',
                      'gscThreshold' : '0',
                      'bTag' : 'offperf',
-                     'bConfig' : 'split' }
+                     'bConfig' : 'EF',
+                     'minEta' : '0',
+                     'maxEta' : '320',
+                     'L1' : None }
     
     chain = conf
     match = re_Bjet.match( chain )
@@ -32,6 +35,8 @@ def TrigBjetEtHypoToolFromName_j( name, conf ):
     tool.OutputLevel = DEBUG
     tool.AcceptAll   = False
     tool.EtThreshold  = float(conf_dict['threshold']) * GeV
+    tool.MinEtaThreshold = float(conf_dict['minEta']) / 100
+    tool.MaxEtaThreshold = float(conf_dict['maxEta']) / 100
 
     print "TrigBjetEtHypoToolFromName_j: name = %s, cut_j = %s "%(name,tool.EtThreshold)
     return tool
@@ -44,7 +49,10 @@ def TrigBjetEtHypoToolFromName_gsc( name, conf ):
                      'multiplicity' : '1',
                      'gscThreshold' : '0',
                      'bTag' : 'offperf',
-                     'bConfig' : 'split' }
+                     'bConfig' : 'EF',
+                     'minEta' : '0',
+                     'maxEta' : '320',
+                     'L1' : None }
     
     chain = conf
     match = re_Bjet.match( chain )
@@ -59,6 +67,8 @@ def TrigBjetEtHypoToolFromName_gsc( name, conf ):
     tool.OutputLevel = DEBUG
     tool.AcceptAll   = False
     tool.EtThreshold  = float(conf_dict['gscThreshold']) * GeV
+    tool.MinEtaThreshold = float(conf_dict['minEta']) / 100
+    tool.MaxEtaThreshold = float(conf_dict['maxEta']) / 100
 
     print "TrigBjetEtHypoToolFromName_gsc: name = %s, cut_j = %s "%(name,tool.EtThreshold)
     return tool