diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py index ff407649685c3487f4b766f638bfebd2799caa42..8caf4764d1171ddd598f5fc57aae5839b14517fe 100644 --- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py +++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration def TrigTauMonitoringTool(): full_tau = [ @@ -77,10 +77,8 @@ def TrigTauMonitoringTool(): ToolSvc += Level1Emulator from AthenaCommon.Constants import VERBOSE, DEBUG, INFO, ERROR - from LumiBlockComps.LuminosityToolDefault import LuminosityToolOnline - LumiToolOnline = LuminosityToolOnline("OnlLuminosityTool") - #LumiToolOnline.OutputLevel = DEBUG - ToolSvc += LumiToolOnline + from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgOnlineDefault + LuminosityCondAlgOnlineDefault (suffix = 'Online') # get the HLT emulation tool from the emulation python config # from TrigTauEmulation.TrigTauEmulationConfig import get_hlt_emulator diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx index d669c049be2d9eab12defe055549c5c0e7106698..7d010f6543a4883c182c841dbde23e3bc4c0cdfc 100755 --- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx +++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx @@ -16,6 +16,7 @@ #include "GaudiKernel/StatusCode.h" #include "StoreGate/StoreGateSvc.h" +#include "StoreGate/ReadCondHandle.h" #include "EventInfo/TriggerInfo.h" #include "TrigSteeringEvent/HLTResult.h" #include "EventInfo/EventInfo.h" @@ -99,8 +100,7 @@ const float TWOPI=2.0*PI; HLTTauMonTool::HLTTauMonTool(const std::string & type, const std::string & n, const IInterface* parent) : IHLTMonTool(type, n, parent), m_l1emulationTool(this), - m_lumiBlockMuTool("LumiBlockMuTool/LumiBlockMuTool"), // offline mu - m_luminosityToolOnline("LuminosityTool/OnlLuminosityTool") //online mu? + m_lumiBlockMuTool("LumiBlockMuTool/LumiBlockMuTool") // offline mu { ATH_MSG_DEBUG("HLTTauMonTool::HLTTauMonTool()"); @@ -164,12 +164,6 @@ StatusCode HLTTauMonTool::init() { //ATH_CHECK(m_hltemulationTool.retrieve()); } - if (m_luminosityToolOnline.retrieve().isSuccess()) { - ATH_MSG_WARNING("Unable to retrieve LuminosityToolOnline"); - } else { - ATH_MSG_INFO("Successfully retrieved LuminosityToolOnline"); - } - if (m_lumiBlockMuTool.retrieve().isSuccess()) { msg() << MSG::WARNING << "Unable to retrieve LumiBlockMuTool" << endmsg; } else { @@ -212,6 +206,7 @@ StatusCode HLTTauMonTool::init() { if(m_L1StringCondition=="allowResurrectedDecision") m_L1TriggerCondition=TrigDefs::Physics | TrigDefs::allowResurrectedDecision; if(m_HLTStringCondition=="allowResurrectedDecision") m_HLTTriggerCondition=TrigDefs::Physics | TrigDefs::allowResurrectedDecision; + ATH_CHECK( m_luminosityCondDataKey.initialize() ); return StatusCode::SUCCESS; } @@ -286,11 +281,10 @@ StatusCode HLTTauMonTool::fill() { m_mu_offline = avg_mu; ATH_MSG_DEBUG("offline mu "<<avg_mu); } - if(m_luminosityToolOnline){ - float avg_mu = (float)m_luminosityToolOnline->lbAverageInteractionsPerCrossing(); - m_mu_online = avg_mu; - ATH_MSG_DEBUG("online mu "<<avg_mu); - } + SG::ReadCondHandle<LuminosityCondData> lumiData (m_luminosityCondDataKey); + float avg_mu = lumiData->lbAverageInteractionsPerCrossing(); + m_mu_online = avg_mu; + ATH_MSG_DEBUG("online mu "<<avg_mu); // fill true taus vectors m_true_taus.clear(); diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.h b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.h index 9d1958311b50a2eff1238762851984657d916a30..c873182a0b5f58f0dba1a0d838bf31368a3dedea 100755 --- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.h +++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /** @file HLTTauMonTool.h @@ -28,7 +28,8 @@ #include "GaudiKernel/ToolHandle.h" #include "TrigTauEmulation/ILevel1EmulationTool.h" #include "TrigTauEmulation/IHltEmulationTool.h" -#include "LumiBlockComps/ILuminosityTool.h" +#include "StoreGate/ReadCondHandleKey.h" +#include "LumiBlockData/LuminosityCondData.h" // Forward declarations class StatusCode; @@ -176,7 +177,8 @@ class HLTTauMonTool : public IHLTMonTool { ToolHandle<TrigTauEmul::IHltEmulationTool> m_hltemulationTool; ToolHandle<ILumiBlockMuTool> m_lumiBlockMuTool; - ToolHandle<ILuminosityTool> m_luminosityToolOnline; + SG::ReadCondHandleKey<LuminosityCondData> m_luminosityCondDataKey + { this, "LuminosityCondDataKey", "LuminosityCondDataOnline", "" }; float m_mu_offline; int m_mu_online;