Merge branch 'master-LLP-DPDMaker-EventInfo' into 'master'

Finished the migration of LongLivedParticleDPDMaker to xAOD::EventInfo

See merge request atlas/athena!21930

PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/LongLivedParticleDPDMaker/RPVLLTestRates.h

@@ -41,6 +41,7 @@ class RPVLLTestRates : public AthAlgorithm  {
 
    int m_EventCounter;
    ServiceHandle<ITHistSvc> m_tHistSvc;
+   SG::ReadHandleKey<xAOD::EventInfo> m_evt{this, "EvtInfo", "EventInfo", "EventInfo name"};
 
    std::vector<std::string> m_DecisionLabel;
    std::vector<int>         m_EventNumber;

PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/RPVLLTestRates.cxx

@@ -37,14 +37,14 @@ StatusCode RPVLLTestRates::initialize() {
 
   m_EventCounter=0;
 
-  StatusCode sc = m_tHistSvc.retrieve();
-  if (sc.isFailure()) return StatusCode::FAILURE;
+  ATH_CHECK(m_tHistSvc.retrieve());
+  ATH_CHECK( m_evt.initialize() );
 
   ATH_CHECK( m_evt.initialize() );
 
   m_myTree= new TTree("myTree","myTree");
-  sc = m_tHistSvc->regTree("/AANT/myTree",m_myTree);
-  if (sc.isFailure()) msg(MSG::ERROR)<<"Failed to book TTree"<<endmsg;
+  StatusCode sc = m_tHistSvc->regTree("/AANT/myTree",m_myTree);
+  if (sc.isFailure()) ATH_MSG_ERROR("Failed to book TTree");
 
   m_myTree->Branch("RunNumber",&m_runNum,"RunNumber/I");
   m_myTree->Branch("LumiBlock",&m_lumiBlock,"LumiBlock/I");
@@ -54,7 +54,6 @@ StatusCode RPVLLTestRates::initialize() {
 } 
 
 StatusCode RPVLLTestRates::finalize() {
-  //  delete m_filterPassed;
   return StatusCode::SUCCESS;
 }		 
 
@@ -132,7 +131,7 @@ StatusCode RPVLLTestRates::execute() {
     }
   } 
   else {
-    msg(MSG::WARNING )<< "No SkimDecisionCollection was found: key = DESDM_RPVLL_SkimDecisionsContaine"<< endmsg;
+    ATH_MSG_WARNING("No SkimDecisionCollection was found: key = DESDM_RPVLL_SkimDecisionsContaine");
   }