Merge branch 'fixEvtNum' into 'master'

NSW Trigger - Use new format to retrieve event number

See merge request atlas/athena!49535

Trigger/TrigT1/TrigT1NSWSimTools/src/MMLoadVariables.cxx

@@ -136,10 +136,9 @@ MMLoadVariables::MMLoadVariables(StoreGateSvc* evtStore, const MuonGM::MuonDetec
 
         } //end particle loop
       } //end truth container loop (should be only 1 container per event)
-      const EventInfo* pevt = 0;
-      ATH_CHECK( m_evtStore->retrieve(pevt) );
+      auto ctx = Gaudi::Hive::currentContext();
+      int event = ctx.eventID().event_number();
 
-      int event = pevt->event_ID()->event_number();
       int TruthParticle_n = j;
       evFit_entry fit;
       fit.athena_event=event;

Trigger/TrigT1/TrigT1NSWSimTools/src/MMTriggerTool.cxx

@@ -127,10 +127,8 @@ namespace NSWL1 {
   }
 
   StatusCode MMTriggerTool::runTrigger(const bool do_MMDiamonds) {
-    //Retrieve the current run number and event number
-    const EventInfo* pevt = 0;
-    ATH_CHECK( evtStore()->retrieve(pevt) );
-    int event = pevt->event_ID()->event_number();
+    auto ctx = Gaudi::Hive::currentContext();
+    int event = ctx.eventID().event_number();
     ATH_MSG_DEBUG("********************************************************* EVENT NUMBER = " << event);
 
     //////////////////////////////////////////////////////////////