From 41415d722ef3ff553ac6fd00121ac1bc03756092 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 21 Jul 2021 11:11:00 -0400
Subject: [PATCH] McParticleEvent: Enable thread-safety checking.

Enable thread-safety checking and fix warnings.
---
 .../McParticleEvent/McParticleEvent/ATLAS_CHECK_THREAD_SAFETY | 1 +
 .../McParticleEvent/McParticleEvent/TruthEtIsolations.h       | 4 ++--
 .../McParticleEvent/McParticleEvent/TruthParticleParamDefs.h  | 4 ++--
 .../TruthParticleID/McParticleEvent/src/TruthEtIsolations.cxx | 4 ++--
 .../TruthParticleID/McParticleEvent/src/TruthParticleBase.cxx | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/ATLAS_CHECK_THREAD_SAFETY

diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/ATLAS_CHECK_THREAD_SAFETY b/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 00000000000..43fe75649c6
--- /dev/null
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+PhysicsAnalysis/TruthParticleID/McParticleEvent
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthEtIsolations.h b/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthEtIsolations.h
index dfd6c00c4d9..2afec5280e4 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthEtIsolations.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthEtIsolations.h
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 // TruthEtIsolations.h 
@@ -210,7 +210,7 @@ class TruthEtIsolations
   /// The default Et isolation energy which is being returned when
   /// I don't know what to return.
   /// That's ugly but for backward compatibility's sake... Next EDM :P
-  static EtIsol_t m_dfltEtIsols;
+  static const EtIsol_t m_dfltEtIsols;
 }; 
 
 /////////////////////////////////////////////////////////////////// 
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthParticleParamDefs.h b/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthParticleParamDefs.h
index 7d07ac4884f..9d01b0f0d7a 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthParticleParamDefs.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthParticleParamDefs.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /////////////////////////////////////////////////////////////////// 
@@ -36,7 +36,7 @@ namespace TruthParticleParameters {
   /// The actual definition of delta R cuts for each cone
   inline
   double coneCut( const TruthParticleParameters::ConeSize idx ) {
-    static ConeCuts_t coneCuts = { 
+    static const ConeCuts_t coneCuts = { 
       {
 	0.10, // TruthParticleParameters::etcone10
 	0.20, // TruthParticleParameters::etcone20
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthEtIsolations.cxx b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthEtIsolations.cxx
index a6d1a6471d0..16bf2cca005 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthEtIsolations.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthEtIsolations.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /////////////////////////////////////////////////////////////////// 
@@ -28,7 +28,7 @@
 typedef TruthEtIsolations::GenEventLink_t GenEventLink_t;
 typedef TruthEtIsolations::EtIsol_t       EtIsol_t;
 
-EtIsol_t TruthEtIsolations::m_dfltEtIsols = {
+const EtIsol_t TruthEtIsolations::m_dfltEtIsols = {
   {
     -999.*CLHEP::GeV, -999.*CLHEP::GeV, -999.*CLHEP::GeV, -999.*CLHEP::GeV,
     -999.*CLHEP::GeV, -999.*CLHEP::GeV, -999.*CLHEP::GeV, -999.*CLHEP::GeV
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticleBase.cxx b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticleBase.cxx
index 9c0a24f46a7..c3cacf281cc 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticleBase.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticleBase.cxx
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 // TruthParticleBase.cxx 
@@ -75,7 +75,7 @@ TruthParticleBase::origin() const
 const ElementLink<VxContainer>& 
 TruthParticleBase::originLink() const
 {
-  static ElementLink<VxContainer> origin;
+  static const ElementLink<VxContainer> origin;
   return origin;
 }
 
-- 
GitLab