diff --git a/DetectorDescription/RegSelLUT/RegSelLUT/IRegionIDLUT_Creator.h b/DetectorDescription/RegSelLUT/RegSelLUT/IRegionIDLUT_Creator.h
index ad345258093eaa2faa1a4a6f0f62195a2afb443e..3bb923907880813c18864ebac55e1978fa0b8d00 100644
--- a/DetectorDescription/RegSelLUT/RegSelLUT/IRegionIDLUT_Creator.h
+++ b/DetectorDescription/RegSelLUT/RegSelLUT/IRegionIDLUT_Creator.h
@@ -34,7 +34,7 @@ public:
   virtual StatusCode finalize()=0;       /// standard AlgTool method
 
   /// abstract base method for retrieving the table
-  virtual RegSelSiLUT* getLUT() const = 0;
+  virtual RegSelSiLUT* getLUT() = 0;
 
 };
 
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..4e4a8d827772b75fe8dd42118f0d72db525d8ced
--- /dev/null
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+InnerDetector/InDetDetDescr/InDetRegionSelector
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/SiRegionSelectorTable.h b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/SiRegionSelectorTable.h
index 4d3b1cbccc2b5f6dc4796fec68eabd881a5a32fb..428cf404c8fdcf65dd896df023f8b74b27726426 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/SiRegionSelectorTable.h
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/SiRegionSelectorTable.h
@@ -32,7 +32,7 @@ public:
   StatusCode initialize();
   StatusCode finalize();
   
-  virtual RegSelSiLUT* getLUT() const;
+  virtual RegSelSiLUT* getLUT();
 
 private:
   
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/TRT_RegionSelectorTable.h b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/TRT_RegionSelectorTable.h
index 24218c9ffcb4a433c38e1a76b4a08bb88915ee61..ed5ccaa48bad8674e39f47c8e559116059f10d93 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/TRT_RegionSelectorTable.h
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/TRT_RegionSelectorTable.h
@@ -30,7 +30,7 @@ public:
   StatusCode initialize();
   StatusCode execute();
   StatusCode finalize();
-  virtual RegSelSiLUT* getLUT() const;
+  virtual RegSelSiLUT* getLUT();
 
   
 private:
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx
index 0e774353f57dcf0c8db1284ac3358f2ef2431594..29528fe28c8940c31ae123affeedd374fb0b9d1a 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx
@@ -92,7 +92,7 @@ SiRegionSelectorTable::~SiRegionSelectorTable()
 
 
 // Get the lookup table.
-RegSelSiLUT* SiRegionSelectorTable::getLUT() const
+RegSelSiLUT* SiRegionSelectorTable::getLUT()
 {
   return m_regionLUT;
 }
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegionSelectorTable.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegionSelectorTable.cxx
index 27aee9c9cd4bcac7fd41fcd03b13d8240985fdcc..a9d09c864d4599ba48ddade19086eff8b322c192 100755
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegionSelectorTable.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/TRT_RegionSelectorTable.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 "InDetRegionSelector/TRT_RegionSelectorTable.h"
@@ -94,7 +94,7 @@ TRT_RegionSelectorTable::~TRT_RegionSelectorTable()
 }
 
 // Get the lookup table.
-RegSelSiLUT* TRT_RegionSelectorTable::getLUT() const
+RegSelSiLUT* TRT_RegionSelectorTable::getLUT()
 {
   return m_regionLUT;
 }
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/ATLAS_CHECK_THREAD_SAFETY b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..535e432293a6e2d3baaeaa107b02c41182c101aa
--- /dev/null
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+MuonSpectrometer/MuonDetDescr/MuonRegionSelector
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/CSC_RegionSelectorTable.h b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/CSC_RegionSelectorTable.h
index 15fec9aeebaf11a53997d4bd8aedb4ac4f039115..13b4cef202b36429b100de3e001daed6579064fd 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/CSC_RegionSelectorTable.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/CSC_RegionSelectorTable.h
@@ -1,6 +1,6 @@
 // emacs: this is -*- c++ -*-
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 //
 //   @file    CSC_RegionSelectorTable.h        
@@ -45,7 +45,7 @@ public:
   StatusCode initialize();
   StatusCode finalize();
   
-  virtual RegSelSiLUT* getLUT() const;
+  virtual RegSelSiLUT* getLUT();
 
 private:
   
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/MDT_RegionSelectorTable.h b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/MDT_RegionSelectorTable.h
index 1dcf3c64d455fcea7558f86bb0271ef62d268af4..f3fc4b0c1513443dc55e1a2f9399b79227f47e42 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/MDT_RegionSelectorTable.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/MDT_RegionSelectorTable.h
@@ -1,6 +1,6 @@
 // emacs: this is -*- c++ -*-
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 //
 //   @file    MDT_RegionSelectorTable.h        
@@ -45,7 +45,7 @@ public:
   StatusCode initialize();
   StatusCode finalize();
   
-  virtual RegSelSiLUT* getLUT() const;
+  virtual RegSelSiLUT* getLUT();
 
 private:
   
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/MM_RegionSelectorTable.h b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/MM_RegionSelectorTable.h
index c2b5496f434407a799d8a4509920c685985003e7..8b953d44fde5ed2891a2a66c4e847acf5c08ad2a 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/MM_RegionSelectorTable.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/MM_RegionSelectorTable.h
@@ -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
 */
 // emacs: this is -*- c++ -*-
 //
