Merge branch 'master-EMPIDToolLumi' into 'master'

Initialize m_lumiBlockMuTool with a default value in EMPIDTools.

See merge request atlas/athena!6941

Reconstruction/egamma/egammaTools/src/EMPIDBuilder.cxx

@@ -84,10 +84,15 @@ StatusCode EMPIDBuilder::initialize()
   if (m_UselumiBlockMuTool) {
     // retrieve the lumi tool
     if (m_lumiBlockMuTool.retrieve().isFailure()) {
-      ATH_MSG_DEBUG("Unable to retrieve Luminosity Tool");
+      ATH_MSG_FATAL("Unable to retrieve Luminosity Tool");
+      return StatusCode::FAILURE;
     } else {
       ATH_MSG_DEBUG("Successfully retrieved Luminosity Tool");
     }
+  } else {
+    // Switch to using disable when supported by Gaudi version
+    m_lumiBlockMuTool = nullptr;
+    // m_lumiBlockMuTool.disable();
   }
   return StatusCode::SUCCESS;
 }
@@ -141,7 +146,7 @@ StatusCode EMPIDBuilder::execute(xAOD::Egamma* eg)
     //negative mu means the default behaviour --> retrieve the one in xAOD 
     double mu = -99.;
     double avg_mu = -99.;
-    if(m_UselumiBlockMuTool && m_lumiBlockMuTool){ //
+    if(m_UselumiBlockMuTool){ //
       mu = m_lumiBlockMuTool->actualInteractionsPerCrossing(); // (retrieve mu for the current BCID)
       avg_mu = m_lumiBlockMuTool->averageInteractionsPerCrossing();
       ATH_MSG_DEBUG("REGTEST: Retrieved Mu Value : " << mu);

Reconstruction/egamma/egammaTools/src/EMPIDBuilder.h

@@ -72,7 +72,7 @@ protected:
       "photonIsEMselectorResultNames", {}, "The selector result names"};
  
   ToolHandle<ILumiBlockMuTool> m_lumiBlockMuTool {this,
-      "LuminosityTool", "", "Luminosity Tool"};
+      "LuminosityTool", "LumiBlockMuTool/LumiBlockMuTool", "Luminosity Tool"};
 
   Gaudi::Property<std::string> m_LHValueName {this, 
       "LHValueName", "LHValue", "The LH Value name"};

Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py

@@ -33,8 +33,6 @@ from TrigEgammaHypo.TrigEgammaPidTools import ElectronPidTools
 from TrigEgammaHypo.TrigEgammaPidTools import PhotonPidTools
 ElectronPidTools()
 PhotonPidTools()
-from LumiBlockComps.LuminosityToolDefault import LuminosityToolOnline
-lumiTool = LuminosityToolOnline()
 
 # Following tools have TrigEgamma factories
 from egammaTools.egammaToolsFactories import EMTrackMatchBuilder, EMFourMomBuilder, EMShowerBuilder
@@ -97,7 +95,6 @@ TrigElectronPIDBuilder = PublicToolFactory( EMPIDBuilder, name = "TrigElectronPI
         ToolSvc.AsgElectronLHTightSelector],
     electronLHselectorResultNames= ["LHVLoose","LHLoose","LHMedium","LHTight"],
     UseLuminosityTool = True,
-    LuminosityTool = lumiTool
 )
 
 TrigElectronCaloPIDBuilder = PublicToolFactory( EMPIDBuilder, name = "TrigElectronCaloPIDBuilder",
@@ -108,7 +105,6 @@ TrigElectronCaloPIDBuilder = PublicToolFactory( EMPIDBuilder, name = "TrigElectr
     electronLHselectorResultNames= ["LHCaloVLoose","LHCaloLoose","LHCaloMedium","LHCaloTight"],
     LHValueName = "LHCaloValue",
     UseLuminosityTool = True,
-    LuminosityTool = lumiTool
 )
 
 TrigPhotonPIDBuilder = PublicToolFactory( EMPIDBuilder, name = "TrigPhotonPIDBuilder",