Merge branch '21.0-atlasg-1450' into '21.0'

Backport ATLASG-1450 fix to 21.0

See merge request atlas/athena!25182

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

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;	
   }; 
 }
 

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 {
 
@@ -31,7 +32,6 @@ namespace DerivationFramework {
       ATH_MSG_FATAL("Prescale of less than 1 makes no sense");
       return StatusCode::FAILURE;
     }
-    m_eventCounter = 0;
     return StatusCode::SUCCESS;
   }
 
@@ -42,9 +42,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;
   }