diff --git a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/LongLivedParticleDPDMaker/RPVLLTestRates.h b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/LongLivedParticleDPDMaker/RPVLLTestRates.h index 0c6afed0b3a6714986fe9577792a9ddb2faa86fb..341fdb25045974221fa965fd68269b1586b37a85 100755 --- a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/LongLivedParticleDPDMaker/RPVLLTestRates.h +++ b/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; diff --git a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/RPVLLTestRates.cxx b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/RPVLLTestRates.cxx index b60a32be409713883b918342d66f59d6428e2c0b..387bcc155f329d44e13ac6d7b7cdf8ce29781857 100755 --- a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/RPVLLTestRates.cxx +++ b/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"); }