Add the ability to disable the beamspot in xAODEventInfoCnv (Removing it is...

Add the ability to disable the beamspot in xAODEventInfoCnv (Removing it is too disruptive at this time)


Former-commit-id: 738d5aac

Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvTool.cxx

@@ -62,7 +62,8 @@ namespace xAODMaker {
         m_lumiTool( "LuminosityTool" ),
 #endif
         m_beamCondSvcAvailable( false ),
-        m_lumiToolAvailable( false ) {
+        m_lumiToolAvailable( false ),
+        m_disableBeamSpot( false ) {
 
       // Declare the interface(s) provided by the tool:
       declareInterface< IEventInfoCnvTool >( this );
@@ -70,6 +71,7 @@ namespace xAODMaker {
       // Declare the tool's properties:
       declareProperty( "BeamCondSvc", m_beamCondSvc );
       declareProperty( "LuminosityTool", m_lumiTool );
+      declareProperty( "DisableBeamSpot", m_disableBeamSpot );
 #endif
    }
 
@@ -88,7 +90,10 @@ namespace xAODMaker {
                           "xAOD::EventInfo" );
          m_beamCondSvcAvailable = false;
       }
-
+      if(m_disableBeamSpot){
+         ATH_MSG_WARNING( "Beam conditions service manually disabled on EventInfo object" );
+         m_beamCondSvcAvailable = false;
+      }
       // Try to access the beam conditions service:
       if( m_beamCondSvcAvailable ) {
          CHECK( m_beamCondSvc.retrieve() );

Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvTool.h

@@ -69,6 +69,9 @@ namespace xAODMaker {
       /// Internal flag for the availability of the luminosity tool
       bool m_lumiToolAvailable;
 
+      /// Flag to disable beamspot service for AthenaMT migration purposes
+      bool m_disableBeamSpot;
+
    }; // class EventInfoCnvTool
 
 } // namespace xAODMaker