From de5250faa3005fba4d1df1a228b81a62d08479de Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sun, 1 Mar 2020 05:30:22 +0100
Subject: [PATCH] xAODCaloEventCnv: Making setSignalState non-const.
Change the ISignalState::setSignalState and resetSignalState methods
to be (properly!) non-const. SignalStateHelper now takes a non-const
pointer to the object. (Temporarily?) introduce SignalStateConstHelper
that takes a const pointer and does a const_cast on it; this is marked
as not thread-safe.
Remove now-unused SignalStateCollHelper.
Corresponding changes downstream.
---
Event/xAOD/xAODCaloEventCnv/src/CaloClusterCnvTool.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Event/xAOD/xAODCaloEventCnv/src/CaloClusterCnvTool.cxx b/Event/xAOD/xAODCaloEventCnv/src/CaloClusterCnvTool.cxx
index d7cb2883e6f..b24ffd04c00 100644
--- a/Event/xAOD/xAODCaloEventCnv/src/CaloClusterCnvTool.cxx
+++ b/Event/xAOD/xAODCaloEventCnv/src/CaloClusterCnvTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: CaloClusterCnvTool.cxx 785752 2016-11-22 15:06:34Z ssnyder $
@@ -119,7 +119,7 @@ namespace xAODMaker {
xaod->setTime( aod->getTime() );
{
- SignalStateHelper sstate (aod);
+ SignalStateConstHelper sstate (aod);
sstate.setSignalState( P4SignalState::CALIBRATED );
xaod->setCalE( aod->e() );
xaod->setCalEta( aod->eta() );
--
GitLab