diff --git a/TileCalorimeter/TileEvent/TileEvent/ATLAS_CHECK_THREAD_SAFETY b/TileCalorimeter/TileEvent/TileEvent/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..902b81eba5b7b8b9f3081300de98d5f14781e9e4
--- /dev/null
+++ b/TileCalorimeter/TileEvent/TileEvent/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+TileCalorimeter/TileEvent
diff --git a/TileCalorimeter/TileEvent/src/TileCell.cxx b/TileCalorimeter/TileEvent/src/TileCell.cxx
index 8cd8fa5f4fbc726f3c06e9af813bdfde64ca44ba..8288c71f45ec82cd1412fa637706e3e10ff80eb8 100755
--- a/TileCalorimeter/TileEvent/src/TileCell.cxx
+++ b/TileCalorimeter/TileEvent/src/TileCell.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************
@@ -30,7 +30,9 @@
#include <iomanip>
// get cabling
-extern TileCablingService * s_cabling;
+namespace {
+const TileCablingService * const s_cabling = TileCablingService::getInstance();
+}
//=========================
// Constructors
diff --git a/TileCalorimeter/TileEvent/src/TileLaserObject.cxx b/TileCalorimeter/TileEvent/src/TileLaserObject.cxx
index 4df7013980786c4f5a5bc6763e6d4d9db5548653..37c2593c623476934045e1463b608e71ae5c7c50 100644
--- a/TileCalorimeter/TileEvent/src/TileLaserObject.cxx
+++ b/TileCalorimeter/TileEvent/src/TileLaserObject.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*author Renato Febbraro*/
@@ -317,7 +317,7 @@ void TileLaserObject::setDiode(const unsigned int diode,
} // IF
}else{
// log<<MSG::ERROR<<"Exit code in method TileLaserObject::setDiode"<<endmsg;
- exit(0);
+ std::abort();
}
}
@@ -337,7 +337,7 @@ void TileLaserObject::setPmt(const unsigned int pmt,
} // IF
}else{
// log<<MSG::ERROR<<"Exit code in method TileLaserObject::setPmt"<<endmsg;
- exit(0);
+ std::abort();
}
}
diff --git a/TileCalorimeter/TileEvent/src/TileRawData.cxx b/TileCalorimeter/TileEvent/src/TileRawData.cxx
index 061f3d3121f037169f3976fc4188423432e2d3c0..a9f9336717999f9fe2b4cf35b7a0180157bd127c 100755
--- a/TileCalorimeter/TileEvent/src/TileRawData.cxx
+++ b/TileCalorimeter/TileEvent/src/TileRawData.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************
@@ -29,7 +29,9 @@
#include <iomanip>
// get cabling
-TileCablingService * s_cabling = TileCablingService::getInstance();
+namespace {
+const TileCablingService * const s_cabling = TileCablingService::getInstance();
+}
TileRawData::TileRawData( const Identifier& id )
: m_adc_hwid (s_cabling->s2h_adc_id(id))
diff --git a/TileCalorimeter/TileEvent/src/TileSimData.cxx b/TileCalorimeter/TileEvent/src/TileSimData.cxx
index 57caa20da6559481b0591cbb8f36cdc5b0aef034..ed4d69fe02be7f4e27ecfa96102a6383c6cf6e44 100755
--- a/TileCalorimeter/TileEvent/src/TileSimData.cxx
+++ b/TileCalorimeter/TileEvent/src/TileSimData.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*****************************************************************************
@@ -27,7 +27,9 @@
#include <iostream>
// get cabling
-extern TileCablingService * s_cabling;
+namespace {
+const TileCablingService * const s_cabling = TileCablingService::getInstance();
+}
TileSimData::TileSimData( const Identifier& id ) : m_pmt_id( id )
{
diff --git a/TileCalorimeter/TileEvent/src/TileTTL1.cxx b/TileCalorimeter/TileEvent/src/TileTTL1.cxx
index 330074c6eda2ee235d95e205fb3bdcdf8c90ecea..bafe805f55b4f7f413b8ce3d24be329d2cd255d1 100755
--- a/TileCalorimeter/TileEvent/src/TileTTL1.cxx
+++ b/TileCalorimeter/TileEvent/src/TileTTL1.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
*/
//*****************************************************************************
@@ -27,7 +27,9 @@
#include <iomanip>
// get cabling
-extern TileCablingService * s_cabling;
+namespace {
+const TileCablingService * const s_cabling = TileCablingService::getInstance();
+}
TileTTL1::TileTTL1( const Identifier& id,
const std::vector<float>& digits ) :
diff --git a/TileCalorimeter/TileEvent/src/TileTTL1Cell.cxx b/TileCalorimeter/TileEvent/src/TileTTL1Cell.cxx
index a8896e95f8bb1e9f93f74db00da3b90ca8c6b234..b10b1d047197e35adab380ce04f7d0e63bf2654e 100755
--- a/TileCalorimeter/TileEvent/src/TileTTL1Cell.cxx
+++ b/TileCalorimeter/TileEvent/src/TileTTL1Cell.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
*/
//*****************************************************************************
@@ -30,7 +30,9 @@
#include <iomanip>
// get cabling
-extern TileCablingService * s_cabling;
+namespace {
+const TileCablingService * const s_cabling = TileCablingService::getInstance();
+}
//=========================
// Constructors
diff --git a/TileCalorimeter/TileEvent/src/TileTrigger.cxx b/TileCalorimeter/TileEvent/src/TileTrigger.cxx
index d5f76e596e07c400ca65b37fb40bc4c0d97c26d3..f029661683afbd549dc78f4d1a13a2b8ef070ea2 100755
--- a/TileCalorimeter/TileEvent/src/TileTrigger.cxx
+++ b/TileCalorimeter/TileEvent/src/TileTrigger.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
*/
//*****************************************************************************
@@ -27,7 +27,9 @@
#include <iomanip>
// get cabling
-extern TileCablingService * s_cabling;
+namespace {
+const TileCablingService * const s_cabling = TileCablingService::getInstance();
+}
TileTrigger::TileTrigger(int id, const Identifier& mtid, double mtsum,
std::vector<Identifier>& boardtid, std::vector<double>& boardtsum,
diff --git a/TileCalorimeter/TileEvent/test/TileMutableBeamElemContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableBeamElemContainer_test.cxx
index 8e063f7f7e23390bc83505a78717424c28b3476f..a3990be1f280ddce238da1270156113e396f7511 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableBeamElemContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableBeamElemContainer_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
/**
* @file TileEvent/test/TileMutableBeamElemContainer_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -24,16 +22,19 @@ static const size_t NCOLL = 2;
static const size_t NCHAN = 10;
-IdDictParser parser;
-TileHWID hwid;
-TileTBID tbid;
-TileID tileid;
-
-
class TileCablingSvc
{
public:
- static
+ IdDictParser parser;
+ TileHWID hwid;
+ TileTBID tbid;
+ TileID tileid;
+
+ TileCablingSvc()
+ {
+ init_idhelpers();
+ }
+
void init_idhelpers()
{
tileid.set_do_neighbours (false);
@@ -247,7 +248,7 @@ void test1()
int main()
{
std::cout << "TileMutableBeamElemContainer_test\n";
- TileCablingSvc::init_idhelpers();
+ TileCablingSvc cabling;
test1();
return 0;
}
diff --git a/TileCalorimeter/TileEvent/test/TileMutableDataContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableDataContainer_test.cxx
index 56e58dece28c2ecc0ade3b4e0392b3351d634922..ee0aed60ff2d6762967e0972a2c3f63df3a1ad21 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableDataContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableDataContainer_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
/**
* @file TileEvent/testTileMutableDataContainer_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -27,16 +25,19 @@ static const size_t NCOLL = 2;
static const size_t NCHAN = 10;
-IdDictParser parser;
-TileHWID hwid;
-TileTBID tbid;
-TileID tileid;
-
-
class TileCablingSvc
{
public:
- static
+ IdDictParser parser;
+ TileHWID hwid;
+ TileTBID tbid;
+ TileID tileid;
+
+ TileCablingSvc()
+ {
+ init_idhelpers();
+ }
+
void init_idhelpers()
{
tileid.set_do_neighbours (false);
@@ -247,7 +248,7 @@ void test1()
int main()
{
std::cout << "TileMutableDataContainer_test\n";
- TileCablingSvc::init_idhelpers();
+ TileCablingSvc cabling;
test1();
return 0;
}
diff --git a/TileCalorimeter/TileEvent/test/TileMutableDigitsContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableDigitsContainer_test.cxx
index 426215257e0b31fe23e113ae632f6903e0d9567b..c14b0983f9dc6079ffd01f15c97f70bcd551677b 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableDigitsContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableDigitsContainer_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
/**
* @file TileEvent/test/TileMutableDigitsContainer_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -24,16 +22,20 @@ static const size_t NCOLL = 2;
static const size_t NCHAN = 10;
-IdDictParser parser;
-TileHWID hwid;
-TileTBID tbid;
-TileID tileid;
-
class TileCablingSvc
{
public:
- static
+ IdDictParser parser;
+ TileHWID hwid;
+ TileTBID tbid;
+ TileID tileid;
+
+ TileCablingSvc()
+ {
+ init_idhelpers();
+ }
+
void init_idhelpers()
{
tileid.set_do_neighbours (false);
@@ -265,7 +267,7 @@ void test1()
int main()
{
std::cout << "TileMutableDigitsContainer_test\n";
- TileCablingSvc::init_idhelpers();
+ TileCablingSvc cabling;
test1();
return 0;
}
diff --git a/TileCalorimeter/TileEvent/test/TileMutableHitContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableHitContainer_test.cxx
index 7932cf21060feb4ac95df023ec18aa1327ef7081..6106657ab3c5599c3445f09b83ffd9f17f7c4698 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableHitContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableHitContainer_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
/**
* @file TileEvent/test/TileMutableHitContainer_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -24,16 +22,19 @@ static const size_t NCOLL = 2;
static const size_t NCHAN = 10;
-IdDictParser parser;
-TileHWID hwid;
-TileTBID tbid;
-TileID tileid;
-
-
class TileCablingSvc
{
public:
- static
+ IdDictParser parser;
+ TileHWID hwid;
+ TileTBID tbid;
+ TileID tileid;
+
+ TileCablingSvc()
+ {
+ init_idhelpers();
+ }
+
void init_idhelpers()
{
tileid.set_do_neighbours (false);
@@ -236,7 +237,7 @@ void test1()
int main()
{
std::cout << "TileMutableHitContainer_test\n";
- TileCablingSvc::init_idhelpers();
+ TileCablingSvc cabling;
test1();
return 0;
}
diff --git a/TileCalorimeter/TileEvent/test/TileMutableRawChannelContainer_test.cxx b/TileCalorimeter/TileEvent/test/TileMutableRawChannelContainer_test.cxx
index 10c14c6f0c76b1e75b986450be75cae5e2eef59b..820a30ae4d69cd8f737bcb409ac69ae881e17f27 100644
--- a/TileCalorimeter/TileEvent/test/TileMutableRawChannelContainer_test.cxx
+++ b/TileCalorimeter/TileEvent/test/TileMutableRawChannelContainer_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
/**
* @file TileEvent/test/TileMutableRawChannelContainer_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -24,16 +22,19 @@ static const size_t NCOLL = 2;
static const size_t NCHAN = 10;
-IdDictParser parser;
-TileHWID hwid;
-TileTBID tbid;
-TileID tileid;
-
-
class TileCablingSvc
{
public:
- static
+ IdDictParser parser;
+ TileHWID hwid;
+ TileTBID tbid;
+ TileID tileid;
+
+ TileCablingSvc()
+ {
+ init_idhelpers();
+ }
+
void init_idhelpers()
{
tileid.set_do_neighbours (false);
@@ -283,7 +284,7 @@ void test1()
int main()
{
std::cout << "TileMutableRawChannelContainer_test\n";
- TileCablingSvc::init_idhelpers();
+ TileCablingSvc cabling;
test1();
return 0;
}