diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigParticleTPCnv/CMakeLists.txt
index aab818e818253ac487b9ebd4cb804fdbffe966ac..bd94949cdacfa6279c6e4795dd873e0edb410d21 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 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( TrigParticleTPCnv )
@@ -7,7 +7,7 @@ atlas_subdir( TrigParticleTPCnv )
 atlas_add_tpcnv_library( TrigParticleTPCnv
                          src/*.cxx
                          PUBLIC_HEADERS TrigParticleTPCnv
-                         LINK_LIBRARIES AthenaKernel AthenaPoolCnvSvcLib AthenaPoolUtilities DataModelAthenaPoolLib EventCommonTPCnv FourMom Particle TrackParticleTPCnv TrigCaloEventTPCnv TrigInDetEvent TrigInDetEventTPCnv TrigParticle )
+                         LINK_LIBRARIES AthenaKernel AthenaPoolCnvSvcLib AthenaPoolUtilities CxxUtils DataModelAthenaPoolLib EventCommonTPCnv FourMom Particle TrackParticleTPCnv TrigCaloEventTPCnv TrigInDetEvent TrigInDetEventTPCnv TrigParticle )
 
 atlas_add_dictionary( TrigParticleTPCnvDict
                       TrigParticleTPCnv/TrigParticleTPCnvDict.h
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..4129911713b7367034eef450a95bdcc364d2aa3a
--- /dev/null
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Trigger/TrigEvent/TrigParticleTPCnv
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphysCnv_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphysCnv_p2.h
index da6b112a6dd57ee6d91efa3ec700451a6b71a512..87e53c4c471aab5e67a7829a18f410f26ab77604 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphysCnv_p2.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphysCnv_p2.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -12,8 +12,6 @@
  * @author Andrew Hamilton  <Andrew.Hamilton@cern.ch>  - U. Geneva
  * @author Francesca Bucci  <F.Bucci@cern.ch>          - U. Geneva
  *
- * File and Version Information:
- * $Id: TrigEFBphysCnv_p2.h,v 1.2 2009-04-01 22:13:30 salvator Exp $
  **********************************************************************************/
 #ifndef TRIGPARTICLETPCNV_TRIGEFBPHYSCNV_P2_H
 #define TRIGPARTICLETPCNV_TRIGEFBPHYSCNV_P2_H
@@ -33,15 +31,17 @@
 class MsgStream;
 
 
-class TrigEFBphysCnv_p2 : public T_AthenaPoolTPCnvBase<TrigEFBphys, TrigEFBphys_p2> 
+class TrigEFBphysCnv_p2 : public T_AthenaPoolTPCnvConstBase<TrigEFBphys, TrigEFBphys_p2>
 {
 
  public:
+  using base_class::persToTrans;
+  using base_class::transToPers;
 
   TrigEFBphysCnv_p2()   {}
 
-  virtual void persToTrans(const TrigEFBphys_p2* persObj, TrigEFBphys* transObj, MsgStream &log);
-  virtual void transToPers(const TrigEFBphys* transObj, TrigEFBphys_p2* persObj, MsgStream &log);
+  virtual void persToTrans(const TrigEFBphys_p2* persObj, TrigEFBphys* transObj, MsgStream &log) const override;
+  virtual void transToPers(const TrigEFBphys* transObj, TrigEFBphys_p2* persObj, MsgStream &log) const override;
   
  protected:
   ElementLinkCnv_p1<ElementLink<TrigEFBphysContainer> > m_elementLinkEFBphysCnv   ;
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphysCnv_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphysCnv_p3.h
index a90f2d697ffd9700f709b3510f7e7fca830b9ff0..1d296ed92cf9fcfb67445117c283c527d806c8e8 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphysCnv_p3.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigEFBphysCnv_p3.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -12,8 +12,6 @@
  * @author Andrew Hamilton  <Andrew.Hamilton@cern.ch>  - U. Geneva
  * @author Francesca Bucci  <F.Bucci@cern.ch>          - U. Geneva
  *
- * File and Version Information:
- * $Id: TrigEFBphysCnv_p3.h,v 1.1 2010-08-12 demelian Exp $
  **********************************************************************************/
 #ifndef TRIGPARTICLETPCNV_TRIGEFBPHYSCNV_P3_H
 #define TRIGPARTICLETPCNV_TRIGEFBPHYSCNV_P3_H
@@ -30,15 +28,17 @@
 class MsgStream;
 
 
-class TrigEFBphysCnv_p3 : public T_AthenaPoolTPCnvBase<TrigEFBphys, TrigEFBphys_p3> 
+class TrigEFBphysCnv_p3 : public T_AthenaPoolTPCnvConstBase<TrigEFBphys, TrigEFBphys_p3>
 {
 
  public:
+  using base_class::persToTrans;
+  using base_class::transToPers;
 
   TrigEFBphysCnv_p3()   {}
 
-  virtual void persToTrans(const TrigEFBphys_p3* persObj, TrigEFBphys* transObj, MsgStream &log);
-  virtual void transToPers(const TrigEFBphys* transObj, TrigEFBphys_p3* persObj, MsgStream &log);
+  virtual void persToTrans(const TrigEFBphys_p3* persObj, TrigEFBphys* transObj, MsgStream &log) const override;
+  virtual void transToPers(const TrigEFBphys* transObj, TrigEFBphys_p3* persObj, MsgStream &log) const override;
   
  protected:
   ElementLinkCnv_p3<ElementLink<TrigEFBphysContainer> > m_elementLinkEFBphysCnv   ;
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectronCnv_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectronCnv_p2.h
index 82cd00f62963472d38036b2548b8f14d2d681811..5da1fd877a4a309060925f03ba960a7b1f5adaff 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectronCnv_p2.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectronCnv_p2.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -13,8 +13,6 @@
  * @author Francesca Bucci  <f.bucci@cern.ch>          - U. Geneva
  * @author Ricardo Goncalo  <r.goncalo@rhul.ac.uk>     - Royal Holloway 
  *
- * File and Version Information:
- * $Id: TrigElectron_p2.h,v 1.2 2009-06-14 14:23:00 jgoncalo Exp $ 
  **********************************************************************************/
 #ifndef TRIGPARTICLETPCNV_TRIGELECTRONCNV_P2_H
 #define TRIGPARTICLETPCNV_TRIGELECTRONCNV_P2_H
@@ -40,15 +38,14 @@ class MsgStream;
 class TrigElectronCnv_p2 : public T_AthenaPoolTPCnvBase<TrigElectron, TrigElectron_p2>
 {
 public:
-
   TrigElectronCnv_p2() : m_p4PtEtaPhiMCnv(0) {}
 
   virtual void persToTrans(const TrigElectron_p2* persObj, 
 			   TrigElectron* transObj, 
-			   MsgStream &log);
+			   MsgStream &log) override;
   virtual void transToPers(const TrigElectron* transObj, 
 			   TrigElectron_p2* persObj, 
-			   MsgStream &log);
+			   MsgStream &log) override;
  protected:
 
   // to persistify ElementLinks to cluster and track 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectronCnv_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectronCnv_p3.h
index beeaeef73165041deae00e22022ea4cb62849688..178f79d2689caab3b017f9d95f3496ef5530b95d 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectronCnv_p3.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigElectronCnv_p3.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -13,8 +13,6 @@
  * @author Francesca Bucci  <f.bucci@cern.ch>          - U. Geneva
  * @author Ricardo Goncalo  <r.goncalo@rhul.ac.uk>     - Royal Holloway 
  *
- * File and Version Information:
- * $Id: TrigElectronCnv_p3.h 358100 2011-04-12 12:29:54Z salvator $ 
  **********************************************************************************/
 #ifndef TRIGPARTICLETPCNV_TRIGELECTRONCNV_P3_H
 #define TRIGPARTICLETPCNV_TRIGELECTRONCNV_P3_H
@@ -37,18 +35,20 @@
 
 class MsgStream;
 
-class TrigElectronCnv_p3 : public T_AthenaPoolTPCnvBase<TrigElectron, TrigElectron_p3>
+class TrigElectronCnv_p3 : public T_AthenaPoolTPCnvConstBase<TrigElectron, TrigElectron_p3>
 {
 public:
+  using base_class::persToTrans;
+  using base_class::transToPers;
 
   TrigElectronCnv_p3() {}
 
   virtual void persToTrans(const TrigElectron_p3* persObj, 
 			   TrigElectron* transObj, 
-			   MsgStream &log);
+			   MsgStream &log) const override;
   virtual void transToPers(const TrigElectron* transObj, 
 			   TrigElectron_p3* persObj, 
-			   MsgStream &log);
+			   MsgStream &log) const override;
  protected:
 
   // to persistify ElementLinks to cluster and track 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2BphysCnv_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2BphysCnv_p2.h
index 5af69fb038226148abb9abdaa632e4b3a617fb18..499d9a49fe20091bab7f3cc739917d600f959ce8 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2BphysCnv_p2.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2BphysCnv_p2.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -12,9 +12,6 @@
  * @author Andrew Hamilton  <Andrew.Hamilton@cern.ch>  - U. Geneva
  * @author Francesca Bucci  <F.Bucci@cern.ch>          - U. Geneva
  *
- * File and Version Information:
- * $Id: TrigL2BphysCnv_p2.h,v 1.2 2009-04-01 22:13:30 salvator Exp $
- * $Id: TrigL2BphysCnv_p2.h,v 1.2 2009-04-01 22:13:30 salvator Exp $
  **********************************************************************************/
 #ifndef TRIGPARTICLETPCNV_TRIGL2BPHYSCNV_P2_H
 #define TRIGPARTICLETPCNV_TRIGL2BPHYSCNV_P2_H
@@ -37,15 +34,17 @@
 class MsgStream;
 
 
-class TrigL2BphysCnv_p2 : public T_AthenaPoolTPCnvBase<TrigL2Bphys, TrigL2Bphys_p2> 
+class TrigL2BphysCnv_p2 : public T_AthenaPoolTPCnvConstBase<TrigL2Bphys, TrigL2Bphys_p2>
 {
 
  public:
+  using base_class::persToTrans;
+  using base_class::transToPers;
 
   TrigL2BphysCnv_p2()  {}
 
-  virtual void persToTrans(const TrigL2Bphys_p2* persObj, TrigL2Bphys* transObj, MsgStream &log);
-  virtual void transToPers(const TrigL2Bphys* transObj, TrigL2Bphys_p2* persObj, MsgStream &log);
+  virtual void persToTrans(const TrigL2Bphys_p2* persObj, TrigL2Bphys* transObj, MsgStream &log) const override;
+  virtual void transToPers(const TrigL2Bphys* transObj, TrigL2Bphys_p2* persObj, MsgStream &log) const override;
 
   
   protected:
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2BphysCnv_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2BphysCnv_p3.h
index c3611095e4010a5e9e2ed837e453d6a96a9af463..070d28a0151db9caf28790a657aa4d5c75d1b5b6 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2BphysCnv_p3.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigL2BphysCnv_p3.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -12,8 +12,6 @@
  * @author Andrew Hamilton  <Andrew.Hamilton@cern.ch>  - U. Geneva
  * @author Francesca Bucci  <F.Bucci@cern.ch>          - U. Geneva
  *
- * File and Version Information:
- * $Id: TrigL2BphysCnv_p3.h,v 1.2 2010-08-11  demelian Exp $
  **********************************************************************************/
 #ifndef TRIGPARTICLETPCNV_TRIGL2BPHYSCNV_P3_H
 #define TRIGPARTICLETPCNV_TRIGL2BPHYSCNV_P3_H
@@ -32,15 +30,17 @@
 class MsgStream;
 
 
-class TrigL2BphysCnv_p3 : public T_AthenaPoolTPCnvBase<TrigL2Bphys, TrigL2Bphys_p3> 
+class TrigL2BphysCnv_p3 : public T_AthenaPoolTPCnvConstBase<TrigL2Bphys, TrigL2Bphys_p3>
 {
 
  public:
+  using base_class::persToTrans;
+  using base_class::transToPers;
 
   TrigL2BphysCnv_p3()  {}
 
-  virtual void persToTrans(const TrigL2Bphys_p3* persObj, TrigL2Bphys* transObj, MsgStream &log);
-  virtual void transToPers(const TrigL2Bphys* transObj, TrigL2Bphys_p3* persObj, MsgStream &log);
+  virtual void persToTrans(const TrigL2Bphys_p3* persObj, TrigL2Bphys* transObj, MsgStream &log) const override;
+  virtual void transToPers(const TrigL2Bphys* transObj, TrigL2Bphys_p3* persObj, MsgStream &log) const override;
 
   
   protected:
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhotonCnv_p2.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhotonCnv_p2.h
index 1fadd452380c6ce34e96108f504eb1b89091f368..a00ce34334046a5103547c35c62dc260e109228a 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhotonCnv_p2.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhotonCnv_p2.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -12,8 +12,6 @@
  * @author Andrew Hamilton  <Andrew.Hamilton@cern.ch>  - U. Geneva
  * @author Francesca Bucci  <F.Bucci@cern.ch>          - U. Geneva
  *
- * File and Version Information:
- * $Id: TrigPhotonCnv_p2.h,v 1.2 2009-04-01 22:13:31 salvator Exp $
  **********************************************************************************/
 #ifndef TRIGPARTICLETPCNV_TRIGPHOTONCNV_P2_H
 #define TRIGPARTICLETPCNV_TRIGPHOTONCNV_P2_H
@@ -31,7 +29,7 @@
 class MsgStream;
 
 
-class TrigPhotonCnv_p2 : public T_AthenaPoolTPCnvBase<TrigPhoton, TrigPhoton_p2> 
+class TrigPhotonCnv_p2 : public T_AthenaPoolTPCnvBase<TrigPhoton, TrigPhoton_p2>
 {
 
  public:
@@ -40,15 +38,16 @@ class TrigPhotonCnv_p2 : public T_AthenaPoolTPCnvBase<TrigPhoton, TrigPhoton_p2>
 
   virtual void persToTrans(const TrigPhoton_p2* persObj, 
 			   TrigPhoton* transObj, 
-			   MsgStream &log);
+			   MsgStream &log) override;
 
   virtual void transToPers(const TrigPhoton* transObj, 
 			   TrigPhoton_p2* persObj, 
-			   MsgStream &log);
+			   MsgStream &log) override;
   
  protected:
 
   P4PtEtaPhiMCnv_p1      *m_p4PtEtaPhiMCnv ;
+  ElementLinkCnv_p1< ElementLink<TrigEMClusterContainer> > m_eLinkEMClusterCnv;
 };
 
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhotonCnv_p3.h b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhotonCnv_p3.h
index c8736f26103ab2a0224b23e355769f4f386ad17b..fb0fa62bd67482b09f75b7464d616aad814e079a 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhotonCnv_p3.h
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/TrigParticleTPCnv/TrigPhotonCnv_p3.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************************
@@ -12,8 +12,6 @@
  * @author Andrew Hamilton  <Andrew.Hamilton@cern.ch>  - U. Geneva
  * @author Francesca Bucci  <F.Bucci@cern.ch>          - U. Geneva
  *
- * File and Version Information:
- * $Id: TrigPhotonCnv_p3.h 724397 2016-02-16 22:17:22Z ssnyder $
  **********************************************************************************/
 #ifndef TRIGPARTICLETPCNV_TRIGPHOTONCNV_P3_H
 #define TRIGPARTICLETPCNV_TRIGPHOTONCNV_P3_H
@@ -31,20 +29,22 @@
 class MsgStream;
 
 
-class TrigPhotonCnv_p3 : public T_AthenaPoolTPCnvBase<TrigPhoton, TrigPhoton_p3> 
+class TrigPhotonCnv_p3 : public T_AthenaPoolTPCnvConstBase<TrigPhoton, TrigPhoton_p3>
 {
 
  public:
+  using base_class::persToTrans;
+  using base_class::transToPers;
 
   TrigPhotonCnv_p3() {}
 
   virtual void persToTrans(const TrigPhoton_p3* persObj, 
 			   TrigPhoton* transObj, 
-			   MsgStream &log);
+			   MsgStream &log) const override;
 
   virtual void transToPers(const TrigPhoton* transObj, 
 			   TrigPhoton_p3* persObj, 
-			   MsgStream &log);
+			   MsgStream &log) const override;
   
  protected:
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigEFBphysCnv_p2.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigEFBphysCnv_p2.cxx
index ef842ddfabdf41ca3472931aec1fd3c6982762f3..5324e94c091f62216bcde3f2f9be697662de956d 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigEFBphysCnv_p2.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigEFBphysCnv_p2.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigParticle/TrigEFBphys.h"
@@ -7,14 +7,14 @@
 #include "TrigParticleTPCnv/TrigEFBphysCnv_p2.h"
  
 
