diff --git a/Control/AthenaServices/src/CoreDumpSvc.cxx b/Control/AthenaServices/src/CoreDumpSvc.cxx
index 99b497277f74898dce1f7b79746f61eecf91c2b0..004506b3be31b3b5ffaa2ef4060c676efcea06b7 100644
--- a/Control/AthenaServices/src/CoreDumpSvc.cxx
+++ b/Control/AthenaServices/src/CoreDumpSvc.cxx
@@ -41,7 +41,6 @@
// Athena includes
#include "AthenaKernel/IAthenaSummarySvc.h"
-#include "EventInfo/EventIncident.h"
#include "StoreGate/StoreGateSvc.h"
#include "CxxUtils/SealCommon.h"
#include "CxxUtils/SealSignal.h"
@@ -414,13 +413,9 @@ void CoreDumpSvc::handle(const Incident& incident)
currRec.LastInc = incident.source() + ":" + incident.type();
- const EventIncident* eventInc(nullptr);
- if (nullptr != (eventInc = dynamic_cast<const EventIncident*>(&incident))) {
- const EventIDBase& eventID = incident.context().eventID();
- std::ostringstream oss;
- oss << eventID;
- currRec.EvId = oss.str();
- }
+ std::ostringstream oss;
+ oss << incident.context().eventID();
+ currRec.EvId = oss.str();
if (incident.type()==IncidentType::BeginEvent) {
++m_eventCounter;
diff --git a/Control/IOVSvc/src/IOVSvcTool.cxx b/Control/IOVSvc/src/IOVSvcTool.cxx
index 7d529c805c32fd4f45f76b4bce1e51df8fe68ea2..7d75d88d560bba0d19b76e0592d50914d489a79a 100644
--- a/Control/IOVSvc/src/IOVSvcTool.cxx
+++ b/Control/IOVSvc/src/IOVSvcTool.cxx
@@ -37,7 +37,6 @@
#include "StoreGate/StoreGateSvc.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
-#include "EventInfo/EventIncident.h"
#include "IOVSvc/IOVEntry.h"
#include "IOVSvc/IOVAddress.h"
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx
index 8d801a41339fcf673abe92f849d0c44313477cb3..fdc46ac4de77febfd109db0ba4a4d3aab5abb94b 100755
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/*****************************************************************************
@@ -24,7 +24,6 @@ Purpose : create a GlobalTriggerTag - The Tag information associated to the even
#include "EventInfo/TriggerInfo.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
-#include "EventInfo/EventIncident.h"
#include "TrigDecisionTool/ChainGroup.h"
@@ -114,8 +113,6 @@ void GlobalTriggerTagTool::handle ( const Incident& incident ) {
ATH_MSG_INFO("stream bit map copied to MetaDataStore");
}
}
- const EventIncident* evtinc = dynamic_cast<const EventIncident*>(&incident);
- if(evtinc==0) ATH_MSG_ERROR("Couldn't get EventIncident object => Event Info not available");
unsigned long run = incident.context().eventID().run_number();
unsigned int index = 0;
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx
index 1440391cc297c41270dae09e3a4b2f713ea0a183..5928baa48110048304aa5a2479689e3a46bd5e9a 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -47,7 +47,6 @@
// Event Incident to get Event Info
#include "GaudiKernel/IIncidentSvc.h"
-#include "EventInfo/EventIncident.h"
// Initialize method for all tools
// Retrieval of all Tools to be used during run
@@ -1347,24 +1346,18 @@ StatusCode TrigDataAccess::LoadFullCollections (
void TrigDataAccess::handle(const Incident & inc ) {
- const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
- if(!eventInc) {
- ATH_MSG_WARNING(" Unable to get EventInfo from either EventStore or BeginRun incident");
- return;
- }
- else {
EventContext context = inc.context();
m_larcell->eventNumber(context.eventID().event_number());
- if (m_applyOffsetCorrection) m_larcell->lumiBlock_BCID(context.eventID().lumi_block(), context.eventID().bunch_crossing_id());
- m_tilecell->eventNumber(context.eventID().event_number());
- m_d0cells.clear();
- //m_full_vrodid32.clear();
- m_present_roi = 0;
- TileCellCollection* mbts = m_tilecell->MBTS_collection();
- for (size_t i = 0; i < (*mbts).size(); ++i)
- (*mbts)[i]->setEnergy(0.0);
- m_mbts_done=false;
- }
+ if (m_applyOffsetCorrection) m_larcell->lumiBlock_BCID(context.eventID().lumi_block(), context.eventID().bunch_crossing_id());
+ m_tilecell->eventNumber(context.eventID().event_number());
+ m_d0cells.clear();
+ //m_full_vrodid32.clear();
+ m_present_roi = 0;
+ TileCellCollection* mbts = m_tilecell->MBTS_collection();
+ for (size_t i = 0; i < (*mbts).size(); ++i) {
+ (*mbts)[i]->setEnergy(0.0);
+ }
+ m_mbts_done=false;
}
void TrigDataAccess::ROBList( const IRoiDescriptor& roi, std::vector<uint32_t>& vec){
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.cxx
index 6eac5aa4ed5113813ab9f7edd8e097e001fb520f..e2a90dd3fdde61431ff3a210c99249050e4f9882 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccessATLFAST.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -41,7 +41,6 @@
#include "GaudiKernel/IIncidentSvc.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
-#include "EventInfo/EventIncident.h"
// Initialize method for all tools
// Retrieval of all Tools to be used during run
@@ -615,14 +614,7 @@ StatusCode TrigDataAccessATLFAST::LoadFullCollections (
// handle events (beginEvent only) to prepare containers
void TrigDataAccessATLFAST::handle(const Incident & inc ) {
- const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
- if(!eventInc) {
- ATH_MSG_ERROR(" Unable to get EventInfo from either EventStore or BeginRun incident");
- return;
- }
- else {
- m_larcell->eventNumber(inc.context().eventID().event_number());
- }
+ m_larcell->eventNumber(inc.context().eventID().event_number());
}
template<class T>
diff --git a/Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx b/Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx
index 7a4c14cbdfe4a0b0f0e226bdadeee98a6fa7e51e..c1a8f892a435b60e444642b26f0e53467c593433 100644
--- a/Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx
+++ b/Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx
@@ -44,7 +44,6 @@
#include "AtlasDetDescr/AtlasDetectorID.h"
#include "GaudiKernel/MsgStream.h"
-#include "EventInfo/EventIncident.h"
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/ServiceHandle.h"
diff --git a/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx b/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx
index b255ce45165cba300676a9455eb9e1e17b22989b..698c9223a95805286d7cbcaed30fcdb9d4fee172 100755
--- a/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/**********************************************************************************
@@ -24,7 +24,6 @@
#include "AthenaKernel/IAtRndmGenSvc.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
-#include "EventInfo/EventIncident.h"
namespace {
@@ -110,14 +109,8 @@ StatusCode HLT::RandomScaler::initialize()
void HLT::RandomScaler::handle(const Incident& inc)
{
if (inc.type()==IncidentType::BeginEvent) {
- const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
- if (!eventInc) {
- msg() << MSG::ERROR << "Cannot cast BeginEvent incident to EventIncident." << endmsg;
- return;
- }
- EventContext context = inc.context();
- m_seedInput[SEED_SEC] = context.eventID().time_stamp();
- m_seedInput[SEED_NSEC] = context.eventID().time_stamp_ns_offset();
+ m_seedInput[SEED_SEC] = inc.context().eventID().time_stamp();
+ m_seedInput[SEED_NSEC] = inc.context().eventID().time_stamp_ns_offset();
/* Generate hash-based seed from event quantities.
* Ranlux64 only supports signed 32bit seeds ('long' on i686)
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx
index c4db617c014e17438bcdd4f59e007f737282d1cd..215089ce65e67db286a42cb458617ab759d75d22 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -216,15 +216,8 @@ StatusCode TrigT1CaloDataAccess::loadCollection(
}
void TrigT1CaloDataAccess::handle(const Incident & inc ) {
- const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
- if(!eventInc) {
- msg(MSG::ERROR) << " Unable to cast " << inc.type() << " to EventIncident" << endmsg;
- return;
- }
- else {
- m_present_event = inc.context().eventID().event_number();
- m_ppmBSConverter->eventNumber(m_present_event);
- }
+ m_present_event = inc.context().eventID().event_number();
+ m_ppmBSConverter->eventNumber(m_present_event);
}
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.h
index 306b1c057f4db004c046221301987ee90126d9ed..18af2125f273fe838efdbcae9b8f242729216c99 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/TrigT1CaloDataAccess.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOBYTESTREAM_TRIGT1CALODATAACCESS_H
@@ -18,7 +18,6 @@
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/Incident.h"
-#include "EventInfo/EventIncident.h"
class IInterface;
class IROBDataProviderSvc;
diff --git a/graphics/VP1/VP1AlgsBatch/src/VP1BatchOnLatestEvent.cxx b/graphics/VP1/VP1AlgsBatch/src/VP1BatchOnLatestEvent.cxx
index 541101c33c0dfa487ce226a9a458f6b59fc19476..32f5e7cbf899f55e293d47f6eb156fe4d9ec8992 100755
--- a/graphics/VP1/VP1AlgsBatch/src/VP1BatchOnLatestEvent.cxx
+++ b/graphics/VP1/VP1AlgsBatch/src/VP1BatchOnLatestEvent.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "VP1AlgsBatch/VP1BatchOnLatestEvent.h"
@@ -10,7 +10,6 @@
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
#include "EventInfo/EventType.h"
-#include "EventInfo/EventIncident.h"
#include "PathResolver/PathResolver.h"
#include "GaudiKernel/FileIncident.h"
@@ -121,14 +120,6 @@ void VP1BatchOnLatestEvent::handle(const Incident& inc)
{
msg(MSG::INFO) << "Handling incident '" << inc.type() << "'" << endmsg;
- const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
- if(eventInc == 0) {
- msg(MSG::WARNING) << " Unable to cast incident type" << endmsg;
- return;
- } else {
- msg(MSG::DEBUG) << " Event incident casting successful" << endmsg;
- }
-
// Let VP1FileUtilities handle the output of the previous event
if(m_nEvent) {
makeEventDisplay();
diff --git a/graphics/VP1/VP1AlgsEventProd/src/VP1EventProd.cxx b/graphics/VP1/VP1AlgsEventProd/src/VP1EventProd.cxx
index 7404ab39ade0878b6ba46c553b71dd2cd79c7748..bc9722fd6a9beb065c64a0b700a3933d3a9a815a 100755
--- a/graphics/VP1/VP1AlgsEventProd/src/VP1EventProd.cxx
+++ b/graphics/VP1/VP1AlgsEventProd/src/VP1EventProd.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "VP1AlgsEventProd/VP1EventProd.h"
@@ -7,7 +7,6 @@
#include "VP1UtilsBase/VP1FileUtilities.h"
#include "StorageSvc/DbType.h"
-#include "EventInfo/EventIncident.h"
#include "PathResolver/PathResolver.h"
#include "GaudiKernel/FileIncident.h"
@@ -109,14 +108,6 @@ void VP1EventProd::handle(const Incident& inc)
{
msg(MSG::INFO) << "Handling incident '" << inc.type() << "'" << endmsg;
- const EventIncident* eventInc = dynamic_cast<const EventIncident*>(&inc);
- if(eventInc == 0) {
- msg(MSG::WARNING) << " Unable to cast incident type" << endmsg;
- return;
- } else {
- msg(MSG::DEBUG) << " Event incident casting successful" << endmsg;
- }
-
// Let VP1FileUtilities handle the output of the previous event.
// Skip this if m_nEvent == 0,
// because the processing of the event is not done yet