Merge branch 'master-sp' into 'master'

Add ATLAS_CHECK_THREAD_SAFETY to TrkSpacePoint package

See merge request atlas/athena!22726

Tracking/TrkEvent/TrkSpacePoint/TrkSpacePoint/ATLAS_CHECK_THREAD_SAFETY

+Tracking/TrkEvent/TrkSpacePoint/TrkSpacePoint

Tracking/TrkEvent/TrkSpacePoint/TrkSpacePoint/SpacePoint.h

@@ -82,11 +82,8 @@ namespace Trk{
     /**Interface method for output, to be overloaded by child classes* */
     virtual std::ostream& dump( std::ostream& out ) const =0 ;
 
-    /**return number of parameters currently created*/
-    static unsigned int numberOfInstantiations() ;
-
   protected:
-    mutable const std::pair<const PrepRawData*, const PrepRawData*> *m_clusList;
+    const std::pair<const PrepRawData*, const PrepRawData*> *m_clusList;
     std::pair<IdentifierHash, IdentifierHash> m_elemIdList;
     Amg::Vector3D m_position; 
     Amg::MatrixX  m_globalCovariance;
@@ -95,8 +92,6 @@ namespace Trk{
     /** might not be performant enough, evaluate */
 
   private:
-    /** number of objects of this type in memory */
-    static unsigned int s_numberOfInstantiations;
         
   };
 

Tracking/TrkEvent/TrkSpacePoint/TrkSpacePoint/SpacePointContainer.h

@@ -44,7 +44,7 @@ public:
    /** return class ID */
   static const CLID& classID() 
     {
-      static CLID id = 1273119430 ; 
+      static const CLID id = 1273119430 ; 
       return id; 
       // we do not know why using the traits does not work
       //return ClassID_traits<SpacePointContainer>::ID();

Tracking/TrkEvent/TrkSpacePoint/src/SpacePoint.cxx

@@ -23,16 +23,10 @@
 namespace Trk
 {
   
-  unsigned int SpacePoint::s_numberOfInstantiations=0;
-
-  
   // Destructor:
   SpacePoint::~SpacePoint()
   {
     delete m_clusList;
-#ifndef NDEBUG
-    s_numberOfInstantiations--; // delete SpacePoint, so decrement total count
-#endif
   }
   
   // ------------------------------------------------------------------
@@ -45,9 +39,6 @@ namespace Trk
     m_position(),
     m_globalCovariance()
   {
-#ifndef NDEBUG
-    s_numberOfInstantiations++; // new SpacePoint, so increment total count
-#endif
   } 
   
   // ------------------------------------------------------------------
@@ -64,9 +55,6 @@ namespace Trk
       m_clusList=nullptr;
     }    
     m_globalCovariance = SP.m_globalCovariance; 
-#ifndef NDEBUG
-    s_numberOfInstantiations++; // new SpacePoint, so increment total count
-#endif
   }
   
   // ------------------------------------------------------------------
@@ -129,14 +117,6 @@ namespace Trk
       return m_clusList->first->detectorElement()->surface(); 
     }
 
-  // ------------------------------------------------------------------
-  
-  unsigned int SpacePoint::numberOfInstantiations()
-  {
-    return s_numberOfInstantiations;
-  }
-
-
 } // end of namespace