diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.cxx index f3b76ad4a015e78fc477d56f1addacf34e61af17..7ee1bc2ae4c61d85133bafd6e9de0e276de827cd 100644 --- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.cxx +++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.cxx @@ -72,7 +72,6 @@ L1TopoSimulation::L1TopoSimulation(const std::string &name, ISvcLocator *pSvcLoc m_jetInputProvider("LVL1::JetInputProvider/JetInputProvider", this), m_energyInputProvider("LVL1::EnergyInputProvider/EnergyInputProvider", this), m_muonInputProvider("LVL1::MuonInputProvider/MuonInputProvider", this), -// m_EventInfoKey("EventInfo"), m_topoSteering( unique_ptr<TCS::TopoSteering>(new TCS::TopoSteering()) ) { declareProperty( "TrigConfigSvc", m_l1topoConfigSvc, "Service to provide the L1Topo menu"); @@ -138,7 +137,7 @@ L1TopoSimulation::initialize() { CHECK(m_topoCTPLocation.initialize()); CHECK(m_topoOverflowCTPLocation.initialize()); -// CHECK(m_EventInfoKey.initialize()); + CHECK(m_EventInfoKey.initialize()); ATH_MSG_DEBUG("Prescale factor set to " << m_prescale); ATH_MSG_DEBUG("PrescaleDAQROBAccess factor set to " << m_prescaleForDAQROBAccess); @@ -249,12 +248,9 @@ L1TopoSimulation::execute() { TCS::TopoInputEvent & inputEvent = m_topoSteering->inputEvent(); // Event Info -//ReadHandle doesn't seem to work yet for eventinfo -// SG::ReadHandle< EventInfo > evt(m_EventInfoKey); -// CHECK(evt.isValid()); - const EventInfo *evt; - CHECK(evtStore()->retrieve(evt)); - inputEvent.setEventInfo(evt->event_ID()->run_number(),evt->event_ID()->event_number(),evt->event_ID()->lumi_block(),evt->event_ID()->bunch_crossing_id()); + SG::ReadHandle< xAOD::EventInfo > evt(m_EventInfoKey); + + inputEvent.setEventInfo(evt->runNumber(),evt->eventNumber(),evt->lumiBlock(),evt->bcid()); // EM TAU CHECK(m_emtauInputProvider->fillTopoInputEvent(inputEvent)); diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.h b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.h index aa554494b412ea2af42e58a4be1c766bd0ba7738..1b5064e5d175ec779f9f089fa21c5430753499ab 100644 --- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.h +++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/L1TopoSimulation.h @@ -10,8 +10,7 @@ #include "AthenaBaseComps/AthAlgorithm.h" #include "TrigInterfaces/IMonitoredAlgo.h" -#include "EventInfo/EventInfo.h" -#include "EventInfo/EventID.h" +#include "xAODEventInfo/EventInfo.h" #include "GaudiKernel/ServiceHandle.h" #include "GaudiKernel/ToolHandle.h" @@ -20,6 +19,8 @@ #include "TrigT1Interfaces/FrontPanelCTP.h" +#include "StoreGate/ReadHandleKey.h" + class TH1; class IMonitorToolBase; class ITHistSvc; @@ -85,7 +86,7 @@ namespace LVL1 { BooleanProperty m_enableInputDump { false }; // for enabling input dumping BooleanProperty m_enableBitwise { false }; // for enabling bitwise algorithms StringProperty m_inputDumpFile { "inputdump.txt" }; // input dump file -// SG::ReadHandleKey<EventInfo> m_EventInfoKey; + SG::ReadHandleKey<xAOD::EventInfo> m_EventInfoKey{this,"EventInfoKey","EventInfo","RHK for EventInfo"}; SG::WriteHandleKey<LVL1::FrontPanelCTP> m_topoCTPLocation { "" }; ///< SG key of decision bits for CTP SG::WriteHandleKey<LVL1::FrontPanelCTP> m_topoOverflowCTPLocation { "" }; ///< SG key of overflow bits for CTP int m_topoOutputLevel{TrigConf::MSGTC::WARNING}; // property to set the outputlevel of the topo algorithms