diff --git a/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/CombinedScintillatorTool.cc b/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/CombinedScintillatorTool.cc
index bd03a89697e5d3e36daf4bd96d52a86ebc868691..d74a41269629fe231e9279dd8763d2a61ab1d87d 100644
--- a/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/CombinedScintillatorTool.cc
+++ b/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/CombinedScintillatorTool.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
//class header
@@ -9,7 +9,6 @@
#include "GeoModelInterfaces/StoredMaterialManager.h"
#include "GeoModelKernel/GeoMaterial.h"
#include "GeoMaterial2G4/Geo2G4MaterialFactory.h"
-#include "StoreGate/DataHandle.h"
// Geant4 headers
#include "G4LogicalVolume.hh"
@@ -53,7 +52,7 @@ void CombinedScintillatorTool::BuildGeometry() {
G4Tubs* sci_mother = new G4Tubs("CScintillatorLayer", m_rMin, m_rMax, m_dzSci, phi1 * CLHEP::deg, dphi * CLHEP::deg);
// Get the materials
- const DataHandle<StoredMaterialManager> materialManager;
+ StoredMaterialManager* materialManager = nullptr;
if (StatusCode::SUCCESS != detStore()->retrieve(materialManager, std::string("MATERIALS"))) {
//FIXME should probably at least print an ERROR here...
return;
diff --git a/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/DeadMaterialTool.cxx b/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/DeadMaterialTool.cxx
index f23a00d4945a38ff8fa963a94cb6f085439d94e9..b236448cee4c96ebf0476579fdef920f462c5405 100644
--- a/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/DeadMaterialTool.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/DeadMaterialTool.cxx
@@ -9,7 +9,6 @@
#include "GeoModelInterfaces/StoredMaterialManager.h"
#include "GeoModelKernel/GeoMaterial.h"
#include "GeoMaterial2G4/Geo2G4MaterialFactory.h"
-#include "StoreGate/DataHandle.h"
// Geant4 headers
#include "G4Box.hh"
@@ -50,7 +49,7 @@ void DeadMaterialTool::BuildGeometry()
G4Box *wall = new G4Box("DeadMaterial",dxdeadmaterial,dydeadmaterial,dzdeadmaterial);
// Get the materials
- const DataHandle<StoredMaterialManager> materialManager;
+ StoredMaterialManager* materialManager = nullptr;
if (StatusCode::SUCCESS != detStore()->retrieve(materialManager, std::string("MATERIALS")))
{
//FIXME should probably at least print an ERROR here...
diff --git a/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/LArCrateTool.cxx b/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/LArCrateTool.cxx
index d2fad03748e661b3deee88831ef1e2f98810a95f..25055bf3c13e366f82c5e917762a44eca9a76676 100644
--- a/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/LArCrateTool.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/LArCrateTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
//class header
@@ -9,7 +9,6 @@
#include "GeoModelInterfaces/StoredMaterialManager.h"
#include "GeoModelKernel/GeoMaterial.h"
#include "GeoMaterial2G4/Geo2G4MaterialFactory.h"
-#include "StoreGate/DataHandle.h"
// Geant4 headers
#include "G4Box.hh"
@@ -43,7 +42,7 @@ void LArCrateTool::BuildGeometry()
G4Box *emptybox = new G4Box("Crate",dxCrate,dyCrate,dzCrate);
// Get the materials
- const DataHandle<StoredMaterialManager> materialManager;
+ StoredMaterialManager* materialManager = nullptr;
if (StatusCode::SUCCESS != detStore()->retrieve(materialManager, std::string("MATERIALS")))
{
//FIXME should probably at least print an ERROR here...
diff --git a/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/MuonWallTool.cxx b/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/MuonWallTool.cxx
index 7e29017e54d0503dbc644c5057768842e98590e1..89007671954bf3307563155e0a134c93f011eb6f 100644
--- a/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/MuonWallTool.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/MuonWallTool.cxx
@@ -71,7 +71,7 @@ void MuonWallTool::BuildGeometry() {
G4Box *wall = new G4Box("MuonWall", dxmuonwall, dymuonwall, dzmuonwall);
// Get the materials
- const StoredMaterialManager* materialManager = nullptr;
+ StoredMaterialManager* materialManager = nullptr;
if (StatusCode::SUCCESS != detStore()->retrieve(materialManager, std::string("MATERIALS"))) {
ATH_MSG_ERROR( "Could not find Material Manager MATERIALS" );
return;
diff --git a/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/PhantomBarrelTool.cc b/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/PhantomBarrelTool.cc
index ecb6e9e48e7badec435a274d3a625eec153a81b4..26d016b6893dfdbea07b64a484e4515003902a87 100644
--- a/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/PhantomBarrelTool.cc
+++ b/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/PhantomBarrelTool.cc
@@ -9,7 +9,6 @@
#include "GeoModelInterfaces/StoredMaterialManager.h"
#include "GeoModelKernel/GeoMaterial.h"
#include "GeoMaterial2G4/Geo2G4MaterialFactory.h"
-#include "StoreGate/DataHandle.h"
// Geant4 headers
#include "G4Box.hh"
@@ -54,7 +53,7 @@ void PhantomBarrelTool::BuildGeometry() {
G4Box *barrel = new G4Box("PhantomBarrel", dxBarrel, dyBarrelwithEnvelop, dzBarrelwithEnvelop);
// Get the materials
- const DataHandle<StoredMaterialManager> materialManager;
+ StoredMaterialManager* materialManager = nullptr;
if (StatusCode::SUCCESS != detStore()->retrieve(materialManager, std::string("MATERIALS"))) {
//FIXME should probably at least print an ERROR here...
return ;
diff --git a/TileCalorimeter/TileGeoModel/src/TileAtlasFactory.cxx b/TileCalorimeter/TileGeoModel/src/TileAtlasFactory.cxx
index 1128b2e99731f984873a3e0ab7afbd0c47e15b8d..ccc7e03ec4fe62d9466b4115412f6f6012b87235 100755
--- a/TileCalorimeter/TileGeoModel/src/TileAtlasFactory.cxx
+++ b/TileCalorimeter/TileGeoModel/src/TileAtlasFactory.cxx
@@ -91,7 +91,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
(*m_log) << MSG::INFO <<" Entering TileAtlasFactory::create()" << endmsg;
// -------- -------- MATERIAL MANAGER -------- ----------
- const StoredMaterialManager* theMaterialManager = nullptr;
+ StoredMaterialManager* theMaterialManager = nullptr;
if (StatusCode::SUCCESS != m_detectorStore->retrieve(theMaterialManager, "MATERIALS"))
{
(*m_log) << MSG::ERROR << "Could not find Material Manager MATERIALS" << endmsg;
diff --git a/TileCalorimeter/TileGeoModel/src/TileDetectorFactory.cxx b/TileCalorimeter/TileGeoModel/src/TileDetectorFactory.cxx
index 16af2d8b97f1d4af4083c87c67729c5cf92238e1..697a233431d090ba708f055c7486a55a2a8e3cb3 100755
--- a/TileCalorimeter/TileGeoModel/src/TileDetectorFactory.cxx
+++ b/TileCalorimeter/TileGeoModel/src/TileDetectorFactory.cxx
@@ -76,7 +76,7 @@ void TileDetectorFactory::create(GeoPhysVol *world)
int nregion = 0;
// -------- -------- MATERIAL MANAGER -------- ----------
- const StoredMaterialManager* theMaterialManager = nullptr;
+ StoredMaterialManager* theMaterialManager = nullptr;
if (StatusCode::SUCCESS != m_detectorStore->retrieve(theMaterialManager, "MATERIALS"))
{
(*m_log) << MSG::ERROR << "Could not find Material Manager MATERIALS" << endmsg;
diff --git a/TileCalorimeter/TileGeoModel/src/TileGeoCutBuilder.cxx b/TileCalorimeter/TileGeoModel/src/TileGeoCutBuilder.cxx
index 2619391d1a5703de2e8a2737e4fbb72335cf1fa1..2af93b987e012decea1ac80fd489050d317d4e81 100755
--- a/TileCalorimeter/TileGeoModel/src/TileGeoCutBuilder.cxx
+++ b/TileCalorimeter/TileGeoModel/src/TileGeoCutBuilder.cxx
@@ -33,7 +33,7 @@
#include <iostream>
#include <assert.h>
-TileGeoCutBuilder::TileGeoCutBuilder(const StoredMaterialManager* /*matManager*/,
+TileGeoCutBuilder::TileGeoCutBuilder(StoredMaterialManager* /*matManager*/,
TileDddbManager * /*pDbManager*/,
MsgStream * log)
: m_log(log)
diff --git a/TileCalorimeter/TileGeoModel/src/TileGeoCutBuilder.h b/TileCalorimeter/TileGeoModel/src/TileGeoCutBuilder.h
index 8c76361438d101a77b855fb75eb971f49735f08c..210bc19edd042cd5ad5280cf76132df698f8d667 100755
--- a/TileCalorimeter/TileGeoModel/src/TileGeoCutBuilder.h
+++ b/TileCalorimeter/TileGeoModel/src/TileGeoCutBuilder.h
@@ -27,7 +27,7 @@ class TileGeoCutBuilder
{
public:
/** Constructor */
- TileGeoCutBuilder(const StoredMaterialManager* matManager,
+ TileGeoCutBuilder(StoredMaterialManager* matManager,
TileDddbManager* pDbManager,
MsgStream * log);
diff --git a/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx b/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx
index 5faaef4bc9252411fe57381cc66f2523a84126c3..ef3278875072bd1b24d1bbbb0dc858c1485f09ac 100755
--- a/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx
+++ b/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx
@@ -50,7 +50,7 @@
using namespace GeoGenfun;
using namespace GeoXF;
-TileGeoSectionBuilder::TileGeoSectionBuilder(const StoredMaterialManager* matManager,
+TileGeoSectionBuilder::TileGeoSectionBuilder(StoredMaterialManager* matManager,
TileDddbManager * pDbManager,
const TileSwitches & switches,
MsgStream * log)
diff --git a/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.h b/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.h
index 2ec0667e042a3c807b85dc0f51f2e3ce9b73cf68..d9a4d992acc67cb175d85066fabd1b3cf64960fb 100755
--- a/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.h
+++ b/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.h
@@ -36,7 +36,7 @@ class TileGeoSectionBuilder
{
public:
/** Constructor */
- TileGeoSectionBuilder(const StoredMaterialManager* matManager,
+ TileGeoSectionBuilder(StoredMaterialManager* matManager,
TileDddbManager* pDbManager,
const TileSwitches & switches,
MsgStream * log);
@@ -183,7 +183,7 @@ class TileGeoSectionBuilder
private:
- const StoredMaterialManager* m_theMaterialManager;
+ StoredMaterialManager* m_theMaterialManager;
TileDddbManager * m_dbManager;
MsgStream * m_log;
diff --git a/TileCalorimeter/TileGeoModel/src/TileTBFactory.cxx b/TileCalorimeter/TileGeoModel/src/TileTBFactory.cxx
index 5af0c8fc7a3159bf9c32cd2af2cecc5cbafee3e2..15e1e8bbbd959a54e42260dd8d3d929d881d0865 100755
--- a/TileCalorimeter/TileGeoModel/src/TileTBFactory.cxx
+++ b/TileCalorimeter/TileGeoModel/src/TileTBFactory.cxx
@@ -67,7 +67,7 @@ void TileTBFactory::create(GeoPhysVol *world)
(*m_log) << MSG::INFO <<" Entering TileTBFactory::create()" << endmsg;
// -------- -------- MATERIAL MANAGER -------- ----------
- const StoredMaterialManager* theMaterialManager = nullptr;
+ StoredMaterialManager* theMaterialManager = nullptr;
if (StatusCode::SUCCESS != m_detectorStore->retrieve(theMaterialManager, "MATERIALS"))
{
(*m_log) << MSG::ERROR << "Could not find Material Manager MATERIALS" << endmsg;