Address MR Feedback

InnerDetector/InDetConditions/BeamSpotConditions/src/BeamSpotCondAlg.h

@@ -22,9 +22,9 @@ class BeamSpotCondAlg : public AthAlgorithm
   virtual ~BeamSpotCondAlg(); 
 
                                         //IS EXECUTED:
-  virtual StatusCode  initialize();     //once, before any input is loaded
-  virtual StatusCode  execute();        //per event
-  virtual StatusCode  finalize();       //once, after all events processed
+  virtual StatusCode  initialize() override;     //once, before any input is loaded
+  virtual StatusCode  execute()    override;     //per event
+  virtual StatusCode  finalize()   override;     //once, after all events processed
   
   static const EventIDRange alwaysValid;
 

InnerDetector/InDetConditions/BeamSpotConditions/src/components/BeamSpotConditions_entries.cxx

 
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
 #include "../BeamSpotCondAlg.h"
 
 

InnerDetector/InDetConditions/BeamSpotConditions/src/components/BeamSpotConditions_load.cxx

- 
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(BeamSpotConditions)

InnerDetector/InDetConditions/BeamSpotConditionsData/BeamSpotConditionsData/BeamSpotData.h

@@ -16,21 +16,32 @@
 namespace InDet
 {
 
-  class BeamSpotData
+  class BeamSpotData final //Class declared as final because no virtual destructor is used
+                           //if you want to inherit, remove final keyword and add virtual destructor
   {
   public:
     BeamSpotData(int status, float posX, float posY, float posZ,
 		 float sigmaX, float sigmaY, float sigmaZ,
 		 float tiltX, float tiltY, float sigmaXY);
 
-    virtual ~BeamSpotData() { }
+    BeamSpotData() = delete; //Forbid undefined behaviour
 
     const Amg::Vector3D& beamPos() const;
 
+   /**
+    * @brief Returns the beam sigma for the i-th error matrix element
+    * @return The matrix element as float
+    * @param i the requested index
+    */
     float beamSigma(int i) const;
 
     float beamSigmaXY() const;
 
+   /**
+    * @brief Returns the beam sigma for the i+3-th error matrix element (the 'tilt')
+    * @return The (i + 3)th element as float
+    * @param i the requested index after the addition of 3
+    */
     float beamTilt(int i) const;
 
     int beamStatus() const;

InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx

@@ -150,12 +150,9 @@ StatusCode SiTrackerSpacePointFinder::initialize()
 
   ATH_CHECK(m_SiSpacePointMakerTool.retrieve());
   if (!m_overrideBS){
-    if (m_beamSpotKey.initialize().isFailure()) {
-      m_overrideBS = true;
-      ATH_MSG_WARNING( "Could not retrieve Beam Conditions Service. " );
-      ATH_MSG_WARNING( "Using instead pre-set beam spot at ( " << m_xVertex
-          <<" , "<< m_yVertex << " , " << m_yVertex<< " ) " );
-    }
+    ATH_CHECK(m_beamSpotKey.initialize());
+  }else{
+//    m_beamSpotKey = "";//Remove request for condition object
   }
 
   ATH_CHECK(m_SpacePointCache_SCTKey.initialize(!m_SpacePointCache_SCTKey.key().empty()));

InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/InDetIterativePriVxFinderTool.cxx

@@ -102,7 +102,7 @@ StatusCode InDetIterativePriVxFinderTool::initialize()
 {
     if (m_createSplitVertices==true && m_useBeamConstraint==true)
     {
-      msg(MSG::FATAL) << " Split vertices cannot be obtained if beam spot constraint is true! Change settings..." << endmsg;
+      ATH_MSG_FATAL(" Split vertices cannot be obtained if beam spot constraint is true! Change settings...");
       return StatusCode::FAILURE;
     }