Commit 3694889b authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'correct-view-names' into 'master'

Fixed issues in EDM configuration

See merge request !30504
parents 3e30959c 2096fde3
......@@ -94,7 +94,7 @@ TriggerHLTListRun3 = [
# Egamma
('xAOD::TrigEMClusterContainer#HLT_L2CaloEMClusters', 'BS ESD AODFULL', 'Egamma', 'inViews:EMCaloViews'), # last arg specifies in which view container the fragments are, look into the proprty of View maker alg for it
('xAOD::TrigEMClusterAuxContainer#HLT_L2CaloEMClustersAux.', 'BS ESD AODFULL', 'Egamma'),
('xAOD::TrigPhotonContainer#HLT_L2Photons', 'BS ESD AODFULL', 'Egamma', 'inViews:L2PhotonRecoViews'),
('xAOD::TrigPhotonContainer#HLT_L2Photons', 'BS ESD AODFULL', 'Egamma', 'inViews:EMPhotonViews'),
('xAOD::TrigPhotonAuxContainer#HLT_L2PhotonsAux.', 'BS ESD AODFULL', 'Egamma'),
('xAOD::TrigElectronContainer#HLT_L2Electrons', 'BS ESD AODFULL', 'Egamma', 'inViews:EMElectronViews'),
('xAOD::TrigElectronAuxContainer#HLT_L2ElectronsAux.', 'BS ESD AODFULL', 'Egamma'),
......@@ -117,13 +117,15 @@ TriggerHLTListRun3 = [
# These are for precision photon and precision Electron Keeping same names as in Run2
('xAOD::ElectronContainer#HLT_egamma_Electrons', 'BS ESD AODFULL', 'Egamma', 'inViews:precisionElectronViews'),
('xAOD::ElectronTrigAuxContainer#HLT_egamma_ElectronsAux.', 'BS ESD AODFULL', 'Egamma'),
('xAOD::ElectronContainer#HLT_egamma_Iso_Electrons', 'BS ESD AODFULL', 'Egamma', 'inViews:precisionIsoElectronViews'),
('xAOD::ElectronTrigAuxContainer#HLT_egamma_Iso_ElectronsAux.', 'BS ESD AODFULL', 'Egamma'),
# enable when iso chains are present
# ('xAOD::ElectronContainer#HLT_egamma_Iso_Electrons', 'BS ESD AODFULL', 'Egamma', 'inViews:precisionIsoElectronViews'),
# ('xAOD::ElectronTrigAuxContainer#HLT_egamma_Iso_ElectronsAux.', 'BS ESD AODFULL', 'Egamma'),
('xAOD::PhotonContainer#HLT_egamma_Photons', 'BS ESD AODFULL', 'Egamma', 'inViews:precisionPhotonViews'),
('xAOD::PhotonTrigAuxContainer#HLT_egamma_PhotonsAux.', 'BS ESD AODFULL', 'Egamma'),
('xAOD::PhotonContainer#HLT_egamma_Iso_Photons', 'BS ESD AODFULL', 'Egamma', 'inViews:precisionIsoPhotonViews'),
('xAOD::PhotonTrigAuxContainer#HLT_egamma_Iso_PhotonsAux.', 'BS ESD AODFULL', 'Egamma'),
# enable when iso chains are present
# ('xAOD::PhotonContainer#HLT_egamma_Iso_Photons', 'BS ESD AODFULL', 'Egamma', 'inViews:precisionIsoPhotonViews'),
# ('xAOD::PhotonTrigAuxContainer#HLT_egamma_Iso_PhotonsAux.', 'BS ESD AODFULL', 'Egamma'),
# Muon
......@@ -276,8 +278,9 @@ TriggerHLTListRun3 = [
('xAOD::CaloClusterTrigAuxContainer#HLT_TopoCaloClustersFSAux.nCells', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'MET'),
# tau
('xAOD::TauJetContainer#HLT_TrigTauRecMerged_CaloOnly', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUCaloViews'),
('xAOD::TauJetAuxContainer#HLT_TrigTauRecMerged_CaloOnlyAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'),
# will enable when needed
# ('xAOD::TauJetContainer#HLT_TrigTauRecMerged_CaloOnly', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUCaloViews'),
# ('xAOD::TauJetAuxContainer#HLT_TrigTauRecMerged_CaloOnlyAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'),
('xAOD::TauJetContainer#HLT_TrigTauRecMerged_CaloOnlyMVA', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUCaloMVAViews'),
('xAOD::TauJetAuxContainer#HLT_TrigTauRecMerged_CaloOnlyMVAAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'),
......@@ -292,12 +295,10 @@ TriggerHLTListRun3 = [
('xAOD::TauJetAuxContainer#HLT_TrigTauRecMerged_PreselAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'),
# tau calo clusters
('xAOD::CaloClusterContainer#HLT_TopoCaloClustersLC', 'BS ESD AODFULL', 'Tau', 'TAUCaloViews'),
('xAOD::CaloClusterContainer#HLT_TopoCaloClustersLC', 'BS ESD AODFULL', 'Tau', 'inViews:TAUCaloViews'),
('xAOD::CaloClusterTrigAuxContainer#HLT_TopoCaloClustersLCAux.nCells' ,'BS ESD AODFULL', 'Tau'),
# tau tracks
('xAOD::TauTrackContainer#HLT_tautrack_dummy', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUCaloViews'),
('xAOD::TauTrackAuxContainer#HLT_tautrack_dummyAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'),
('xAOD::TauTrackContainer#HLT_tautrack_MVA', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUFTFIsoViews'),
('xAOD::TauTrackAuxContainer#HLT_tautrack_MVAAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau'),
('xAOD::TauTrackContainer#HLT_tautrack_Precision', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Tau', 'inViews:TAUFTFIdViews'),
......
......@@ -462,7 +462,7 @@ def triggerMergeViewsAndAddMissingEDMCfg( edmSet, hypos, viewMakers, decObj, dec
setattr(tool, collType, attrName )
producer = [ maker for maker in viewMakers if maker.Views == viewsColl ]
if len(producer) == 0:
__log.warning("The producer of the {} not in the menu, it's outputs won't ever make it out of the HLT".format( viewsColl ) )
__log.warning("The producer of the {} not in the menu, it's outputs won't ever make it out of the HLT".format( str(coll) ) )
continue
if len(producer) > 1:
for pr in producer[1:]:
......
......@@ -5,6 +5,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFr
from AthenaCommon.CFElements import parOR, seqAND
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
import AthenaCommon.CfgMgr as CfgMgr
from TrigEDMConfig.TriggerEDMRun3 import recordable
# logger
from AthenaCommon.Logging import logging
......@@ -21,7 +22,7 @@ def fastPhotonMenuSequence():
from TrigEgammaHypo.TrigL2PhotonFexMTConfig import L2PhotonFex_1
thePhotonFex= L2PhotonFex_1()
thePhotonFex.TrigEMClusterName = CaloMenuDefs.L2CaloClusters
thePhotonFex.PhotonsName="TrigL2Photons"
thePhotonFex.PhotonsName=recordable("HLT_L2Photons")
#thePhotonFex.RoIs="EMIDRoIs"
l2PhotonViewsMaker = EventViewCreatorAlgorithm("IMl2Photon")
......
......@@ -28,7 +28,7 @@ def _algoTauCaloOnly(inputRoIs, clusters):
algo.Key_trigTauJetInputContainer = ""
algo.Key_trigTauTrackInputContainer = ""
algo.Key_trigTauJetOutputContainer = recordable("HLT_TrigTauRecMerged_CaloOnly")
algo.Key_trigTauTrackOutputContainer = recordable("HLT_tautrack_dummy")
algo.Key_trigTauTrackOutputContainer = "HLT_tautrack_dummy"
return algo
def _algoTauCaloOnlyMVA(inputRoIs, clusters):
......@@ -43,7 +43,7 @@ def _algoTauCaloOnlyMVA(inputRoIs, clusters):
algo.Key_trigTauJetInputContainer = ""
algo.Key_trigTauTrackInputContainer = ""
algo.Key_trigTauJetOutputContainer = recordable("HLT_TrigTauRecMerged_CaloOnlyMVA")
algo.Key_trigTauTrackOutputContainer = recordable("HLT_tautrack_dummy")
algo.Key_trigTauTrackOutputContainer = "HLT_tautrack_dummy"
return algo
def _algoTauTrackRoiUpdater(inputRoIs, tracks):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment