Move some initialization of SiDetectorElement to its header file. (ATLASRECTS-5079)

InnerDetector/InDetDetDescr/InDetReadoutGeometry/InDetReadoutGeometry/SiDetectorElement.h

@@ -29,6 +29,7 @@
 #include "CLHEP/Geometry/Point3D.h"
 
 #include <atomic>
+#include <limits>
 #include <memory>
 #include <mutex>
 
@@ -37,7 +38,6 @@ class GeoAlignmentStore;
 class GeoVFullPhysVol;
 
 namespace Trk {
-  class Surface;
   class SurfaceBounds;
 }
 
@@ -628,11 +628,11 @@ namespace InDetDD {
     //const AtlasDetectorID* m_idHelper; // id helper
     const SiCommonItems* m_commonItems;
     
-    const SiDetectorElement* m_nextInEta;
-    const SiDetectorElement* m_prevInEta;
-    const SiDetectorElement* m_nextInPhi;
-    const SiDetectorElement* m_prevInPhi;
-    const SiDetectorElement* m_otherSide;
+    const SiDetectorElement* m_nextInEta{nullptr};
+    const SiDetectorElement* m_prevInEta{nullptr};
+    const SiDetectorElement* m_nextInPhi{nullptr};
+    const SiDetectorElement* m_prevInPhi{nullptr};
+    const SiDetectorElement* m_otherSide{nullptr};
     
     bool m_isPixel;
     bool m_isBarrel;
@@ -648,20 +648,20 @@ namespace InDetDD {
 
     // Directions of axes. These are true if the hit/simulation and reconstruction local frames are
     // in the same direction and false if they are opposite.
-    mutable bool m_depthDirection ATLAS_THREAD_SAFE; // Guarded by m_mutex // Direction of depth axis. 
+    mutable bool m_depthDirection ATLAS_THREAD_SAFE {true}; // Guarded by m_mutex // Direction of depth axis. 
     // Also direction of readout implant (n+ for pixel, p+ for SCT).
-    mutable bool m_phiDirection ATLAS_THREAD_SAFE;
-    mutable bool m_etaDirection ATLAS_THREAD_SAFE;
+    mutable bool m_phiDirection ATLAS_THREAD_SAFE {true};
+    mutable bool m_etaDirection ATLAS_THREAD_SAFE {true};
 
-    mutable std::atomic_bool m_cacheValid; // Alignment associated quatities.
-    mutable std::atomic_bool m_firstTime;
+    mutable std::atomic_bool m_cacheValid{false}; // Alignment associated quatities.
+    mutable std::atomic_bool m_firstTime{true};
     // Since m_isStereo depends on m_otherSide->sinStereo(), a dedicated validity variable is needed.
-    mutable std::atomic_bool m_stereoCacheValid;
+    mutable std::atomic_bool m_stereoCacheValid{false};
     // Since m_surfaces depends on m_otherSide->surface(), a dedicated validity variable is needed.
-    mutable std::atomic_bool m_surfacesValid;
-    mutable bool m_isStereo ATLAS_THREAD_SAFE;
+    mutable std::atomic_bool m_surfacesValid{false};
+    mutable bool m_isStereo ATLAS_THREAD_SAFE {false};
 
-    mutable std::mutex m_mutex;
+    mutable std::mutex m_mutex{};
 
     mutable Amg::Transform3D m_transform ATLAS_THREAD_SAFE; // Guarded by m_mutex
     mutable HepGeom::Transform3D m_transformCLHEP ATLAS_THREAD_SAFE; // Guarded by m_mutex
@@ -674,15 +674,15 @@ namespace InDetDD {
     mutable Amg::Vector3D m_center ATLAS_THREAD_SAFE; // Guarded by m_mutex
     mutable HepGeom::Vector3D<double> m_centerCLHEP ATLAS_THREAD_SAFE; // Guarded by m_mutex
 
-    mutable double m_minZ   ATLAS_THREAD_SAFE;// Guarded by m_mutex
-    mutable double m_maxZ   ATLAS_THREAD_SAFE;// Guarded by m_mutex
-    mutable double m_minR   ATLAS_THREAD_SAFE;// Guarded by m_mutex
-    mutable double m_maxR   ATLAS_THREAD_SAFE;// Guarded by m_mutex
-    mutable double m_minPhi ATLAS_THREAD_SAFE;// Guarded by m_mutex
-    mutable double m_maxPhi ATLAS_THREAD_SAFE;// Guarded by m_mutex
+    mutable double m_minZ ATLAS_THREAD_SAFE {std::numeric_limits<double>::max()}; // Guarded by m_mutex
+    mutable double m_maxZ ATLAS_THREAD_SAFE {std::numeric_limits<double>::lowest()}; // Guarded by m_mutex
+    mutable double m_minR ATLAS_THREAD_SAFE {std::numeric_limits<double>::max()}; // Guarded by m_mutex
+    mutable double m_maxR ATLAS_THREAD_SAFE {std::numeric_limits<double>::lowest()}; // Guarded by m_mutex
+    mutable double m_minPhi ATLAS_THREAD_SAFE {std::numeric_limits<double>::max()}; // Guarded by m_mutex
+    mutable double m_maxPhi ATLAS_THREAD_SAFE {std::numeric_limits<double>::lowest()}; // Guarded by m_mutex
 
     std::unique_ptr<Trk::Surface> m_surface;
-    mutable std::vector<const Trk::Surface*> m_surfaces ATLAS_THREAD_SAFE; // Guarded by m_mutex
+    mutable std::vector<const Trk::Surface*> m_surfaces ATLAS_THREAD_SAFE {}; // Guarded by m_mutex
 
     const GeoAlignmentStore* m_geoAlignStore{};
   };

InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SiDetectorElement.cxx

@@ -30,7 +30,6 @@
 
 #include <cassert>
 #include <cmath>
-#include <limits>
 
 namespace InDetDD {
   using Trk::distPhi;
@@ -47,39 +46,12 @@ namespace InDetDD {
     m_id(id),
     m_design(design),
     m_commonItems(commonItems),
-    m_nextInEta(nullptr),
-    m_prevInEta(nullptr),
-    m_nextInPhi(nullptr),
-    m_prevInPhi(nullptr),
-    m_otherSide(nullptr),
-    m_cacheValid(false),
-    m_firstTime(true),
-    m_stereoCacheValid(false),
-    m_surfacesValid(false),
-    m_isStereo(false),
-    m_mutex(),
-    m_surface{},
-    m_surfaces{},
+    m_surface(),
     m_geoAlignStore(geoAlignStore)
     {
-      //The following are fixes for coverity bug 11955, uninitialized scalars:
-      const bool boolDefault(true);
-      m_depthDirection=boolDefault;
-      m_phiDirection=boolDefault;
-      m_etaDirection=boolDefault;
-      const double defaultMin(std::numeric_limits<double>::max());
-      const double defaultMax(std::numeric_limits<double>::lowest());
-      m_minZ=defaultMin;
-      m_maxZ=defaultMax;
-      m_minR=defaultMin;
-      m_maxR=defaultMax;
-      m_minPhi=defaultMin;
-      m_maxPhi=defaultMax;
-
       m_hitEta = m_design->etaAxis();
       m_hitPhi = m_design->phiAxis();
       m_hitDepth = m_design->depthAxis();
-      ///
   
       commonConstructor();
     }
@@ -823,7 +795,7 @@ namespace InDetDD {
     double oneOverRadius = (maxWidth() - minWidth()) / (width() * length());
     double x = localPos[distPhi];
     double y = localPos[distEta];
-    return -x*oneOverRadius / sqrt( (1+y*oneOverRadius)*(1+y*oneOverRadius) + x*oneOverRadius*x*oneOverRadius );
+    return -x*oneOverRadius / sqrt( (1.+y*oneOverRadius)*(1.+y*oneOverRadius) + x*oneOverRadius*x*oneOverRadius );
   }
 
   double