From fe671e13da30e54872ea4b3de8723446c8768146 Mon Sep 17 00:00:00 2001 From: scott snyder Date: Thu, 4 Nov 2021 22:36:22 -0400 Subject: [PATCH] TRT_GeoModel: Update for thread-safety checker const changes. The thread-safety checker is getting more strict on const checks. Fix resulting warnings. --- .../TRT_GeoModel/src/TRTDetectorFactory_Full.cxx | 2 +- .../InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.h | 2 +- .../TRT_GeoModel/src/TRT_DetDescrDB_ParameterInterface.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.cxx b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.cxx index 24eb98033cf..5d58bb23b0b 100755 --- a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.cxx +++ b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.cxx @@ -2157,7 +2157,7 @@ const GeoShape * TRTDetectorFactory_Full::makeModule ( double length, GeoTrf::Ve // //GeoPhysVol * TRTDetectorFactory_Full::makeStraw( double& activeGasZPosition, bool hasLargeDeadRegion /*= false*/ ) const { -GeoPhysVol * TRTDetectorFactory_Full::makeStraw( double& activeGasZPosition, bool hasLargeDeadRegion /*= false*/, ActiveGasMixture gasMixture) const { +GeoPhysVol * TRTDetectorFactory_Full::makeStraw( double& activeGasZPosition, bool hasLargeDeadRegion /*= false*/, ActiveGasMixture gasMixture) { double lengthOfInnerDeadRegion= hasLargeDeadRegion ? m_data->barrelLengthOfLargeDeadRegion : m_data->lengthOfDeadRegion ; double lengthOfActiveGas = (m_data->barrelLengthOfStraw-m_data->barrelLengthOfTwister)/2.0 - m_data->lengthOfDeadRegion - lengthOfInnerDeadRegion; diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.h b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.h index dd5eda243e4..5639c8a89ff 100755 --- a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.h +++ b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRTDetectorFactory_Full.h @@ -86,7 +86,7 @@ class TRTDetectorFactory_Full : public InDetDD::DetectorFactoryBase { const GeoShape * makeModule ( double length, GeoTrf::Vector2D corner1 , GeoTrf::Vector2D corner2, GeoTrf::Vector2D corner3, GeoTrf::Vector2D corner4, GeoTrf::Transform3D & absolutePosition, double shrinkDist=0 ) const; //GeoPhysVol * makeStraw( double& activeGasZPosition, bool hasLargeDeadRegion=false ) const; - GeoPhysVol * makeStraw( double& activeGasZPosition, bool hasLargeDeadRegion=false, ActiveGasMixture gasMixture = GM_XENON) const; + GeoPhysVol * makeStraw( double& activeGasZPosition, bool hasLargeDeadRegion=false, ActiveGasMixture gasMixture = GM_XENON); //GeoFullPhysVol *makeStrawPlane( size_t w ) const; GeoFullPhysVol *makeStrawPlane( size_t w , ActiveGasMixture gasMixture = GM_XENON); diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetDescrDB_ParameterInterface.h b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetDescrDB_ParameterInterface.h index f28529a3f1d..f7b336c9c88 100755 --- a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetDescrDB_ParameterInterface.h +++ b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/TRT_DetDescrDB_ParameterInterface.h @@ -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 */ #ifndef TRT_GEOMODEL_TRT_DETDESCRDB_PARAMETERINTERFACE_H @@ -44,7 +44,7 @@ public: void SetValues(); - MsgStream& msg (MSG::Level lvl) const { return m_athenaComps->msg(lvl); } + MsgStream& msg (MSG::Level lvl) { return m_athenaComps->msg(lvl); } private: -- GitLab