diff --git a/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.cxx b/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.cxx index 29c836a242ca35a66fa253c065be9d21396d4130..03159a9daeff65194eeb3b52a6de0764d9c62b4e 100644 --- a/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.cxx +++ b/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.cxx @@ -57,7 +57,6 @@ namespace NSWL1 { StatusCode NSWL1Simulation::initialize() { ATH_MSG_DEBUG( "initialize " << name() ); ATH_CHECK( m_trigRdoContainer.initialize() ); - ATH_CHECK( m_xaodevtKey.initialize() ); // Create an register the ntuple if requested, add branch for event and run number if ( m_doNtuple ) { ITHistSvc* tHistSvc; @@ -118,11 +117,10 @@ namespace NSWL1 { StatusCode NSWL1Simulation::execute() { - SG::ReadHandle<xAOD::EventInfo> evt(m_xaodevtKey); - if (evt.isValid()) { - m_current_run = evt->runNumber(); - m_current_evt = evt->eventNumber(); - } + auto ctx = Gaudi::Hive::currentContext(); + m_current_evt = ctx.eventID().event_number(); + m_current_run = ctx.eventID().run_number(); + std::vector<std::shared_ptr<PadData>> pads; std::vector<std::unique_ptr<PadTrigger>> padTriggers; std::vector<std::unique_ptr<StripData>> strips; diff --git a/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h b/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h index 3cd7d99e4f7f3698d2bc61cf98dfb622d14b582e..5fa9cfa3f0f09fb517ed08abaab621013b4e09fd 100644 --- a/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h +++ b/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h @@ -104,7 +104,6 @@ namespace NSWL1 { protected: - SG::ReadHandleKey<xAOD::EventInfo> m_xaodevtKey{this,"xAODEventInfoKey","EventInfo","Key of xAOD::EventInfo"}; SG::WriteHandleKey<Muon::NSW_TrigRawDataContainer> m_trigRdoContainer; }; // end of NSWL1Simulation class