Merge branch 'master' into 'master'

Fix initializations left out of initial commit

See merge request !18

Scintillator/ScintDetDescr/ScintReadoutGeometry/ScintReadoutGeometry/ScintDetectorDesign.h

@@ -152,10 +152,10 @@ private:
     double m_length;    // !< dimnesion in "eta" direction
     int    m_cells;     // !< number of pmts
 
+    ScintDetectorDesign::Edge m_readoutSide;
     ScintDetectorDesign::Axis m_phiAxis;  // which axis in hit frame corresponds to photon flight direction?
     ScintDetectorDesign::Axis m_etaAxis;  // which axis in hit frame is normal to photon flight direction?
     ScintDetectorDesign::Axis m_depthAxis; // which axis in hit frame is depth?
-    ScintDetectorDesign::Edge m_readoutSide;
 
     const Trk::RectangleBounds* m_bounds;
 

Scintillator/ScintDetDescr/ScintReadoutGeometry/src/ScintDetectorDesign.cxx

@@ -36,9 +36,13 @@ ScintDetectorDesign::ScintDetectorDesign( const double thickness,
                                           const ScintDetectorDesign::Axis photonDirection,
                                           const ScintDetectorDesign::Axis thicknessDirection ) :
     m_thickness(thickness),
+    m_width{width},
+    m_length{length},
+    m_cells{cells},
+    m_readoutSide(readoutSide),
     m_phiAxis(photonDirection),  /* same as ATLAS SCT for now */
-    m_depthAxis(thicknessDirection),
-    m_readoutSide(readoutSide) {
+    m_depthAxis(thicknessDirection)
+{
         m_etaAxis = static_cast<Axis> ((xAxis + yAxis + zAxis) - (photonDirection + thicknessDirection)); 
         m_bounds = new Trk::RectangleBounds(0.5*width, 0.5*length);
 }