From 2128d538107db8cdfaadea5548456a0b78a0217f Mon Sep 17 00:00:00 2001
From: Susumu Oda <susumu.oda@cern.ch>
Date: Mon, 12 Aug 2019 11:11:13 +0000
Subject: [PATCH] Remove const_cast in BTagSecVertexing.
---
.../JetTagAlgs/BTagging/BTagging/BTagSecVertexing.h | 6 +++---
.../JetTagAlgs/BTagging/src/BTagSecVertexing.cxx | 9 ++++-----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/BTagSecVertexing.h b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/BTagSecVertexing.h
index 6b7237223b6..47118e8631f 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/BTagSecVertexing.h
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/BTagSecVertexing.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef BTAGGING_BTAGSECVERTEXING_H
@@ -62,8 +62,8 @@ namespace Analysis
private:
- StatusCode fillVkalVariables(xAOD::Jet&, xAOD::BTagging*, xAOD::VertexContainer*, const Trk::VxSecVKalVertexInfo*, const xAOD::TrackParticleContainer*,const xAOD::Vertex&, std::string) const;
- StatusCode fillJFVariables(xAOD::Jet&, xAOD::BTagging*, xAOD::BTagVertexContainer*, const Trk::VxJetFitterVertexInfo*, const xAOD::TrackParticleContainer*, std::string) const;
+ StatusCode fillVkalVariables(const xAOD::Jet&, xAOD::BTagging*, xAOD::VertexContainer*, const Trk::VxSecVKalVertexInfo*, const xAOD::TrackParticleContainer*,const xAOD::Vertex&, std::string) const;
+ StatusCode fillJFVariables(const xAOD::Jet&, xAOD::BTagging*, xAOD::BTagVertexContainer*, const Trk::VxJetFitterVertexInfo*, const xAOD::TrackParticleContainer*, std::string) const;
ToolHandleArray< InDet::ISecVertexInJetFinder > m_secVertexFinderToolsHandleArray;
ToolHandle<IJetFitterVariablesFactory> m_JFvarFactory;
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagSecVertexing.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagSecVertexing.cxx
index e3fb4faedc3..1e637b5c20c 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagSecVertexing.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagSecVertexing.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "BTagging/IBTagSecVertexing.h"
@@ -278,7 +278,7 @@ namespace Analysis {
}
- StatusCode BTagSecVertexing::fillVkalVariables(xAOD::Jet& myJet,
+ StatusCode BTagSecVertexing::fillVkalVariables(const xAOD::Jet& myJet,
xAOD::BTagging* newBTag,
xAOD::VertexContainer* bTagVertexContainer,
const Trk::VxSecVKalVertexInfo* myVertexInfoVKal,
@@ -388,7 +388,7 @@ namespace Analysis {
}
- StatusCode BTagSecVertexing::fillJFVariables(xAOD::Jet& myJet,
+ StatusCode BTagSecVertexing::fillJFVariables(const xAOD::Jet& myJet,
xAOD::BTagging* newBTag,
xAOD::BTagVertexContainer* bTagJFVertexContainer,
const Trk::VxJetFitterVertexInfo* myVertexInfoJetFitter,
@@ -692,8 +692,7 @@ namespace Analysis {
xAOD::BTaggingContainer::iterator btagIter=btaggingContainer->begin();
for (xAOD::JetContainer::const_iterator jetIter = jetContainer->begin(); jetIter != jetContainer->end(); ++jetIter, ++btagIter) {
- //temporary const_cast
- xAOD::Jet& jetToTag = const_cast<xAOD::Jet&>( **jetIter );
+ const xAOD::Jet& jetToTag = **jetIter;
ToolHandleArray< InDet::ISecVertexInJetFinder >::const_iterator itSecVtxFinders = m_secVertexFinderToolsHandleArray.begin();
ToolHandleArray< InDet::ISecVertexInJetFinder >::const_iterator itSecVtxFindersEnd = m_secVertexFinderToolsHandleArray.end();
--
GitLab