diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/CryostatCalibrationLArCalculator.h b/LArCalorimeter/LArG4/LArG4Barrel/src/CryostatCalibrationLArCalculator.h
index a034ae12ee80f17dd24f55331cfbccecd4aed057..7ae9714deaaeeb2a676c681f1a1651162b5d120e 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/CryostatCalibrationLArCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/CryostatCalibrationLArCalculator.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// LArG4::BarrelCryostat::CalibrationLArCalculator
@@ -69,7 +69,7 @@ namespace LArG4 {
CaloG4::SimulationEnergies m_energyCalculator;
// Access to parameters.
- LArVG4DetectorParameters* m_parameters;
+ const LArVG4DetectorParameters* m_parameters;
ServiceHandle<ILArCalibCalculatorSvc> m_defaultCalculator;
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.cxx
index 8d94e24403cf2ef327cdaa88d645da56facd5355..7b6445d5aba922ad73b1e683c53dc7b941d7491c 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelCalculator.cxx
@@ -87,7 +87,7 @@ StatusCode LArBarrelCalculator::initialize()
}
// Access source of detector parameters.
- LArVG4DetectorParameters* parameters = LArVG4DetectorParameters::GetInstance();
+ const LArVG4DetectorParameters* parameters = LArVG4DetectorParameters::GetInstance();
// Get the out-of-time cut from the detector parameters routine.
m_OOTcut = parameters->GetValue("LArExpHallOutOfTimeCut"); //FIXME should be done via configurables
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelGeometry.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelGeometry.cxx
index 98c60b6a3b14d8f2d160e46a009f23f0fb9e0c01..872d047bd2c25ac0b89a926c3cc84abcddd62afd 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelGeometry.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelGeometry.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/********************************************************************
@@ -78,7 +78,7 @@ namespace LArG4 {
// initialize the geometry.
// Access source of detector parameters.
- LArVG4DetectorParameters* parameters = LArVG4DetectorParameters::GetInstance();
+ const LArVG4DetectorParameters* parameters = LArVG4DetectorParameters::GetInstance();
// number of straight sections (should be 14)
m_Nbrt = (int) (parameters->GetValue("LArEMBnoOFAccZigs"));
@@ -330,7 +330,7 @@ namespace LArG4 {
static bool FILL = true;
if (FILL) {
- LArVG4DetectorParameters* parameters = LArVG4DetectorParameters::GetInstance();
+ const LArVG4DetectorParameters* parameters = LArVG4DetectorParameters::GetInstance();
// maximum eta barrel 1.475 (at r=1500.024)
Eta_max = parameters->GetValue("LArEMBMaxEtaAcceptance");
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelPresamplerCalculator.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelPresamplerCalculator.cxx
index 9370663a1c6571f968fca5abcfc6517148f6df84..a1bc8a3f5829c9effc40d7332581013b8e98dbd6 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelPresamplerCalculator.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArBarrelPresamplerCalculator.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// Prepared 05-Dec-2002 Bill Seligman
@@ -60,7 +60,7 @@ StatusCode LArBarrelPresamplerCalculator::initialize()
// Initialize private members.
// Access source of detector parameters.
- LArVG4DetectorParameters* parameters = LArVG4DetectorParameters::GetInstance();
+ const LArVG4DetectorParameters* parameters = LArVG4DetectorParameters::GetInstance();
// Initialize the geometry calculator
ATH_CHECK(m_geometry.retrieve());
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightAbsorbers.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightAbsorbers.cxx
index 841b607b2a2921f8faca977ca05a63d4b4b5a35f..946f19aec84930497b5fe1b2388897c8e368da6c 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightAbsorbers.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightAbsorbers.cxx
@@ -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
*/
#include "LArStraightAbsorbers.h"
@@ -23,7 +23,7 @@ LArStraightAbsorbers* LArStraightAbsorbers::GetInstance(const std::string& strD
LArStraightAbsorbers::LArStraightAbsorbers(std::string strDetector)
{
- LArVG4DetectorParameters* parameters = LArVG4DetectorParameters::GetInstance();
+ const LArVG4DetectorParameters* parameters = LArVG4DetectorParameters::GetInstance();
if (parameters->GetValue("LArEMBPhiAtCurvature",0)>0.) m_parity=0; // first wave goes up
else m_parity=1; // first wave goes down
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightElectrodes.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightElectrodes.cxx
index 61bd7b055c2cfd0241ff7b0cf4d6a486f3183621..c1ae4d8d43934ea4082b6a8a9f2f2db784eeed04 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightElectrodes.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/LArStraightElectrodes.cxx
@@ -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
*/
#include "LArStraightElectrodes.h"
@@ -22,7 +22,7 @@ LArStraightElectrodes* LArStraightElectrodes::GetInstance(const std::string& st
LArStraightElectrodes::LArStraightElectrodes(std::string strDetector)
{
- LArVG4DetectorParameters* parameters = LArVG4DetectorParameters::GetInstance();
+ const LArVG4DetectorParameters* parameters = LArVG4DetectorParameters::GetInstance();
if (parameters->GetValue("LArEMBPhiAtCurvature",0)>0.) m_parity=0; // first wave goes up
else m_parity=1; // first wave goes down
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/CryostatCalibrationLArCalculator.h b/LArCalorimeter/LArG4/LArG4EC/src/CryostatCalibrationLArCalculator.h
index 43b5548d5d3c72606624e70eb9c3c767fb619f91..5f3e15a195def89a22d334ba2827f9cb4431abe5 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/CryostatCalibrationLArCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4EC/src/CryostatCalibrationLArCalculator.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// LArG4::EndcapCryostat::CalibrationLArCalculator
@@ -69,7 +69,7 @@ namespace LArG4 {
CaloG4::SimulationEnergies m_energyCalculator;
// Access to parameters.
- LArVG4DetectorParameters* m_parameters{nullptr};
+ const LArVG4DetectorParameters* m_parameters{nullptr};
// For the default calculator (hopefully temporary).
ServiceHandle<ILArCalibCalculatorSvc> m_defaultCalculator;
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/EMECSupportCalibrationCalculator.cc b/LArCalorimeter/LArG4/LArG4EC/src/EMECSupportCalibrationCalculator.cc
index 2725ddf2302ab9de4e4bbc46ae462a614a649f0c..b35f400fb51deb8f6e136182de0e4eb693b3a12c 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/EMECSupportCalibrationCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4EC/src/EMECSupportCalibrationCalculator.cc
@@ -54,7 +54,7 @@ namespace LArG4 {
~Parameters();
// Access to parameters.
- LArVG4DetectorParameters* m_parameters;
+ const LArVG4DetectorParameters* m_parameters;
double m_zShift; // 40.0
double m_zEMECRefPoint; // 3689.5000
diff --git a/LArCalorimeter/LArGeoModel/LArGeoCode/LArGeoCode/VDetectorParameters.h b/LArCalorimeter/LArGeoModel/LArGeoCode/LArGeoCode/VDetectorParameters.h
index 09cf0299d7d96f60ef24a438dab249cb8a43a896..92dc8af2ea1770c93a57cf65087c60ee7c6d05e6 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoCode/LArGeoCode/VDetectorParameters.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoCode/LArGeoCode/VDetectorParameters.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// VDetectorParameters
@@ -53,7 +53,7 @@ namespace LArGeo {
const int i1 = INT_MIN,
const int i2 = INT_MIN,
const int i3 = INT_MIN,
- const int i4 = INT_MIN ) = 0;
+ const int i4 = INT_MIN ) const = 0;
protected:
VDetectorParameters() {};
diff --git a/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RAL.h b/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RAL.h
index 97dbc7e6a7288ccd67e3688f1af028a78c7acf20..1e485722f577a2b8eb0ad1dbe8ddbd40cb474ca0 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RAL.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RAL.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// RAL.h
@@ -35,7 +35,7 @@ namespace LArGeo {
const int i1 = INT_MIN,
const int i2 = INT_MIN,
const int i3 = INT_MIN,
- const int i4 = INT_MIN );
+ const int i4 = INT_MIN ) const override;
private:
diff --git a/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALEmb.h b/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALEmb.h
index efb8dab64d10ad96abc8d02c5140e9b8b75ad218..353726d8f0f94c56ea25ba73226b969d5b9a0730 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALEmb.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALEmb.h
@@ -29,7 +29,7 @@ namespace LArGeo {
const int i1 = INT_MIN,
const int i2 = INT_MIN,
const int i3 = INT_MIN,
- const int i4 = INT_MIN );
+ const int i4 = INT_MIN ) const override;
private:
diff --git a/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALEmec.h b/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALEmec.h
index 06fad87f7fc61a9ce8861b39cc0064895a1a223b..a737954f7f1c428c5692cb51cddbdf6e5028aac3 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALEmec.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALEmec.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// RALEmec.h
@@ -29,7 +29,7 @@ namespace LArGeo {
const int i1 = INT_MIN,
const int i2 = INT_MIN,
const int i3 = INT_MIN,
- const int i4 = INT_MIN );
+ const int i4 = INT_MIN ) const override;
private:
diff --git a/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALExperimentalHall.h b/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALExperimentalHall.h
index 2b30553ac36fc743d8095d7e93ed4cc2749fb849..73244943121dd7bdb08f34bc6168c992dffff154 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALExperimentalHall.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALExperimentalHall.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// RALExperimentalHall.h
@@ -29,7 +29,7 @@ namespace LArGeo {
const int i1 = INT_MIN,
const int i2 = INT_MIN,
const int i3 = INT_MIN,
- const int i4 = INT_MIN );
+ const int i4 = INT_MIN ) const override;
private:
diff --git a/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALHec.h b/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALHec.h
index 1309202a40a81622f5b0ff2835336173d11e5fb5..ff4b2c9a4de23179e999c64c9d0a1c61c5bbab8b 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALHec.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoRAL/LArGeoRAL/RALHec.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
// RALHec.h
@@ -29,7 +29,7 @@ namespace LArGeo {
const int i1 = INT_MIN,
const int i2 = INT_MIN,
const int i3 = INT_MIN,
- const int i4 = INT_MIN );
+ const int i4 = INT_MIN ) const override;
private:
diff --git a/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RAL.cxx b/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RAL.cxx
index 838112c7fc21bd92b9a52001296a783c3f88a261..67b4301674be25d8b1cd13c5358a1e6e0a09cedc 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RAL.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RAL.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include "LArGeoRAL/RAL.h"
@@ -35,7 +35,7 @@ namespace LArGeo {
const int a1,
const int a2,
const int a3,
- const int a4 )
+ const int a4 ) const
{
// Call the appropriate GetValue() based on the contents of the
diff --git a/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALEmb.cxx b/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALEmb.cxx
index 1c7d4e81228507caea3d06dc83c10af2d5961eaa..1faba64d938586407d85da6cf3e8d4467c7072d2 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALEmb.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALEmb.cxx
@@ -148,7 +148,7 @@ double LArGeo::RALEmb::GetValue(const std::string& a_name,
const int /*a1*/,
const int /*a2*/,
const int /*a3*/,
- const int /*a4*/ )
+ const int /*a4*/ ) const
{
std::ostringstream A0STR;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALEmec.cxx b/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALEmec.cxx
index f4ef558cbf5f9eecc227f9eb0bc63e66dae8a4b0..688c25ae71dcd239fa7c09515a366a587dab5794 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALEmec.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALEmec.cxx
@@ -105,7 +105,7 @@ double LArGeo::RALEmec::GetValue(const std::string& a_name,
const int a1,
const int /*a2*/,
const int /*a3*/,
- const int /*a4*/ )
+ const int /*a4*/ ) const
{
std::ostringstream A0STR;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALExperimentalHall.cxx b/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALExperimentalHall.cxx
index 22dee3412cac43d47f0b332a491fe892d756aa70..c29d080e0f7eb3418ee8e32792862bbd74d3b0ab 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALExperimentalHall.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALExperimentalHall.cxx
@@ -86,7 +86,7 @@ double LArGeo::RALExperimentalHall::GetValue(const std::string& a_name,
const int /*a1*/,
const int /*a2*/,
const int /*a3*/,
- const int /*a4*/ )
+ const int /*a4*/ ) const
{
if ( a_name == "LArExpHallOutOfTimeCut" ) return 2.5*CLHEP::ns;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALHec.cxx b/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALHec.cxx
index 4cff7fded2722d81b094e427b292169c2b17c296..09ce10734a20b26fdf89584afefec3c4e06ed50b 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALHec.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoRAL/src/RALHec.cxx
@@ -97,7 +97,7 @@ double LArGeo::RALHec::GetValue(const std::string& a_name,
const int /*a1*/,
const int /*a2*/,
const int /*a3*/,
- const int /*a4*/ )
+ const int /*a4*/ ) const
{
std::ostringstream A0STR;