From 930b0a4c71a2a9a97765e1ec52d26d130b8f2a93 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 23 Jan 2019 16:34:27 +0100
Subject: [PATCH] TileGeoG4Calib: A couple const fixes.
Declare as const ServiceHandles to the detStore used as arguments.
Needed for compatibility with thread-safety fixes in AthenaBaseComps.
---
TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc | 4 ++--
TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h | 4 ++--
.../TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.cc | 4 ++--
.../TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.h | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc
index 29a5d6697aca..5ea892a0a567 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//************************************************************
@@ -60,7 +60,7 @@
//CONSTRUCTOR
TileGeoG4CalibSD::TileGeoG4CalibSD(const G4String& name, const std::vector<std::string>& outputCollectionNames, ITileCalculator* tileCalculator,
- ServiceHandle<StoreGateSvc> &detStore)
+ const ServiceHandle<StoreGateSvc> &detStore)
: G4VSensitiveDetector(name),
m_tileActiveCellCalibHits(outputCollectionNames[1]),
m_tileInactiveCellCalibHits(outputCollectionNames[2]),
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h
index 84bc556df6c2..6a3a3fd70e4a 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//************************************************************
@@ -86,7 +86,7 @@ typedef std::vector<double> E_4;
class TileGeoG4CalibSD: public G4VSensitiveDetector {
public:
TileGeoG4CalibSD(const G4String& name, const std::vector<std::string>& m_outputCollectionNames,
- ITileCalculator* tileCalculator, ServiceHandle<StoreGateSvc> &detStore);
+ ITileCalculator* tileCalculator, const ServiceHandle<StoreGateSvc> &detStore);
~TileGeoG4CalibSD();
void InvokeUserRunAction();
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.cc b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.cc
index eceab515f85a..09a9e908db2a 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.cc
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//************************************************************
@@ -44,7 +44,7 @@
TileGeoG4DMLookupBuilder::TileGeoG4DMLookupBuilder(TileGeoG4LookupBuilder* lookup_builder,
ServiceHandle<IRDBAccessSvc> &raccess,
ServiceHandle<IGeoModelSvc> &geo_svc,
- ServiceHandle<StoreGateSvc> &pDetStore, const int verboseLevel)
+ const ServiceHandle<StoreGateSvc> &pDetStore, const int verboseLevel)
: rBMin(0),
rBMax(0),
zBarrMaxPos(0),
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.h b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.h
index 81cd050822fd..5f3db2a910a0 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.h
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//************************************************************
@@ -33,7 +33,7 @@ class StoreGateSvc;
class TileGeoG4DMLookupBuilder {
public:
TileGeoG4DMLookupBuilder(TileGeoG4LookupBuilder* tile_lookup_builder, ServiceHandle<IRDBAccessSvc> &access,
- ServiceHandle<IGeoModelSvc> &geo_svc, ServiceHandle<StoreGateSvc> &pDetStore,
+ ServiceHandle<IGeoModelSvc> &geo_svc, const ServiceHandle<StoreGateSvc> &pDetStore,
const int verboseLevel);
~TileGeoG4DMLookupBuilder();
--
GitLab