From 53cf8223f1cc4e33a17cb19e7f1331f117e78229 Mon Sep 17 00:00:00 2001
From: Susumu Oda <susumu.oda@cern.ch>
Date: Wed, 17 Jun 2020 17:14:27 +0200
Subject: [PATCH] Add ATLAS_CHECK_THREAD_SAFETY to
InnerDetector/InDetDetDescrCnv/InDetIdCnv
---
.../InDetDetDescrCnv/InDetIdCnv/ATLAS_CHECK_THREAD_SAFETY | 1 +
.../InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.cxx | 2 +-
.../InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.cxx | 4 ++--
.../InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.cxx | 4 ++--
.../InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.cxx | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
create mode 100644 InnerDetector/InDetDetDescrCnv/InDetIdCnv/ATLAS_CHECK_THREAD_SAFETY
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 00000000000..882243e2cd9
--- /dev/null
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+InnerDetector/InDetDetDescrCnv/InDetIdCnv
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.cxx
index 0937c86e3f7..f3add41451d 100644
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.cxx
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/PixelIDDetDescrCnv.cxx
@@ -121,7 +121,7 @@ PixelIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
} else {}
// Get the dictionary manager from the detector store
- const DataHandle<IdDictManager> idDictMgr;
+ const IdDictManager* idDictMgr;
status = detStore->retrieve(idDictMgr, "IdDict");
if (status.isFailure()) {
log << MSG::FATAL << "Could not get IdDictManager !" << endmsg;
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.cxx
index 80075761662..7f49d183923 100644
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.cxx
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SCT_IDDetDescrCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -122,7 +122,7 @@ SCT_IDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
} else {}
// Get the dictionary manager from the detector store
- const DataHandle<IdDictManager> idDictMgr;
+ const IdDictManager* idDictMgr;
status = detStore->retrieve(idDictMgr, "IdDict");
if (status.isFailure()) {
log << MSG::FATAL << "Could not get IdDictManager !" << endmsg;
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.cxx
index f7a9302786f..8655441e635 100644
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.cxx
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/SiliconIDDetDescrCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -124,7 +124,7 @@ SiliconIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
} else {}
// Get the dictionary manager from the detector store
- const DataHandle<IdDictManager> idDictMgr;
+ const IdDictManager* idDictMgr;
status = detStore->retrieve(idDictMgr, "IdDict");
if (status.isFailure()) {
log << MSG::FATAL << "Could not get IdDictManager !" << endmsg;
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.cxx
index 8804f39781c..6477047a370 100644
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.cxx
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/TRT_IDDetDescrCnv.cxx
@@ -122,7 +122,7 @@ TRT_IDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
} else {}
// Get the dictionary manager from the detector store
- const DataHandle<IdDictManager> idDictMgr;
+ const IdDictManager* idDictMgr;
status = detStore->retrieve(idDictMgr, "IdDict");
if (status.isFailure()) {
log << MSG::FATAL << "Could not get IdDictManager !" << endmsg;
--
GitLab