From aa1804b9d2366bcc5261b37c0cd72fcba4f83202 Mon Sep 17 00:00:00 2001
From: Tim Martin <Tim.Martin@cern.ch>
Date: Thu, 7 Feb 2019 11:11:20 +0100
Subject: [PATCH] Complete migration to V2 of TrigComposite Aux
touch file for CI
---
.../xAOD/xAODTrigger/xAODTrigger/TrigCompositeAuxContainer.h | 4 ++--
.../TrigValidation/TrigUpgradeTest/share/egamma.withViews.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/TrigCompositeAuxContainer.h b/Event/xAOD/xAODTrigger/xAODTrigger/TrigCompositeAuxContainer.h
index ca2848a9fcea..a6f6cfdaca04 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 7f5b3e11065d..c7ba9262e195 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
--
GitLab