From 29c4289d0c182cb1be18936e9711c7698995a1cc Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Wed, 27 Oct 2021 18:16:21 +0200
Subject: [PATCH] Trk Geometry remove unndeeded const leading to uneeded
const_cast
---
.../src/CaloTrackingGeometryBuilder.cxx | 4 ++--
.../src/CaloTrackingGeometryBuilderCond.cxx | 4 ++--
.../src/HGTD_TrackingGeometryBuilderCond.cxx | 2 +-
.../src/RobustTrackingGeometryBuilder.cxx | 6 +++---
.../src/RobustTrackingGeometryBuilderCond.cxx | 10 +++++-----
.../src/StagedTrackingGeometryBuilderCond.cxx | 4 ++--
.../src/MuonTrackingGeometryBuilder.cxx | 4 ++--
.../src/MuonTrackingGeometryBuilderCond.cxx | 2 +-
.../TrkDetDescrTools/src/GenericGeometryBuilder.cxx | 2 +-
.../src/GenericGeometryBuilderCond.cxx | 6 +++---
.../TrkGeometry/TrkGeometry/TrackingGeometry.h | 6 +++---
.../TrkDetDescr/TrkGeometry/src/TrackingGeometry.cxx | 2 +-
12 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx
index 668e8eea59fd..45c8686049b9 100755
--- a/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx
@@ -193,7 +193,7 @@ Trk::TrackingGeometry* Calo::CaloTrackingGeometryBuilder::trackingGeometry(const
// the return TG
Trk::TrackingGeometry* caloTrackingGeometry = nullptr;
- const Trk::TrackingVolume* calorimeter = nullptr;
+ Trk::TrackingVolume* calorimeter = nullptr;
// the key dimensions
RZPairVector keyDim;
@@ -1210,7 +1210,7 @@ Trk::TrackingGeometry* Calo::CaloTrackingGeometryBuilder::trackingGeometry(const
//std::cout <<"Combined LAr ready " << std::endl;
// glue with LAr sector
- const Trk::TrackingVolume* caloCombined = nullptr;
+ Trk::TrackingVolume* caloCombined = nullptr;
// ++ has 2 sub volumes in R
std::vector<const Trk::TrackingVolume*> caloVolumes;
// ++++ (a) -> LAr sector
diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx
index 7e244f7b4dbf..35c77eaed95b 100755
--- a/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx
@@ -200,7 +200,7 @@ Calo::CaloTrackingGeometryBuilderCond::trackingGeometry(
// the return TG
Trk::TrackingGeometry* caloTrackingGeometry = nullptr;
- const Trk::TrackingVolume* calorimeter = nullptr;
+ Trk::TrackingVolume* calorimeter = nullptr;
// the key dimensions
RZPairVector keyDim;
@@ -1226,7 +1226,7 @@ Calo::CaloTrackingGeometryBuilderCond::trackingGeometry(
//std::cout <<"Combined LAr ready " << std::endl;
// glue with LAr sector
- const Trk::TrackingVolume* caloCombined = nullptr;
+ Trk::TrackingVolume* caloCombined = nullptr;
// ++ has 2 sub volumes in R
std::vector<const Trk::TrackingVolume*> caloVolumes;
// ++++ (a) -> LAr sector
diff --git a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_TrackingGeometry/src/HGTD_TrackingGeometryBuilderCond.cxx b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_TrackingGeometry/src/HGTD_TrackingGeometryBuilderCond.cxx
index b2d550dc52bb..9dab3f74773e 100644
--- a/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_TrackingGeometry/src/HGTD_TrackingGeometryBuilderCond.cxx
+++ b/HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_TrackingGeometry/src/HGTD_TrackingGeometryBuilderCond.cxx
@@ -324,7 +324,7 @@ std::pair<EventIDRange, Trk::TrackingGeometry*> HGTDet::HGTD_TrackingGeometryBui
enclosedVolumes.push_back(tripleContainer);
enclosedVolumes.push_back(positiveEnclosure);
- const Trk::TrackingVolume* enclosedDetector =
+ Trk::TrackingVolume* enclosedDetector =
m_trackingVolumeCreator->createContainerTrackingVolume(enclosedVolumes,
*materialProperties,
"HGTD::Detectors::"+m_layerBuilder->identification(),
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/RobustTrackingGeometryBuilder.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/RobustTrackingGeometryBuilder.cxx
index 528fb607f496..178f06591149 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/RobustTrackingGeometryBuilder.cxx
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/RobustTrackingGeometryBuilder.cxx
@@ -561,7 +561,7 @@ Trk::TrackingGeometry* InDet::RobustTrackingGeometryBuilder::trackingGeometry AT
ATH_MSG_VERBOSE(" -> inserting beam pipe into detectors." );
- const Trk::TrackingVolume* detectorWithBp =
+ Trk::TrackingVolume* detectorWithBp =
m_trackingVolumeCreator->createContainerTrackingVolume(idVolumes,
*m_materialProperties,
volumeName,
@@ -569,7 +569,7 @@ Trk::TrackingGeometry* InDet::RobustTrackingGeometryBuilder::trackingGeometry AT
m_replaceJointBoundaries);
// if packing is needed ------------------------------------------------------------------
- const Trk::TrackingVolume* highestIdVolume = nullptr;
+ Trk::TrackingVolume* highestIdVolume = nullptr;
if (enclose){
// negative positions
@@ -607,7 +607,7 @@ Trk::TrackingGeometry* InDet::RobustTrackingGeometryBuilder::trackingGeometry AT
enclosedVolumes.push_back(detectorWithBp);
enclosedVolumes.push_back(positiveEnclosure);
- const Trk::TrackingVolume* enclosedDetector =
+ Trk::TrackingVolume* enclosedDetector =
m_trackingVolumeCreator->createContainerTrackingVolume(enclosedVolumes,
*m_materialProperties,
m_exitVolume,
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/RobustTrackingGeometryBuilderCond.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/RobustTrackingGeometryBuilderCond.cxx
index ecdcdfbbeb02..d0ab5d46f76e 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/RobustTrackingGeometryBuilderCond.cxx
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/RobustTrackingGeometryBuilderCond.cxx
@@ -577,7 +577,7 @@ InDet::RobustTrackingGeometryBuilderCond::trackingGeometry ATLAS_NOT_THREAD_SAFE
ATH_MSG_VERBOSE(" -> inserting beam pipe into detectors." );
- const Trk::TrackingVolume* detectorWithBp =
+ Trk::TrackingVolume* detectorWithBp =
m_trackingVolumeCreator->createContainerTrackingVolume(idVolumes,
*m_materialProperties,
volumeName,
@@ -585,7 +585,7 @@ InDet::RobustTrackingGeometryBuilderCond::trackingGeometry ATLAS_NOT_THREAD_SAFE
m_replaceJointBoundaries);
// if packing is needed ------------------------------------------------------------------
- const Trk::TrackingVolume* highestIdVolume = nullptr;
+ Trk::TrackingVolume* highestIdVolume = nullptr;
if (enclose){
// negative positions
@@ -594,7 +594,7 @@ InDet::RobustTrackingGeometryBuilderCond::trackingGeometry ATLAS_NOT_THREAD_SAFE
posIter != negDiscPositionZ.end(); ++posIter) (*posIter) *= -1;
- const Trk::TrackingVolume* negativeEnclosure = !negDiscPositionZ.empty() ?
+ Trk::TrackingVolume* negativeEnclosure = !negDiscPositionZ.empty() ?
m_trackingVolumeCreator->createGapTrackingVolume(*m_materialProperties,
0., enclosingVolumeRadius,
-enclosingVolumeHalfZ, -overallExtendZ,
@@ -606,7 +606,7 @@ InDet::RobustTrackingGeometryBuilderCond::trackingGeometry ATLAS_NOT_THREAD_SAFE
1, false,
m_namespace+"Gaps::NegativeEnclosure");
- const Trk::TrackingVolume* positiveEnclosure = !m_enclosingDiscPositionZ.empty() ?
+ Trk::TrackingVolume* positiveEnclosure = !m_enclosingDiscPositionZ.empty() ?
m_trackingVolumeCreator->createGapTrackingVolume(*m_materialProperties,
0., enclosingVolumeRadius,
overallExtendZ, enclosingVolumeHalfZ,
@@ -623,7 +623,7 @@ InDet::RobustTrackingGeometryBuilderCond::trackingGeometry ATLAS_NOT_THREAD_SAFE
enclosedVolumes.push_back(detectorWithBp);
enclosedVolumes.push_back(positiveEnclosure);
- const Trk::TrackingVolume* enclosedDetector =
+ Trk::TrackingVolume* enclosedDetector =
m_trackingVolumeCreator->createContainerTrackingVolume(enclosedVolumes,
*m_materialProperties,
m_exitVolume,
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/StagedTrackingGeometryBuilderCond.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/StagedTrackingGeometryBuilderCond.cxx
index 39c202767e7b..c7cb7dd949db 100644
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/StagedTrackingGeometryBuilderCond.cxx
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/StagedTrackingGeometryBuilderCond.cxx
@@ -294,8 +294,8 @@ InDet::StagedTrackingGeometryBuilderCond::trackingGeometry ATLAS_NOT_THREAD_SAFE
enclosedVolumes.push_back(idContainer);
enclosedVolumes.push_back(positiveEnclosure);
- const Trk::TrackingVolume* enclosedDetector =
- m_trackingVolumeCreator->createContainerTrackingVolume(enclosedVolumes,
+ Trk::TrackingVolume* enclosedDetector =
+ m_trackingVolumeCreator->createContainerTrackingVolume(enclosedVolumes,
*m_materialProperties,
m_exitVolume,
m_buildBoundaryLayers,
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilder.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilder.cxx
index 3093ed310976..d1745d90d3f3 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilder.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilder.cxx
@@ -682,8 +682,8 @@ Trk::TrackingGeometry* Muon::MuonTrackingGeometryBuilder::trackingGeometry(const
const Trk::TrackingVolume* negDet = m_trackingVolumeHelper->glueTrackingVolumeArrays(*negEndcap, Trk::positiveFaceXY, *barrel,
Trk::negativeFaceXY, "All::Container::NegDet");
- const Trk::TrackingVolume* detector =
- m_trackingVolumeHelper->glueTrackingVolumeArrays(*posEndcap, Trk::negativeFaceXY, *negDet, Trk::positiveFaceXY, m_exitVolume);
+ Trk::TrackingVolume* detector =
+ m_trackingVolumeHelper->glueTrackingVolumeArrays(*posEndcap, Trk::negativeFaceXY, *negDet, Trk::positiveFaceXY, m_exitVolume);
// blend material
if (m_blendInertMaterial) blendMaterial(aLVC);
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilderCond.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilderCond.cxx
index 585a2a53f9d5..dabc01cf53eb 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilderCond.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilderCond.cxx
@@ -709,7 +709,7 @@ std::pair<EventIDRange, Trk::TrackingGeometry*> Muon::MuonTrackingGeometryBuilde
const Trk::TrackingVolume* negDet = m_trackingVolumeHelper->glueTrackingVolumeArrays(*negEndcap, Trk::positiveFaceXY, *barrel,
Trk::negativeFaceXY, "All::Container::NegDet");
- const Trk::TrackingVolume* detector =
+ Trk::TrackingVolume* detector =
m_trackingVolumeHelper->glueTrackingVolumeArrays(*posEndcap, Trk::negativeFaceXY, *negDet, Trk::positiveFaceXY, m_exitVolume);
// blend material
if (m_blendInertMaterial) blendMaterial(aLVC);
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTools/src/GenericGeometryBuilder.cxx b/Tracking/TrkDetDescr/TrkDetDescrTools/src/GenericGeometryBuilder.cxx
index 735a0b83a7a5..ab7d60fd009e 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrTools/src/GenericGeometryBuilder.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrTools/src/GenericGeometryBuilder.cxx
@@ -268,7 +268,7 @@ Trk::TrackingGeometry* Trk::GenericGeometryBuilder::trackingGeometry(const Trk::
// and now create the triple
allVolumes = !extendedVolumes.empty() ? std::vector<const Trk::TrackingVolume*>{extendedVolumes[0],nSector,cSector,pSector,extendedVolumes[1]} :
std::vector<const Trk::TrackingVolume*>{nSector,cSector,pSector};
- const Trk::TrackingVolume* tVolume =
+ Trk::TrackingVolume* tVolume =
m_trackingVolumeCreator->createContainerTrackingVolume(
allVolumes, vacuum, m_geometryName + "::Container");
// now create the TrackingGeometry from the highest volume
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTools/src/GenericGeometryBuilderCond.cxx b/Tracking/TrkDetDescr/TrkDetDescrTools/src/GenericGeometryBuilderCond.cxx
index 959827253c8b..97e35cf50df4 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrTools/src/GenericGeometryBuilderCond.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrTools/src/GenericGeometryBuilderCond.cxx
@@ -276,9 +276,9 @@ Trk::GenericGeometryBuilderCond::trackingGeometry(
// and now create the triple
allVolumes = !extendedVolumes.empty() ? std::vector<const Trk::TrackingVolume*>{extendedVolumes[0],nSector,cSector,pSector,extendedVolumes[1]} :
std::vector<const Trk::TrackingVolume*>{nSector,cSector,pSector};
- const Trk::TrackingVolume* tVolume = m_trackingVolumeCreator->createContainerTrackingVolume(allVolumes,
- vacuum,
- m_geometryName+"::Container");
+ Trk::TrackingVolume* tVolume = m_trackingVolumeCreator->createContainerTrackingVolume(allVolumes,
+ vacuum,
+ m_geometryName+"::Container");
// now create the TrackingGeometry from the highest volume
if (tVolume) {
tGeometry = new Trk::TrackingGeometry(tVolume);
diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingGeometry.h b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingGeometry.h
index 9b39f71ef650..01407f6b5e63 100644
--- a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingGeometry.h
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingGeometry.h
@@ -79,7 +79,7 @@ namespace Trk {
public :
/** Constructor */
- TrackingGeometry(const TrackingVolume* highestVolume,
+ TrackingGeometry(TrackingVolume* highestVolume,
NavigationLevel navlevel = globalSearch)
ATLAS_CTORDTOR_NOT_THREAD_SAFE; //unsafe registerTrackingVolumes called;
/** Destructor */
@@ -158,7 +158,7 @@ namespace Trk {
void printVolumeInformation(MsgStream& msgstream, const TrackingVolume& tvol, int lvl) const;
/** The known world - and the beam */
- const TrackingVolume* m_world;
+ TrackingVolume* m_world;
const PerigeeSurface* m_beam;
/** The unique boundary Layers */
@@ -188,7 +188,7 @@ namespace Trk {
inline void TrackingGeometry::sign ATLAS_NOT_THREAD_SAFE (GeometrySignature geosit, GeometryType geotype)
- { const_cast<TrackingVolume*> (m_world)->sign(geosit, geotype); }
+ { m_world->sign(geosit, geotype); }
inline const TrackingVolume* TrackingGeometry::trackingVolume(const std::string& name) const
{
diff --git a/Tracking/TrkDetDescr/TrkGeometry/src/TrackingGeometry.cxx b/Tracking/TrkDetDescr/TrkGeometry/src/TrackingGeometry.cxx
index ace2b80f22da..27005bbe19ee 100755
--- a/Tracking/TrkDetDescr/TrkGeometry/src/TrackingGeometry.cxx
+++ b/Tracking/TrkDetDescr/TrkGeometry/src/TrackingGeometry.cxx
@@ -18,7 +18,7 @@
#include "GaudiKernel/MsgStream.h"
Trk::TrackingGeometry::TrackingGeometry(
- const Trk::TrackingVolume* highestVolume, Trk::NavigationLevel navLev)
+ Trk::TrackingVolume* highestVolume, Trk::NavigationLevel navLev)
: m_world(highestVolume), m_beam(nullptr), m_navigationLevel(navLev) {
// for the time being only world
if (m_world) registerTrackingVolumes(*m_world);
--
GitLab