@@ -48,7 +48,7 @@ public:
   StatusCode initialize();
   StatusCode finalize();
   
-  virtual RegSelSiLUT* getLUT() const;
+  virtual RegSelSiLUT* getLUT();
 
 private:
   
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/RPC_RegionSelectorTable.h b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/RPC_RegionSelectorTable.h
index 31d7d0cea6df1a16d52bf7aa55956dd21919d17b..091d41fe32fbf5cf4b1825ad59d3322ebe3ba295 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/RPC_RegionSelectorTable.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/RPC_RegionSelectorTable.h
@@ -1,6 +1,6 @@
 // emacs: this is -*- C++ -*-
 /*
-  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    RPC_RegionSelectorTable.h        
@@ -38,7 +38,7 @@ public:
   StatusCode initialize();
   StatusCode finalize();
   
-  virtual RegSelSiLUT* getLUT() const;
+  virtual RegSelSiLUT* getLUT();
 
 private:
   
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/TGC_RegionSelectorTable.h b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/TGC_RegionSelectorTable.h
index 8252775f83f33fe9ba2bb457947fa82c385fd622..d4041f0579d089de2dd3d95bbd3f23c20b1f5058 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/TGC_RegionSelectorTable.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/TGC_RegionSelectorTable.h
@@ -1,6 +1,6 @@
 // emacs: this is -*- c++ -*-
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 //
 //   @file    TGC_RegionSelectorTable.h        
@@ -46,7 +46,7 @@ public:
   StatusCode initialize();
   StatusCode finalize();
   
-  virtual RegSelSiLUT* getLUT() const;
+  virtual RegSelSiLUT* getLUT();
 
 private:
   
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/sTGC_RegionSelectorTable.h b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/sTGC_RegionSelectorTable.h
index f651d48e9db9db6e2665b652c1196a15b912a307..e5aee9a63987939f4bc3c6541f743dfc7e66dc57 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/sTGC_RegionSelectorTable.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/MuonRegionSelector/sTGC_RegionSelectorTable.h
@@ -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
 */
 // emacs: this is -*- c++ -*-
 //
@@ -46,7 +46,7 @@ public:
   StatusCode initialize();
   StatusCode finalize();
   
-  virtual RegSelSiLUT* getLUT() const;
+  virtual RegSelSiLUT* getLUT();
 
 private:
   
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx
index f11328c755d72e4102967f6ebfbaff2ab01d8fc3..9019b39bc1908b2138bd9cf6b9fca00b342c88e3 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx
@@ -50,7 +50,7 @@ StatusCode CSC_RegionSelectorTable::finalize() {
 }
 
 
-RegSelSiLUT* CSC_RegionSelectorTable::getLUT() const {
+RegSelSiLUT* CSC_RegionSelectorTable::getLUT() {
   return m_regionLUT;
 } 
 
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx
index ca8610c7c5f8f358e1a53e3278af51ac3d91ea47..f1586dae8b31365675ae38a41ccd8a5f262db923 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx
@@ -56,7 +56,7 @@ StatusCode MDT_RegionSelectorTable::finalize() {
 }
 
 
-RegSelSiLUT* MDT_RegionSelectorTable::getLUT() const {
+RegSelSiLUT* MDT_RegionSelectorTable::getLUT() {
   return m_regionLUT;
 } 
 
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegionSelectorTable.cxx
index 83e88740a8ee99df8833dc8108665ee9e482ec7c..3e5567f828f1838d8c099b9f728a9974f8803128 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegionSelectorTable.cxx
@@ -60,7 +60,7 @@ StatusCode MM_RegionSelectorTable::finalize() {
 }
 
 
-RegSelSiLUT* MM_RegionSelectorTable::getLUT() const {
+RegSelSiLUT* MM_RegionSelectorTable::getLUT() {
   return m_regionLUT;
 } 
 
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/RPC_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/RPC_RegionSelectorTable.cxx
index 340119d40ed3ccf0665378bb9abdcbd9414388f6..78254517b1b460059c851af20f005925be9360b1 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/RPC_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/RPC_RegionSelectorTable.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
 */
 //
 //   @file    RPC_RegionSelectorTable.cxx         
@@ -81,7 +81,7 @@ StatusCode RPC_RegionSelectorTable::finalize() {
 }
 
 
-RegSelSiLUT* RPC_RegionSelectorTable::getLUT() const {
+RegSelSiLUT* RPC_RegionSelectorTable::getLUT() {
   return m_regionLUT;
 } 
 
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx
index 88bf46b5971ab0fc6a7259a5b8e151f0c2b5aa8d..0bdbfe59bb1d924a970df774925323db8d980bbf 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx
@@ -64,7 +64,7 @@ StatusCode TGC_RegionSelectorTable::finalize() {
 }
 
 
-RegSelSiLUT* TGC_RegionSelectorTable::getLUT() const {
+RegSelSiLUT* TGC_RegionSelectorTable::getLUT() {
   return m_regionLUT;
 } 
 
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegionSelectorTable.cxx
index ec2e95ac94c7f1f2b141b94a147faf639f9cee8a..7c6f9604d8dc966c687753ad74b16764bad1fda5 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegionSelectorTable.cxx
@@ -64,7 +64,7 @@ StatusCode sTGC_RegionSelectorTable::finalize() {
 }
 
 
-RegSelSiLUT* sTGC_RegionSelectorTable::getLUT() const {
+RegSelSiLUT* sTGC_RegionSelectorTable::getLUT() {
   return m_regionLUT;
 }