diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/CMakeLists.txt b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/CMakeLists.txt index c7e5fd910502b1a5d47062e170b74efeed676261..df403be80d351bd5563d3c5dbdec3d8157549252 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/CMakeLists.txt +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/CMakeLists.txt @@ -13,6 +13,7 @@ atlas_depends_on_subdirs( PUBLIC PhysicsAnalysis/AnalysisCommon/PATCore PhysicsAnalysis/DerivationFramework/DerivationFrameworkInterfaces Trigger/TrigAnalysis/TrigDecisionTool + Event/xAOD/xAODEventInfo PRIVATE Control/AthenaKernel PhysicsAnalysis/CommonTools/ExpressionEvaluation ) @@ -25,7 +26,7 @@ atlas_add_library( DerivationFrameworkToolsLib src/*.cxx PUBLIC_HEADERS DerivationFrameworkTools PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} - LINK_LIBRARIES AthenaBaseComps xAODBase GaudiKernel PATCoreLib TrigDecisionToolLib ExpressionEvaluationLib + LINK_LIBRARIES AthenaBaseComps xAODBase GaudiKernel PATCoreLib TrigDecisionToolLib ExpressionEvaluationLib xAODEventInfo PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel ) atlas_add_component( DerivationFrameworkTools diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/DerivationFrameworkTools/PrescaleTool.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/DerivationFrameworkTools/PrescaleTool.h index 33dab780dcc32f41834af74e74960a35a4df9d89..b5db6fe041bc08c5462cd27b1981ab87e0e0be90 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/DerivationFrameworkTools/PrescaleTool.h +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/DerivationFrameworkTools/PrescaleTool.h @@ -25,7 +25,7 @@ namespace DerivationFramework { virtual bool eventPassesFilter() const; private: - mutable int m_prescale, m_eventCounter; + unsigned int m_prescale; }; } diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/PrescaleTool.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/PrescaleTool.cxx index abb82535c52d0ba2ded9d461cfde94594630c74f..e1f69bd2134ac0e88ec0efad069cedca7ee17e76 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/PrescaleTool.cxx +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/PrescaleTool.cxx @@ -11,6 +11,7 @@ // Use of ExpressionParsing to analyse a more complex string #include "DerivationFrameworkTools/PrescaleTool.h" +#include "xAODEventInfo/EventInfo.h" namespace DerivationFramework { @@ -30,7 +31,6 @@ namespace DerivationFramework { ATH_MSG_FATAL("Prescale of less than 1 makes no sense"); return StatusCode::FAILURE; } - m_eventCounter = 0; return StatusCode::SUCCESS; } @@ -41,9 +41,10 @@ namespace DerivationFramework { bool PrescaleTool::eventPassesFilter() const { + const xAOD::EventInfo* ei = 0; + CHECK( evtStore()->retrieve( ei , "EventInfo" ) ); bool accept(false); - if (m_eventCounter % m_prescale == 0) accept = true; - ++m_eventCounter; + if (ei->eventNumber() % m_prescale == 0) accept = true; return accept; }