diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/TrigCompositeAuxContainer.h b/Event/xAOD/xAODTrigger/xAODTrigger/TrigCompositeAuxContainer.h index ca2848a9fceab04e356cfac3102083a9a1160027..a6f6cfdaca041410df5a7ec8d1d3ed6db95b9591 100644 --- a/Event/xAOD/xAODTrigger/xAODTrigger/TrigCompositeAuxContainer.h +++ b/Event/xAOD/xAODTrigger/xAODTrigger/TrigCompositeAuxContainer.h @@ -9,11 +9,11 @@ #define XAODTRIGGER_TRIGCOMPOSITEAUXCONTAINER_H // Local include(s): -#include "xAODTrigger/versions/TrigCompositeAuxContainer_v1.h" +#include "xAODTrigger/versions/TrigCompositeAuxContainer_v2.h" namespace xAOD{ /// Declare the latest version of the container - typedef TrigCompositeAuxContainer_v1 TrigCompositeAuxContainer; + typedef TrigCompositeAuxContainer_v2 TrigCompositeAuxContainer; } namespace TrigCompositeUtils{ diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py index 7f5b3e11065df48bdc697591e7203b8286318546..c7ba9262e1951a4b707ec98d0383e913b5a22949 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py @@ -430,7 +430,7 @@ hltTop = seqOR( "hltTop", [ steps, summMaker, mon, edmMakerAlg, hltResultMakerA topSequence += hltTop -###### Begin Cost Monitoring block +###### Begin Cost Monitoring block ## TODO: Express this as a ComponentAccumulator from AthenaCommon.AppMgr import ServiceMgr