diff --git a/Control/AthenaMP/src/AthMpEvtLoopMgr.cxx b/Control/AthenaMP/src/AthMpEvtLoopMgr.cxx
index 19eb19e19bdedef07870a814a20487bda6e057dc..0923eb0f8ef495fe3a27fba349252f575e19e634 100644
--- a/Control/AthenaMP/src/AthMpEvtLoopMgr.cxx
+++ b/Control/AthenaMP/src/AthMpEvtLoopMgr.cxx
@@ -8,7 +8,7 @@
#include "AthenaInterprocess/SharedQueue.h"
#include "AthenaInterprocess/Utilities.h"
#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/FileIncident.h"
+#include "GaudiKernel/Incident.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIoComponentMgr.h"
#include "GaudiKernel/IIoComponent.h"
diff --git a/Control/AthenaServices/share/AthenaOutputStream_test.ref b/Control/AthenaServices/share/AthenaOutputStream_test.ref
index afa598df0eb4cfbf1a37572c5921e37508d13c53..a5770f9171ac63bdb7758bde6d7d1a79837da517 100644
--- a/Control/AthenaServices/share/AthenaOutputStream_test.ref
+++ b/Control/AthenaServices/share/AthenaOutputStream_test.ref
@@ -135,7 +135,6 @@ IoComponentMgr DEBUG --> io_register(AthenaOutputStream,W,DidNotNameOutput.
IoComponentMgr DEBUG --> io_hasitem()
AthenaOutputStream INFO I/O reinitialization...
IncidentSvc DEBUG Adding [MetaDataStop] listener 'AthenaOutputStream' with priority 50
-IncidentSvc DEBUG Adding [UpdateOutputFile] listener 'AthenaOutputStream' with priority 50
AthenaOutputStr... DEBUG Property update for OutputLevel : new value = 1
AthenaOutputStream DEBUG End initialize
AthenaOutputStreamVERBOSE ServiceLocatorHelper::service: found service AlgExecStateSvc
diff --git a/Control/AthenaServices/src/AthenaOutputStream.cxx b/Control/AthenaServices/src/AthenaOutputStream.cxx
index 487b2ce65e07fa98e1254097248907d9b1688d20..738d3287f00763fffed92e3991a4af589e089b45 100644
--- a/Control/AthenaServices/src/AthenaOutputStream.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStream.cxx
@@ -14,7 +14,6 @@
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/FileIncident.h"
#include "GaudiKernel/AlgTool.h"
#include "AthenaKernel/IClassIDSvc.h"
@@ -412,27 +411,6 @@ void AthenaOutputStream::handle(const Incident& inc)
}
ATH_MSG_INFO("Records written: " << m_events);
}
- } else if (inc.type() == "UpdateOutputFile") {
- const FileIncident* fileInc = dynamic_cast<const FileIncident*>(&inc);
- if(fileInc!=nullptr) {
- if(m_outputName != fileInc->fileName()) {
- m_outputName = fileInc->fileName();
- ServiceHandle<IIoComponentMgr> iomgr("IoComponentMgr", name());
- if(iomgr.retrieve().isFailure()) {
- ATH_MSG_FATAL("Cannot retrieve IoComponentMgr from within the incident handler");
- return;
- }
- if(iomgr->io_register(this, IIoComponentMgr::IoMode::WRITE, m_outputName).isFailure()) {
- ATH_MSG_FATAL("Cannot register new output name with IoComponentMgr");
- return;
- }
- } else {
- ATH_MSG_DEBUG("New output file name received through the UpdateOutputFile incident is the same as the already defined output name. Nothing to do");
- }
- } else {
- ATH_MSG_FATAL("Cannot dyn-cast the UpdateOutputFile incident to FileIncident");
- return;
- }
}
// Handle Event Ranges
@@ -948,7 +926,7 @@ bool AthenaOutputStream::matchKey(const std::vector<std::string>& key,
StatusCode AthenaOutputStream::io_reinit() {
ATH_MSG_INFO("I/O reinitialization...");
- // For 'write on finalize', we set up listener for 'MetaDataStop' and 'UpdateOutputFile'
+ // For 'write on finalize', we set up listener for 'MetaDataStop'
// and perform write at this point. This happens at 'stop' of the
// event selector. RDS 04/2010
// Set to be listener for end of event
@@ -958,7 +936,6 @@ StatusCode AthenaOutputStream::io_reinit() {
return StatusCode::FAILURE;
}
incSvc->addListener(this, "MetaDataStop", 50);
- incSvc->addListener(this, "UpdateOutputFile", 50);
for (std::vector<ToolHandle<IAthenaOutputTool> >::iterator iter = m_helperTools.begin();
iter != m_helperTools.end(); iter++) {
if (!(*iter)->postInitialize().isSuccess()) {
diff --git a/Control/AthenaServices/src/AthenaOutputStream.h b/Control/AthenaServices/src/AthenaOutputStream.h
index fbe23ed29f2f51e758bf0467e1c4d5d76b46219e..f06eb58f343228582520dd75d6515e1f326bbf97 100644
--- a/Control/AthenaServices/src/AthenaOutputStream.h
+++ b/Control/AthenaServices/src/AthenaOutputStream.h
@@ -167,7 +167,7 @@ public:
IDataSelector* selectedObjects() {
return &m_objects;
}
- /// Incident service handle listening for MetaDataStop and UpdateOutputFile
+ /// Incident service handle listening for MetaDataStop
virtual void handle(const Incident& incident) override;
/// Callback method to reinitialize the internal state of the component for I/O purposes (e.g. upon @c fork(2))
virtual StatusCode io_reinit() override;
diff --git a/Control/AthenaServices/src/AthenaSummarySvc.cxx b/Control/AthenaServices/src/AthenaSummarySvc.cxx
index 6a70b223e94371b53ec16332703a0da1bf1e824d..14fd358f65fae99e47037b16e55f4779825552db 100644
--- a/Control/AthenaServices/src/AthenaSummarySvc.cxx
+++ b/Control/AthenaServices/src/AthenaSummarySvc.cxx
@@ -193,10 +193,6 @@ StatusCode AthenaSummarySvc::initialize() {
p_incSvc->addListener( this, "BeginRun", pri, true);
p_incSvc->addListener( this, "EndRun", pri, true);
-
- p_incSvc->addListener( this, "BeginFile", pri, true );
- p_incSvc->addListener( this, "EndFile", pri, true );
-
p_incSvc->addListener( this, "FirstInputFile", pri, true );
vector<string>::const_iterator itr;
@@ -379,7 +375,7 @@ AthenaSummarySvc::handle(const Incident &inc) {
fileName = inc.source();
}
- if (inc.type() == "BeginInputFile" || inc.type() == "BeginFile") {
+ if (inc.type() == "BeginInputFile" ) {
m_inputFilesRead.push_back( fileName );
} else if (inc.type() == "BeginOutputFile") {
m_outputFiles.push_back( fileName );
diff --git a/Control/AthenaServices/src/DecisionSvc.cxx b/Control/AthenaServices/src/DecisionSvc.cxx
index 6909062bfa1067ad26434673b5f26fb1118e7302..0d60e1fe3583873c365348d16be9c700cf1b8796 100644
--- a/Control/AthenaServices/src/DecisionSvc.cxx
+++ b/Control/AthenaServices/src/DecisionSvc.cxx
@@ -5,8 +5,6 @@
#include "DecisionSvc.h"
// Gaudi include files
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/FileIncident.h"
#include "GaudiKernel/EventContext.h"
#include "PersistentDataModel/AthenaAttributeList.h"
#include <algorithm>
@@ -49,11 +47,6 @@ DecisionSvc::initialize()
// Get handle to exec state service for retrieving decisions
ATH_CHECK( m_algstateSvc.retrieve() );
- // Must listen to EndEvent (why?)
- ServiceHandle<IIncidentSvc> incSvc("IncidentSvc", this->name());
- ATH_CHECK( incSvc.retrieve() );
- //incSvc->addListener(this, "EndEvent", 100);
-
ATH_CHECK(m_evtStore.retrieve());
return StatusCode::SUCCESS;
@@ -341,24 +334,6 @@ DecisionSvc::isEventAccepted( const std::string& stream,
return result;
}
-//__________________________________________________________________________
-void
-DecisionSvc::handle(const Incident& inc)
-{
- const FileIncident* fileInc = dynamic_cast<const FileIncident*>(&inc);
- std::string fileName;
- if (fileInc == nullptr) {
- fileName = "Undefined ";
- } else {
- fileName = fileInc->fileName();
- }
-
- ATH_MSG_DEBUG("handle() " << inc.type() << " for file: " << fileName);
-
- return;
-}
-
-
StatusCode DecisionSvc::start()
{
ATH_MSG_DEBUG("in start");
diff --git a/Control/AthenaServices/src/DecisionSvc.h b/Control/AthenaServices/src/DecisionSvc.h
index 12aa34ad969c8c3db5823bfcbdb86cc7aca1467a..27dd773b59b6e03591ddeee17f8d815571a1c73b 100644
--- a/Control/AthenaServices/src/DecisionSvc.h
+++ b/Control/AthenaServices/src/DecisionSvc.h
@@ -11,7 +11,6 @@
// FrameWork includes
#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/IAlgExecStateSvc.h"
// Athena includes
@@ -28,7 +27,7 @@
* @author S.Binet<binet@cern.ch>
* @author B.Radics<radbal@cern.ch>
*/
-class DecisionSvc : public extends<AthService, IDecisionSvc, IIncidentListener>
+class DecisionSvc : public extends<AthService, IDecisionSvc>
{
public:
@@ -47,9 +46,6 @@ public:
//@}
- /// Incident service handle listening for BeginFile and EndFile.
- virtual void handle(const Incident& incident) override;
-
///////////////////////////////////////////////////////////////////
// Non-const methods:
///////////////////////////////////////////////////////////////////
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadMeta.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadMeta.cxx
index 193c5acd9ebee81b763ffa8b75de900ce6af6795..0a807f2d54842974303514bea12eb9a5d0cc9a30 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadMeta.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadMeta.cxx
@@ -50,7 +50,7 @@ StatusCode ReadMeta::initialize() {
return StatusCode::FAILURE;
}
incSvc->addListener(this, "BeginInputFile", 60); // pri has to be < 100 to be after MetaDataSvc.
- incSvc->addListener(this, "EndFile", 50); // pri has to be > 10 to be before MetaDataSvc.
+ incSvc->addListener(this, "EndInputFile", 50); // pri has to be > 10 to be before MetaDataSvc.
return StatusCode::SUCCESS;
}
//___________________________________________________________________________
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/CopyEventStreamInfo.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/CopyEventStreamInfo.cxx
index 6c324572f19999c9d8435c502800356513c50a27..a9a7e911770e1fca860a8d7712728d85f018df56 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/CopyEventStreamInfo.cxx
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/CopyEventStreamInfo.cxx
@@ -10,8 +10,6 @@
#include "CopyEventStreamInfo.h"
-#include "GaudiKernel/FileIncident.h"
-
#include "EventInfo/EventStreamInfo.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/Database/IOVDbMetaDataTools/IOVDbMetaDataTools/IIOVDbMetaDataTool.h b/Database/IOVDbMetaDataTools/IOVDbMetaDataTools/IIOVDbMetaDataTool.h
index e2dcb193084e69afdefcdfdd49ca01c548d05d97..0bc0733326c70dc42baecb80d9966cb52fcc5cbb 100755
--- a/Database/IOVDbMetaDataTools/IOVDbMetaDataTools/IIOVDbMetaDataTool.h
+++ b/Database/IOVDbMetaDataTools/IOVDbMetaDataTools/IIOVDbMetaDataTool.h
@@ -64,9 +64,9 @@ public:
/// Explicit call to process IOV meta data from the input meta
/// data store, transferring it to the main meta data
/// store. Normally, this method is called at the
- /// BeginFileIncident. However, this explicit call allows the
+ /// BeginInputFile incident. However, this explicit call allows the
/// transfer to occur during the initialization phase, which
- /// occurs before BeginFileIncident.
+ /// occurs before BeginInputFile incident.
virtual StatusCode processInputFileMetaData(const std::string& fileName) = 0;
};
diff --git a/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.cxx b/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.cxx
index 5e96c29c90f2d71ea77e9490017cb4a9d2039ba7..3d7c55fa7428d2432f0be0a8ba31aa078a341578 100755
--- a/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.cxx
+++ b/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.cxx
@@ -97,7 +97,6 @@ IOVDbMetaDataTool::initialize()
}
incSvc->addListener(this, "FirstInputFile", 60); // pri has to be < 100 to be after MetaDataSvc.
incSvc->addListener(this, "BeginInputFile", 60); // pri has to be < 100 to be after MetaDataSvc.
- //incSvc->addListener(this, "EndFile", 50); // pri has to be > 10 to be before MetaDataSvc.
// Check whether folders need to be modified
m_modifyFolders = false;
@@ -149,9 +148,7 @@ IOVDbMetaDataTool::handle(const Incident& inc) {
ATH_MSG_ERROR(" Could not process input file meta data");
throw std::exception();
}
- } else if (inc.type() == "EndFile") {
- // Do nothing
- }
+ }
}
diff --git a/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.h b/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.h
index 77052951f838b2a909aea4dc1a2a44d966520b2e..72cb57d6bbb8a93db1515800ea6cc821024040fb 100755
--- a/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.h
+++ b/Database/IOVDbMetaDataTools/src/IOVDbMetaDataTool.h
@@ -106,9 +106,9 @@ public:
/// Explicit call to process IOV meta data from the input meta
/// data store, transferring it to the main meta data
/// store. Normally, this method is called at the
- /// BeginFileIncident. However, this explicit call allows the
+ /// BeginInputFile incident. However, this explicit call allows the
/// transfer to occur during the initialization phase, which
- /// occurs before BeginFileIncident.
+ /// occurs before BegininputFile incident.
StatusCode processInputFileMetaData(const std::string& fileName);
private:
@@ -137,7 +137,7 @@ private:
StoreGateSvc_t m_inputStore;
// Has the FirstInputFileIncidence fired? Used to skip the first
- // BeginFileIncidence
+ // BeginInputFile incident
bool m_processedFirstInputFileIncidence;
// Flag to check whether we need to override run number for MC
diff --git a/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.cxx b/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.cxx
index e25a6a60cdfc8eccdba30d2f6606e7f4cfcd1153..a2568c18d212ac7b11f2f09dedfc733eeea81c83 100755
--- a/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.cxx
+++ b/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.cxx
@@ -45,7 +45,7 @@ DataHeaderCnv::~DataHeaderCnv()
//______________________________________________________________________________
StatusCode DataHeaderCnv::initialize()
{
- // listen to EndFile incidents to clear old DataHeaderForms from the cache
+ // listen to EndInputFile incidents to clear old DataHeaderForms from the cache
//Get IncidentSvc
ServiceHandle<IIncidentSvc> incSvc("IncidentSvc", "DataHeaderCnv");
ATH_CHECK( incSvc.retrieve() );
diff --git a/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.h b/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.h
index 5304df052ca764ff598ab2a5282b32413a1b2483..0246a58829a0e2376857d24e5a8fc817ebf1c24d 100755
--- a/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.h
+++ b/Database/PersistentDataModelAthenaPool/src/DataHeaderCnv.h
@@ -52,7 +52,7 @@ public:
[[deprecated("this converter uses createPersistent() with 2 arguments")]]
virtual DataHeader_p6* createPersistent(DataHeader*) override { return nullptr; }
- /// Incident service handle listening for EndFile.
+ /// Incident service handle listening for EndInputFile.
virtual void handle(const Incident& incident) override;
protected:
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
index 34167f15f6590fc23869ad36ee82f6d57b0ee8ab..839a7feb7c2c4b8430626df34c09121efbb2042d 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
@@ -11,9 +11,7 @@
#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
#include "EventStorage/pickDataReader.h"
-#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/FileIncident.h"
#include "GaudiKernel/Property.h"
#include "PersistentDataModel/DataHeader.h"
@@ -44,7 +42,6 @@ ByteStreamEventStorageInputSvc::ByteStreamEventStorageInputSvc(const std::string
m_evtInFile(0),
m_sgSvc("StoreGateSvc", name),
m_mdSvc("StoreGateSvc/InputMetaDataStore", name),
- m_incidentSvc("IncidentSvc", name),
m_attlistsvc("ByteStreamAttListMetadataSvc", name),
m_robProvider("ROBDataProviderSvc", name),
m_sequential(false),
@@ -79,11 +76,6 @@ StatusCode ByteStreamEventStorageInputSvc::initialize() {
ATH_MSG_FATAL("Cannot get InputMetaDataStore.");
return(StatusCode::FAILURE);
}
- // Retrieve IncidentSvc
- if (!m_incidentSvc.retrieve().isSuccess()) {
- ATH_MSG_FATAL("Cannot get IncidentSvc.");
- return(StatusCode::FAILURE);
- }
// Retrieve AttListSvc
if (!m_attlistsvc.retrieve().isSuccess()) {
ATH_MSG_FATAL("Cannot get metadata AttListSvc.");
@@ -128,9 +120,6 @@ StatusCode ByteStreamEventStorageInputSvc::finalize() {
if (!m_sgSvc.release().isSuccess()) {
ATH_MSG_WARNING("Cannot release StoreGateSvc");
}
- if (!m_incidentSvc.release().isSuccess()) {
- ATH_MSG_WARNING("Cannot release IncidentSvc");
- }
if (!m_robProvider.release().isSuccess()) {
ATH_MSG_WARNING("Cannot release rob data provider");
}
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.h b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.h
index 4f25b662c2c455b466096b41f88c2e48c9820e3c..43da93bf165e4abd724665f55f6b9657dfc29e33 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.h
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.h
@@ -22,7 +22,6 @@
#include "GaudiKernel/ServiceHandle.h"
class StoreGateSvc;
-class IIncidentSvc;
/** @class ByteStreamEventStorageInputSvc
* @brief This class is the ByteStreamInputSvc for reading events written by EventStorage.
@@ -93,7 +92,6 @@ private: // data
/// Pointer to StoreGate
ServiceHandle<StoreGateSvc> m_sgSvc; //!< StoreGateSvc
ServiceHandle<StoreGateSvc> m_mdSvc; //!< StoreGateSvc
- ServiceHandle<IIncidentSvc> m_incidentSvc; //!< IncidentSvc
ServiceHandle<IByteStreamFreeMetadataSvc> m_attlistsvc;
ServiceHandle<IROBDataProviderSvc> m_robProvider;
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamMetadataTool.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamMetadataTool.cxx
index e5d59bd5ee477dc2400cea503f9f785cffa0c631..d9e65ca8e7c755d607c04eb615dfc236bdfdad83 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamMetadataTool.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamMetadataTool.cxx
@@ -10,8 +10,6 @@
#include "ByteStreamMetadataTool.h"
-//#include "GaudiKernel/FileIncident.h"
-
#include "ByteStreamData/ByteStreamMetadataContainer.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/Event/EventBookkeeperTools/src/CutFlowSvc.h b/Event/EventBookkeeperTools/src/CutFlowSvc.h
index e2a67ce06d92ac61296980a9b538a009772058b8..a2316105da0fb1eab19795c9ff296b0e40541ffe 100644
--- a/Event/EventBookkeeperTools/src/CutFlowSvc.h
+++ b/Event/EventBookkeeperTools/src/CutFlowSvc.h
@@ -58,7 +58,7 @@ public:
//@}
- /// Incident service handle listening for BeginFile and EndFile.
+ /// Incident service handle listening for BeginInputFile, EndInputFile and MetaDataStop
virtual void handle(const Incident& incident) override;
///////////////////////////////////////////////////////////////////
diff --git a/LumiBlock/LumiBlockComps/LumiBlockComps/CreateLumiBlockCollectionFromFile.h b/LumiBlock/LumiBlockComps/LumiBlockComps/CreateLumiBlockCollectionFromFile.h
index db81311b0db0db1020790ce387f6fb0b12b4f9ae..9ae85763669e44c9c393da31549c2f07ac34cb1b 100644
--- a/LumiBlock/LumiBlockComps/LumiBlockComps/CreateLumiBlockCollectionFromFile.h
+++ b/LumiBlock/LumiBlockComps/LumiBlockComps/CreateLumiBlockCollectionFromFile.h
@@ -42,7 +42,7 @@ public:
StatusCode finalize();
StatusCode fillLumiBlockCollection();
- /// Incident service handle listening for BeginFile and EndFile.
+ /// Incident service handle listening for MetaDataStop
void handle(const Incident& incident);
/// Callback for database access
virtual StatusCode updateCache(IOVSVC_CALLBACK_ARGS);
diff --git a/LumiBlock/LumiBlockComps/LumiBlockComps/LumiCalcSvc.h b/LumiBlock/LumiBlockComps/LumiBlockComps/LumiCalcSvc.h
index 23842155cd33e33a8cba6f16122aefd943c29a66..8d86da2eba5b2244ce4018ede770174a5128af65 100644
--- a/LumiBlock/LumiBlockComps/LumiBlockComps/LumiCalcSvc.h
+++ b/LumiBlock/LumiBlockComps/LumiBlockComps/LumiCalcSvc.h
@@ -50,7 +50,7 @@ public:
StatusCode finalize();
//@}
- /// Incident service handle listening for BeginFile and EndFile.
+ /// Incident service handle listening for BeginInputFile and EndInputFile.
void handle(const Incident& incident);
public:
@@ -131,4 +131,4 @@ inline const InterfaceID& LumiCalcSvc::interfaceID()
#endif //> !ATHENAKERNEL_LUMICALCSVC_H
-#endif
\ No newline at end of file
+#endif
diff --git a/LumiBlock/LumiBlockComps/src/CreateLumiBlockCollectionFromFile.cxx b/LumiBlock/LumiBlockComps/src/CreateLumiBlockCollectionFromFile.cxx
index 16918003eb76a4a72caf8fd2f35ed46d0ec5ead2..083af7c61f2890f333bc715df46665d1aa8ab137 100644
--- a/LumiBlock/LumiBlockComps/src/CreateLumiBlockCollectionFromFile.cxx
+++ b/LumiBlock/LumiBlockComps/src/CreateLumiBlockCollectionFromFile.cxx
@@ -3,7 +3,6 @@
*/
#include "LumiBlockComps/CreateLumiBlockCollectionFromFile.h"
-#include "GaudiKernel/FileIncident.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/IIoComponentMgr.h"
diff --git a/PhysicsAnalysis/POOLRootAccess/test/ut_basicAlg_test.cxx b/PhysicsAnalysis/POOLRootAccess/test/ut_basicAlg_test.cxx
index 4bfba93498f2de74d44da47def2757a4f62a6343..1caba0b83f9335991599fb65971468098feb9f4b 100644
--- a/PhysicsAnalysis/POOLRootAccess/test/ut_basicAlg_test.cxx
+++ b/PhysicsAnalysis/POOLRootAccess/test/ut_basicAlg_test.cxx
@@ -44,8 +44,6 @@ private:
#include "POOLRootAccess/TEvent.h"
-#include "GaudiKernel/FileIncident.h"
-
int main() {
POOL::TEvent evt(POOL::TEvent::kClassAccess);
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx
index e7f2669b19f87bd80b58a6d8d034f13d773598b2..a823bae0d345c3c8f7a9432562d1f4cce5469a0c 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx
@@ -244,7 +244,7 @@ void PrimaryDPDPrescaler::handle(const Incident& inc) {
const FileIncident* fileInc = dynamic_cast<const FileIncident*>(&inc);
if (fileInc == 0) {
- ATH_MSG_ERROR( " Unable to get FileName from BeginFile/EndFile incident" );
+ ATH_MSG_ERROR( " Unable to get FileName from BeginInputFile/EndInputFile incident" );
return;
}
const std::string fileName = fileInc->fileName();
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
index 759de6ede7e7bd1b6435e780f730340f806caee4..2bf8891b1014aaee40184ae21931294253289d41 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
@@ -39,7 +39,7 @@ public:
StatusCode execute();
StatusCode finalize();
- /// Incident service handle listening for BeginFile and EndFile.
+ /// Incident service handle listening for BeginInputFile and EndInputFile.
void handle(const Incident& incident);
diff --git a/graphics/VP1/VP1AlgsBatch/src/VP1BatchOnLatestEvent.cxx b/graphics/VP1/VP1AlgsBatch/src/VP1BatchOnLatestEvent.cxx
index 32f5e7cbf899f55e293d47f6eb156fe4d9ec8992..921563a398b593f6d733d238c375045b2889784c 100755
--- a/graphics/VP1/VP1AlgsBatch/src/VP1BatchOnLatestEvent.cxx
+++ b/graphics/VP1/VP1AlgsBatch/src/VP1BatchOnLatestEvent.cxx
@@ -12,7 +12,6 @@
#include "EventInfo/EventType.h"
#include "PathResolver/PathResolver.h"
-#include "GaudiKernel/FileIncident.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IEvtSelector.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/graphics/VP1/VP1AlgsEventProd/src/VP1EventProd.cxx b/graphics/VP1/VP1AlgsEventProd/src/VP1EventProd.cxx
index bc9722fd6a9beb065c64a0b700a3933d3a9a815a..0cf06c1c9ac488d0e9b237973a634dc17c07413a 100755
--- a/graphics/VP1/VP1AlgsEventProd/src/VP1EventProd.cxx
+++ b/graphics/VP1/VP1AlgsEventProd/src/VP1EventProd.cxx
@@ -9,7 +9,6 @@
#include "StorageSvc/DbType.h"
#include "PathResolver/PathResolver.h"
-#include "GaudiKernel/FileIncident.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IEvtSelector.h"
#include "GaudiKernel/IIncidentSvc.h"