Skip to content
Snippets Groups Projects
Commit 9475664d authored by scott snyder's avatar scott snyder
Browse files

L1TopoSimulation: Remove references to old EventInfo.

L1TopoSimualation was accessing the old EventInfo in order to get event ID
information.  Replace with a reference to EventContext.
parent 2546250b
No related branches found
No related tags found
No related merge requests found
...@@ -11,7 +11,6 @@ atlas_depends_on_subdirs( ...@@ -11,7 +11,6 @@ atlas_depends_on_subdirs(
PRIVATE PRIVATE
Control/AthenaBaseComps Control/AthenaBaseComps
Control/AthenaMonitoring Control/AthenaMonitoring
Event/EventInfo
GaudiKernel GaudiKernel
Trigger/TrigConfiguration/TrigConfBase Trigger/TrigConfiguration/TrigConfBase
Trigger/TrigConfiguration/TrigConfInterfaces Trigger/TrigConfiguration/TrigConfInterfaces
...@@ -44,7 +43,7 @@ atlas_add_component( L1TopoSimulation ...@@ -44,7 +43,7 @@ atlas_add_component( L1TopoSimulation
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib
TrigInterfacesLib TrigT1CaloEventLib TrigT1CaloUtilsLib TrigInterfacesLib TrigT1CaloEventLib TrigT1CaloUtilsLib
AthenaBaseComps EventInfo GaudiKernel TrigConfBase TrigConfL1Data L1TopoConfig AthenaBaseComps GaudiKernel TrigConfBase TrigConfL1Data L1TopoConfig
L1TopoCoreSim L1TopoEvent L1TopoInterfaces L1TopoAlgorithms TrigT1Interfaces L1TopoCoreSim L1TopoEvent L1TopoInterfaces L1TopoAlgorithms TrigT1Interfaces
TrigT1Result TrigConfInterfaces ) TrigT1Result TrigConfInterfaces )
......
/* /*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/ */
#include "./L1TopoSimulation.h" #include "./L1TopoSimulation.h"
...@@ -137,7 +137,6 @@ L1TopoSimulation::initialize() { ...@@ -137,7 +137,6 @@ L1TopoSimulation::initialize() {
CHECK(m_topoCTPLocation.initialize()); CHECK(m_topoCTPLocation.initialize());
CHECK(m_topoOverflowCTPLocation.initialize()); CHECK(m_topoOverflowCTPLocation.initialize());
CHECK(m_EventInfoKey.initialize());
ATH_MSG_DEBUG("Prescale factor set to " << m_prescale); ATH_MSG_DEBUG("Prescale factor set to " << m_prescale);
ATH_MSG_DEBUG("PrescaleDAQROBAccess factor set to " << m_prescaleForDAQROBAccess); ATH_MSG_DEBUG("PrescaleDAQROBAccess factor set to " << m_prescaleForDAQROBAccess);
...@@ -227,7 +226,7 @@ L1TopoSimulation::start() { ...@@ -227,7 +226,7 @@ L1TopoSimulation::start() {
StatusCode StatusCode
L1TopoSimulation::execute() { L1TopoSimulation::execute() {
const EventContext& ctx = Gaudi::Hive::currentContext();
if (m_prescale>1 && not m_scaler->decision(m_prescale)){ if (m_prescale>1 && not m_scaler->decision(m_prescale)){
ATH_MSG_DEBUG( "This event not processed due to prescale"); ATH_MSG_DEBUG( "This event not processed due to prescale");
...@@ -247,10 +246,10 @@ L1TopoSimulation::execute() { ...@@ -247,10 +246,10 @@ L1TopoSimulation::execute() {
// fill the L1Topo Input Event // fill the L1Topo Input Event
TCS::TopoInputEvent & inputEvent = m_topoSteering->inputEvent(); TCS::TopoInputEvent & inputEvent = m_topoSteering->inputEvent();
// Event Info inputEvent.setEventInfo(ctx.eventID().run_number(),
SG::ReadHandle< xAOD::EventInfo > evt(m_EventInfoKey); ctx.eventID().event_number(),
ctx.eventID().lumi_block(),
inputEvent.setEventInfo(evt->runNumber(),evt->eventNumber(),evt->lumiBlock(),evt->bcid()); ctx.eventID().bunch_crossing_id());
// EM TAU // EM TAU
CHECK(m_emtauInputProvider->fillTopoInputEvent(inputEvent)); CHECK(m_emtauInputProvider->fillTopoInputEvent(inputEvent));
......
/* /*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/ */
#ifndef L1Topo_L1TopoSimulation #ifndef L1Topo_L1TopoSimulation
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "AthenaBaseComps/AthAlgorithm.h" #include "AthenaBaseComps/AthAlgorithm.h"
#include "TrigInterfaces/IMonitoredAlgo.h" #include "TrigInterfaces/IMonitoredAlgo.h"
#include "xAODEventInfo/EventInfo.h"
#include "GaudiKernel/ServiceHandle.h" #include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h" #include "GaudiKernel/ToolHandle.h"
...@@ -86,7 +85,6 @@ namespace LVL1 { ...@@ -86,7 +85,6 @@ namespace LVL1 {
BooleanProperty m_enableInputDump { false }; // for enabling input dumping BooleanProperty m_enableInputDump { false }; // for enabling input dumping
BooleanProperty m_enableBitwise { false }; // for enabling bitwise algorithms BooleanProperty m_enableBitwise { false }; // for enabling bitwise algorithms
StringProperty m_inputDumpFile { "inputdump.txt" }; // input dump file StringProperty m_inputDumpFile { "inputdump.txt" }; // input dump file
SG::ReadHandleKey<xAOD::EventInfo> m_EventInfoKey{this,"EventInfoKey","EventInfo","RHK for EventInfo"};
SG::WriteHandleKey<LVL1::FrontPanelCTP> m_topoCTPLocation { "" }; ///< SG key of decision bits for CTP SG::WriteHandleKey<LVL1::FrontPanelCTP> m_topoCTPLocation { "" }; ///< SG key of decision bits for CTP
SG::WriteHandleKey<LVL1::FrontPanelCTP> m_topoOverflowCTPLocation { "" }; ///< SG key of overflow bits for CTP SG::WriteHandleKey<LVL1::FrontPanelCTP> m_topoOverflowCTPLocation { "" }; ///< SG key of overflow bits for CTP
int m_topoOutputLevel{TrigConf::MSGTC::WARNING}; // property to set the outputlevel of the topo algorithms int m_topoOutputLevel{TrigConf::MSGTC::WARNING}; // property to set the outputlevel of the topo algorithms
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment