diff --git a/Tools/WorkflowTestRunner/python/References.py b/Tools/WorkflowTestRunner/python/References.py index 5a36601be08b3c273f9cb5684b0cf44134d8764b..09b96205a0168d6a3a82bb2fdfee9b1b1ddef4cc 100644 --- a/Tools/WorkflowTestRunner/python/References.py +++ b/Tools/WorkflowTestRunner/python/References.py @@ -23,7 +23,7 @@ references_map = { "d1912": "v4", # Reco "q442": "v3", - "q449": "v4", + "q449": "v5", "q452": "v4", "q454": "v8", # Derivations diff --git a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx index 2017d9e598c5713a90d55976f624bc237f7bacae..251d9efba24a77db7fa45f9943f9cead26a25a10 100644 --- a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx +++ b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx @@ -14,7 +14,7 @@ #include "xAODTracking/VertexContainer.h" #include "xAODJet/Jet.h" -#include "xAODJet/JetTrigAuxContainer.h" +#include "xAODJet/JetAuxContainer.h" #include "xAODJet/JetContainer.h" #include "xAODTau/TauJetContainer.h" @@ -291,9 +291,9 @@ StatusCode TrigTauRecMerged::execute(const EventContext& ctx) const } std::unique_ptr<xAOD::JetContainer> theJetContainer{std::make_unique<xAOD::JetContainer>()}; - std::unique_ptr<xAOD::JetTrigAuxContainer> theTrigJetAuxContainer{std::make_unique<xAOD::JetTrigAuxContainer>()}; + std::unique_ptr<xAOD::JetAuxContainer> theJetAuxContainer{std::make_unique<xAOD::JetAuxContainer>()}; - theJetContainer->setStore(theTrigJetAuxContainer.get()); + theJetContainer->setStore(theJetAuxContainer.get()); xAOD::Jet *aJet = new xAOD::Jet; @@ -343,7 +343,7 @@ StatusCode TrigTauRecMerged::execute(const EventContext& ctx) const // Save Outputs SG::WriteHandle< xAOD::JetContainer > outTauSeedHandle = SG::makeHandle( m_trigtauSeedOutKey,ctx ); - CHECK( outTauSeedHandle.record( std::move( theJetContainer ), std::move( theTrigJetAuxContainer ) ) ); + CHECK( outTauSeedHandle.record( std::move( theJetContainer ), std::move( theJetAuxContainer ) ) ); } //Check if jetLink is valid for all taus diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py index 65a456e89475eefb49f8e27abad027d6b2605161..0617c151b052de66292158ef910f49f545e0bb71 100644 --- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py +++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py @@ -710,8 +710,8 @@ TriggerHLTListRun3 = [ ('TrigRoiDescriptorCollection#HLT_Roi_TauIsoBDT', 'BS ESD AODFULL', 'Tau'), ('TrigRoiDescriptorCollection#HLT_Roi_TauIsoBDT_probe', 'BS ESD AODFULL', 'Tau'), - ('xAOD::JetContainer#HLT_jet_seed', 'BS ESD', 'Tau', [InViews('tauCaloMVAViews')]), - ('xAOD::JetAuxContainer#HLT_jet_seedAux.', 'BS ESD', 'Tau'), + ('xAOD::JetContainer#HLT_jet_seed', '', 'Tau', [InViews('tauCaloMVAViews')]), + ('xAOD::JetAuxContainer#HLT_jet_seedAux.', '', 'Tau'), # Jet ('xAOD::JetContainer#HLT_AntiKt4EMTopoJets_subjesIS', 'BS ESD AODFULL AODSLIM', 'Jet', [Alias('JetContainerShallowCopy')]),