From 4cca56534299bf1baeb2fbf957388fcdcb80a7cc Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Tue, 5 Jan 2021 15:11:27 +0100
Subject: [PATCH] Egamma : Pass EventContext down the call chain (2nd pass)
---
Reconstruction/egamma/egammaAlgs/src/EMVertexBuilder.cxx | 4 ++--
Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx | 4 ++--
Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx | 4 ++--
Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Reconstruction/egamma/egammaAlgs/src/EMVertexBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/EMVertexBuilder.cxx
index b0fdb0edc01..8d23ac6a8b5 100644
--- a/Reconstruction/egamma/egammaAlgs/src/EMVertexBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/EMVertexBuilder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -63,7 +63,7 @@ StatusCode EMVertexBuilder::execute(const EventContext& ctx) const
}
std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> verticesPair =
- m_vertexFinderTool->findVertex(TPCol.cptr());
+ m_vertexFinderTool->findVertex(ctx,TPCol.cptr());
if (!verticesPair.first || !verticesPair.second){
ATH_MSG_ERROR("Null pointer to conversion container");
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
index c9b19ab18a1..75011f7d99c 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "egammaRecBuilder.h"
@@ -104,7 +104,7 @@ egammaRecBuilder::execute(const EventContext& ctx) const
const size_t nTopo = topoclusters->size();
egammaRecs->reserve(nTopo);
for (size_t i(0); i < nTopo; i++) {
- const ElementLink<xAOD::CaloClusterContainer> clusterLink(*topoclusters, i);
+ const ElementLink<xAOD::CaloClusterContainer> clusterLink(*topoclusters, i, ctx);
const std::vector<ElementLink<xAOD::CaloClusterContainer>> ClusterLink{
clusterLink
};
diff --git a/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx b/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
index d523fdb0e56..8b0fdb2f16f 100644
--- a/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "EMClusterTool.h"
@@ -192,7 +192,7 @@ EMClusterTool::setNewCluster(const EventContext& ctx,
outputClusterContainer->push_back(cluster);
// Set the link to the new cluster
- ClusterLink_t clusterLink(cluster, *outputClusterContainer);
+ ClusterLink_t clusterLink(cluster, *outputClusterContainer, ctx);
const std::vector<ClusterLink_t> clusterLinks{ clusterLink };
eg->setCaloClusterLinks(clusterLinks);
}
diff --git a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
index 1b719045ede..89a5c2360bd 100644
--- a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// INCLUDE HEADER FILES:
@@ -137,7 +137,7 @@ EMTrackMatchBuilder::trackExecute(
using EL = ElementLink<xAOD::TrackParticleContainer>;
std::vector<EL> trackParticleLinks;
trackParticleLinks.reserve(trkMatches.size());
- const std::string key = EL(*trackPC, 0).dataID();
+ const std::string key = EL(*trackPC, 0, ctx).dataID();
for (const TrackMatch& m : trkMatches) {
ATH_MSG_DEBUG("Match dR: " << m.dR << " second dR: " << m.seconddR
<< " hasPix: " << m.hasPix
--
GitLab