From d58282db5f7a59cb33dc800338780d50c10c5f3a Mon Sep 17 00:00:00 2001
From: Debo <debottam.bakshi.gupta@cern.ch>
Date: Wed, 3 Mar 2021 16:51:04 +0100
Subject: [PATCH 1/7] Parsing chaindict instead of string in chainName

---
 .../python/TrigEgammaFastCaloHypoTool.py      | 24 ++++++++++++-------
 .../python/TrigEgammaFastElectronHypoTool.py  |  4 ++--
 .../src/TrigEgammaMassHypoTool.cxx            |  2 ++
 .../HLTMenuConfig/Egamma/ElectronDef.py       | 23 +++++++++++++++---
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
index 9a0a46f38e1e..9cca333f8c04 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
@@ -32,14 +32,13 @@ def _GetPath( cand, sel, basepath = 'RingerSelectorTools/TrigL2_20180903_v9' ):
     return constant, threshold
 
 
-def _IncTool(name, cand, threshold, sel):
+def _IncTool(name, cand, threshold, sel, trackinfo, noringerinfo):
 
     possibleSel = L2CaloCutMaps( threshold ).MapsHADETthr.keys()
     from AthenaConfiguration.ComponentFactory import CompFactory
     tool = CompFactory.TrigEgammaFastCaloHypoToolInc( name )
     tool.AcceptAll = False
-    tool.UseRinger = False
-    
+    tool.UseRinger = False    
 
     if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in  TriggerFlags.enableMonitoring():
         monTool = GenericMonitoringTool("MonTool_"+name)
@@ -85,8 +84,9 @@ def _IncTool(name, cand, threshold, sel):
     tool.F3thr          = same( 99999. )
     tool.CARCOREthr     = same( -9999. )
     tool.CAERATIOthr    = same( -9999. )
+        
 
-    if sel == 'nocut' or 'idperf' in name:
+    if trackinfo != '' and trackinfo == 'nocut' or 'idperf' in trackinfo:
         tool.AcceptAll = True
         tool.UseRinger = False
         tool.ETthr          = same( float( threshold )*GeV )
@@ -97,7 +97,7 @@ def _IncTool(name, cand, threshold, sel):
         tool.CARCOREthr     = same( -9999. )
         tool.CAERATIOthr    = same( -9999. )
 
-    elif sel == "etcut": # stcut is part of the name, it can as well be etcut1step (test chains)
+    if sel == "etcut": # stcut is part of the name, it can as well be etcut1step (test chains)
         tool.UseRinger = False
         tool.ETthr          = same( ( float( threshold ) -  3 )*GeV )
         # No other cuts applied
@@ -108,7 +108,7 @@ def _IncTool(name, cand, threshold, sel):
         tool.CARCOREthr     = same( -9999. )
         tool.CAERATIOthr    = same( -9999. )
 
-    elif sel in possibleSel and "noringer" in name: # real selection
+    elif sel in possibleSel and "noringer" in noringerinfo: # real selection
         tool.UseRinger = False
         tool.ETthr       = same( ( float( threshold ) - 3 )*GeV )
         tool.HADETthr    = L2CaloCutMaps( threshold ).MapsHADETthr[sel]
@@ -122,7 +122,7 @@ def _IncTool(name, cand, threshold, sel):
         tool.CARCOREthr  = L2CaloCutMaps( threshold ).MapsCARCOREthr[sel]
         tool.CAERATIOthr = L2CaloCutMaps( threshold ).MapsCAERATIOthr[sel]    
 
-    elif sel in _possibleSel.keys() and "noringer" not in name and cand=="e":
+    elif sel in _possibleSel.keys() and "noringer" not in noringerinfo and cand=="e":
         tool.UseRinger = True
         pconstants, pthresholds = _GetPath( cand, sel )
         tool.ConstantsCalibPath = pconstants
@@ -156,6 +156,7 @@ def _IncTool(name, cand, threshold, sel):
         propLen = len( getattr( tool, prop ) )
         assert propLen == etaBinsLen , "In " + name + " " + prop + " has length " + str( propLen ) + " which is different from EtaBins which has length " + str( etaBinsLen )
 
+    
     return tool
 
 
@@ -168,7 +169,6 @@ def _MultTool(name):
 def TrigEgammaFastCaloHypoToolFromDict( d ):
     """ Use menu decoded chain dictionary to configure the tool """
     cparts = [i for i in d['chainParts'] if ((i['signature']=='Electron') or (i['signature']=='Photon'))]
-
     from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgDefault
     LuminosityCondAlgDefault()
 
@@ -184,6 +184,12 @@ def TrigEgammaFastCaloHypoToolFromDict( d ):
     def __cand(cpart):
         return cpart['trigType']
 
+    def __trackinfo(cpart):
+        return cpart['trkInfo'] if cpart['trkInfo'] else ''
+
+    def __noringer(cpart):    
+        return cpart['L2IDAlg']
+
     name = d['chainName']
 
 
@@ -196,7 +202,7 @@ def TrigEgammaFastCaloHypoToolFromDict( d ):
 
        # return tool
     # else:
-    return _IncTool( name, __cand( cparts[0]), __th( cparts[0]),  __sel( cparts[0]))
+    return _IncTool( name, __cand( cparts[0]), __th( cparts[0]),  __sel( cparts[0]), __trackinfo(cparts[0]), __noringer(cparts[0]))
 
 
 def TrigEgammaFastCaloHypoToolFromName( name, conf ):
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastElectronHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastElectronHypoTool.py
index 5f44ae2edb23..6aecd4f3174d 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastElectronHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastElectronHypoTool.py
@@ -15,8 +15,9 @@ def TrigEgammaFastElectronHypoToolFromDict( chainDict ):
     name = chainDict['chainName']
     from AthenaConfiguration.ComponentFactory import CompFactory
     tool = CompFactory.TrigEgammaFastElectronHypoTool(name)
+    tool.AcceptAll = False
 
-    if 'idperf' in name:
+    if cparts[0]['trkInfo']!='' and 'idperf' in cparts[0]['trkInfo']:
         tool.AcceptAll = True
    
     else:
@@ -41,7 +42,6 @@ def TrigEgammaFastElectronHypoToolFromDict( chainDict ):
         tool.CaloTrackdEoverPHigh = [ 999.0 ] * nt
         tool.TRTRatio = [ -999. ] * nt
 
