From 87dbe58487f79bf972aac718b9540a511f94881f Mon Sep 17 00:00:00 2001
From: Joerg Stelzer <joerg.stelzer@cern.ch>
Date: Thu, 20 Feb 2020 17:59:15 +0100
Subject: [PATCH] Switch PrescalingEmulationTool to use event context for
timestamp (ATR-20930)
---
.../L1Decoder/src/PrescalingEmulationTool.cxx | 13 ++-----------
.../L1Decoder/src/PrescalingEmulationTool.h | 1 -
.../python/EmuStepProcessingConfig.py | 1 -
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/Trigger/TrigSteer/L1Decoder/src/PrescalingEmulationTool.cxx b/Trigger/TrigSteer/L1Decoder/src/PrescalingEmulationTool.cxx
index df61a11aec5a..55fc91d36c1b 100644
--- a/Trigger/TrigSteer/L1Decoder/src/PrescalingEmulationTool.cxx
+++ b/Trigger/TrigSteer/L1Decoder/src/PrescalingEmulationTool.cxx
@@ -21,9 +21,6 @@ PrescalingEmulationTool::PrescalingEmulationTool( const std::string& type,
PrescalingEmulationTool::~PrescalingEmulationTool() { }
StatusCode PrescalingEmulationTool::initialize() {
-
- CHECK( m_eventInfo.initialize( not m_eventInfo.key().empty() ) );
-
for ( const std::string& confElement: m_prescalingConfig ) {
std::string chainName( confElement, 0, confElement.find(':') );
std::string psValue( confElement, confElement.find(':')+1 );
@@ -41,15 +38,9 @@ StatusCode PrescalingEmulationTool::prescaleChains( const EventContext& ctx,
// obtain CTP time
remainActive.reserve( initialyActive.size() );
- size_t seed = initialyActive[0].numeric();
-
- if ( not m_eventInfo.key().empty() ) {
- auto handle = SG::makeHandle( m_eventInfo, ctx );
- const xAOD::EventInfo* event = handle.cptr();
- // not sure we should mimick something we had before, will not be abel to reproduce it exactly anyways
- seed = event->timeStamp() ^ event->timeStampNSOffset();
- }
+ // create the seed from the event time
+ size_t seed = ctx.eventID().time_stamp() ^ ctx.eventID().time_stamp_ns_offset();
CLHEP::HepRandomEngine* engine = m_RNGEngines.getEngine( ctx );
engine->setSeed( seed, 0 );
for ( auto ch: initialyActive ) {
diff --git a/Trigger/TrigSteer/L1Decoder/src/PrescalingEmulationTool.h b/Trigger/TrigSteer/L1Decoder/src/PrescalingEmulationTool.h
index 63f135a221f6..56271438f401 100644
--- a/Trigger/TrigSteer/L1Decoder/src/PrescalingEmulationTool.h
+++ b/Trigger/TrigSteer/L1Decoder/src/PrescalingEmulationTool.h
@@ -43,7 +43,6 @@ public:
private:
PrescalingEmulationTool();
- SG::ReadHandleKey<xAOD::EventInfo> m_eventInfo{ this, "EventInfo", "EventInfo", "EventInfo object, source of CTP time used to reseed the RNG" };
Gaudi::Property<bool> m_keepUnknownChains{ this, "KeepUnknownChains", true, "If True then chains for which prescaling information is not set are kept" };
Gaudi::Property< std::vector<std::string> > m_prescalingConfig{ this, "Prescales", {}, "The prescaling info in the form: \"chainName:PSValue\"" };
ATHRNG::RNGWrapper m_RNGEngines;
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
index 7f19802b2a72..80f30e2db1f3 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
@@ -237,7 +237,6 @@ def generateL1DecoderAndChains():
L1UnpackingSeq = parOR("L1UnpackingSeq")
l1Decoder = L1Decoder( RoIBResult="", L1TriggerResult="" )
- l1Decoder.prescaler.EventInfo=""
l1Decoder.L1DecoderSummaryKey = "L1DecoderSummary"
ctpUnpacker = CTPUnpackingEmulationTool( ForceEnableAllChains=False , InputFilename="ctp.dat" )
--
GitLab