Merge pull request cms-sw#303 from ktf/thread-safe-tracking-rechit

Make RecHit1D / RecHit2DLocalPos thread safe.

Author: ktf

DataFormats/TrackingRecHit/interface/RecHit1D.h

@@ -39,11 +39,9 @@ class RecHit1D : public TrackingRecHit {
 
   ///Return the projection matrix
   virtual AlgebraicMatrix projectionMatrix() const {
-    if ( !isInitialized) initialize();
     return theProjectionMatrix;
   }
 
-
   /// Return the RecHit dimension
   virtual int dimension() const {
     return 1;
@@ -59,17 +57,6 @@ class RecHit1D : public TrackingRecHit {
 
 
  private:
-
-  static bool isInitialized;
-
-  static AlgebraicMatrix theProjectionMatrix;
-
-  void initialize() const;
-
+  static const AlgebraicMatrix theProjectionMatrix;
 };
 #endif
-
-
-
-
-

DataFormats/TrackingRecHit/interface/RecHit2DLocalPos.h

@@ -22,7 +22,6 @@ class RecHit2DLocalPos : public TrackingRecHit {
   virtual AlgebraicSymMatrix parametersError() const;
 
   virtual AlgebraicMatrix projectionMatrix() const {
-    if ( !isInitialized) initialize();
     return theProjectionMatrix;
   }
 
@@ -38,12 +37,7 @@ class RecHit2DLocalPos : public TrackingRecHit {
 
 private:
 
-  static bool isInitialized;
-
-  static AlgebraicMatrix theProjectionMatrix;
-
-  void initialize() const;
-
+  static const AlgebraicMatrix theProjectionMatrix;
 };
 
 #endif

DataFormats/TrackingRecHit/src/RecHit1D.cc

@@ -38,21 +38,11 @@ AlgebraicSymMatrix RecHit1D::parametersError() const {
   return m;
 }
 
-
-
-// Initialize the projection matrix
-void RecHit1D::initialize() const {
-  theProjectionMatrix = AlgebraicMatrix( 1, 5, 0);
-  theProjectionMatrix[0][3] = 1;
-  
-  isInitialized = true;
+// Return an initialized matrix.
+static const AlgebraicMatrix initializeMatrix() {
+  AlgebraicMatrix matrix( 1, 5, 0);
+  matrix[0][3] = 1;
+  return matrix;
 }
 
-
-
-bool RecHit1D::isInitialized(false);
-
-
-
-AlgebraicMatrix RecHit1D::theProjectionMatrix;
-
+const AlgebraicMatrix RecHit1D::theProjectionMatrix(initializeMatrix());

DataFormats/TrackingRecHit/src/RecHit2DLocalPos.cc

@@ -1,14 +1,5 @@
 #include "DataFormats/TrackingRecHit/interface/RecHit2DLocalPos.h"
 
-void RecHit2DLocalPos::initialize() const
-{
-  theProjectionMatrix = AlgebraicMatrix( 2, 5, 0);
-  theProjectionMatrix[0][3] = 1;
-  theProjectionMatrix[1][4] = 1;
-
-  isInitialized = true;
-}
-
 AlgebraicVector RecHit2DLocalPos::parameters() const 
 {
   AlgebraicVector result(2);
@@ -38,9 +29,12 @@ std::vector<TrackingRecHit*> RecHit2DLocalPos::recHits() {
   return nullvector; 
 }
 
-
-
 // static member definition
-
-bool RecHit2DLocalPos::isInitialized( false);
-AlgebraicMatrix RecHit2DLocalPos::theProjectionMatrix;
+static const AlgebraicMatrix initializeMatrix()
+{
+  AlgebraicMatrix aMatrix( 2, 5, 0);
+  aMatrix[0][3] = 1;
+  aMatrix[1][4] = 1;
+  return aMatrix;
+}
+const AlgebraicMatrix RecHit2DLocalPos::theProjectionMatrix{initializeMatrix()};