Merge branch 'split_trigEgamma_flags' into 'master'

split egamma LH flags

See merge request atlas/athena!52969

Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionElectronHypoTool.py

@@ -314,23 +314,21 @@ def TrigEgammaPrecisionElectronDNNSelectorCfg(name='TrigEgammaPrecisionElectronD
 #
 # Electron LH Selectors
 #
-def TrigEgammaPrecisionElectronLHSelectorCfg( name='TrigEgammaPrecisionElectronLHSelector', ConfigFilePath=None):
+def TrigEgammaPrecisionElectronLHSelectorCfg( name='TrigEgammaPrecisionElectronLHSelector', ConfigFilePath=None, ConfigFileNoPixPath=None):
 
     # Configure the LH selectors
     acc = ComponentAccumulator()
     if not ConfigFilePath:
-        ConfigFilePath = ConfigFlags.Trigger.egamma.pidVersion
-
+        ConfigFilePath = ConfigFlags.Trigger.egamma.electronPidVersion
+    if not ConfigFileNoPixPath:
+        ConfigFileNoPixPath = ConfigFlags.Trigger.egamma.electronNoPixPidVersion
+    
     import collections.abc
     SelectorNames = collections.OrderedDict({
           'lhtight'       :'AsgElectronLHTightSelector',
           'lhmedium'      :'AsgElectronLHMediumSelector',
           'lhloose'       :'AsgElectronLHLooseSelector',
           'lhvloose'      :'AsgElectronLHVLooseSelector',
-          'lhtight_nopix' :'AsgElectronLHTightSelectorNoPix',
-          'lhmedium_nopix':'AsgElectronLHMediumSelectorNoPix',
-          'lhloose_nopix' :'AsgElectronLHLooseSelectorNoPix',
-          'lhvloose_nopix':'AsgElectronLHVLooseSelectorNoPix',
           })
      
     ElectronToolConfigFile = collections.OrderedDict({
@@ -338,6 +336,15 @@ def TrigEgammaPrecisionElectronLHSelectorCfg( name='TrigEgammaPrecisionElectronL
           'lhmedium'        :'ElectronLikelihoodMediumTriggerConfig.conf',
           'lhloose'         :'ElectronLikelihoodLooseTriggerConfig.conf',
           'lhvloose'        :'ElectronLikelihoodVeryLooseTriggerConfig.conf',
+          })
+    SelectorNoPixNames = collections.OrderedDict({
+          'lhtight_nopix' :'AsgElectronLHTightSelectorNoPix',
+          'lhmedium_nopix':'AsgElectronLHMediumSelectorNoPix',
+          'lhloose_nopix' :'AsgElectronLHLooseSelectorNoPix',
+          'lhvloose_nopix':'AsgElectronLHVLooseSelectorNoPix',
+          })
+     
+    ElectronNoPixToolConfigFile = collections.OrderedDict({
           'lhtight_nopix'   :'ElectronLikelihoodTightTriggerConfig_NoPix.conf',
           'lhmedium_nopix'  :'ElectronLikelihoodMediumTriggerConfig_NoPix.conf',
           'lhloose_nopix'   :'ElectronLikelihoodLooseTriggerConfig_NoPix.conf',
@@ -350,6 +357,13 @@ def TrigEgammaPrecisionElectronLHSelectorCfg( name='TrigEgammaPrecisionElectronL
       SelectorTool.usePVContainer = False 
       SelectorTool.skipDeltaPoverP = True
       acc.addPublicTool(SelectorTool)
+
+    for pidname, name in SelectorNoPixNames.items():
+      SelectorTool = CompFactory.AsgElectronLikelihoodTool(name)
+      SelectorTool.ConfigFile = ConfigFileNoPixPath + '/' + ElectronNoPixToolConfigFile[pidname]
+      SelectorTool.usePVContainer = False 
+      SelectorTool.skipDeltaPoverP = True
+      acc.addPublicTool(SelectorTool)
     return acc
 
 
@@ -381,7 +395,7 @@ def TrigEgammaPrecisionElectronCBSelectorCfg(name='TrigEgammaPrecisionElectronCB
     )
 
     if not ConfigFilePath:
-        ConfigFilePath = ConfigFlags.Trigger.egamma.pidVersion
+        ConfigFilePath = ConfigFlags.Trigger.egamma.electronPidVersion
 
     from collections import OrderedDict
     SelectorNames = OrderedDict({

Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionPhotonHypoTool.py

@@ -185,7 +185,7 @@ def createTrigEgammaPrecisionPhotonSelectors(ConfigFilePath=None):
     from ElectronPhotonSelectorTools.ConfiguredAsgPhotonIsEMSelectors import ConfiguredAsgPhotonIsEMSelector
 
     if not ConfigFilePath:
-      ConfigFilePath = ConfigFlags.Trigger.egamma.pidVersion
+      ConfigFilePath = ConfigFlags.Trigger.egamma.photonPidVersion
 
     import collections.abc
     # Configure the IsEM selectors

Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py

@@ -227,7 +227,9 @@ def createTriggerFlags():
     flags.addFlag('Trigger.calo.doOffsetCorrection', True )
 
     # Particle ID tune
-    flags.addFlag('Trigger.egamma.pidVersion', 'ElectronPhotonSelectorTools/trigger/rel22_20210611/')
+    flags.addFlag('Trigger.egamma.electronPidVersion', 'ElectronPhotonSelectorTools/trigger/rel22_20210611/')
+    flags.addFlag('Trigger.egamma.electronNoPixPidVersion', 'ElectronPhotonSelectorTools/trigger/rel22_20210611/')
+    flags.addFlag('Trigger.egamma.photonPidVersion', 'ElectronPhotonSelectorTools/trigger/rel22_20210611/')
     flags.addFlag('Trigger.egamma.dnnVersion', 'ElectronPhotonSelectorTools/trigger/rel21_20220421/')
     flags.addFlag('Trigger.egamma.ringerVersion', 'RingerSelectorTools/TrigL2_20210702_r4/')