diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/CMakeLists.txt b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/CMakeLists.txt
index 19e5971aee6ee058803fc7f3e37079f0b6235020..4b826ef6153183d0de77d939c0b7ab4e4ededfbd 100644
--- a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/CMakeLists.txt
+++ b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/CMakeLists.txt
@@ -11,6 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
InnerDetector/InDetConditions/TRT_ConditionsServices
PRIVATE
+ Control/CxxUtils
Control/StoreGate
InnerDetector/InDetConditions/TRT_ConditionsData
InnerDetector/InDetDetDescr/InDetIdentifier
@@ -33,7 +34,7 @@ atlas_add_component( InDetLowBetaFinder
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel TRT_ConditionsServicesLib StoreGateLib SGtests TRT_ConditionsData InDetIdentifier InDetLowBetaInfo InDetRIO_OnTrack TrkParameters xAODTracking TrkRIO_OnTrack TrkTrack MagFieldElements MagFieldConditions TRT_ElectronPidToolsLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel TRT_ConditionsServicesLib CxxUtils StoreGateLib SGtests TRT_ConditionsData InDetIdentifier InDetLowBetaInfo InDetRIO_OnTrack TrkParameters xAODTracking TrkRIO_OnTrack TrkTrack MagFieldElements MagFieldConditions TRT_ElectronPidToolsLib )
# Install files from the package:
atlas_install_headers( InDetLowBetaFinder )
diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/InDetLowBetaFinder/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/InDetLowBetaFinder/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..1599dd8ff1fa6956909abaa46eb8039be2664e5d
--- /dev/null
+++ b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/InDetLowBetaFinder/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+InnerDetector/InDetRecAlgs/InDetLowBetaFinder
diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/InDetLowBetaFinder/LowBetaAlg.h b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/InDetLowBetaFinder/LowBetaAlg.h
index 15a424e165196cccb4216799d8dc14baa81ad71b..9bf4e267549cd5fd12b60152b8964fb4d616c9f6 100644
--- a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/InDetLowBetaFinder/LowBetaAlg.h
+++ b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/InDetLowBetaFinder/LowBetaAlg.h
@@ -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
*/
///////////////////////////////////////////////////////////////////
@@ -31,6 +31,7 @@ author Christopher.Marino <Christopher.Marino@cern.ch>
#include "InDetLowBetaInfo/InDetLowBetaContainer.h"
#include "TrkTrack/TrackCollection.h"
#include "TRT_ElectronPidTools/ITRT_ToT_dEdx.h"
+#include "CxxUtils/checker_macros.h"
/////////////////////////////////////////////////////////////////////////////
@@ -55,7 +56,8 @@ namespace InDet
{
- class LowBetaAlg:public AthAlgorithm {
+ class ATLAS_NOT_THREAD_SAFE LowBetaAlg: // This class is thread unsafe because this class uses thread unsafe TrtToolBetaLiklihood class.
+public AthAlgorithm {
public:
LowBetaAlg (const std::string& name, ISvcLocator* pSvcLocator);
StatusCode initialize();
diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/InDetLowBetaFinder/TrtToolsBetaLiklihood.h b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/InDetLowBetaFinder/TrtToolsBetaLiklihood.h
index 5ee97d716ae7dd7b6f2addea8fb5b441171278ba..fc0361116468bf478025c84856c4d4b3e129ac9c 100644
--- a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/InDetLowBetaFinder/TrtToolsBetaLiklihood.h
+++ b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/InDetLowBetaFinder/TrtToolsBetaLiklihood.h
@@ -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
*/
#ifndef TRTCHAMP_H
@@ -15,16 +15,18 @@
#include "TH1.h"
#include "TMinuit.h"
+#include "CxxUtils/checker_macros.h"
+
//-----------------------------------------------------------------------------------------------//
// //
-// TRTChamp / TrtToolBetaLiklihood //
+// TRTChamp / TrtToolBetaLiklihood //
// Authors: C. Gay, B. Mills, S. Schramm 2009-2011 Univ. British Columbia / ATLAS Canada //
// Contact developers at mills.wj@gmail.com //
// Use default calibrations at your own risk! //
// //
//-----------------------------------------------------------------------------------------------//
-class TrtToolBetaLiklihood {
+class ATLAS_NOT_THREAD_SAFE TrtToolBetaLiklihood { // This class uses global variables and function for TMinuit. However, they are not protected by mutex. This class is not thread safe.
public:
TrtToolBetaLiklihood();
diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/TrtToolsBetaLiklihood.cxx b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/TrtToolsBetaLiklihood.cxx
index 909f67a8772f011d0bfb4cf9264322a488e2c510..341cb3b00c46d01b2da3cab656920da014a38f7c 100644
--- a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/TrtToolsBetaLiklihood.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/TrtToolsBetaLiklihood.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
*/
#include <iostream>
@@ -8,8 +8,6 @@
#include "InDetLowBetaFinder/TrtToolsBetaLiklihood.h"
#include "InDetLowBetaFinder/TrtToolsBetaLiklihood.calibration.h"
-
-
// Define the control parameters here instead of in the header to enable linking
// (Fixing the one-definition rule of C++)
// Some control parameters gathered here for convenience:
@@ -264,7 +262,8 @@ void TrtToolBetaLiklihood::TRT_FEbeta_min(float &beta, float &betaSigmaLo, float
//std::cout << "waypoint 9" << std::endl;
}
-void TRT_FEbeta_fcn(Int_t &npar, Double_t *gin, Double_t &f, Double_t *par, Int_t iflag){
+void TRT_FEbeta_fcn ATLAS_NOT_THREAD_SAFE // Global variables are used without protection.
+(Int_t &npar, Double_t *gin, Double_t &f, Double_t *par, Int_t iflag){
//std::cout << "FEbeta_fcn 0" << std::endl;
const double c = 30.; // speed of light in cm/ns
diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/TrtToolsBetaWrapper.cxx b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/TrtToolsBetaWrapper.cxx
index c97f33e27ed5d8c9ae8f62291c4f91a219fd0f1a..d940013502a982f907cdba6e72d8fbdb09c9bfcd 100644
--- a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/TrtToolsBetaWrapper.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/TrtToolsBetaWrapper.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
*/
#include "InDetLowBetaFinder/LowBetaAlg.h"
@@ -23,6 +23,8 @@
#include "TRT_ConditionsData/RtRelation.h"
#include "TRT_ConditionsData/BasicRtRelation.h"
+// ATLAS_NOT_THREAD_SAFE macro
+#include "CxxUtils/checker_macros.h"
// Prints the input of TRT_FEbeta() to file (hard-set)
// This is a temporary debug method, and may be removed later
@@ -564,11 +566,12 @@ StatusCode InDet::LowBetaAlg::parseDataForTrtToolBetaLiklihood(const Trk::Track&
// Prints the input of TRT_FEbeta() to file (hard-set)
// This is a temporary debug method, and may be removed later
-int printTrtToolBetaLiklihoodDebugFile(std::vector<int> TRT_bitpattern, std::vector<int> TRT_bec, std::vector<int> TRT_strawlayer, std::vector<int> TRT_layer,
+// This method is not thread safe because static variable is used.
+int printTrtToolBetaLiklihoodDebugFile ATLAS_NOT_THREAD_SAFE (std::vector<int> TRT_bitpattern, std::vector<int> TRT_bec, std::vector<int> TRT_strawlayer, std::vector<int> TRT_layer,
std::vector<float> TRT_t0, std::vector<float> TRT_R, std::vector<float> TRT_R_track,
std::vector<float> TrackX, std::vector<float> TrackY, std::vector<float> TrackZ, float RecPt, float RecEta)
{
- static int trackNum = 0;
+ static int trackNum = 0; // static variable is not thread safe.
const char* FILENAME_C = "/afs/cern.ch/user/s/sschramm/testarea/16.0.2/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/debugFile.log";
FILE* outFile;
unsigned int i;