-static ElementLinkVectorCnv_p1<ElementLinkVector<Rec::TrackParticleContainer> > trackELVCnv;
+static const ElementLinkVectorCnv_p1<ElementLinkVector<Rec::TrackParticleContainer> > trackELVCnv;
 
 //-----------------------------------------------------------------------------
 // Persistent to transient
 //-----------------------------------------------------------------------------
 void TrigEFBphysCnv_p2::persToTrans( const TrigEFBphys_p2 *persObj,
 					     TrigEFBphys    *transObj,
-					     MsgStream       &log )
+					     MsgStream       &log ) const
 {
   log << MSG::DEBUG << "TrigEFBphysCnv_p2::persToTrans called " << endmsg;
 
@@ -45,7 +45,7 @@ void TrigEFBphysCnv_p2::persToTrans( const TrigEFBphys_p2 *persObj,
 //-----------------------------------------------------------------------------
 void TrigEFBphysCnv_p2::transToPers( const TrigEFBphys    *transObj,
 					     TrigEFBphys_p2 *persObj,
-					     MsgStream       &log )
+					     MsgStream       &log ) const
 {
   log << MSG::DEBUG << "TrigEFBphysCnv_p2::transToPers called " << endmsg;
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigEFBphysCnv_p3.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigEFBphysCnv_p3.cxx
index 1c86129747ede93957c6ffb1240f0999ecc6f3c3..7048facfd51d58dfdd8883145a4a8cdaed11a074 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigEFBphysCnv_p3.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigEFBphysCnv_p3.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigParticle/TrigEFBphys.h"
@@ -7,14 +7,14 @@
 #include "TrigParticleTPCnv/TrigEFBphysCnv_p3.h"
  
 
-static ElementLinkVectorCnv_p1<ElementLinkVector<Rec::TrackParticleContainer> > trackELVCnv;
+static const ElementLinkVectorCnv_p1<ElementLinkVector<Rec::TrackParticleContainer> > trackELVCnv;
 
 //-----------------------------------------------------------------------------
 // Persistent to transient
 //-----------------------------------------------------------------------------
 void TrigEFBphysCnv_p3::persToTrans( const TrigEFBphys_p3 *persObj,
 				     TrigEFBphys    *transObj,
-				     MsgStream       &log )
+				     MsgStream       &log ) const
 {
   log << MSG::DEBUG << "TrigEFBphysCnv_p3::persToTrans called " << endmsg;
 
@@ -45,7 +45,7 @@ void TrigEFBphysCnv_p3::persToTrans( const TrigEFBphys_p3 *persObj,
 //-----------------------------------------------------------------------------
 void TrigEFBphysCnv_p3::transToPers( const TrigEFBphys    *transObj,
 				     TrigEFBphys_p3 *persObj,
-				     MsgStream       &log )
+				     MsgStream       &log ) const
 {
   log << MSG::DEBUG << "TrigEFBphysCnv_p3::transToPers called " << endmsg;
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigElectronCnv_p2.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigElectronCnv_p2.cxx
index 017330a36db048aefc54b4982fcfa7ccfa3ab322..33bd26fdc117fc10fd36910e702f517d56a2fb81 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigElectronCnv_p2.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigElectronCnv_p2.cxx
@@ -1,15 +1,11 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigParticle/TrigElectron.h"
 #include "TrigParticleTPCnv/TrigElectron_p2.h"
 #include "TrigParticleTPCnv/TrigElectronCnv_p2.h"
 
-
-static ElementLinkCnv_p1<ElementLink<TrigInDetTrackCollection> > ELinkIDTrackCnv;
-// static ElementLinkCnv_p1<ElementLink<TrigEMClusterContainer> >   m_ELinkEMclusterCnv;
-
 //-----------------------------------------------------------------------------
 // Persistent to transient
 //-----------------------------------------------------------------------------
@@ -20,7 +16,7 @@ void TrigElectronCnv_p2::persToTrans(const TrigElectron_p2* persObj,
    log << MSG::DEBUG << "TrigElectronCnv_p2::persToTrans called " << endmsg;
 
    ElementLink< TrigInDetTrackCollection > track;
-   ELinkIDTrackCnv.persToTrans( &persObj->m_track,     &track,   log );
+   m_ELinkIDtrackCnv.persToTrans( &persObj->m_track,     &track,   log );
 
    ElementLink< TrigEMClusterContainer > cluster;
    m_ELinkEMclusterCnv.persToTrans( &persObj->m_cluster, &cluster, log );
@@ -83,7 +79,7 @@ void TrigElectronCnv_p2::transToPers(const TrigElectron* transObj,
    persObj->m_cl_e_frac_S3   = transObj->F3();
 
    log << MSG::DEBUG << "TrigElectronCnv_p2::transToPers calling e-link persToTrabs(track) " << endmsg;   
-   ELinkIDTrackCnv.transToPers( &transObj->trackLink(),     &persObj->m_track,   log );
+   m_ELinkIDtrackCnv.transToPers( &transObj->trackLink(),     &persObj->m_track,   log );
    log << MSG::DEBUG << "TrigElectronCnv_p2::transToPers calling e-link persToTrabs(cluster) " << endmsg;   
    m_ELinkEMclusterCnv.transToPers( &transObj->clusterLink(), &persObj->m_cluster, log );
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigElectronCnv_p3.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigElectronCnv_p3.cxx
index 60f38f394a8bee4e3f2bc9c9fb08becdcd837940..7c6c15c704072f9b4507d5a988c56015e5eb4570 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigElectronCnv_p3.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigElectronCnv_p3.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigParticle/TrigElectron.h"
@@ -7,15 +7,14 @@
 #include "TrigParticleTPCnv/TrigElectronCnv_p3.h"
 
 
-static ElementLinkCnv_p3<ElementLink<TrigInDetTrackCollection> > ELinkIDTrackCnv;
-// static ElementLinkCnv_p1<ElementLink<TrigEMClusterContainer> >   m_ELinkEMclusterCnv;
+static const ElementLinkCnv_p3<ElementLink<TrigInDetTrackCollection> > ELinkIDTrackCnv;
 
 //-----------------------------------------------------------------------------
 // Persistent to transient
 //-----------------------------------------------------------------------------
 void TrigElectronCnv_p3::persToTrans(const TrigElectron_p3* persObj, 
 				       TrigElectron* transObj, 
-				       MsgStream &log)
+				       MsgStream &log) const
 {
    log << MSG::DEBUG << "TrigElectronCnv_p3::persToTrans called " << endmsg;
 
@@ -61,7 +60,7 @@ void TrigElectronCnv_p3::persToTrans(const TrigElectron_p3* persObj,
 //-----------------------------------------------------------------------------
 void TrigElectronCnv_p3::transToPers(const TrigElectron* transObj, 
 				       TrigElectron_p3* persObj, 
-				       MsgStream &log)
+				       MsgStream &log) const
 {
    log << MSG::DEBUG << "TrigElectronCnv_p3::transToPers called " << endmsg;
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigL2BphysCnv_p2.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigL2BphysCnv_p2.cxx
index 25ce1da2813281b285a40250885e59f1d7a2f6f9..0aeaf36109978d5e5114d66d2f02ce0e47e0403a 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigL2BphysCnv_p2.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigL2BphysCnv_p2.cxx
@@ -1,19 +1,19 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigParticleTPCnv/TrigL2Bphys_p2.h"
 #include "TrigParticle/TrigL2Bphys.h"
 #include "TrigParticleTPCnv/TrigL2BphysCnv_p2.h"
 
-static ElementLinkVectorCnv_p1<ElementLinkVector<TrigInDetTrackCollection> > trackELVCnv;
+static const ElementLinkVectorCnv_p1<ElementLinkVector<TrigInDetTrackCollection> > trackELVCnv;
 
 //-----------------------------------------------------------------------------
 // Persistent to transient
 //-----------------------------------------------------------------------------
 void TrigL2BphysCnv_p2::persToTrans( const TrigL2Bphys_p2 *persObj,
 					     TrigL2Bphys    *transObj,
-					     MsgStream       &log )
+					     MsgStream       &log ) const
 {
   log << MSG::DEBUG << "TrigL2BphysCnv_p2::persToTrans called " << endmsg;
 
@@ -46,7 +46,7 @@ void TrigL2BphysCnv_p2::persToTrans( const TrigL2Bphys_p2 *persObj,
 //-----------------------------------------------------------------------------
 void TrigL2BphysCnv_p2::transToPers( const TrigL2Bphys    *transObj,
 					     TrigL2Bphys_p2 *persObj,
-					     MsgStream       &log )
+					     MsgStream       &log ) const
 {
   log << MSG::DEBUG << "TrigL2BphysCnv_p2::transToPers called " << endmsg;
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigL2BphysCnv_p3.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigL2BphysCnv_p3.cxx
index a6b6d754e23cbe576d92a920e03f64946be18469..d23a0e1f4a8e9494153e8fb6decf158ce2321c45 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigL2BphysCnv_p3.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigL2BphysCnv_p3.cxx
@@ -1,19 +1,19 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigParticleTPCnv/TrigL2Bphys_p3.h"
 #include "TrigParticle/TrigL2Bphys.h"
 #include "TrigParticleTPCnv/TrigL2BphysCnv_p3.h"
 
-static ElementLinkVectorCnv_p1<ElementLinkVector<TrigInDetTrackCollection> > trackELVCnv;
+static const ElementLinkVectorCnv_p1<ElementLinkVector<TrigInDetTrackCollection> > trackELVCnv;
 
 //-----------------------------------------------------------------------------
 // Persistent to transient
 //-----------------------------------------------------------------------------
 void TrigL2BphysCnv_p3::persToTrans( const TrigL2Bphys_p3 *persObj,
 				     TrigL2Bphys    *transObj,
-				     MsgStream       &log )
+				     MsgStream       &log ) const
 {
   log << MSG::DEBUG << "TrigL2BphysCnv_p3::persToTrans called " << endmsg;
 
@@ -46,7 +46,7 @@ void TrigL2BphysCnv_p3::persToTrans( const TrigL2Bphys_p3 *persObj,
 //-----------------------------------------------------------------------------
 void TrigL2BphysCnv_p3::transToPers( const TrigL2Bphys    *transObj,
 				     TrigL2Bphys_p3 *persObj,
-				     MsgStream       &log )
+				     MsgStream       &log ) const
 {
   log << MSG::DEBUG << "TrigL2BphysCnv_p3::transToPers called " << endmsg;
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigPhotonCnv_p2.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigPhotonCnv_p2.cxx
index 3c2913a2d01d9c118511b4f1841bd16e6ae51060..6359b174893e26733bb85ff3da5695d1f4012ece 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigPhotonCnv_p2.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigPhotonCnv_p2.cxx
@@ -1,12 +1,10 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigParticle/TrigPhoton.h"
 #include "TrigParticleTPCnv/TrigPhoton_p2.h"
 #include "TrigParticleTPCnv/TrigPhotonCnv_p2.h"
- 
-static ElementLinkCnv_p1< ElementLink<TrigEMClusterContainer> > eLinkEMClusterCnv;
 
 //-----------------------------------------------------------------------------
 // Persistent to transient
@@ -18,7 +16,7 @@ void TrigPhotonCnv_p2::persToTrans( const TrigPhoton_p2 *persObj,
   log << MSG::DEBUG << "TrigPhotonCnv_p2::persToTrans called " << endmsg;
 
   ElementLink< TrigEMClusterContainer > cluster;
-  eLinkEMClusterCnv.persToTrans( &persObj->m_cluster, &cluster, log ); 
+  m_eLinkEMClusterCnv.persToTrans( &persObj->m_cluster, &cluster, log );
 
   *transObj = TrigPhoton (0, 0, 0,
                           persObj->m_roiID,
@@ -63,7 +61,7 @@ void TrigPhotonCnv_p2::transToPers( const TrigPhoton    *transObj,
   persObj->m_Weta2        = transObj->Weta2() ;
   persObj->m_valid        = transObj->isValid()        ;
 
-  eLinkEMClusterCnv.transToPers( &transObj->clusterLink(), &persObj->m_cluster, log );
+  m_eLinkEMClusterCnv.transToPers( &transObj->clusterLink(), &persObj->m_cluster, log );
 
   persObj->m_p4PtEtaPhiM = baseToPersistent( &m_p4PtEtaPhiMCnv, transObj, log );  
     
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigPhotonCnv_p3.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigPhotonCnv_p3.cxx
index cd1051bcaba1d96646547345757f5c330de55cce..84eaa5270a2b01b869be91c5f6534a0873ecc45f 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigPhotonCnv_p3.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/src/TrigPhotonCnv_p3.cxx
@@ -1,19 +1,19 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TrigParticle/TrigPhoton.h"
 #include "TrigParticleTPCnv/TrigPhoton_p3.h"
 #include "TrigParticleTPCnv/TrigPhotonCnv_p3.h"
  
-static ElementLinkCnv_p3< ElementLink<TrigEMClusterContainer> > eLinkEMClusterCnv;
+static const ElementLinkCnv_p3< ElementLink<TrigEMClusterContainer> > eLinkEMClusterCnv;
 
 //-----------------------------------------------------------------------------
 // Persistent to transient
 //-----------------------------------------------------------------------------
 void TrigPhotonCnv_p3::persToTrans( const TrigPhoton_p3 *persObj,
 				    TrigPhoton    *transObj,
-				    MsgStream       &log )
+				    MsgStream       &log ) const
 {
   log << MSG::DEBUG << "TrigPhotonCnv_p3::persToTrans called " << endmsg;
 
@@ -45,7 +45,7 @@ void TrigPhotonCnv_p3::persToTrans( const TrigPhoton_p3 *persObj,
 //-----------------------------------------------------------------------------
 void TrigPhotonCnv_p3::transToPers( const TrigPhoton    *transObj,
 				    TrigPhoton_p3 *persObj,
-				    MsgStream       &log )
+				    MsgStream       &log ) const
 {
   log << MSG::DEBUG << "TrigPhotonCnv_p3::transToPers called " << endmsg;
 
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBjetCnv_p1_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBjetCnv_p1_test.cxx
index 2eea51e075010fde0267248691196737d7ad922a..93fd66fb69e01f7875d882c4b27c9333d63096b9 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBjetCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBjetCnv_p1_test.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigEFBjetCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -17,6 +16,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -95,7 +95,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBjetCnv_p2_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBjetCnv_p2_test.cxx
index 00e71c687cf38e6c1bac6407b277a98a012d0e39..004ebb8556090af6e25c0cfd6b7dc733cfe5990d 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBjetCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBjetCnv_p2_test.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigEFBjetCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -17,6 +16,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -94,7 +94,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p1_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p1_test.cxx
index dadcffd0d3f285543b6f96549f88a2d87d87c0e9..997adfd43cc205502bf00eb554f57924af107dc7 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p1_test.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigEFBphysCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -17,6 +16,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -88,7 +88,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p2_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p2_test.cxx
index 043d0f9824415ce7391760029f8d4ada1e70ba2c..26087a79e2c9c29d0ccb3ab1574ab6139557bd25 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p2_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigParticleTPCnv/test/TrigEFBphysCnv_p2_test.cxx
@@ -15,6 +15,7 @@
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -79,7 +80,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p3_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p3_test.cxx
index 63d055a91a01558c6a5644995d866981887cb5b2..da55d0ce12d4ec6878afaa81c6811dfcadf64894 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigEFBphysCnv_p3_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigParticleTPCnv/test/TrigEFBphysCnv_p3_test.cxx
@@ -15,6 +15,7 @@
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -79,7 +80,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p2_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p2_test.cxx
index 3ce04721e2a16ff24aa1ba2f3b54ca7566c85fd3..7ee9afdd25a0cf1b022fb4d4b90f0c84e03cadd7 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p2_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigParticleTPCnv/test/TrigElectronCnv_p2_test.cxx
@@ -17,6 +17,7 @@
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -98,7 +99,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p3_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p3_test.cxx
index d8c99d29e660d41c77a3c4471bb7de331c29940b..1710f2825caf9ad490ea41f98dbe2d1ee825dcaa 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigElectronCnv_p3_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigParticleTPCnv/test/TrigElectronCnv_p3_test.cxx
@@ -16,6 +16,7 @@
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -95,7 +96,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BjetCnv_p1_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BjetCnv_p1_test.cxx
index 3c194ab98ed989e69a7b70959d880b0e2d193a71..2e802bf6c6dfef9e47047b8fa8860fae1f6fcca8 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BjetCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BjetCnv_p1_test.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigL2BjetCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -17,6 +16,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -94,7 +94,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BjetCnv_p2_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BjetCnv_p2_test.cxx
index 7968393ed5a27d18f4eeed0def9682ce67d91ca4..50e56d0d11195b2652a6b04b0a3f4b1d3d52a704 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BjetCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BjetCnv_p2_test.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigL2BjetCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -17,6 +16,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -94,7 +94,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BjetCnv_p3_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BjetCnv_p3_test.cxx
index 2657509c709b99dbdd874219aa43bf424c7717a0..dcfbed3a2ce36614874ba87e9baf501c6cd05697 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BjetCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BjetCnv_p3_test.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigL2BjetCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -16,6 +15,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -91,7 +91,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p1_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p1_test.cxx
index bff261b1136116f724dc422505680ecdd7ac2a94..4d16e1aeb6e8cc4f55b8161b12629a08a658bfca 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p1_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -17,6 +17,7 @@
 #include "SGTools/TestStore.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -87,7 +88,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p2_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p2_test.cxx
index 1948ef255ab2f46039afd97718070b453b06c29e..6d0786450b8f2683ef04c27a226b81c5f870b97b 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p2_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigParticleTPCnv/test/TrigL2BphysCnv_p2_test.cxx
@@ -15,6 +15,7 @@
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -79,7 +80,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p3_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p3_test.cxx
index 9f9ffddd11374ebddac36bc1f4659f01f74387b8..af5de2464ad55548894847f6319dca41e8398a06 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigL2BphysCnv_p3_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigParticleTPCnv/test/TrigL2BphysCnv_p3_test.cxx
@@ -15,6 +15,7 @@
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -79,7 +80,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p2_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p2_test.cxx
index 7f6cda479ccf145a1a6e167c2e1018366f4749bc..ce5e8507cd54a39b365f5498b1a01b2ded0ff6f0 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p2_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigParticleTPCnv/test/TrigPhotonCnv_p2_test.cxx
@@ -17,6 +17,7 @@
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -88,7 +89,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p3_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p3_test.cxx
index cba8c1125e1789f7ac9af4483477569bf6cb6279..5f920c22ee1604913e6ceef8b540660755ee2026 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigPhotonCnv_p3_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 /**
  * @file TrigParticleTPCnv/test/TrigPhotonCnv_p3_test.cxx
@@ -16,6 +16,7 @@
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ThreadLocalContext.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -85,7 +86,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   SGTest::initTestStore();
   test1();
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigTauCnv_p1_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigTauCnv_p1_test.cxx
index 32e62450dc7509934ddd41d23215ea52e4318852..c94c3cdc75b574ae6843e6679801857e55fe6231 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigTauCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigTauCnv_p1_test.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigTauCnv_p1_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -17,6 +16,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -85,7 +85,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigTauCnv_p2_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigTauCnv_p2_test.cxx
index b33c5321cf8828cdfb4be01b975a9595131bcfcd..0f222df7a7cb0d9b151c354a3bce582b9d386ca6 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigTauCnv_p2_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigTauCnv_p2_test.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigTauCnv_p2_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -17,6 +16,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -84,7 +84,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   test1();
   return 0;
diff --git a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigTauCnv_p3_test.cxx b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigTauCnv_p3_test.cxx
index 44589913fb34b76e41a41cefc17a8e34f5415f89..521ca82bf39e9c39e43aa3d2b0199ad133cc515a 100644
--- a/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigTauCnv_p3_test.cxx
+++ b/Trigger/TrigEvent/TrigParticleTPCnv/test/TrigTauCnv_p3_test.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id$
 /**
  * @file TrigParticleTPCnv/test/TrigTauCnv_p3_test.cxx
  * @author scott snyder <snyder@bnl.gov>
@@ -16,6 +15,7 @@
 #include "TestTools/FLOATassert.h"
 #include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
 #include <cassert>
 #include <iostream>
 
@@ -79,7 +79,7 @@ void test1()
 }
 
 
-int main()
+int main ATLAS_NOT_THREAD_SAFE()
 {
   test1();
   return 0;