diff --git a/Calorimeter/CaloUtils/CaloUtils/ATLAS_CHECK_THREAD_SAFETY b/Calorimeter/CaloUtils/CaloUtils/ATLAS_CHECK_THREAD_SAFETY new file mode 100644 index 0000000000000000000000000000000000000000..5f5ab8b0ed82d2ca587bcde2042aad66c4a5706d --- /dev/null +++ b/Calorimeter/CaloUtils/CaloUtils/ATLAS_CHECK_THREAD_SAFETY @@ -0,0 +1 @@ +Calorimeter/CaloUtils diff --git a/Calorimeter/CaloUtils/CaloUtils/CaloLayerCalculator.h b/Calorimeter/CaloUtils/CaloUtils/CaloLayerCalculator.h index acfd45cc4059e725e832bfd2d92c3a87467efb2c..d0e8d16d67e613cfedfa622d406f88bd2724558c 100644 --- a/Calorimeter/CaloUtils/CaloUtils/CaloLayerCalculator.h +++ b/Calorimeter/CaloUtils/CaloUtils/CaloLayerCalculator.h @@ -342,7 +342,7 @@ private: double m_s01r; // phi_raw-weighted energy sum. /// Phi-wrapping helper. - static CaloPhiRange s_range; + static const CaloPhiRange s_range; }; friend struct Helper; //@} diff --git a/Calorimeter/CaloUtils/CaloUtils/CaloTowerBuilderToolBase.h b/Calorimeter/CaloUtils/CaloUtils/CaloTowerBuilderToolBase.h index cc977e7626bc48a7be6fbb8b091f8c1f0d8de7d6..cd013103843932006bedd57cb0f436e7e8cf22d3 100644 --- a/Calorimeter/CaloUtils/CaloUtils/CaloTowerBuilderToolBase.h +++ b/Calorimeter/CaloUtils/CaloUtils/CaloTowerBuilderToolBase.h @@ -24,11 +24,12 @@ #include "AthenaBaseComps/AthAlgTool.h" #include <string> +#include "CxxUtils/checker_macros.h" class CaloTowerContainer; class CaloCellContainer; class IGeoAlignTool; -class CaloTowerBuilderToolBase: public AthAlgTool, +class ATLAS_NOT_THREAD_SAFE CaloTowerBuilderToolBase: public AthAlgTool, virtual public ICaloTowerBuilderToolBase, public IIncidentListener { diff --git a/Calorimeter/CaloUtils/src/CaloLayerCalculator.cxx b/Calorimeter/CaloUtils/src/CaloLayerCalculator.cxx index 646def76bbd3f9ef633d0c65ccfe7ad63719fcfc..0a9183ae19fd4012361d9a5344a2767627f31b27 100644 --- a/Calorimeter/CaloUtils/src/CaloLayerCalculator.cxx +++ b/Calorimeter/CaloUtils/src/CaloLayerCalculator.cxx @@ -141,7 +141,7 @@ void CaloLayerCalculator::resetOnNegativeEnergy(double eta, double phi) /// Phi-wrapping helper. -CaloPhiRange CaloLayerCalculator::Helper::s_range; +const CaloPhiRange CaloLayerCalculator::Helper::s_range; /** diff --git a/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.cxx b/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.cxx index 2f1a1a5597c15c08b0bfba459c7750cb3e89f4f1..60ce766c39a5593aa458c6122f7369ae80aa8dd6 100644 --- a/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.cxx +++ b/Calorimeter/CaloUtils/src/CaloTowerBuilderToolTestAlg.cxx @@ -12,6 +12,10 @@ #undef NDEBUG +//This is a test so need to be thread safe +#include "CxxUtils/checker_macros.h" +ATLAS_NO_CHECK_FILE_THREAD_SAFETY; + #include "CaloTowerBuilderToolTestAlg.h" #include "CaloUtils/CaloTowerBuilderTool.h" #include "CaloEvent/CaloCellContainer.h" diff --git a/Calorimeter/CaloUtils/test/CaloLayerCalculator_test.cxx b/Calorimeter/CaloUtils/test/CaloLayerCalculator_test.cxx index 0fd708e65d21919c97cea4d2323c0199c329261a..61bbd228688e34df050deb43a747ec4aca1de940 100644 --- a/Calorimeter/CaloUtils/test/CaloLayerCalculator_test.cxx +++ b/Calorimeter/CaloUtils/test/CaloLayerCalculator_test.cxx @@ -9,9 +9,15 @@ * @date March, 2006 * @brief Component test for CaloLayerCalculator. */ + #ifndef XAOD_STANDALONE #undef NDEBUG +//This is a test so need to be thread safe +#include "CxxUtils/checker_macros.h" +ATLAS_NO_CHECK_FILE_THREAD_SAFETY; + + #include "CaloUtils/CaloLayerCalculator.h" #include "CaloUtils/CaloClusterStoreHelper.h" #include "CaloEvent/CaloCellContainer.h" @@ -50,7 +56,7 @@ bool is_equal (double x1, double x2) } -static CaloPhiRange range; +static const CaloPhiRange range; static const float deta = 0.025f; static const float dphi = static_cast<float> (2*M_PI / 256);