From c97d2f4d4cca9ea6c96e93b3221d306b52d75845 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 11 Aug 2016 20:46:42 +0200
Subject: [PATCH] 'Const fixes.' (InDetEventCnvTools-02-01-10)
* Tagging InDetEventCnvTools-02-01-10.
* Const fixes.
* Tagging InDetEventCnvTools-02-01-09.
* Comply with ATLAS naming conventions.
Former-commit-id: 57f98c60eb026cdcca20d562c696c9390191ef96
---
.../InDetEventCnvTools/InDetEventCnvTool.h | 6 ++--
.../src/InDetEventCnvTool.cxx | 30 +++++++++----------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/InnerDetector/InDetEventCnv/InDetEventCnvTools/InDetEventCnvTools/InDetEventCnvTool.h b/InnerDetector/InDetEventCnv/InDetEventCnvTools/InDetEventCnvTools/InDetEventCnvTool.h
index f6ea018fa50..edec70886d8 100755
--- a/InnerDetector/InDetEventCnv/InDetEventCnvTools/InDetEventCnvTools/InDetEventCnvTool.h
+++ b/InnerDetector/InDetEventCnv/InDetEventCnvTools/InDetEventCnvTools/InDetEventCnvTool.h
@@ -65,13 +65,13 @@ class InDetEventCnvTool : virtual public Trk::ITrkEventCnvTool, public AthAlgTo
private:
/** use the passed identifier to recreate the pixel cluster link on the passed RIO_OnTrack*/
- virtual Trk::PrepRawData* pixelClusterLink( const Identifier& id, const IdentifierHash& idHash);
+ virtual const Trk::PrepRawData* pixelClusterLink( const Identifier& id, const IdentifierHash& idHash);
/** use the passed identifier to recreate the SCT cluster link on the passed RIO_OnTrack*/
- virtual Trk::PrepRawData* sctClusterLink( const Identifier& id, const IdentifierHash& idHash );
+ virtual const Trk::PrepRawData* sctClusterLink( const Identifier& id, const IdentifierHash& idHash );
/** use the passed identifier to recreate the TRT Drift circle link on the passed RIO_OnTrack*/
- virtual Trk::PrepRawData* trtDriftCircleLink( const Identifier& id, const IdentifierHash& idHash );
+ virtual const Trk::PrepRawData* trtDriftCircleLink( const Identifier& id, const IdentifierHash& idHash );
std::string m_pixMgrLocation; //!< Location of sct Manager
const InDetDD::PixelDetectorManager* m_pixMgr; //!< SCT Detector Manager
diff --git a/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/InDetEventCnvTool.cxx b/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/InDetEventCnvTool.cxx
index ed14cc17c62..316e8958e88 100755
--- a/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/InDetEventCnvTool.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/InDetEventCnvTool.cxx
@@ -284,7 +284,7 @@ InDet::InDetEventCnvTool::getDetectorElement(const Identifier& id)
return detEl;
}
-Trk::PrepRawData*
+const Trk::PrepRawData*
InDet::InDetEventCnvTool::pixelClusterLink( const Identifier& id, const IdentifierHash& idHash )
{
using namespace Trk;
@@ -292,8 +292,8 @@ Trk::PrepRawData*
// retrieve Pixel cluster container
// obviously this can be optimised! EJWM
- const PixelClusterContainer* m_pixClusCont;
- StatusCode sc = evtStore()->retrieve(m_pixClusCont, m_pixClusContName);
+ const PixelClusterContainer* pixClusCont;
+ StatusCode sc = evtStore()->retrieve(pixClusCont, m_pixClusContName);
if (sc.isFailure()){
ATH_MSG_ERROR("Pixel Cluster container not found at "<<m_pixClusContName);
return 0;
@@ -302,9 +302,9 @@ Trk::PrepRawData*
ATH_MSG_DEBUG("Pixel Cluster container found" );
}
- PixelClusterContainer::const_iterator it = m_pixClusCont->indexFind(idHash);
+ PixelClusterContainer::const_iterator it = pixClusCont->indexFind(idHash);
// if we find PRD, then recreate link
- if (it!=m_pixClusCont->end())
+ if (it!=pixClusCont->end())
{
//loop though collection to find matching PRD.
PixelClusterCollection::const_iterator collIt = (*it)->begin();
@@ -318,7 +318,7 @@ Trk::PrepRawData*
return 0;
}
-Trk::PrepRawData*
+const Trk::PrepRawData*
InDet::InDetEventCnvTool::sctClusterLink( const Identifier& id, const IdentifierHash& idHash )
{
using namespace Trk;
@@ -326,8 +326,8 @@ Trk::PrepRawData*
// retrieve Pixel cluster container
// obviously this can be optimised! EJWM
- const SCT_ClusterContainer* m_sctClusCont;
- StatusCode sc = evtStore()->retrieve(m_sctClusCont, m_sctClusContName);
+ const SCT_ClusterContainer* sctClusCont;
+ StatusCode sc = evtStore()->retrieve(sctClusCont, m_sctClusContName);
if (sc.isFailure()){
ATH_MSG_ERROR("SCT Cluster Container not found at "<< m_sctClusContName);
return 0;
@@ -336,9 +336,9 @@ Trk::PrepRawData*
ATH_MSG_DEBUG("SCT Cluster Container found" );
}
- SCT_ClusterContainer::const_iterator it = m_sctClusCont->indexFind(idHash);
+ SCT_ClusterContainer::const_iterator it = sctClusCont->indexFind(idHash);
// if we find PRD, then recreate link
- if (it!=m_sctClusCont->end())
+ if (it!=sctClusCont->end())
{
//loop though collection to find matching PRD.
SCT_ClusterCollection::const_iterator collIt = (*it)->begin();
@@ -352,7 +352,7 @@ Trk::PrepRawData*
return 0;
}
-Trk::PrepRawData*
+const Trk::PrepRawData*
InDet::InDetEventCnvTool::trtDriftCircleLink( const Identifier& id, const IdentifierHash& idHash )
{
using namespace Trk;
@@ -360,8 +360,8 @@ Trk::PrepRawData*
// retrieve Pixel cluster container
// obviously this can be optimised! EJWM
- const TRT_DriftCircleContainer* m_trtDriftCircleCont;
- StatusCode sc = evtStore()->retrieve(m_trtDriftCircleCont, m_trtDriftCircleContName);
+ const TRT_DriftCircleContainer* trtDriftCircleCont;
+ StatusCode sc = evtStore()->retrieve(trtDriftCircleCont, m_trtDriftCircleContName);
if (sc.isFailure()){
ATH_MSG_ERROR("TRT DriftCircle Container not found at "<<m_trtDriftCircleContName);
return 0;
@@ -370,9 +370,9 @@ Trk::PrepRawData*
ATH_MSG_DEBUG("TRT DriftCircle Container found" );
}
- TRT_DriftCircleContainer::const_iterator it = m_trtDriftCircleCont->indexFind(idHash);
+ TRT_DriftCircleContainer::const_iterator it = trtDriftCircleCont->indexFind(idHash);
// if we find PRD, then recreate link
- if (it!=m_trtDriftCircleCont->end())
+ if (it!=trtDriftCircleCont->end())
{
//loop though collection to find matching PRD.
TRT_DriftCircleCollection::const_iterator collIt = (*it)->begin();
--
GitLab