diff --git a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx index e1169bab8eeb150f534c479221297ac945ce1d8b..4eb3949c3292cd07150f934efb6c62134dd97886 100755 --- a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx +++ b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx @@ -56,7 +56,6 @@ TrigTauRecMerged::TrigTauRecMerged(const std::string& name,ISvcLocator* pSvcLoca m_outputName("TrigTauRecMerged"), m_tools(this), m_endtools(this), - m_lumiTool("LuminosityTool"), m_lumiBlockMuTool("LumiBlockMuTool/LumiBlockMuTool"), m_maxeta( 2.5 ), m_minpt( 10000 ), @@ -87,8 +86,7 @@ TrigTauRecMerged::TrigTauRecMerged(const std::string& name,ISvcLocator* pSvcLoca /** cone for trk seed */ declareProperty("trkcone",m_trkcone,"max distance track seed from roi center"); - /** Luminosity tools - first is deprecated but kept in case of need */ - declareProperty("LuminosityTool", m_lumiTool, "Luminosity Tool"); + /** Luminosity tools */ declareProperty("LumiBlockMuTool", m_lumiBlockMuTool, "Luminosity Tool" ); /** number of cells in ROI */ @@ -294,14 +292,6 @@ HLT::ErrorCode TrigTauRecMerged::hltInitialize() } } - m_lumiTool.disable(); // never used? - // // Try to retrieve the lumi tool - // if (m_lumiTool.retrieve().isFailure()) { - // msg() << MSG::WARNING << "Unable to retrieve Luminosity Tool" << endmsg; - // } else { - // msg() << MSG::DEBUG << "Successfully retrieved Luminosity Tool" << endmsg; - // } - if (m_lumiBlockMuTool.retrieve().isFailure()) { ATH_MSG_WARNING( "Unable to retrieve LumiBlockMuTool" ); } else { @@ -554,14 +544,6 @@ HLT::ErrorCode TrigTauRecMerged::hltExecute(const HLT::TriggerElement* inputTE, //------------------------------------------------------------------------- // Get the online luminosity //------------------------------------------------------------------------- - // double mu = 0.0; - // double avg_mu = 0.0; - // mu = m_lumiTool->lbLuminosityPerBCID() / m_lumiTool->muToLumi(); // (retrieve mu for the current BCID) - // avg_mu = m_lumiTool->lbAverageInteractionsPerCrossing(); - // msg() << MSG::DEBUG << "REGTEST: lbLuminosityPerBCID : " << m_lumiTool->lbLuminosityPerBCID() << endmsg; - // msg() << MSG::DEBUG << "REGTEST: muToLumi : " << m_lumiTool->muToLumi() << endmsg; - // msg() << MSG::DEBUG << "REGTEST: Retrieved Mu Value : " << mu << endmsg; - // msg() << MSG::DEBUG << "REGTEST: Average Mu Value : " << avg_mu << endmsg; double mu = 0.0; double avg_mu = 0.0; diff --git a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.h b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.h index 01a9f242e7fe6984867bf6cd25c66d8d2dca6da5..8960fc0766e527a8c991df846b51a9ace42e18d1 100755 --- a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.h +++ b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.h @@ -24,7 +24,6 @@ #include "tauRecTools/ITauToolBase.h" #include "tauRecTools/TauJetRNNEvaluator.h" -#include "LumiBlockComps/ILuminosityTool.h" #include "BeamSpotConditionsData/BeamSpotData.h" @@ -100,7 +99,6 @@ class TrigTauRecMerged: public HLT::FexAlgo { ToolHandleArray<ITauToolBase> m_endtools; /** Luminosity Tool */ - ToolHandle<ILuminosityTool> m_lumiTool; ToolHandle<ILumiBlockMuTool> m_lumiBlockMuTool; /** Beam spot service */ diff --git a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.h b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.h index 9450875f54a3d3bdff091f7fad9468dc170598e9..c836a644a8c771b4620b2a706bf7c3003a98f9ed 100755 --- a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.h +++ b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMergedMT.h @@ -23,7 +23,6 @@ #include <vector> #include "tauRecTools/ITauToolBase.h" -#include "LumiBlockComps/ILuminosityTool.h" #include "BeamSpotConditionsData/BeamSpotData.h" #include "TrigSteeringEvent/TrigRoiDescriptor.h"