diff --git a/LumiBlock/LumiCalc/CMakeLists.txt b/LumiBlock/LumiCalc/CMakeLists.txt
index 356c2f846cf5b958be8f7260d8bc90c1ea3ef0dd..ae37adad9209dc0cb89ec0d6a7174d605128922e 100644
--- a/LumiBlock/LumiCalc/CMakeLists.txt
+++ b/LumiBlock/LumiCalc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( LumiCalc )
@@ -16,7 +16,7 @@ atlas_add_library( LumiBlockCoolQuery
                    src/LumiBlockCollectionConverter.cxx
                    PUBLIC_HEADERS LumiCalc
                    INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} 
-                   LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel GoodRunsListsLib LumiBlockData xAODLuminosity )
+                   LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GoodRunsListsLib LumiBlockData xAODLuminosity )
 
 atlas_add_executable( iLumiCalc
                       src/iLumiCalc.cxx
diff --git a/LumiBlock/LumiCalc/LumiCalc/LumiBlockCollectionConverter.h b/LumiBlock/LumiCalc/LumiCalc/LumiBlockCollectionConverter.h
index 7052d7fe84cd6eff3de1b815a8468842d1723952..a2388ecee64faa57cf1725b4306d99f42200f682 100644
--- a/LumiBlock/LumiCalc/LumiCalc/LumiBlockCollectionConverter.h
+++ b/LumiBlock/LumiCalc/LumiCalc/LumiBlockCollectionConverter.h
@@ -17,6 +17,8 @@
 #include <vector>
 #include "TString.h"
 
+#include "CxxUtils/checker_macros.h"
+
 namespace Root {
   class TGoodRunsList;
   class TGRLCollection;
@@ -28,7 +30,7 @@ class LumiBlockCollection;
 
 typedef std::map<TString,TString> grlmetadatamap;
 
-class LumiBlockCollectionConverter {
+class ATLAS_NOT_THREAD_SAFE LumiBlockCollectionConverter {
    
  public:
 
diff --git a/LumiBlock/LumiCalc/LumiCalc/LumiBlockRangeContainerConverter.h b/LumiBlock/LumiCalc/LumiCalc/LumiBlockRangeContainerConverter.h
index c95b60bbc581a3e7e4fa886c90cb19c595cb831b..29baf0240d35bb463836685bcab872bef3063f6f 100644
--- a/LumiBlock/LumiCalc/LumiCalc/LumiBlockRangeContainerConverter.h
+++ b/LumiBlock/LumiCalc/LumiCalc/LumiBlockRangeContainerConverter.h
@@ -25,12 +25,13 @@ namespace Root {
   class TGoodRunsListWriter;
 }
 
+#include "CxxUtils/checker_macros.h"
 #include "xAODLuminosity/LumiBlockRangeContainer.h"
 #include "xAODLuminosity/LumiBlockRangeAuxContainer.h"
 
 typedef std::map<TString,TString> grlmetadatamap;
 
-class LumiBlockRangeContainerConverter {
+class ATLAS_NOT_THREAD_SAFE LumiBlockRangeContainerConverter {
    
  public:
 
diff --git a/LumiBlock/LumiCalc/LumiCalc/LumiCalculator.h b/LumiBlock/LumiCalc/LumiCalc/LumiCalculator.h
index d18fc84e72ac49103ce43a35c41116f74e3fd405..1b4c7493a520fbc4bfa29a091df2bbca8c764796 100644
--- a/LumiBlock/LumiCalc/LumiCalc/LumiCalculator.h
+++ b/LumiBlock/LumiCalc/LumiCalc/LumiCalculator.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef LUMICALC_LUMICALCULATOR_H
 #define LUMICALC_LUMICALCULATOR_H
 
-
+#include "CxxUtils/checker_macros.h"
 #include "LumiCalc/CoolQuery.h"
 #include "LumiCalc/LumiBlockRangeContainerConverter.h"
 #include <vector>
@@ -31,7 +31,7 @@ class LumiCalculator{
   void UseLumiMethod(const std::string& method);// i.e. COOL Folder channel
   void UseLumiChannel(int chan);
   void UseLiveTrigger(bool live, std::string& livetrigger);
-  void IntegrateLumi(const xAOD::LumiBlockRangeContainer * iovc, const std::string& triggerchain);
+  void IntegrateLumi ATLAS_NOT_THREAD_SAFE (const xAOD::LumiBlockRangeContainer * iovc, const std::string& triggerchain);
   void SetCollName(const std::string& lbcollname);
   void setTree(TTree * tree = 0);
 
diff --git a/LumiBlock/LumiCalc/src/LumiCalculator.cxx b/LumiBlock/LumiCalc/src/LumiCalculator.cxx
index 7b79eb00494740a07430ced0692acc31c9c3fe54..7c4fe3f51b59e142ca905b4eec320e60c64871a9 100644
--- a/LumiBlock/LumiCalc/src/LumiCalculator.cxx
+++ b/LumiBlock/LumiCalc/src/LumiCalculator.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LumiCalc/LumiCalculator.h"
@@ -284,7 +284,7 @@ TTree * LumiCalculator::getTree(){
 }
 
 //______________________________________________________________________________
-void  LumiCalculator::IntegrateLumi(const xAOD::LumiBlockRangeContainer * iovc, const std::string& triggerchain){
+void  LumiCalculator::IntegrateLumi ATLAS_NOT_THREAD_SAFE (const xAOD::LumiBlockRangeContainer * iovc, const std::string& triggerchain){
 
 
   CoolQuery * cq_lumi = NULL;