-
         for th, thvalue in enumerate(thresholds):        
             if float(thvalue) < 15:
                     tool.TrackPt[ th ] = 1.0 * GeV 
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaMassHypoTool.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaMassHypoTool.cxx
index f54cb97af906..0035978bd0c1 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaMassHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaMassHypoTool.cxx
@@ -52,7 +52,9 @@ bool TrigEgammaMassHypoTool::executeAlg(std::vector<LegDecision> &combination) c
 //retrieve the elements
   std::vector<ElementLink<xAOD::IParticleContainer>> selected_electrons;
   for (auto el: combination){
+    ATH_MSG_DEBUG("found Combination: "<<combination);
     auto EL= el.second;    
+    ATH_MSG_DEBUG("found featureString(): "<<featureString());
     auto electronLink = TrigCompositeUtils::findLink<xAOD::IParticleContainer>( *EL, featureString() ).link;
     selected_electrons.push_back(electronLink);
   }
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index faf897862fce..04ead10697d9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -87,7 +87,7 @@ class ElectronChainConfiguration(ChainConfigurationBase):
 
         stepDictionary = {
                 'etcut1step': ['getFastCalo'],
-                'idperf'    : ['getFastCalo', 'getFastElectron_idperf', 'getPrecisionCaloElectron', 'getPrecisionTracking'],
+                'idperf'    : ['getFastCalo', 'getFastElectron_idperf', 'getPrecisionCaloElectron', 'getPrecisionTracking_idperf'],
                 'etcut'     : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking'],
                 'lhloose'   : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionElectron'],
                 'lhvloose'  : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionElectron'],
@@ -126,7 +126,7 @@ class ElectronChainConfiguration(ChainConfigurationBase):
 
         log.debug('electron chain part = %s', self.chainPart)
         key = self.chainPart['extra'] + self.chainPart['IDinfo'] + self.chainPart['L2IDAlg'] + self.chainPart['isoInfo'] + self.chainPart['trkInfo']
-
+        addInfo = 'etcut'
 
         for addInfo in self.chainPart['addInfo']:
             key+=addInfo
@@ -167,10 +167,27 @@ class ElectronChainConfiguration(ChainConfigurationBase):
         stepName = "precisionCalo_electron"
         return self.getStep(3,stepName,[ precisionCaloSequenceCfg])
 
+    def getPrecisionCaloElectron_idperf(self):
+        if "Zee" in self.chainName:
+            stepName = "precisionCalo_topo"
+            return self.getStep(3,stepName,sequenceCfgArray=[precisionCaloSequenceCfg], comboTools=[diElectronZeeMassComboHypoToolFromDict])
+        else:
+            stepName = "precisionCalo_electron"
+            return self.getStep(3,stepName,[ precisionCaloSequenceCfg])
+
+    def getPrecisionTracking_idperf(self):
+        if "Zee" in self.chainName:
+            stepName = "precisionTracking_topo"
+            return self.getStep(4,stepName,sequenceCfgArray=[precisionTrackingSequenceCfg], comboTools=[diElectronZeeMassComboHypoToolFromDict])
+        else:
+            stepName = "precisionTracking_electron"
+            return self.getStep(4,stepName,[ precisionTrackingSequenceCfg])
+
     def getPrecisionTracking(self):
         stepName = "precisionTracking_electron"
         return self.getStep(4,stepName,[ precisionTrackingSequenceCfg])
 
+
     def getPrecisionElectron(self):
 
         isocut = self.chainPart['isoInfo']
@@ -194,7 +211,7 @@ class ElectronChainConfiguration(ChainConfigurationBase):
         if "Zee" in self.chainName:
             stepName = "precision_topoelectron_GSF"+isocut
             return self.getStep(5,stepName,sequenceCfgArray=[precisionGSFElectronSequenceCfg], comboTools=[diElectronZeeMassComboHypoToolFromDict])
-        if "Jpsiee" in self.chainName:
+        if "Jpsiee" in self.self.chainName:
             stepName = "precision_topoelectron_GSF"+isocut
             return self.getStep(5,stepName,sequenceCfgArray=[precisionGSFElectronSequenceCfg], comboTools=[diElectronJpsieeMassComboHypoToolFromDict])
         else:
-- 
GitLab


From ec88615d3e7d9dd90cffeaf7dbd054b7e8e6bba6 Mon Sep 17 00:00:00 2001
From: Debo <debottam.bakshi.gupta@cern.ch>
Date: Fri, 5 Mar 2021 16:58:44 +0100
Subject: [PATCH 2/7] Fixing GeV issue in TrigEgammaFastCaloHypoTool.py and
 rigEgammaPrecisionCaloHypoTool.py

---
 .../python/TrigEgammaFastCaloHypoTool.py      | 13 +++++-----
 .../python/TrigEgammaPrecisionCaloHypoTool.py |  2 +-
 .../python/TrigIsoHPtTrackTriggerHypoTool.py  |  2 +-
 .../HLTMenuConfig/Egamma/ElectronDef.py       | 26 +++++--------------
 4 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
index 9cca333f8c04..5b09c1c5f514 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
@@ -1,5 +1,7 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
+from __future__ import print_function 
+
 from AthenaCommon.SystemOfUnits import GeV
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 from TriggerJobOpts.TriggerFlags import TriggerFlags
@@ -72,7 +74,7 @@ def _IncTool(name, cand, threshold, sel, trackinfo, noringerinfo):
     def same( val ):
         return [val]*( len( tool.EtaBins ) - 1 )
 
-    tool.ETthr          = same( float(threshold) )
+    tool.ETthr          = same( float(threshold)*GeV )
     tool.dETACLUSTERthr = 0.1
     tool.dPHICLUSTERthr = 0.1
     tool.F1thr          = same( 0.005 )
@@ -108,7 +110,7 @@ def _IncTool(name, cand, threshold, sel, trackinfo, noringerinfo):
         tool.CARCOREthr     = same( -9999. )
         tool.CAERATIOthr    = same( -9999. )
 
-    elif sel in possibleSel and "noringer" in noringerinfo: # real selection
+    elif sel in possibleSel and "noringer" in noringerinfo and cand=="e": # real selection
         tool.UseRinger = False
         tool.ETthr       = same( ( float( threshold ) - 3 )*GeV )
         tool.HADETthr    = L2CaloCutMaps( threshold ).MapsHADETthr[sel]
@@ -168,10 +170,10 @@ def _MultTool(name):
 
 def TrigEgammaFastCaloHypoToolFromDict( d ):
     """ Use menu decoded chain dictionary to configure the tool """
-    cparts = [i for i in d['chainParts'] if ((i['signature']=='Electron') or (i['signature']=='Photon'))]
+    cparts = [i for i in d['chainParts'] if (((i['signature']=='Electron') or (i['signature']=='Photon')) and (i['signature']!='UnconventionalTracking'))]
     from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgDefault
     LuminosityCondAlgDefault()
-
+    print("Printing cparts:",cparts)
     #def __mult(cpart):
      #   return int( cpart['multiplicity'] )
 
@@ -188,11 +190,10 @@ def TrigEgammaFastCaloHypoToolFromDict( d ):
         return cpart['trkInfo'] if cpart['trkInfo'] else ''
 
     def __noringer(cpart):    
-        return cpart['L2IDAlg']
+        return cpart['L2IDAlg'] if cpart['trigType']=='e' else ''
 
     name = d['chainName']
 
-
     # do we need to configure high multiplicity selection, either NeX or ex_ey_ez etc...?
     #if len(cparts) > 1 or __mult(cparts[0]) > 1:
      #   tool = _MultTool(name)
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionCaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionCaloHypoTool.py
index a2d0687ba5f7..1f417a051114 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionCaloHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionCaloHypoTool.py
@@ -29,7 +29,7 @@ def _IncTool(name, threshold, sel):
     def same( val ):
         return [val]*( len( tool.EtaBins ) - 1 )
 
-    tool.ETthr          = same( float(threshold) )
+    tool.ETthr          = same( float(threshold)*GeV )
     tool.dETACLUSTERthr = 0.1
     tool.dPHICLUSTERthr = 0.1
     tool.ET2thr         = same( 90.0*GeV )
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigIsoHPtTrackTriggerHypoTool.py b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigIsoHPtTrackTriggerHypoTool.py
index 86dd93d0d420..8915e9d7e07b 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigIsoHPtTrackTriggerHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigIsoHPtTrackTriggerHypoTool.py
@@ -12,7 +12,7 @@ log = logging.getLogger('TrigIsoHPtTrackTriggerHypoTool')
 
 def TrigIsoHPtTrackTriggerHypoToolFromDict( chainDict ):
     """ Use menu decoded chain dictionary to configure the tool """
-    cparts = [i for i in chainDict['chainParts'] if i['signature']=='UnconventionalTracking']
+    cparts = [i for i in chainDict['chainParts'] if ((i['signature']=='UnconventionalTracking') and (i['signature']!='Electron'))]
     
     thresholds = sum([ [cpart['threshold']]*int(cpart['multiplicity']) for cpart in cparts], [])
 
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index 04ead10697d9..036dd5d57e17 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -87,7 +87,7 @@ class ElectronChainConfiguration(ChainConfigurationBase):
 
         stepDictionary = {
                 'etcut1step': ['getFastCalo'],
-                'idperf'    : ['getFastCalo', 'getFastElectron_idperf', 'getPrecisionCaloElectron', 'getPrecisionTracking_idperf'],
+                'idperf'    : ['getFastCalo', 'getFastElectron_idperf', 'getPrecisionCaloElectron', 'getPrecisionTracking'],
                 'etcut'     : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking'],
                 'lhloose'   : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionElectron'],
                 'lhvloose'  : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionElectron'],
@@ -125,11 +125,15 @@ class ElectronChainConfiguration(ChainConfigurationBase):
                 }
 
         log.debug('electron chain part = %s', self.chainPart)
-        key = self.chainPart['extra'] + self.chainPart['IDinfo'] + self.chainPart['L2IDAlg'] + self.chainPart['isoInfo'] + self.chainPart['trkInfo']
+        key = self.chainPart['extra'] + self.chainPart['IDinfo'] + self.chainPart['isoInfo'] + self.chainPart['trkInfo']
         addInfo = 'etcut'
+        L2IDAlg = 'noringer'
 
         for addInfo in self.chainPart['addInfo']:
             key+=addInfo
+        
+        for L2IDAlg in self.chainPart['L2IDAlg']:
+            key+=L2IDAlg
 
         log.debug('electron key = %s', key)
         if key in stepDictionary:
@@ -167,22 +171,6 @@ class ElectronChainConfiguration(ChainConfigurationBase):
         stepName = "precisionCalo_electron"
         return self.getStep(3,stepName,[ precisionCaloSequenceCfg])
 
-    def getPrecisionCaloElectron_idperf(self):
-        if "Zee" in self.chainName:
-            stepName = "precisionCalo_topo"
-            return self.getStep(3,stepName,sequenceCfgArray=[precisionCaloSequenceCfg], comboTools=[diElectronZeeMassComboHypoToolFromDict])
-        else:
-            stepName = "precisionCalo_electron"
-            return self.getStep(3,stepName,[ precisionCaloSequenceCfg])
-
-    def getPrecisionTracking_idperf(self):
-        if "Zee" in self.chainName:
-            stepName = "precisionTracking_topo"
-            return self.getStep(4,stepName,sequenceCfgArray=[precisionTrackingSequenceCfg], comboTools=[diElectronZeeMassComboHypoToolFromDict])
-        else:
-            stepName = "precisionTracking_electron"
-            return self.getStep(4,stepName,[ precisionTrackingSequenceCfg])
-
     def getPrecisionTracking(self):
         stepName = "precisionTracking_electron"
         return self.getStep(4,stepName,[ precisionTrackingSequenceCfg])
@@ -211,7 +199,7 @@ class ElectronChainConfiguration(ChainConfigurationBase):
         if "Zee" in self.chainName:
             stepName = "precision_topoelectron_GSF"+isocut
             return self.getStep(5,stepName,sequenceCfgArray=[precisionGSFElectronSequenceCfg], comboTools=[diElectronZeeMassComboHypoToolFromDict])
-        if "Jpsiee" in self.self.chainName:
+        if "Jpsiee" in self.chainName:
             stepName = "precision_topoelectron_GSF"+isocut
             return self.getStep(5,stepName,sequenceCfgArray=[precisionGSFElectronSequenceCfg], comboTools=[diElectronJpsieeMassComboHypoToolFromDict])
         else:
-- 
GitLab


From 17a1632ae7d346fceb5b0c213f59c79540a9099e Mon Sep 17 00:00:00 2001
From: Debo <debottam.bakshi.gupta@cern.ch>
Date: Fri, 5 Mar 2021 17:54:47 +0100
Subject: [PATCH 3/7] Removing print messages

---
 .../python/TrigEgammaFastCaloHypoTool.py       | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
index 48f1598c107f..2ab1bd5eb689 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
@@ -1,7 +1,5 @@
 # Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
-from __future__ import print_function 
-
 from AthenaCommon.SystemOfUnits import GeV
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 from TriggerJobOpts.TriggerFlags import TriggerFlags
@@ -39,7 +37,7 @@ def _IncTool(name, cand, threshold, sel, trackinfo, noringerinfo):
     from AthenaConfiguration.ComponentFactory import CompFactory
     tool = CompFactory.TrigEgammaFastCaloHypoToolInc( name )
     tool.AcceptAll = False
-    tool.UseRinger = False    
+    tool.UseRinger = False
 
     if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in  TriggerFlags.enableMonitoring():
         monTool = GenericMonitoringTool("MonTool_"+name)
@@ -169,12 +167,9 @@ def _MultTool(name):
 
 def TrigEgammaFastCaloHypoToolFromDict( d ):
     """ Use menu decoded chain dictionary to configure the tool """
-    cparts = [i for i in d['chainParts'] if (((i['signature']=='Electron') or (i['signature']=='Photon')) and (i['signature']!='UnconventionalTracking'))]
+    cparts = [i for i in d['chainParts'] if ((i['signature']=='Electron') or (i['signature']=='Photon'))]
     from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgDefault
     LuminosityCondAlgDefault()
-    print("Printing cparts:",cparts)
-    #def __mult(cpart):
-     #   return int( cpart['multiplicity'] )
 
     def __th(cpart):
         return cpart['threshold']
@@ -193,15 +188,6 @@ def TrigEgammaFastCaloHypoToolFromDict( d ):
 
     name = d['chainName']
 
-    # do we need to configure high multiplicity selection, either NeX or ex_ey_ez etc...?
-    #if len(cparts) > 1 or __mult(cparts[0]) > 1:
-     #   tool = _MultTool(name)
-     #   for cpart in cparts:
-      #      for cutNumber in range( __mult( cpart ) ):
-       #         tool.SubTools += [ _IncTool( cpart['chainPartName']+"_"+str(cutNumber), __cand(cpart), __th( cpart ), __sel( cpart) ) ]
-
-       # return tool
-    # else:
     return _IncTool( name, __cand( cparts[0]), __th( cparts[0]),  __sel( cparts[0]), __trackinfo(cparts[0]), __noringer(cparts[0]))
 
 
-- 
GitLab


From 2fd463280e14a6e8bb2cff995b16272cbe0e6380 Mon Sep 17 00:00:00 2001
From: Debo <debottam.bakshi.gupta@cern.ch>
Date: Mon, 8 Mar 2021 21:21:38 +0100
Subject: [PATCH 4/7] Debugging the c++ and updating references

---
 .../python/TrigEgammaFastCaloHypoTool.py      |  20 --
 .../TrigEgammaPrecisionCaloHypoToolInc.cxx    |  10 +-
 .../src/ComboHypoToolBase.cxx                 |   5 +-
 .../share/ref_RDOtoRDOTrig_v1Dev_build.ref    | 290 +++++++++---------
 .../share/ref_data_v1Dev_build.ref            | 186 +++++------
 5 files changed, 227 insertions(+), 284 deletions(-)

diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
index 2ab1bd5eb689..806480017d05 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
@@ -15,8 +15,6 @@ log = logging.getLogger('TrigEgammaFastCaloHypoTool')
 
 def _GetPath( cand, sel, basepath = 'RingerSelectorTools/TrigL2_20180903_v9' ):
     
-    if TriggerFlags.EgammaSlice.ringerVersion():
-       basepath = TriggerFlags.EgammaSlice.ringerVersion()
     log.debug('_GetPath: TrigMultiVarHypo version: %s', basepath)
     if sel not in _possibleSel.keys():
        raise RuntimeError( "Bad selection name: %s" % sel )
@@ -207,22 +205,4 @@ if __name__ == "__main__":
     t = TrigEgammaFastCaloHypoToolFromName( "HLT_e10_etcut_L1EM3","HLT_e10_etcut_L1EM3" )
     assert t, "cant configure EtCut"
 
-
-    #t = TrigEgammaFastCaloHypoToolFromName( "HLT_2e5_etcut_L12EM3", "HLT_2e5_etcut_L12EM3" )
-    #assert t, "cant configure symmetric selection"
-    #assert len(t.SubTools) == 2, "Sub-tools not configured"
-
-    #t = TrigEgammaFastCaloHypoToolFromName( "HLT_3e5_etcut_L13EM3", "HLT_3e5_etcut_L13EM3" )
-    #assert t, "cant configure symmetric selection"
-    #assert len(t.SubTools) == 3, "Sub-tools not configured"
-
-    # Asymmetric chais not working with this. Commenting out for now
-    # t = TrigEgammaFastCaloHypoToolFromName( "HLT_e3_etcut_e5_etcut_L12EM3",  "HLT_e3_etcut_e5_etcut_L12EM3" )
-    # assert t, "cant configure asymmetric selection"
-    # assert len(t.SubTools) == 2, "Sub-tools not configured"
-
-    #t = TrigEgammaFastCaloHypoToolFromName( "HLT_e3_etcut_e5_etcut_mu6_L1EM3_MU3",  "HLT_e3_etcut_e5_etcut_L1EM3_MU3" )
-    #assert t, "cant configure asymmetric selection for combined chains"
-    #assert len(t.SubTools) == 2, "Sub-tools not configured"
-
     log.info("TrigEgammaFastCaloHypoToolFromName ALL OK" )
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolInc.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolInc.cxx
index 1d1b22eb8c4f..041bed4d539d 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolInc.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoToolInc.cxx
@@ -59,13 +59,13 @@ bool TrigEgammaPrecisionCaloHypoToolInc::decide( const ITrigEgammaPrecisionCaloH
 
   auto dEta         = Monitored::Scalar( "dEta", -1. ); 
   auto dPhi         = Monitored::Scalar( "dPhi", -1. );
-  auto eT_T2Calo    = Monitored::Scalar( "Et_em"   , -1.0 );
+  auto eT_Cluster    = Monitored::Scalar( "Et_em"   , -1.0 );
   auto etaBin       = Monitored::Scalar( "EtaBin", -1. );
   auto monEta       = Monitored::Scalar( "Eta", -99. ); 
   auto monPhi       = Monitored::Scalar( "Phi", -99. );
   auto PassedCuts   = Monitored::Scalar<int>( "CutCounter", -1 );  
   auto monitorIt    = Monitored::Group( m_monTool, 
-					       dEta, dPhi, eT_T2Calo,
+					       dEta, dPhi, eT_Cluster,
                                                etaBin, monEta,
 					       monPhi,PassedCuts );
  // when leaving scope it will ship data to monTool
@@ -102,7 +102,7 @@ bool TrigEgammaPrecisionCaloHypoToolInc::decide( const ITrigEgammaPrecisionCaloH
   //  Deal with angle diferences greater than Pi
   dPhi =  fabs( pClus->phi() - phiRef );
   dPhi = ( dPhi < M_PI ? dPhi : 2*M_PI - dPhi ); // TB why only <
-  eT_T2Calo  = pClus->et();
+  eT_Cluster  = pClus->et();
   // apply cuts: DeltaEta( clus-ROI )
   ATH_MSG_DEBUG( "CaloCluster: eta="  << pClus->eta()
   		 << " roi eta=" << etaRef << " DeltaEta=" << dEta
@@ -135,8 +135,8 @@ bool TrigEgammaPrecisionCaloHypoToolInc::decide( const ITrigEgammaPrecisionCaloH
   PassedCuts = PassedCuts + 1; // passed eta cut
   
   // ET_em
-  ATH_MSG_DEBUG( "CaloCluster: ET_em=" << eT_T2Calo << " cut: >"  << m_eTthr[cutIndex] );
-  if ( eT_T2Calo < m_eTthr[cutIndex] ) {
+  ATH_MSG_DEBUG( "CaloCluster: ET_em=" << eT_Cluster << " cut: >"  << m_eTthr[cutIndex] );
+  if ( eT_Cluster < m_eTthr[cutIndex] ) {
     ATH_MSG_DEBUG("REJECT et cut failed");
     return pass;
   }
diff --git a/Trigger/TrigSteer/DecisionHandling/src/ComboHypoToolBase.cxx b/Trigger/TrigSteer/DecisionHandling/src/ComboHypoToolBase.cxx
index 613e380f5cf0..5f3b2e289d4e 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/ComboHypoToolBase.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/ComboHypoToolBase.cxx
@@ -16,7 +16,6 @@ StatusCode ComboHypoToolBase::decide(LegDecisionsMap & passingLegs, const EventC
 {
   // if no combinations passed, then exit 
   if (passingLegs.size()==0)  return StatusCode::SUCCESS;
-  
    ATH_MSG_DEBUG( "Looking for "<< decisionId() <<" in the map. Map contains "<<passingLegs.size()<<" legs");
    //ATH_CHECK( printDebugInformation(passingLegs));
 
@@ -25,7 +24,7 @@ StatusCode ComboHypoToolBase::decide(LegDecisionsMap & passingLegs, const EventC
    ATH_CHECK( selectLegs(passingLegs, leg_decisions) );
 
    if (leg_decisions.size() == 0) {
-     ATH_MSG_INFO("Found 0 legs with this DecisionID: something failed?");
+     ATH_MSG_DEBUG("Found 0 legs with this DecisionID: something failed?");
      return StatusCode::SUCCESS;
    }
 
@@ -110,7 +109,7 @@ StatusCode ComboHypoToolBase::selectLegs(const LegDecisionsMap & IDCombMap, std:
 
   size_t nLegs= leg_decisions.size(); // the legs for this chain only
   if (nLegs==0) {
-    ATH_MSG_INFO("There are no decisions in the legs to combine for ID "<< decisionId());
+    ATH_MSG_DEBUG("There are no decisions in the legs to combine for ID "<< decisionId());
     return StatusCode::SUCCESS;
   }
   
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 60c5e29bbb0d..98774f3247f0 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -63,7 +63,7 @@ HLT_2g10_loose_mu20_L1MU20:
   stepFeatures:
     0: 4
     1: 2
-    2: 3
+    2: 2
     3: 1
 HLT_2g15_tight_dPhi15_L1DPHI-M70-2EM12I:
   eventCount: 0
@@ -925,32 +925,28 @@ HLT_e17_lhvloose_nod0_L1EM15VHI:
     3: 4
     4: 4
 HLT_e20_lhmedium_e15_idperf_Zee_L12EM3:
-  eventCount: 19
+  eventCount: 3
   stepCounts:
-    0: 20
-    1: 20
-    2: 20
-    3: 19
-    4: 19
+    0: 5
+    1: 4
+    2: 3
+    3: 3
+    4: 3
   stepFeatures:
-    0: 352
-    1: 705
-    2: 636
-    3: 306
-    4: 6
+    0: 181
+    1: 53
+    2: 18
+    3: 14
+    4: 3
 HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3:
   eventCount: 0
   stepCounts:
     0: 1
     1: 1
-    2: 1
-    3: 1
   stepFeatures:
     0: 12
     1: 9
-    2: 4
-    3: 3
-    4: 2
+    2: 2
 HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-EM18I:
   eventCount: 2
   stepCounts:
@@ -1069,8 +1065,8 @@ HLT_e26_idperf_L1EM24VHI:
   stepFeatures:
     0: 7
     1: 7
-    2: 14
-    3: 7
+    2: 6
+    3: 6
 HLT_e26_lhloose_L1EM15VH:
   eventCount: 5
   stepCounts:
@@ -1188,18 +1184,18 @@ HLT_e26_lhtight_e15_etcut_Zee_L1EM22VHI:
     3: 2
     4: 1
 HLT_e26_lhtight_e15_idperf_Zee_L1EM22VHI:
-  eventCount: 2
+  eventCount: 1
   stepCounts:
-    0: 6
-    1: 4
-    2: 2
-    3: 2
-    4: 2
+    0: 5
+    1: 3
+    2: 1
+    3: 1
+    4: 1
   stepFeatures:
-    0: 13
-    1: 34
-    2: 17
-    3: 5
+    0: 11
+    1: 10
+    2: 6
+    3: 2
     4: 1
 HLT_e26_lhtight_gsf_L1EM22VHI:
   eventCount: 4
@@ -1309,8 +1305,8 @@ HLT_e28_idperf_L1EM24VHI:
   stepFeatures:
     0: 7
     1: 7
-    2: 14
-    3: 7
+    2: 6
+    3: 6
 HLT_e28_lhmedium_mu8noL1_L1EM24VHI:
   eventCount: 2
   stepCounts:
@@ -1332,15 +1328,15 @@ HLT_e28_lhmedium_mu8noL1_L1EM24VHI:
 HLT_e300_etcut_L1EM22VHI:
   eventCount: 0
 HLT_e3_etcut1step_g5_etcut_L12EM3:
-  eventCount: 17
+  eventCount: 15
   stepCounts:
-    0: 17
-    1: 17
-    2: 17
+    0: 15
+    1: 15
+    2: 15
   stepFeatures:
-    0: 192
-    1: 131
-    2: 182
+    0: 172
+    1: 116
+    2: 172
 HLT_e3_etcut_L1EM3:
   eventCount: 20
   stepCounts:
@@ -1375,8 +1371,8 @@ HLT_e5_idperf_L1EM3:
   stepFeatures:
     0: 176
     1: 165
-    2: 330
-    3: 159
+    2: 102
+    3: 73
 HLT_e5_lhloose_L1EM3:
   eventCount: 6
   stepCounts:
@@ -1388,23 +1384,23 @@ HLT_e5_lhloose_L1EM3:
   stepFeatures:
     0: 60
     1: 138
-    2: 81
-    3: 46
-    4: 7
+    2: 24
+    3: 24
+    4: 6
 HLT_e5_lhloose_noringer_L1EM3:
   eventCount: 6
   stepCounts:
     0: 17
     1: 15
-    2: 15
-    3: 15
+    2: 13
+    3: 13
     4: 6
   stepFeatures:
     0: 56
     1: 130
-    2: 84
-    3: 46
-    4: 7
+    2: 28
+    3: 25
+    4: 6
 HLT_e5_lhmedium_L1EM3:
   eventCount: 4
   stepCounts:
@@ -1416,23 +1412,23 @@ HLT_e5_lhmedium_L1EM3:
   stepFeatures:
     0: 58
     1: 125
-    2: 76
-    3: 44
-    4: 5
+    2: 23
+    3: 23
+    4: 4
 HLT_e5_lhmedium_noringer_L1EM3:
   eventCount: 4
   stepCounts:
     0: 16
     1: 13
-    2: 13
-    3: 13
+    2: 11
+    3: 11
     4: 4
   stepFeatures:
     0: 48
     1: 98
-    2: 66
-    3: 38
-    4: 5
+    2: 21
+    3: 20
+    4: 4
 HLT_e5_lhtight_L1EM3:
   eventCount: 4
   stepCounts:
@@ -1444,9 +1440,9 @@ HLT_e5_lhtight_L1EM3:
   stepFeatures:
     0: 57
     1: 123
-    2: 74
-    3: 43
-    4: 5
+    2: 23
+    3: 23
+    4: 4
 HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
   eventCount: 1
   stepCounts:
@@ -1458,21 +1454,21 @@ HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
   stepFeatures:
     0: 4
     1: 12
-    2: 3
+    2: 2
     3: 2
 HLT_e5_lhtight_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
-  eventCount: 2
+  eventCount: 1
   stepCounts:
     0: 2
     1: 2
     2: 2
-    3: 2
-    4: 2
+    3: 1
+    4: 1
   stepFeatures:
     0: 13
     1: 35
-    2: 17
-    3: 11
+    2: 7
+    3: 6
 HLT_e5_lhtight_gsf_L1EM3:
   eventCount: 4
   stepCounts:
@@ -1484,9 +1480,9 @@ HLT_e5_lhtight_gsf_L1EM3:
   stepFeatures:
     0: 57
     1: 123
-    2: 74
-    3: 43
-    4: 5
+    2: 23
+    3: 23
+    4: 4
 HLT_e5_lhtight_nod0_L1EM3:
   eventCount: 4
   stepCounts:
@@ -1498,54 +1494,52 @@ HLT_e5_lhtight_nod0_L1EM3:
   stepFeatures:
     0: 57
     1: 123
-    2: 74
-    3: 43
-    4: 5
+    2: 23
+    3: 23
+    4: 4
 HLT_e5_lhtight_noringer_L1EM3:
   eventCount: 4
   stepCounts:
     0: 16
     1: 13
-    2: 13
-    3: 13
+    2: 11
+    3: 11
     4: 4
   stepFeatures:
     0: 45
     1: 93
-    2: 61
-    3: 36
-    4: 5
+    2: 20
+    3: 19
+    4: 4
 HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
   eventCount: 0
   stepFeatures:
     0: 2
 HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
-  eventCount: 1
+  eventCount: 0
   stepCounts:
     0: 1
     1: 1
     2: 1
-    3: 1
-    4: 1
   stepFeatures:
     0: 8
     1: 13
-    2: 5
-    3: 4
+    2: 3
+    3: 2
 HLT_e5_lhtight_noringer_nod0_L1EM3:
   eventCount: 4
   stepCounts:
     0: 16
     1: 13
-    2: 13
-    3: 13
+    2: 11
+    3: 11
     4: 4
   stepFeatures:
     0: 45
     1: 93
-    2: 61
-    3: 36
-    4: 5
+    2: 20
+    3: 19
+    4: 4
 HLT_e60_lhmedium_L1EM22VHI:
   eventCount: 2
   stepCounts:
@@ -1605,8 +1599,8 @@ HLT_e7_lhmedium_mu24_L1MU20:
   stepCounts:
     0: 7
     1: 5
-    2: 5
-    3: 5
+    2: 3
+    3: 3
     4: 2
     5: 2
     6: 1
@@ -1615,39 +1609,31 @@ HLT_e7_lhmedium_mu24_L1MU20:
   stepFeatures:
     0: 9
     1: 10
-    2: 8
-    3: 7
+    2: 3
+    3: 3
     4: 2
     5: 2
     6: 1
     7: 1
     8: 1
 HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
-  eventCount: 2
+  eventCount: 0
   stepCounts:
     0: 2
     1: 2
-    2: 2
-    3: 2
-    4: 2
   stepFeatures:
     0: 25
     1: 71
-    2: 24
-    3: 18
+    2: 21
 HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
-  eventCount: 1
+  eventCount: 0
   stepCounts:
     0: 1
     1: 1
-    2: 1
-    3: 1
-    4: 1
   stepFeatures:
     0: 24
     1: 54
-    2: 17
-    3: 13
+    2: 16
 HLT_e9_lhvloose_mu20_mu8noL1_L1MU20:
   eventCount: 0
   stepCounts:
@@ -1663,8 +1649,8 @@ HLT_e9_lhvloose_mu20_mu8noL1_L1MU20:
   stepFeatures:
     0: 4
     1: 5
-    2: 4
-    3: 4
+    2: 3
+    3: 3
     4: 2
     5: 2
     6: 1
@@ -1701,30 +1687,30 @@ HLT_g15_loose_2mu10_msonly_L12MU10:
   stepFeatures:
     0: 1
     1: 1
-    2: 3
+    2: 1
 HLT_g20_loose_L1EM15VH:
   eventCount: 6
   stepCounts:
     0: 8
     1: 8
-    2: 8
+    2: 7
     3: 6
   stepFeatures:
     0: 9
     1: 9
-    2: 15
+    2: 8
     3: 6
 HLT_g20_loose_L1EM15VHI:
   eventCount: 5
   stepCounts:
     0: 6
     1: 6
-    2: 6
+    2: 5
     3: 5
   stepFeatures:
     0: 6
     1: 6
-    2: 9
+    2: 5
     3: 5
 HLT_g20_loose_LArPEBHLT_L1EM15:
   eventCount: 0
@@ -1733,117 +1719,117 @@ HLT_g20_medium_L1EM15VH:
   stepCounts:
     0: 8
     1: 8
-    2: 8
+    2: 7
     3: 6
   stepFeatures:
     0: 8
     1: 8
-    2: 14
+    2: 7
     3: 6
 HLT_g20_medium_L1EM15VHI:
   eventCount: 5
   stepCounts:
     0: 6
     1: 6
-    2: 6
+    2: 5
     3: 5
   stepFeatures:
     0: 6
     1: 6
-    2: 9
+    2: 5
     3: 5
 HLT_g20_tight_L1EM15VH:
   eventCount: 5
   stepCounts:
     0: 8
     1: 8
-    2: 8
+    2: 7
     3: 5
   stepFeatures:
     0: 8
     1: 8
-    2: 14
+    2: 7
     3: 5
 HLT_g20_tight_L1EM15VHI:
   eventCount: 5
   stepCounts:
     0: 6
     1: 6
-    2: 6
+    2: 5
     3: 5
   stepFeatures:
     0: 6
     1: 6
-    2: 9
+    2: 5
     3: 5
 HLT_g20_tight_icaloloose_L1EM15VH:
   eventCount: 5
   stepCounts:
     0: 8
     1: 8
-    2: 8
+    2: 7
     3: 5
   stepFeatures:
     0: 8
     1: 8
-    2: 14
+    2: 7
     3: 5
 HLT_g20_tight_icaloloose_L1EM15VHI:
   eventCount: 5
   stepCounts:
     0: 6
     1: 6
-    2: 6
+    2: 5
     3: 5
   stepFeatures:
     0: 6
     1: 6
-    2: 9
+    2: 5
     3: 5
 HLT_g20_tight_icalomedium_L1EM15VH:
   eventCount: 5
   stepCounts:
     0: 8
     1: 8
-    2: 8
+    2: 7
     3: 5
   stepFeatures:
     0: 8
     1: 8
-    2: 14
+    2: 7
     3: 5
 HLT_g20_tight_icalomedium_L1EM15VHI:
   eventCount: 5
   stepCounts:
     0: 6
     1: 6
-    2: 6
+    2: 5
     3: 5
   stepFeatures:
     0: 6
     1: 6
-    2: 9
+    2: 5
     3: 5
 HLT_g20_tight_icalotight_L1EM15VH:
   eventCount: 0
   stepCounts:
     0: 8
     1: 8
-    2: 8
+    2: 7
   stepFeatures:
     0: 8
     1: 8
-    2: 14
+    2: 7
 HLT_g20_tight_icalotight_L1EM15VHI:
   eventCount: 0
   stepCounts:
     0: 6
     1: 6
-    2: 6
+    2: 5
   stepFeatures:
     0: 6
     1: 6
-    2: 9
+    2: 5
 HLT_g22_tight_L1EM15VH:
   eventCount: 5
   stepCounts:
@@ -1854,7 +1840,7 @@ HLT_g22_tight_L1EM15VH:
   stepFeatures:
     0: 7
     1: 7
-    2: 11
+    2: 7
     3: 5
 HLT_g25_etcut_L1EM20VH:
   eventCount: 7
@@ -1876,7 +1862,7 @@ HLT_g25_loose_L1EM20VH:
   stepFeatures:
     0: 9
     1: 9
-    2: 15
+    2: 9
     3: 7
 HLT_g25_medium_L1EM20VH:
   eventCount: 6
@@ -1888,7 +1874,7 @@ HLT_g25_medium_L1EM20VH:
   stepFeatures:
     0: 7
     1: 7
-    2: 11
+    2: 7
     3: 6
 HLT_g25_medium_mu24_L1MU20:
   eventCount: 1
@@ -1920,7 +1906,7 @@ HLT_g25_tight_L1EM20VH:
   stepFeatures:
     0: 7
     1: 7
-    2: 11
+    2: 7
     3: 5
 HLT_g300_etcut_L1EM22VHI:
   eventCount: 0
@@ -2017,7 +2003,7 @@ HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 5
-    2: 6
+    2: 5
 HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM24VHI:
   eventCount: 0
   stepCounts:
@@ -2027,7 +2013,7 @@ HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM24VHI:
   stepFeatures:
     0: 5
     1: 5
-    2: 6
+    2: 5
 HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI:
   eventCount: 0
   stepCounts:
@@ -2037,7 +2023,7 @@ HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI:
   stepFeatures:
     0: 5
     1: 5
-    2: 6
+    2: 5
 HLT_g35_tight_icalotight_mu18noL1_L1EM24VHI:
   eventCount: 0
   stepCounts:
@@ -2047,7 +2033,7 @@ HLT_g35_tight_icalotight_mu18noL1_L1EM24VHI:
   stepFeatures:
     0: 5
     1: 5
-    2: 6
+    2: 5
 HLT_g3_loose_LArPEBHLT_L1EM3:
   eventCount: 0
 HLT_g40_loose_LArPEBHLT_L1EM20VHI:
@@ -2067,41 +2053,41 @@ HLT_g5_etcut_L1EM3:
     1: 137
     2: 193
 HLT_g5_loose_L1EM3:
-  eventCount: 9
+  eventCount: 7
   stepCounts:
     0: 17
     1: 17
-    2: 17
-    3: 9
+    2: 14
+    3: 7
   stepFeatures:
     0: 56
     1: 56
-    2: 101
-    3: 14
+    2: 31
+    3: 8
 HLT_g5_medium_L1EM3:
-  eventCount: 9
+  eventCount: 7
   stepCounts:
     0: 16
     1: 16
-    2: 16
-    3: 9
+    2: 12
+    3: 7
   stepFeatures:
     0: 48
     1: 48
-    2: 83
-    3: 12
+    2: 24
+    3: 7
 HLT_g5_tight_L1EM3:
-  eventCount: 8
+  eventCount: 5
   stepCounts:
     0: 16
     1: 16
-    2: 16
-    3: 8
+    2: 12
+    3: 5
   stepFeatures:
     0: 45
     1: 45
-    2: 76
-    3: 8
+    2: 23
+    3: 5
 HLT_g60_loose_LArPEBHLT_L1EM20VHI:
   eventCount: 0
 HLT_g80_loose_LArPEBHLT_L1EM20VHI:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 7c71ac2a2c48..f5ccb5810099 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -515,18 +515,9 @@ HLT_e17_lhvloose_nod0_L1EM15VH:
 HLT_e17_lhvloose_nod0_L1EM15VHI:
   eventCount: 0
 HLT_e20_lhmedium_e15_idperf_Zee_L12EM3:
-  eventCount: 12
-  stepCounts:
-    0: 13
-    1: 13
-    2: 13
-    3: 12
-    4: 12
+  eventCount: 0
   stepFeatures:
-    0: 98
-    1: 106
-    2: 138
-    3: 69
+    0: 49
 HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3:
   eventCount: 0
   stepFeatures:
@@ -562,17 +553,13 @@ HLT_e26_etcut_L1EM22VHI:
     2: 1
     3: 1
 HLT_e26_idperf_L1EM24VHI:
-  eventCount: 1
+  eventCount: 0
   stepCounts:
     0: 1
     1: 1
-    2: 1
-    3: 1
   stepFeatures:
     0: 1
     1: 1
-    2: 4
-    3: 1
 HLT_e26_lhloose_L1EM15VH:
   eventCount: 0
 HLT_e26_lhloose_L1EM22VHI:
@@ -591,13 +578,8 @@ HLT_e26_lhtight_e15_etcut_Zee_L1EM22VHI:
   eventCount: 0
 HLT_e26_lhtight_e15_idperf_Zee_L1EM22VHI:
   eventCount: 0
-  stepCounts:
-    0: 1
-    1: 1
   stepFeatures:
-    0: 21
-    1: 2
-    2: 4
+    0: 20
 HLT_e26_lhtight_gsf_L1EM22VHI:
   eventCount: 0
 HLT_e26_lhtight_gsf_ivarloose_L1EM22VHI:
@@ -613,31 +595,27 @@ HLT_e26_lhtight_nod0_L1EM22VHI:
 HLT_e26_lhtight_nod0_L1EM24VHI:
   eventCount: 0
 HLT_e28_idperf_L1EM24VHI:
-  eventCount: 1
+  eventCount: 0
   stepCounts:
     0: 1
     1: 1
-    2: 1
-    3: 1
   stepFeatures:
     0: 1
     1: 1
-    2: 4
-    3: 1
 HLT_e28_lhmedium_mu8noL1_L1EM24VHI:
   eventCount: 0
 HLT_e300_etcut_L1EM22VHI:
   eventCount: 0
 HLT_e3_etcut1step_g5_etcut_L12EM3:
-  eventCount: 10
+  eventCount: 9
   stepCounts:
-    0: 10
-    1: 10
-    2: 10
+    0: 9
+    1: 9
+    2: 9
   stepFeatures:
-    0: 68
-    1: 34
-    2: 43
+    0: 58
+    1: 33
+    2: 42
 HLT_e3_etcut_L1EM3:
   eventCount: 13
   stepCounts:
@@ -663,77 +641,77 @@ HLT_e5_etcut_L1EM3:
     2: 41
     3: 27
 HLT_e5_idperf_L1EM3:
-  eventCount: 13
+  eventCount: 10
   stepCounts:
     0: 15
     1: 13
-    2: 13
-    3: 13
+    2: 10
+    3: 10
   stepFeatures:
     0: 49
     1: 40
-    2: 74
-    3: 38
+    2: 18
+    3: 15
 HLT_e5_lhloose_L1EM3:
   eventCount: 0
   stepCounts:
     0: 10
     1: 8
-    2: 7
-    3: 7
+    2: 4
+    3: 4
   stepFeatures:
     0: 19
     1: 22
-    2: 13
-    3: 10
+    2: 5
+    3: 5
 HLT_e5_lhloose_noringer_L1EM3:
   eventCount: 0
   stepCounts:
     0: 10
     1: 8
-    2: 8
-    3: 8
+    2: 5
+    3: 5
   stepFeatures:
     0: 15
     1: 22
-    2: 22
-    3: 12
+    2: 7
+    3: 6
 HLT_e5_lhmedium_L1EM3:
   eventCount: 0
   stepCounts:
     0: 10
     1: 9
-    2: 8
-    3: 8
+    2: 4
+    3: 4
   stepFeatures:
     0: 21
     1: 24
-    2: 16
-    3: 12
+    2: 5
+    3: 5
 HLT_e5_lhmedium_noringer_L1EM3:
   eventCount: 0
   stepCounts:
     0: 9
     1: 7
-    2: 7
-    3: 7
+    2: 4
+    3: 4
   stepFeatures:
     0: 13
     1: 20
-    2: 21
-    3: 10
+    2: 4
+    3: 4
 HLT_e5_lhtight_L1EM3:
   eventCount: 0
   stepCounts:
     0: 9
     1: 7
-    2: 6
-    3: 6
+    2: 3
+    3: 3
   stepFeatures:
     0: 17
     1: 17
-    2: 11
-    3: 8
+    2: 3
+    3: 3
 HLT_e5_lhtight_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
   eventCount: 0
   stepCounts:
@@ -755,37 +733,37 @@ HLT_e5_lhtight_gsf_L1EM3:
   stepCounts:
     0: 9
     1: 7
-    2: 6
-    3: 6
+    2: 3
+    3: 3
   stepFeatures:
     0: 17
     1: 17
-    2: 11
-    3: 8
+    2: 3
+    3: 3
 HLT_e5_lhtight_nod0_L1EM3:
   eventCount: 0
   stepCounts:
     0: 9
     1: 7
-    2: 6
-    3: 6
+    2: 3
+    3: 3
   stepFeatures:
     0: 17
     1: 17
-    2: 11
-    3: 8
+    2: 3
+    3: 3
 HLT_e5_lhtight_noringer_L1EM3:
   eventCount: 0
   stepCounts:
     0: 9
     1: 7
-    2: 7
-    3: 7
+    2: 4
+    3: 4
   stepFeatures:
     0: 13
     1: 20
-    2: 21
-    3: 10
+    2: 4
+    3: 4
 HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
   eventCount: 1
   stepCounts:
@@ -797,7 +775,7 @@ HLT_e5_lhtight_noringer_e14_etcut_Jpsiee_L1JPSI-1M5-EM12:
   stepFeatures:
     0: 18
     1: 5
-    2: 5
+    2: 2
     3: 2
 HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
   eventCount: 1
@@ -810,20 +788,20 @@ HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7:
   stepFeatures:
     0: 21
     1: 8
-    2: 6
+    2: 3
     3: 3
 HLT_e5_lhtight_noringer_nod0_L1EM3:
   eventCount: 0
   stepCounts:
     0: 9
     1: 7
-    2: 7
-    3: 7
+    2: 4
+    3: 4
   stepFeatures:
     0: 13
     1: 20
-    2: 21
-    3: 10
+    2: 4
+    3: 4
 HLT_e60_lhmedium_L1EM22VHI:
   eventCount: 0
 HLT_e60_lhmedium_nod0_L1EM22VHI:
@@ -856,18 +834,18 @@ HLT_e9_lhtight_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
     1: 12
     2: 4
 HLT_e9_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM7:
-  eventCount: 2
+  eventCount: 1
   stepCounts:
     0: 2
     1: 2
-    2: 2
-    3: 2
-    4: 2
+    2: 1
+    3: 1
+    4: 1
   stepFeatures:
     0: 49
     1: 15
-    2: 16
-    3: 7
+    2: 12
+    3: 4
 HLT_e9_lhvloose_mu20_mu8noL1_L1MU20:
   eventCount: 0
   stepFeatures:
@@ -939,11 +917,11 @@ HLT_g25_loose_L1EM20VH:
   stepCounts:
     0: 2
     1: 2
-    2: 2
+    2: 1
   stepFeatures:
     0: 2
     1: 2
-    2: 5
+    2: 1
 HLT_g25_medium_L1EM20VH:
   eventCount: 0
 HLT_g25_medium_mu24_L1MU20:
@@ -971,19 +949,19 @@ HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI:
 HLT_g35_tight_icalotight_mu18noL1_L1EM24VHI:
   eventCount: 0
 HLT_g3_loose_LArPEBHLT_L1EM3:
-  eventCount: 3
+  eventCount: 2
   stepCounts:
     0: 11
     1: 11
-    2: 11
-    3: 3
-    4: 3
+    2: 8
+    3: 2
+    4: 2
   stepFeatures:
     0: 17
     1: 17
-    2: 30
-    3: 3
-    4: 3
+    2: 13
+    3: 2
+    4: 2
 HLT_g40_loose_LArPEBHLT_L1EM20VHI:
   eventCount: 0
 HLT_g45_loose_tight_6j45_L14J15p0ETA25:
@@ -1001,40 +979,40 @@ HLT_g5_etcut_L1EM3:
     1: 41
     2: 53
 HLT_g5_loose_L1EM3:
-  eventCount: 3
+  eventCount: 1
   stepCounts:
     0: 10
     1: 10
-    2: 10
-    3: 3
+    2: 5
+    3: 1
   stepFeatures:
     0: 15
     1: 15
-    2: 27
-    3: 3
+    2: 7
+    3: 1
 HLT_g5_medium_L1EM3:
-  eventCount: 3
+  eventCount: 1
   stepCounts:
     0: 9
     1: 9
-    2: 9
-    3: 3
+    2: 4
+    3: 1
   stepFeatures:
     0: 13
     1: 13
-    2: 26
-    3: 3
+    2: 4
+    3: 1
 HLT_g5_tight_L1EM3:
   eventCount: 1
   stepCounts:
     0: 9
     1: 9
-    2: 9
+    2: 4
     3: 1
   stepFeatures:
     0: 13
     1: 13
-    2: 26
+    2: 4
     3: 1
 HLT_g60_loose_LArPEBHLT_L1EM20VHI:
   eventCount: 0
-- 
GitLab


From e155f0d375bb54bca85748db2b675ac7d0e16f8e Mon Sep 17 00:00:00 2001
From: Debo <debottam.bakshi.gupta@cern.ch>
Date: Fri, 12 Mar 2021 22:33:06 +0100
Subject: [PATCH 5/7] Updating TrigEgammaFastCaloHypoTool.py and fixing
 doRinger

---
 .../python/TrigEgammaFastCaloHypoTool.py      | 21 ++++++++-----------
 .../CommonSequences/CaloSequenceSetup.py      | 11 +++++-----
 .../HLTMenuConfig/Egamma/ElectronDef.py       |  2 +-
 .../python/HLTMenuConfig/Egamma/PhotonDef.py  |  4 +++-
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
index dd86c2325556..99c9f38a2367 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
@@ -59,12 +59,6 @@ class TrigEgammaFastCaloHypoToolConfig:
     tool.CAERATIOthr    = same( -9999. , tool)
     self.__tool = tool
 
-    self.__log.info( 'Chain     :%s', name )
-    self.__log.info( 'Signature :%s', cand )
-    self.__log.info( 'Threshold :%s', threshold )
-    self.__log.info( 'Pidname   :%s', sel )
-
-
 
   def chain(self):
     return self.__name
@@ -86,12 +80,15 @@ class TrigEgammaFastCaloHypoToolConfig:
     return 'g' in self.__cand
 
 
+  def noringerinfo(self):
+    return self.__noringerinfo
+
+  def trackinfo(self):
+    return self.__trackinfo
+
   def tool(self):
     return self.__tool
-
   
-  def noringerinfo(self):
-    return self.__noringerinfo  
 
   def idperf(self):
     
@@ -152,16 +149,16 @@ class TrigEgammaFastCaloHypoToolConfig:
 
   def compile(self):
 
-    if trackinfo == 'nocut' or 'idperf' in trackinfo:
+    if self.trackinfo()=='idperf':
       self.idperf()
 
     elif 'etcut' == self.pidname():
       self.etcut()
 
-    elif self.pidname() in self.__operation_points and 'noringer' in noringerinfo() and self.isElectron():
+    elif self.pidname() in self.__operation_points and 'noringer' in self.noringerinfo() and self.isElectron():
       self.noringer()
 
-    elif self.pidname() in self.__operation_points and and "noringer" not in noringerinfo() and self.isElectron():
+    elif self.pidname() in self.__operation_points and "noringer" not in self.noringerinfo() and self.isElectron():
       self.ringer()
 
     elif self.pidname() in self.__operation_points and self.isPhoton():
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
index 46850e373768..bc7e28af18be 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
@@ -5,6 +5,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool, M
 from AthenaCommon.CFElements import seqAND, parOR
 from TrigEDMConfig.TriggerEDMRun3 import recordable
 from .FullScanDefs import caloFSRoI
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
 class CaloMenuDefs(object):
       """Static Class to collect all string manipulations in Calo sequences """
@@ -12,9 +13,7 @@ class CaloMenuDefs(object):
       L2CaloClusters= recordable("HLT_FastCaloEMClusters")
 
 
-
-
-def fastCaloSequence(doRinger):
+def fastCaloSequence(ConfigFlags):
     """ Creates Fast Calo sequence"""
     # EV creator
     from TrigT2CaloCommon.CaloDef import fastCaloEVCreator
@@ -22,19 +21,19 @@ def fastCaloSequence(doRinger):
 
     # reco sequence always build the rings
     from TrigT2CaloCommon.CaloDef import fastCaloRecoSequence
-    (fastCaloInViewSequence, sequenceOut) = fastCaloRecoSequence(InViewRoIs, doRinger=doRinger)
+    (fastCaloInViewSequence, sequenceOut) = fastCaloRecoSequence(InViewRoIs, doRinger=True)
 
      # connect EVC and reco
     fastCaloSequence = seqAND("fastCaloSequence", [fastCaloViewsMaker, fastCaloInViewSequence ])
     return (fastCaloSequence, fastCaloViewsMaker, sequenceOut)
 
 
-def fastCaloMenuSequence(name, doRinger):
+def fastCaloMenuSequence(name):
     """ Creates Egamma Fast Calo  MENU sequence
     The Hypo name changes depending on name, so for different implementations (Electron, Gamma,....)
     The doRinger flag is to use or not the Ringer hypo
     """
-    (sequence, fastCaloViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(fastCaloSequence, {'doRinger' : doRinger})
+    (sequence, fastCaloViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(fastCaloSequence, ConfigFlags)
     # check if use Ringer and are electron because there aren't ringer for photons yet:
     # hypo
     from TrigEgammaHypo.TrigEgammaHypoConf import TrigEgammaFastCaloHypoAlgMT
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index 036dd5d57e17..ac768c99bd1b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -21,7 +21,7 @@ from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool,
 #----------------------------------------------------------------
 
 def electronFastCaloCfg( flags ):
-    return fastCaloMenuSequence("Electron", doRinger=True)
+    return fastCaloMenuSequence("Electron")
 
 def fastElectronSequenceCfg( flags ):
     return fastElectronMenuSequence(do_idperf=False)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
index fb82bd518e21..b7b87b4679bc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
@@ -19,7 +19,7 @@ from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool,
 # so let's make them functions already now
 #----------------------------------------------------------------
 def fastPhotonCaloSequenceCfg( flags ):
-    return fastCaloMenuSequence('Photon', doRinger=False)
+    return fastCaloMenuSequence('Photon')
     
 def fastPhotonSequenceCfg( flags ):    
     return fastPhotonMenuSequence()
@@ -77,6 +77,8 @@ class PhotonChainConfiguration(ChainConfigurationBase):
         
         ## This needs to be configured by the Egamma Developer!!
         log.debug('photon chain part = %s', self.chainPart)
+        addInfo = 'etcut'
+
         key = self.chainPart['extra'] + self.chainPart['IDinfo'] + self.chainPart['isoInfo']
         for addInfo in self.chainPart['addInfo']:
             key+=addInfo
-- 
GitLab


From 40c88bb63a37af8e11e56b062c712955f7fcb9c2 Mon Sep 17 00:00:00 2001
From: Debo <debottam.bakshi.gupta@cern.ch>
Date: Sun, 14 Mar 2021 15:28:58 +0100
Subject: [PATCH 6/7] Removing signature!=electron clause, seems unnecessary

---
 .../python/TrigIsoHPtTrackTriggerHypoTool.py                   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigIsoHPtTrackTriggerHypoTool.py b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigIsoHPtTrackTriggerHypoTool.py
index 1588ac4054c3..3f58f315c4ec 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigIsoHPtTrackTriggerHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigIsoHPtTrackTriggerHypoTool.py
@@ -11,8 +11,7 @@ log = logging.getLogger('TrigIsoHPtTrackTriggerHypoTool')
 
 def TrigIsoHPtTrackTriggerHypoToolFromDict( chainDict ):
     """ Use menu decoded chain dictionary to configure the tool """
-    cparts = [i for i in chainDict['chainParts'] if ((i['signature']=='UnconventionalTracking') and (i['signature']!='Electron'))]
-    
+    cparts = [i for i in chainDict['chainParts'] if i['signature']=='UnconventionalTracking']
     thresholds = sum([ [cpart['threshold']]*int(cpart['multiplicity']) for cpart in cparts], [])
 
     name = chainDict['chainName']
-- 
GitLab


From d8f210e930980bd5af22cd59910a35b9c87b8821 Mon Sep 17 00:00:00 2001
From: Debo <debottam.bakshi.gupta@cern.ch>
Date: Sun, 14 Mar 2021 16:17:21 +0100
Subject: [PATCH 7/7] Removing some unnecessary import in
 TrigEgammaFastCaloHypoTool.py

---
 .../TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
index 99c9f38a2367..1a7964a620b1 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastCaloHypoTool.py
@@ -268,8 +268,6 @@ def _IncTool(name, cand, threshold, sel, trackinfo, noringerinfo):
 def TrigEgammaFastCaloHypoToolFromDict( d ):
     """ Use menu decoded chain dictionary to configure the tool """
     cparts = [i for i in d['chainParts'] if ((i['signature']=='Electron') or (i['signature']=='Photon'))]
-    from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgDefault
-    LuminosityCondAlgDefault()
 
     def __th(cpart):
         return cpart['threshold']
-- 
GitLab