diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/InDetTrigParticleCreation/TrigParticleCreator.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/InDetTrigParticleCreation/TrigParticleCreator.h
index 7b0c0af84fdb30e22346bc8fdde424bfc3ceef6f..3c821cb6dde579d26ab2b92e73af90ccd0d6cd45 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/InDetTrigParticleCreation/TrigParticleCreator.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/InDetTrigParticleCreation/TrigParticleCreator.h
@@ -56,7 +56,6 @@ namespace InDet
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* input, HLT::TriggerElement* output);
HLT::ErrorCode hltFinalize();
- HLT::ErrorCode hltEndRun();
private:
void ResetMon();
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/InDetTrigParticleCreation/TrigTrackingxAODCnv.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/InDetTrigParticleCreation/TrigTrackingxAODCnv.h
index e38b9ad67eab388a949d0d9b98b0d9319f601e89..54f5b01f14d342cd4d826ec5700b2a25e96a54e2 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/InDetTrigParticleCreation/TrigTrackingxAODCnv.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/InDetTrigParticleCreation/TrigTrackingxAODCnv.h
@@ -56,7 +56,6 @@ namespace InDet
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* input, HLT::TriggerElement* output);
HLT::ErrorCode hltFinalize();
- HLT::ErrorCode hltEndRun();
private:
void ResetMon();
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigParticleCreator.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigParticleCreator.cxx
index cb24529038bacb538dcd7f61f4b44eeb060126b2..fc2d6b29d492d42fdbbb5499f482d79ea7f490f9 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigParticleCreator.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigParticleCreator.cxx
@@ -523,18 +523,6 @@ namespace InDet
return HLT::OK;
}
- //----------------------------------
- // endRun method:
- //----------------------------------------------------------------------------
- HLT::ErrorCode TrigParticleCreator::hltEndRun() {
-
- msg() << MSG::INFO << "TrigParticleCreator::endRun()" << endmsg;
-
- return HLT::OK;
- }
- //---------------------------------------------------------------------------
-
-
//---------------------------------------------------------------------------
// update the monitoring arrays
//---------------------------------------------------------------------------
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigTrackingxAODCnv.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigTrackingxAODCnv.cxx
index 35835c0c0580b74ebaf843271dceffed7c0ec79c..1051984ecaa9d19e16189cab2bcacd17d668e9aa 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigTrackingxAODCnv.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigTrackingxAODCnv.cxx
@@ -336,18 +336,6 @@ namespace InDet
return HLT::OK;
}
- //----------------------------------
- // endRun method:
- //----------------------------------------------------------------------------
- HLT::ErrorCode TrigTrackingxAODCnv::hltEndRun() {
-
- msg() << MSG::INFO << "TrigTrackingxAODCnv::endRun()" << endmsg;
-
- return HLT::OK;
- }
- //---------------------------------------------------------------------------
-
-
//---------------------------------------------------------------------------
// update the monitoring arrays
//---------------------------------------------------------------------------
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/FTK_TrackMaker.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/FTK_TrackMaker.h
index c0bcc7a1777d979a6e2631afb74931d373b068bd..0d5aff74fcdc6f7a486b216c123e6c65080edc24 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/FTK_TrackMaker.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/FTK_TrackMaker.h
@@ -46,7 +46,6 @@ namespace InDet{
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* input, HLT::TriggerElement* output);
HLT::ErrorCode hltFinalize () ;
- virtual HLT::ErrorCode hltEndRun();
//Method to prepare ROB ID list
using HLT::FexAlgo::prepareRobRequests;
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/Pixel_TrgClusterization.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/Pixel_TrgClusterization.h
index c5b4b9b652f520d0c525ef3f4166455f332a509a..47dce149cff064d507cd6c9a80397b08aa3b9871 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/Pixel_TrgClusterization.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/Pixel_TrgClusterization.h
@@ -81,7 +81,6 @@ namespace InDet {
virtual HLT::ErrorCode hltExecute(const HLT::TriggerElement* input,
HLT::TriggerElement* output);
virtual HLT::ErrorCode hltFinalize();
- virtual HLT::ErrorCode hltEndRun();
// Method to prepare ROB id list
using HLT::FexAlgo::prepareRobRequests;
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/SCT_TrgClusterization.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/SCT_TrgClusterization.h
index 306eb520c23d6ae5fbed8dc083f74b93052972a0..d9845ca991dcb9eddb38362adf5313d8c6d6f753 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/SCT_TrgClusterization.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/SCT_TrgClusterization.h
@@ -75,7 +75,6 @@ namespace InDet {
virtual HLT::ErrorCode hltExecute(const HLT::TriggerElement* input,
HLT::TriggerElement* output);
virtual HLT::ErrorCode hltFinalize();
- virtual HLT::ErrorCode hltEndRun();
// Method to prepare ROB id list
using HLT::FexAlgo::prepareRobRequests;
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/TRT_TrgRIO_Maker.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/TRT_TrgRIO_Maker.h
index e29b4a7afc109ac4fc913fe92b1afb0f818e4957..0dcfef16ca23a2aac69762d3f5336014dfadc267 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/TRT_TrgRIO_Maker.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/TRT_TrgRIO_Maker.h
@@ -56,7 +56,6 @@ namespace InDet{
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* input, HLT::TriggerElement* output);
HLT::ErrorCode hltFinalize () ;
- virtual HLT::ErrorCode hltEndRun();
//Method to prepare ROB ID list
using HLT::FexAlgo::prepareRobRequests;
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/FTK_TrackMaker.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/FTK_TrackMaker.cxx
index bdd9f484cd49a01bddbd6c1551826f23d88e440f..64ebce29bfe0f24ed3f4b1e21a259dd49f8cca50 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/FTK_TrackMaker.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/FTK_TrackMaker.cxx
@@ -181,16 +181,6 @@ namespace InDet{
return HLT::OK;
}
- //----------------------------------------------------------------------------
- HLT::ErrorCode FTK_TrackMaker::hltEndRun()
- {
- ATH_MSG_INFO( "FTK_TrackMaker::endRun()" );
-
- //errorSvc statistics
-
- return HLT::OK;
- }
-
//---------------------------------------------------------------------------
HLT::ErrorCode FTK_TrackMaker::prepareRobRequests(const HLT::TriggerElement* inputTE){
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx
index 656e882daef8920bc494883c1a90de3097957406..122d0509dc12380dd140d43bdf0877150d58f31e 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/Pixel_TrgClusterization.cxx
@@ -636,19 +636,6 @@ namespace InDet{
return HLT::OK;
}
- //----------------------------------
- // endRun method:
- //----------------------------------------------------------------------------
- HLT::ErrorCode Pixel_TrgClusterization::hltEndRun()
- {
-
- ATH_MSG_INFO( "Pixel_TrgClusterization::endRun()" );
-
- return HLT::OK;
- }
-
- //---------------------------------------------------------------------------
-
//-------------------------------------------------------------------------
HLT::ErrorCode Pixel_TrgClusterization::prepareRobRequests(const HLT::TriggerElement* inputTE ) {
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx
index 1ba3f147cdf3446d2ac45ede1979d96bd4757483..324afb09f239716f41568253b2f4c49d88f6fc69 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx
@@ -617,20 +617,6 @@ namespace InDet{
}
return HLT::OK;
}
- //----------------------------------
- // endRun method:
- //----------------------------------------------------------------------------
- HLT::ErrorCode SCT_TrgClusterization::hltEndRun() {
-
- // Get the messaging service, print where you are
- ATH_MSG_INFO( "SCT_TrgClusterization::hltEndRun()" );
-
- return HLT::OK;
- }
-
- //---------------------------------------------------------------------------
-
-
//-------------------------------------------------------------------------
HLT::ErrorCode SCT_TrgClusterization::prepareRobRequests(const HLT::TriggerElement* inputTE ) {
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx
index 449b3c527e4c683e7558ce9a9cb670cac1735466..2c546cee2e7194ecba9ac042c37d06234aa8e117 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx
@@ -514,19 +514,6 @@ namespace InDet{
return HLT::OK;
}
- //----------------------------------
- // endRun method:
- //----------------------------------------------------------------------------
- HLT::ErrorCode TRT_TrgRIO_Maker::hltEndRun()
- {
-
- ATH_MSG_INFO( "TRT_TrgRIO_Maker::endRun()" );
-
- return HLT::OK;
- }
-
- //---------------------------------------------------------------------------
-
//---------------------------------
// prepareRobRequests method:
//--------------------------------
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/InDetTrigTrackCollectionMerger/SimpleTrigTrackCollMerger.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/InDetTrigTrackCollectionMerger/SimpleTrigTrackCollMerger.h
index fb6fd264f009822ef87fc223a7c4a3a3c6bdb2bc..dd2bdbc61e4cc2c9c2130854b6458e4bdf9ddbe1 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/InDetTrigTrackCollectionMerger/SimpleTrigTrackCollMerger.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/InDetTrigTrackCollectionMerger/SimpleTrigTrackCollMerger.h
@@ -43,7 +43,6 @@ namespace Trk {
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* input, HLT::TriggerElement* output);
HLT::ErrorCode hltFinalize();
- HLT::ErrorCode hltEndRun();
private:
HLT::ErrorCode mergeTrack(const TrackCollection* trackCol, TrackCollection* outputCol);
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/SimpleTrigTrackCollMerger.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/SimpleTrigTrackCollMerger.cxx
index f0c18a10cae8f8200f3a0d1a205fa19c42c3772a..26c13618d09e765d1a584ac69426709d5f569d98 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/SimpleTrigTrackCollMerger.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/SimpleTrigTrackCollMerger.cxx
@@ -147,16 +147,6 @@ namespace Trk {
return HLT::OK;
}
- //----------------------------------
- // endRun method:
- //----------------------------------------------------------------------------
- HLT::ErrorCode SimpleTrigTrackCollMerger::hltEndRun() {
- msg() << MSG::INFO << name() << "::hltEndRun()" << endmsg;
-
- return HLT::OK;
- }
- //----------------------------------------------------------------------------
-
//----------------------------------
// finalize method:
//----------------------------------------------------------------------------
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/InDetTrigTrackResidualMonitor/TrigTrackResidualMonitor.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/InDetTrigTrackResidualMonitor/TrigTrackResidualMonitor.h
index 469455419d46655ca6f4457dcaee5542af169207..eb6d37a43c91d00cb322a83598b3a5293dea195d 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/InDetTrigTrackResidualMonitor/TrigTrackResidualMonitor.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/InDetTrigTrackResidualMonitor/TrigTrackResidualMonitor.h
@@ -75,7 +75,6 @@ namespace InDet
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* input, HLT::TriggerElement* output);
HLT::ErrorCode hltFinalize();
- HLT::ErrorCode hltEndRun();
private:
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/TrigTrackResidualMonitor.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/TrigTrackResidualMonitor.cxx
index 0c36940b3267f3c2b0627d2820039b47d0ad9947..9f2cec38bfb80dc4ab2f607c61ca00b842d146a3 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/TrigTrackResidualMonitor.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/TrigTrackResidualMonitor.cxx
@@ -696,16 +696,6 @@ namespace InDet
return HLT::OK;
}
- //----------------------------------
- // endRun method:
- //----------------------------------------------------------------------------
- HLT::ErrorCode TrigTrackResidualMonitor::hltEndRun() {
-
- msg() << MSG::INFO << "TrigTrackResidualMonitor::endRun()" << endmsg;
-
- return HLT::OK;
- }
- //---------------------------------------------------------------------------
} // end namespace
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/InDetTrigTrackSlimmer/TrigTrackSlimmer.h b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/InDetTrigTrackSlimmer/TrigTrackSlimmer.h
index 556eb4d982f6bc8811af841eed7a4a30434d8388..0aa421ec3f9c663733fcf4e4f355dc4dc8f4a9ef 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/InDetTrigTrackSlimmer/TrigTrackSlimmer.h
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/InDetTrigTrackSlimmer/TrigTrackSlimmer.h
@@ -40,7 +40,6 @@ namespace InDet
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* input, HLT::TriggerElement* output);
HLT::ErrorCode hltFinalize();
- HLT::ErrorCode hltEndRun();
private:
ToolHandle<Trk::ITrackSlimmingTool> m_trackSlimmingTool;
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/TrigTrackSlimmer.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/TrigTrackSlimmer.cxx
index aecd40429eac00b82794f1bac76e7f0c3f39a098..dc854b9cad543c1f6352ed2324b11f76ff00def2 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/TrigTrackSlimmer.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/TrigTrackSlimmer.cxx
@@ -143,16 +143,6 @@ namespace InDet
return HLT::OK;
}
- //----------------------------------
- // endRun method:
- //----------------------------------------------------------------------------
- HLT::ErrorCode TrigTrackSlimmer::hltEndRun() {
-
- msg() << MSG::INFO << "TrigTrackSlimmer::endRun()" << endmsg;
-
- return HLT::OK;
- }
- //---------------------------------------------------------------------------
} // end namespace
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h
index 184ee858f105d7419bcc29b5adabf21066ad0ef0..3d26f1ce18aabd776a43ebe158a5b311e8951562 100755
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h
@@ -66,7 +66,6 @@ namespace InDet {
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* input, HLT::TriggerElement* output);
HLT::ErrorCode hltFinalize();
- HLT::ErrorCode hltEndRun();
///////////////////////////////////////////////////////////////////
//!< Print internal tool parameters and status
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/SiTrigSPSeededTrackFinder.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/SiTrigSPSeededTrackFinder.cxx
index 24ffd1dee1438091e74753e5c66e00f6e3efbfc9..71aecb1c72b3628bc44814dbbb26531af448bbd4 100755
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/SiTrigSPSeededTrackFinder.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/SiTrigSPSeededTrackFinder.cxx
@@ -703,17 +703,6 @@ HLT::ErrorCode InDet::SiTrigSPSeededTrackFinder::hltFinalize() {
<< ". Invoked " << m_nInvoked << " times." << endmsg;
return HLT::OK;
}
-//----------------------------------
-// endRun method:
-//----------------------------------------------------------------------------
-HLT::ErrorCode InDet::SiTrigSPSeededTrackFinder::hltEndRun() {
-
- msg() << MSG::INFO << "SiTrigSPSeededTrackFinder::endRun()" << endmsg;
-
- return HLT::OK;
-}
-
-//---------------------------------------------------------------------------
///////////////////////////////////////////////////////////////////
// Overload of << operator MsgStream
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/SiTrigSpacePointFormation/SiTrigSpacePointFinder.h b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/SiTrigSpacePointFormation/SiTrigSpacePointFinder.h
index ca4c3ef7a5ec941058456bd638b5c24d5c001fc0..dd19b81cd02401ab67aac397b0538b792ef6dcae 100755
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/SiTrigSpacePointFormation/SiTrigSpacePointFinder.h
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/SiTrigSpacePointFormation/SiTrigSpacePointFinder.h
@@ -72,7 +72,6 @@ namespace InDet{
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* input, HLT::TriggerElement* output);
HLT::ErrorCode hltFinalize();
- HLT::ErrorCode hltEndRun();
private:
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SiTrigSpacePointFinder.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SiTrigSpacePointFinder.cxx
index 3d890832e31eabd533f8cd17e0f1569e8d902757..4b09b75daa687d95f11da9beae9d1edae8e78fcb 100755
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SiTrigSpacePointFinder.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/SiTrigSpacePointFinder.cxx
@@ -782,15 +782,4 @@ namespace InDet{
return HLT::OK;
}
- //----------------------------------
- // endRun method:
- //----------------------------------------------------------------------------
- HLT::ErrorCode SiTrigSpacePointFinder::hltEndRun(){
-
- // Get the messaging service, print where you are
- ATH_MSG_INFO( "SiTrigSpacePointFinder::endRun()" );
-
- return HLT::OK;
- }
- //---------------------------------------------------------------------------
}
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder.h b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder.h
index bc4989c817382f591221cf11c2c114fc00b12911..0bd6c21f5fa28dd4e4d0d86f88c52f6ff53233f7 100755
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder.h
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder.h
@@ -39,7 +39,6 @@ namespace InDet {
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* input, HLT::TriggerElement* output);
HLT::ErrorCode hltFinalize();
- HLT::ErrorCode hltEndRun();
//parameters for monitoring
double m_RoIPhi;
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/TRT_TrigTrackSegmentsFinder.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/TRT_TrigTrackSegmentsFinder.cxx
index 1784d7f2c2a9ed76e1f3d6c9374e9bdd24e7edbb..1c736dfaad197f742532831258daf99c556db7ce 100755
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/TRT_TrigTrackSegmentsFinder.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/TRT_TrigTrackSegmentsFinder.cxx
@@ -207,16 +207,6 @@ HLT::ErrorCode InDet::TRT_TrigTrackSegmentsFinder::hltFinalize() {
return HLT::OK;
}
-//----------------------------------
-// endRun method:
-//----------------------------------------------------------------------------
-HLT::ErrorCode InDet::TRT_TrigTrackSegmentsFinder::hltEndRun() {
-
- msg() << MSG::INFO << "TRT_TrigTrackSegmentsFinder::endRun()" << endmsg;
-
- return HLT::OK;
-}
-
///////////////////////////////////////////////////////////////////
// Overload of << operator MsgStream
///////////////////////////////////////////////////////////////////
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/TrigEgammaRec/TrigEgammaRec.h b/Trigger/TrigAlgorithms/TrigEgammaRec/TrigEgammaRec/TrigEgammaRec.h
index 07366757df8a32317095b7bfde80b075a5be73e4..5e86e07598dd278d6be45ca9247fa04215c94d38 100755
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/TrigEgammaRec/TrigEgammaRec.h
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/TrigEgammaRec/TrigEgammaRec.h
@@ -69,7 +69,6 @@ public:
HLT::TriggerElement* outputTE );
HLT::ErrorCode hltStart();
- HLT::ErrorCode hltEndRun();
private:
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx b/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
index e299040140c855f3741020d1366a4b13674556c9..0677b8af109ac027e520c576476cf8c65af5ab11 100755
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
@@ -574,15 +574,6 @@ HLT::ErrorCode TrigEgammaRec::hltFinalize() {
return HLT::OK;
}
-/////////////////////////////////////////////////////////////////
-// endRun method:
-
-HLT::ErrorCode TrigEgammaRec::hltEndRun()
-{
- if(msgLvl() <= MSG::INFO) msg() << MSG::INFO << "in endRun()" << endmsg;
- return HLT::OK;
-}
-
//////////////////////////////////////////////////
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/AcceptL1TopoMonitor.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/AcceptL1TopoMonitor.cxx
index 0166cb227fcec40a61d472e588c656ee5818f5f0..b86ad0118f3075b382d2b31960535a31129802fd 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/AcceptL1TopoMonitor.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/AcceptL1TopoMonitor.cxx
@@ -457,9 +457,8 @@ HLT::ErrorCode AcceptL1TopoMonitor::hltBeginRun()
return HLT::OK;
}
//----------------------------------------------------------
-HLT::ErrorCode AcceptL1TopoMonitor::hltEndRun()
+HLT::ErrorCode AcceptL1TopoMonitor::hltStop()
{
- ATH_MSG_INFO("endRun");
ATH_MSG_DEBUG("Error counters:");
ATH_MSG_DEBUG("GenericRoiError : "<<m_counterGenericRoiError);
ATH_MSG_DEBUG("GenericDaqError : "<<m_counterGenericDaqError);
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/AcceptL1TopoMonitor.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/AcceptL1TopoMonitor.h
index 605b0399a9c99ab0a23e780fe23f0cb15661e6d8..fe8954f6d04f242df3435a7b16f9359b95b34e49 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/AcceptL1TopoMonitor.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/AcceptL1TopoMonitor.h
@@ -67,7 +67,7 @@ public:
HLT::ErrorCode hltExecute(std::vector<HLT::TEVec>&, unsigned int outputTeType);
HLT::ErrorCode hltFinalize();
HLT::ErrorCode hltBeginRun();
- HLT::ErrorCode hltEndRun();
+ HLT::ErrorCode hltStop();
private:
static const unsigned int m_nTopoCTPOutputs = 128; //! Number of CTP outputs, used for histogram ranges and loops
/**
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx
index 45af898de357824d00766a908688c463bb9f56bf..54a283dd0440498d53888778f98384d88429e500 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.cxx
@@ -34,15 +34,6 @@ namespace PESA
TrigRoiUpdater::~TrigRoiUpdater()
{}
- //----------------------------------
- // beginRun method:
- //----------------------------------------------------------------------------
- HLT::ErrorCode TrigRoiUpdater::hltBeginRun() {
- ATH_MSG_DEBUG("TrigRoiUpdater::beginRun()");
-
- return HLT::OK;
- }
- //----------------------------------------------------------------------------
///////////////////////////////////////////////////////////////////
// Initialisation
@@ -224,16 +215,6 @@ namespace PESA
return HLT::OK;
}
- //----------------------------------
- // endRun method:
- //----------------------------------------------------------------------------
- HLT::ErrorCode TrigRoiUpdater::hltEndRun() {
-
- ATH_MSG_DEBUG("TrigRoiUpdater::endRun()");
-
- return HLT::OK;
- }
- //---------------------------------------------------------------------------
} // end namespace
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.h
index bd57ab0bc7c83ed5ea17115438508703bd210e6d..d07974d7d0e6e084034e7e5e108ef2b3d7c609d8 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/TrigRoiUpdater.h
@@ -33,12 +33,10 @@ namespace PESA
public:
TrigRoiUpdater(const std::string &name, ISvcLocator *pSvcLocator);
virtual ~TrigRoiUpdater();
- HLT::ErrorCode hltBeginRun();
HLT::ErrorCode hltInitialize();
virtual void handle(const Incident& inc);
HLT::ErrorCode hltExecute(const HLT::TriggerElement* input, HLT::TriggerElement* output);
HLT::ErrorCode hltFinalize();
- HLT::ErrorCode hltEndRun();
private:
diff --git a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/TrigL2LongLivedParticles/MuonCluster.h b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/TrigL2LongLivedParticles/MuonCluster.h
index b8cca0cd2c4b854965af8612a8246a5fad8dacef..cc7446de4661eff2d8af86baabd2b650a20aa75e 100644
--- a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/TrigL2LongLivedParticles/MuonCluster.h
+++ b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/TrigL2LongLivedParticles/MuonCluster.h
@@ -42,11 +42,6 @@ public:
MuonCluster(const std::string& name, ISvcLocator* svc);
~MuonCluster();
- /** hltBeginRun() */
- HLT::ErrorCode hltBeginRun();
- /** hltEndRun() */
- HLT::ErrorCode hltEndRun();
-
/** hltInitialize() */
HLT::ErrorCode hltInitialize();
/** hltFinalize() */
diff --git a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/TrigL2LongLivedParticles/MuonClusterIsolation.h b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/TrigL2LongLivedParticles/MuonClusterIsolation.h
index dc4ceab0988dedd161c49a31be4ac3e6b16cb18c..412e46c9e7466b1468afac4ed84f109d43c69dec 100644
--- a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/TrigL2LongLivedParticles/MuonClusterIsolation.h
+++ b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/TrigL2LongLivedParticles/MuonClusterIsolation.h
@@ -44,11 +44,6 @@ public:
MuonClusterIsolation(const std::string& name, ISvcLocator* svc);
~MuonClusterIsolation();
- /** hltBeginRun() */
- HLT::ErrorCode hltBeginRun();
- /** hltEndRun() */
- HLT::ErrorCode hltEndRun();
-
/** hltInitialize() */
HLT::ErrorCode hltInitialize();
/** hltFinalize() */
diff --git a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonCluster.cxx b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonCluster.cxx
index b0e6a8594901d9bf1370ae1015557a558767a73c..830ce43cd745df0eb6457abda3752f79832ff24a 100644
--- a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonCluster.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonCluster.cxx
@@ -84,16 +84,6 @@ HLT::ErrorCode MuonCluster::hltInitialize() {
return HLT::OK;
}
-HLT::ErrorCode MuonCluster::hltBeginRun() {
- msg() << MSG::INFO << "hltBeginRun"<< endmsg;
- return HLT::OK;
-}
-
-HLT::ErrorCode MuonCluster::hltEndRun() {
- msg() << MSG::INFO << "hltEndRun"<< endmsg;
- return HLT::OK;
-}
-
HLT::ErrorCode MuonCluster::hltFinalize() {
msg() << MSG::INFO << "hltFinalize()" << endmsg;
return HLT::OK;
diff --git a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonClusterIsolation.cxx b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonClusterIsolation.cxx
index 0033ac76501dc1fdfa2f07104d47485b8caadf03..0e8345a2fea14a192d2c0d7870388ea33edd1110 100644
--- a/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonClusterIsolation.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2LongLivedParticles/src/MuonClusterIsolation.cxx
@@ -100,16 +100,6 @@ HLT::ErrorCode MuonClusterIsolation::hltInitialize() {
return HLT::OK;
}
-HLT::ErrorCode MuonClusterIsolation::hltBeginRun() {
- msg() << MSG::INFO << "hltBeginRun"<< endmsg;
- return HLT::OK;
-}
-
-HLT::ErrorCode MuonClusterIsolation::hltEndRun() {
- msg() << MSG::INFO << "hltEndRun"<< endmsg;
- return HLT::OK;
-}
-
HLT::ErrorCode MuonClusterIsolation::hltFinalize() {
msg() << MSG::INFO << "hltFinalize()" << endmsg;
return HLT::OK;
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastSteering.h b/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastSteering.h
index 72ba07c2afecf49010e3767627b07325aa539df7..8c74fd38be3073b0173e55b79a118c55bd94448e 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastSteering.h
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastSteering.h
@@ -63,10 +63,8 @@ class MuFastSteering : public HLT::FexAlgo,
MuFastSteering(const std::string& name, ISvcLocator* svc);
~MuFastSteering();
- /** hltBeginRun() */
- HLT::ErrorCode hltBeginRun();
- /** hltEndRun() */
- HLT::ErrorCode hltEndRun();
+ /** hltStop() */
+ HLT::ErrorCode hltStop();
/** hltInitialize() */
HLT::ErrorCode hltInitialize();
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx
index ee833e58e3d8e025c3b2aa287417761e0bdd601a..1130a016bc0929b5a29cb71460d409046acaebc3 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/MuFastSteering.cxx
@@ -233,15 +233,8 @@ HLT::ErrorCode MuFastSteering::hltInitialize()
}
// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-HLT::ErrorCode MuFastSteering::hltBeginRun() {
- ATH_MSG_DEBUG("hltBeginRun");
- return HLT::OK;
-}
-HLT::ErrorCode MuFastSteering::hltEndRun() {
- ATH_MSG_DEBUG("hltEndRun");
+HLT::ErrorCode MuFastSteering::hltStop() {
// close the calibration stream
if (m_doCalStream) {
if ( !m_calDataScouting ) {
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountSpacePoints.h b/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountSpacePoints.h
index 0f7ea7d54829fddc81aaa97b1550b102a1daf7a4..5aa83a073863e7bb0b0959780e7b9cb4205489a5 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountSpacePoints.h
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountSpacePoints.h
@@ -33,7 +33,6 @@ class TrigCountSpacePoints: public HLT::AllTEAlgo {
virtual ~TrigCountSpacePoints();
HLT::ErrorCode hltInitialize(); //!< hlt initialize
- HLT::ErrorCode hltBeginRun();
HLT::ErrorCode hltFinalize(); //!< hlt finalize
HLT::ErrorCode hltExecute(std::vector<std::vector<HLT::TriggerElement*> >& input, unsigned int output);
StatusCode fillCollections( bool, bool, std::vector<int>&, std::vector<int>& );
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountSpacePointsHypo.h b/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountSpacePointsHypo.h
index 779390b5a8bc4013d365446bfc29662bd319e6cd..ea1d46a62b49f0250d2c9299d91e6682de06285d 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountSpacePointsHypo.h
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountSpacePointsHypo.h
@@ -16,7 +16,6 @@ class TrigCountSpacePointsHypo: public HLT::HypoAlgo {
TrigCountSpacePointsHypo(const std::string & name, ISvcLocator* pSvcLocator);
HLT::ErrorCode hltInitialize();
- HLT::ErrorCode hltBeginRun();
HLT::ErrorCode hltFinalize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* outputTE, bool& pass);
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountTrtHits.h b/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountTrtHits.h
index 5e1f9829ef673e5078c15a1133f74ee6c94e3655..8b2d4e32a8ac797c1cdfb7047cf770cc05c3b97b 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountTrtHits.h
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountTrtHits.h
@@ -29,7 +29,6 @@ class TrigCountTrtHits: public HLT::AllTEAlgo {
virtual ~TrigCountTrtHits(void);
HLT::ErrorCode hltInitialize();
- HLT::ErrorCode hltBeginRun();
HLT::ErrorCode hltFinalize();
HLT::ErrorCode hltExecute(std::vector<std::vector<HLT::TriggerElement*> >& input, unsigned int output);
StatusCode fillCollections( bool, bool, std::vector<int>&, std::vector<int>& );
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountTrtHitsHypo.h b/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountTrtHitsHypo.h
index 289ec60e7a6f249acde0d85604a23c6d8fe8bc2b..5fdb8972b6a5d61f44b1ce2f62b8279574783f88 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountTrtHitsHypo.h
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountTrtHitsHypo.h
@@ -15,7 +15,6 @@ class TrigCountTrtHitsHypo: public HLT::HypoAlgo {
~TrigCountTrtHitsHypo();
HLT::ErrorCode hltInitialize();
- HLT::ErrorCode hltBeginRun();
HLT::ErrorCode hltFinalize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* outputTE, bool& pass);
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.cxx
index f2d727158eb65ebf7e459928c150496c70cc8562..9a54d5be7c6c27a0694b5e1214b3b182ce14cae9 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.cxx
@@ -246,13 +246,6 @@ HLT::ErrorCode TrigCountSpacePoints::hltInitialize() {
}
-//---------------------------------------------------------------------------------------------------------------------------------------------
-HLT::ErrorCode TrigCountSpacePoints::hltBeginRun() {
- // This initialisation has been moved into the event loop.
- // @see TrigCountSpacePoints::checkDetectorMask
- ATH_MSG_DEBUG(" TrigCountSpacePoints will be initialized in hltExecute");
- return HLT::OK;
-}
//---------------------------------------------------------------------------------------------------------------------------------------------
HLT::ErrorCode TrigCountSpacePoints::checkDetectorMask() {
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePointsHypo.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePointsHypo.cxx
index 80579e3ff9fcb45463f4b84622f06ec9c72e3d9e..30de8f21f8ab7f916b76a449d3c7fd4e4af8bc0b 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePointsHypo.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePointsHypo.cxx
@@ -167,13 +167,6 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltInitialize() {
return HLT::OK;
}
-//-----------------------------------------------------------------------------
-HLT::ErrorCode TrigCountSpacePointsHypo::hltBeginRun() {
- // This initialisation has been moved into the event loop.
- // @see TrigCountSpacePointsHypo::checkDetectorMask
- ATH_MSG_DEBUG(" TrigCountSpacePointsHypo will be initialized in hltExecute");
- return HLT::OK;
-}
//---------------------------------------------------------------------------------------------------------------------------------------------
HLT::ErrorCode TrigCountSpacePointsHypo::checkDetectorMask() {
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHits.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHits.cxx
index 3ce241d8e3b6463a97a76d4829b2b5ad24832c9f..c6c1333caa59ee8732695b4a8afa21d9412942d2 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHits.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHits.cxx
@@ -120,13 +120,6 @@ HLT::ErrorCode TrigCountTrtHits::hltInitialize() {
return HLT::OK;
}
-//---------------------------------------------------------------------------------------------------------------------------------------------
-HLT::ErrorCode TrigCountTrtHits::hltBeginRun() {
- // This initialisation has been moved into the event loop.
- // @see TrigCountTrtHitsHypo::checkDetectorMask
- ATH_MSG_DEBUG(" TrigCountTrtHits will be initialized in hltExecute");
- return HLT::OK;
-}
//---------------------------------------------------------------------------------------------------------------------------------------------
HLT::ErrorCode TrigCountTrtHits::checkDetectorMask() {
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHitsHypo.cxx b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHitsHypo.cxx
index aa9d4bc2a8b0a6436bb398a1d0666df52265dd2f..b493d140c02d368d34b90631d297cf75f2d2fd97 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHitsHypo.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountTrtHitsHypo.cxx
@@ -57,13 +57,6 @@ HLT::ErrorCode TrigCountTrtHitsHypo::hltInitialize() {
return HLT::OK;
}
-//---------------------------------------------------------------------------------------------------------------------------------------------
-HLT::ErrorCode TrigCountTrtHitsHypo::hltBeginRun() {
- // This initialisation has been moved into the event loop.
- // @see TrigCountTrtHitsHypo::checkDetectorMask
- ATH_MSG_DEBUG(" TrigCountTrtHitsHypo will be initialized in hltExecute");
- return HLT::OK;
-}
//-----------------------------------------------------------------------------
HLT::ErrorCode TrigCountTrtHitsHypo::checkDetectorMask() {
diff --git a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypo.cxx b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypo.cxx
index 8c7e633895ed93ef2de1ff8474583f991570a36c..8842fb9b5694d465006c9c2951688368de090ab7 100644
--- a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypo.cxx
+++ b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypo.cxx
@@ -32,12 +32,6 @@ HLT::ErrorCode TrigTRTHTHhypo::hltInitialize() {
return HLT::OK;
}
-//-----------------------------------------------------------------------------
-HLT::ErrorCode TrigTRTHTHhypo::hltBeginRun() {
- ATH_MSG_DEBUG ( "hltBeginRun of " << name());
-
- return HLT::OK;
-}
//---------------------------------------------------------------------------------------------------------------------------------------------
HLT::ErrorCode TrigTRTHTHhypo::hltExecute(const HLT::TriggerElement* outputTE,
diff --git a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypo.h b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypo.h
index f47b83f0aef2d188a3caa626e60e1f8605f26199..a73fb80ae093d8c1d99507adc69cf3e596318009 100644
--- a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypo.h
+++ b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHhypo.h
@@ -21,7 +21,6 @@ class TrigTRTHTHhypo: public HLT::HypoAlgo {
TrigTRTHTHhypo(const std::string & name, ISvcLocator* pSvcLocator);
HLT::ErrorCode hltInitialize();
- HLT::ErrorCode hltBeginRun();
HLT::ErrorCode hltFinalize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* outputTE, bool& pass);
diff --git a/Trigger/TrigAlgorithms/TrigmuIso/TrigmuIso/muIso.h b/Trigger/TrigAlgorithms/TrigmuIso/TrigmuIso/muIso.h
index 63895edb13b3512afdc0544d85341a5183306c8e..534ea6cde1a9a6520ed08d5fd2fc167c111d6394 100755
--- a/Trigger/TrigAlgorithms/TrigmuIso/TrigmuIso/muIso.h
+++ b/Trigger/TrigAlgorithms/TrigmuIso/TrigmuIso/muIso.h
@@ -41,8 +41,6 @@ class muIso: public HLT::FexAlgo {
HLT::ErrorCode hltExecute(const HLT::TriggerElement* inputTE, HLT::TriggerElement* outputTE);
/** hltInitialize. Called by the Steering. */
HLT::ErrorCode hltInitialize();
- /** hltBeginRun. Called by the Steering. */
- HLT::ErrorCode hltBeginRun();
/** hltFinalize. Called by the Steering. */
HLT::ErrorCode hltFinalize();
diff --git a/Trigger/TrigAlgorithms/TrigmuIso/src/muIso.cxx b/Trigger/TrigAlgorithms/TrigmuIso/src/muIso.cxx
index 19d31db17e1c8c3839c78b8b8fe0c19a686cf669..03ec745cb3ca39429f6706be9e411eacf6d03c2a 100755
--- a/Trigger/TrigAlgorithms/TrigmuIso/src/muIso.cxx
+++ b/Trigger/TrigAlgorithms/TrigmuIso/src/muIso.cxx
@@ -102,15 +102,6 @@ HLT::ErrorCode muIso::hltFinalize()
return HLT::OK;
}
-HLT::ErrorCode muIso::hltBeginRun()
-{
-
- ATH_MSG_INFO( "At BeginRun of " << name() << " - package version "
- << PACKAGE_VERSION );
-
- return HLT::OK;
-}
-
HLT::ErrorCode muIso::hltExecute(const HLT::TriggerElement* inputTE, HLT::TriggerElement* outputTE)
{
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/TrigEgammaHypo/TrigEFElectronHypo.h b/Trigger/TrigHypothesis/TrigEgammaHypo/TrigEgammaHypo/TrigEFElectronHypo.h
index 7a391741d46a2dc6d9f0205ce263479a6c686d75..049d85ff7aaafcd4a90813bc1de984802011c6b8 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/TrigEgammaHypo/TrigEFElectronHypo.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/TrigEgammaHypo/TrigEFElectronHypo.h
@@ -75,7 +75,7 @@ class TrigEFElectronHypo : public HLT::HypoAlgo {
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltFinalize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* outputTE, bool& pass);
- HLT::ErrorCode hltBeginRun();
+ HLT::ErrorCode hltStart();
/** Find the impact parameter by extrapolating to either the beam spot or (0,0) **/
double findImpact(const xAOD::TrackParticle* track) const;//AT: copied from Offline
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/TrigEgammaHypo/TrigEFPhotonHypo.h b/Trigger/TrigHypothesis/TrigEgammaHypo/TrigEgammaHypo/TrigEFPhotonHypo.h
index 7bc8fb0441378b3d4617cc7c294bbec98c705465..259106a3d2c0ebc1ff973ca1e075fcd902d21f20 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/TrigEgammaHypo/TrigEFPhotonHypo.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/TrigEgammaHypo/TrigEFPhotonHypo.h
@@ -75,7 +75,7 @@ class TrigEFPhotonHypo : public HLT::HypoAlgo {
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltFinalize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* outputTE, bool& pass);
- HLT::ErrorCode hltBeginRun();
+ HLT::ErrorCode hltStart();
private:
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/TrigEgammaHypo/TrigEFTrackHypo.h b/Trigger/TrigHypothesis/TrigEgammaHypo/TrigEgammaHypo/TrigEFTrackHypo.h
index c523ddfc61cbb57a336a1e9fb24fe08c97e0ca9a..adef7a4204373fa79d2181fb6babf55e8d0d2761 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/TrigEgammaHypo/TrigEFTrackHypo.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/TrigEgammaHypo/TrigEFTrackHypo.h
@@ -43,7 +43,6 @@ class TrigEFTrackHypo : public HLT::HypoAlgo {
~TrigEFTrackHypo();
HLT::ErrorCode hltInitialize();
- HLT::ErrorCode hltBeginRun();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* outputTE, bool& pass);
HLT::ErrorCode hltFinalize();
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFElectronHypo.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFElectronHypo.cxx
index 3358b887fb2d4c36042b1dc5b79962b9928d2333..993b0c3096fe102a5d7e70e8201b8cc795040a84 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFElectronHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFElectronHypo.cxx
@@ -340,7 +340,7 @@ HLT::ErrorCode TrigEFElectronHypo::hltInitialize()
return HLT::OK;
}
-HLT::ErrorCode TrigEFElectronHypo::hltBeginRun() {
+HLT::ErrorCode TrigEFElectronHypo::hltStart() {
prepareMonitoringVars();
return HLT::OK;
}
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFPhotonHypo.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFPhotonHypo.cxx
index eb7615e0efd1bc9cb8c8273ad53c5238281bb88a..de8f6271eee89796f2ef7d26e239babfd2148251 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFPhotonHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFPhotonHypo.cxx
@@ -225,7 +225,7 @@ HLT::ErrorCode TrigEFPhotonHypo::hltInitialize()
}
-HLT::ErrorCode TrigEFPhotonHypo::hltBeginRun() {
+HLT::ErrorCode TrigEFPhotonHypo::hltStart() {
prepareMonitoringVars();
return HLT::OK;
}
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFTrackHypo.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFTrackHypo.cxx
index 8714e162397fa0c750691ba3807aa97012d065e4..9f2e33ae94e57545886e3cabbd11e904eb0efb10 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFTrackHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFTrackHypo.cxx
@@ -79,16 +79,6 @@ TrigEFTrackHypo::~TrigEFTrackHypo()
// sub-algorithms. The framework takes care of it.
/////////////////////////////////////////////////////////////////////
//
-//----------------------------------
-// beginRun method:
-//----------------------------------------------------------------------------
-HLT::ErrorCode TrigEFTrackHypo::hltBeginRun(){
-
- msg() << MSG::INFO << "TrigEFTrackHypo::beginRun()" << endmsg;
- return HLT::OK;
-
-}
-//----------------------------------------------------------------------------
// ----------------------------------------------------------------------
HLT::ErrorCode TrigEFTrackHypo::hltInitialize() {
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.cxx b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.cxx
index 46b3a0c962af1c3bc1dca8ffd5cd503cf7f603fe..1e9a66c0a39216509b6bb935f53e53fb6fe2229d 100755
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.cxx
@@ -83,16 +83,6 @@ TrigHIEFTrackHypo::~TrigHIEFTrackHypo()
// sub-algorithms. The framework takes care of it.
/////////////////////////////////////////////////////////////////////
//
-//----------------------------------
-// beginRun method:
-//----------------------------------------------------------------------------
-HLT::ErrorCode TrigHIEFTrackHypo::hltBeginRun(){
-
- msg() << MSG::INFO << "TrigHIEFTrackHypo::beginRun()" << endmsg;
- return HLT::OK;
-
-}
-//----------------------------------------------------------------------------
// ----------------------------------------------------------------------
HLT::ErrorCode TrigHIEFTrackHypo::hltInitialize() {
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.h b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.h
index 9e118388a91ad51fb9ba0ebdd177d6324a6b4d84..f8cb76781f200eb9020563401e7c4d9fb4f4d5ed 100755
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.h
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.h
@@ -45,7 +45,6 @@ class TrigHIEFTrackHypo : public HLT::HypoAlgo {
~TrigHIEFTrackHypo();
HLT::ErrorCode hltInitialize();
- HLT::ErrorCode hltBeginRun();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* outputTE, bool& pass);
HLT::ErrorCode hltFinalize();
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIL2VtxMultHypo.cxx b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIL2VtxMultHypo.cxx
index edd78c3fc0d8c828f8432bf0cf50a504e99c2081..017c1c3430b9a34eda68ef87c00c9972a3df478e 100755
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIL2VtxMultHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIL2VtxMultHypo.cxx
@@ -49,17 +49,6 @@ TrigHIL2VtxMultHypo::~TrigHIL2VtxMultHypo(){
}
-///
-/// Initialise - beginRun
-///
-HLT::ErrorCode TrigHIL2VtxMultHypo::hltBeginRun(){
-
- msg() << MSG::INFO << "TrigHIL2VtxMultHypo::beginRun()" << endmsg;
- return HLT::OK;
-
-}
-
-
///
/// Initialise
///
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIL2VtxMultHypo.h b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIL2VtxMultHypo.h
index 0ac7442caf38569557614bb67613788d4f883354..67ea06b074bcabc64e83f80a7d89e32970b6b838 100755
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIL2VtxMultHypo.h
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIL2VtxMultHypo.h
@@ -37,7 +37,6 @@ class TrigHIL2VtxMultHypo : public HLT::HypoAlgo {
~TrigHIL2VtxMultHypo();
HLT::ErrorCode hltInitialize();
- HLT::ErrorCode hltBeginRun();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* outputTE, bool& pass);
HLT::ErrorCode hltFinalize();
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypo.hxx b/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypo.hxx
index fb7077eaf048254c9f1d4b1b9171ee7e7d185f85..1c899f4a209341a1b484eba7edfdc0c5083e269c 100755
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypo.hxx
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypo.hxx
@@ -33,8 +33,6 @@ public:
~L1InfoHypo();
HLT::ErrorCode hltInitialize();
- HLT::ErrorCode hltBeginRun();
- HLT::ErrorCode hltEndRun();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* outputTE,bool &Pass);
HLT::ErrorCode hltFinalize();
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.cxx b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.cxx
index f1492f4152b2beddb7d8d3601285f79a4f22ff1a..e1a7bca9d9a3cc7cc09bdf6c84c26448f0fc4383 100755
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.cxx
@@ -81,19 +81,6 @@ HLT::ErrorCode L1InfoHypo::hltInitialize()
return HLT::OK;
}
-HLT::ErrorCode L1InfoHypo::hltBeginRun()
-{
- msg() << MSG::DEBUG << "beginRun"<< endmsg;
-
- return HLT::OK;
-}
-
-HLT::ErrorCode L1InfoHypo::hltEndRun()
-{
- msg() << MSG::DEBUG << "endRun"<< endmsg;
- return HLT::OK;
-}
-
HLT::ErrorCode L1InfoHypo::hltFinalize()
{
msg() << MSG::DEBUG << "finalize()" << endmsg;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigEFMuonOverlapRemover.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigEFMuonOverlapRemover.h
index 164838a3dce0e7309066f160818bc84f9d077596..3b43ef176ae91c20f832757fff651d9e49ccde6a 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigEFMuonOverlapRemover.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigEFMuonOverlapRemover.h
@@ -44,7 +44,7 @@ class TrigEFMuonOverlapRemover : public HLT::AllTEAlgo
HLT::ErrorCode hltInitialize() { return HLT::OK; } //!< hlt initialize, doing nothing here
HLT::ErrorCode hltFinalize() { return HLT::OK; } //!< hlt finalize, doing nothing here
- virtual HLT::ErrorCode hltBeginRun();
+ virtual HLT::ErrorCode hltStart();
HLT::ErrorCode hltExecute(std::vector<std::vector<HLT::TriggerElement*> >& input,
unsigned int output);
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigL2MuonOverlapRemover.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigL2MuonOverlapRemover.h
index d6daef3ac6c455c4662a0368b5c00d56596a48d5..81fececef7ad54e1c4a0d8a8349ddedbd6a9ecf3 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigL2MuonOverlapRemover.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigL2MuonOverlapRemover.h
@@ -38,7 +38,7 @@ class TrigL2MuonOverlapRemover : public HLT::AllTEAlgo
HLT::ErrorCode hltInitialize() { return HLT::OK; } //!< hlt initialize, doing nothing here
HLT::ErrorCode hltFinalize() { return HLT::OK; } //!< hlt finalize, doing nothing here
- virtual HLT::ErrorCode hltBeginRun();
+ virtual HLT::ErrorCode hltStart();
HLT::ErrorCode hltExecute(std::vector<std::vector<HLT::TriggerElement*> >& input,
unsigned int output);
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerDiMuonMassHypo.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerDiMuonMassHypo.h
index 72634cd7399592374a516c4fccb8af91dcf4fe52..784c49617f236635af80245a06cf367736ba0024 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerDiMuonMassHypo.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerDiMuonMassHypo.h
@@ -21,7 +21,7 @@ class TrigMuonEFCombinerDiMuonMassHypo: public HLT::HypoAlgo
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* outputTE, bool& pass);
HLT::ErrorCode hltFinalize();
- HLT::ErrorCode hltBeginRun();
+ HLT::ErrorCode hltStart();
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerDiMuonMassPtImpactsHypo.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerDiMuonMassPtImpactsHypo.h
index cf943e6689060de3d7d6f63fd8d3bf2fd545ec8f..6c9a590d80dced35fb89188986d9445bbae4348b 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerDiMuonMassPtImpactsHypo.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerDiMuonMassPtImpactsHypo.h
@@ -21,7 +21,7 @@ class TrigMuonEFCombinerDiMuonMassPtImpactsHypo: public HLT::AllTEAlgo
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(std::vector<std::vector<HLT::TriggerElement*> >& input, unsigned int output);
HLT::ErrorCode hltFinalize();
- HLT::ErrorCode hltBeginRun();
+ HLT::ErrorCode hltStart();
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonIDTrackMultiHypo.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonIDTrackMultiHypo.h
index e6c83555087f35e3134a9ec2128c79ffaf6bfb86..8c9bf4adcf0168ad4347c959aaba3fc8911f9c2d 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonIDTrackMultiHypo.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonIDTrackMultiHypo.h
@@ -21,7 +21,7 @@ class TrigMuonIDTrackMultiHypo: public HLT::AllTEAlgo
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(std::vector<std::vector<HLT::TriggerElement*> >& input, unsigned int output);
HLT::ErrorCode hltFinalize();
- HLT::ErrorCode hltBeginRun();
+ HLT::ErrorCode hltStart();
private:
// Properties
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigEFMuonOverlapRemover.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigEFMuonOverlapRemover.cxx
index 793f6e92fa62886b5a4efbef01dc97c2998b9732..229efeca0430e63946f4a14a6e5afaa8a557199d 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigEFMuonOverlapRemover.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigEFMuonOverlapRemover.cxx
@@ -63,11 +63,8 @@ TrigEFMuonOverlapRemover::TrigEFMuonOverlapRemover(const std::string& name, ISvc
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-HLT::ErrorCode TrigEFMuonOverlapRemover::hltBeginRun()
+HLT::ErrorCode TrigEFMuonOverlapRemover::hltStart()
{
- msg() << MSG::INFO << "in hltBeginRun : " << name() << endmsg;
-
- //
m_doDebug = msgLvl() <= MSG::DEBUG;
msg() << MSG::INFO << "m_doDebug=" << m_doDebug << endmsg;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigL2MuonOverlapRemover.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigL2MuonOverlapRemover.cxx
index c29fd70056ef8ed79b0e828e0af73c33e1557f3c..ba36e56ddfae2247f4d8b6338911608e2c506cfe 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigL2MuonOverlapRemover.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigL2MuonOverlapRemover.cxx
@@ -100,11 +100,8 @@ TrigL2MuonOverlapRemover::TrigL2MuonOverlapRemover(const std::string& name, ISvc
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-HLT::ErrorCode TrigL2MuonOverlapRemover::hltBeginRun()
+HLT::ErrorCode TrigL2MuonOverlapRemover::hltStart()
{
- msg() << MSG::INFO << "in hltBeginRun : " << name() << endmsg;
-
- //
m_doDebug = msgLvl() <= MSG::DEBUG;
msg() << MSG::INFO << "m_doDebug=" << m_doDebug << endmsg;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerDiMuonMassHypo.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerDiMuonMassHypo.cxx
index 83e84b533a38f725645ad4d2e51514c45c333976..1b43113adc0121c6bad53518cc6656dd112a14fb 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerDiMuonMassHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerDiMuonMassHypo.cxx
@@ -67,10 +67,8 @@ HLT::ErrorCode TrigMuonEFCombinerDiMuonMassHypo::hltFinalize()
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-HLT::ErrorCode TrigMuonEFCombinerDiMuonMassHypo::hltBeginRun()
+HLT::ErrorCode TrigMuonEFCombinerDiMuonMassHypo::hltStart()
{
- msg() << MSG::INFO << "in hltBeginRun : " << name() << endmsg;
-
msg() << MSG::INFO << "sign requirement flag : " << m_signRequirement << endmsg;
msg() << MSG::INFO << "mass threshold low : " << m_massThresLow << endmsg;
msg() << MSG::INFO << "mass threshold high : " << m_massThresHigh << endmsg;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerDiMuonMassPtImpactsHypo.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerDiMuonMassPtImpactsHypo.cxx
index 64905cf509b426862d8401120518b4e0c27cb4c2..2c45a47b7ed1851b480d696dc73b1d9d0723cc4e 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerDiMuonMassPtImpactsHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerDiMuonMassPtImpactsHypo.cxx
@@ -80,10 +80,8 @@ HLT::ErrorCode TrigMuonEFCombinerDiMuonMassPtImpactsHypo::hltFinalize()
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-HLT::ErrorCode TrigMuonEFCombinerDiMuonMassPtImpactsHypo::hltBeginRun()
+HLT::ErrorCode TrigMuonEFCombinerDiMuonMassPtImpactsHypo::hltStart()
{
- msg() << MSG::INFO << "in hltBeginRun : " << name() << endmsg;
-
msg() << MSG::INFO << "AcceptAll : " << m_acceptAll << endmsg;
msg() << MSG::INFO << "mass threshold low(GeV) : " << m_massThresLow << endmsg;
msg() << MSG::INFO << "mass threshold high(GeV) : " << m_massThresHigh << endmsg;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonIDTrackMultiHypo.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonIDTrackMultiHypo.cxx
index 5011cee3f9cc534d83f2f435b8d1654e1dada999..7b819c3589181430c7efef28b27a3800df5d8883 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonIDTrackMultiHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonIDTrackMultiHypo.cxx
@@ -88,9 +88,8 @@ HLT::ErrorCode TrigMuonIDTrackMultiHypo::hltFinalize()
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-HLT::ErrorCode TrigMuonIDTrackMultiHypo::hltBeginRun()
+HLT::ErrorCode TrigMuonIDTrackMultiHypo::hltStart()
{
- msg() << MSG::INFO << "in hltBeginRun : " << name() << endmsg;
msg() << MSG::INFO << "AcceptAll : " << m_acceptAll << endmsg;
if (m_acceptAll) {
diff --git a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.cxx b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.cxx
index 742b0faa82f5e11cc34f188fac5360c6696611ea..35615706ad751721cb65190d2759bfba8f42acf3 100644
--- a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.cxx
+++ b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
/**************************************************************************
@@ -75,11 +75,6 @@ HLT::ErrorCode TrigIDTPMonitor::hltFinalize(){
return HLT::OK;
}
-HLT::ErrorCode TrigIDTPMonitor::hltBeginRun() {
- ATH_MSG_INFO( "beginning run in this " << name() );
- return HLT::OK;
-}
-
HLT::ErrorCode TrigIDTPMonitor::acceptInput(const HLT::TriggerElement* /*inputTE*/, bool& pass){
ATH_MSG_DEBUG( "Running TrigIDTPMonitor::acceptInputs" );
pass = true;
diff --git a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.h b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.h
index 63b87d371821916cd5d119d9674f5f899507b6c6..3830bc5f3e1b0441d7d821e113d71af7ff2c9c36 100644
--- a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.h
+++ b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
/**************************************************************************
@@ -36,7 +36,6 @@ class TrigIDTPMonitor: public HLT::FexAlgo{
~TrigIDTPMonitor();
HLT::ErrorCode hltInitialize();
- HLT::ErrorCode hltBeginRun();
HLT::ErrorCode hltFinalize();
HLT::ErrorCode acceptInput(const HLT::TriggerElement* inputTE, bool& pass);
HLT::ErrorCode hltExecute(const HLT::TriggerElement* inputTE, HLT::TriggerElement* outputTE);
diff --git a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.cxx b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.cxx
index 3e621825baa04eed9a2271b58d3efe6b0669c4a9..aa533804c8cdd0d61a2ee0677b2d8dfee24d2706 100644
--- a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.cxx
+++ b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.cxx
@@ -115,11 +115,6 @@ HLT::ErrorCode TrigIDTPMonitorElectron::hltFinalize(){
return HLT::OK;
}
-HLT::ErrorCode TrigIDTPMonitorElectron::hltBeginRun() {
- ATH_MSG_INFO( "beginning run in this " << name() );
- return HLT::OK;
-}
-
HLT::ErrorCode TrigIDTPMonitorElectron::acceptInput(const HLT::TriggerElement* /*inputTE*/, bool& pass){
ATH_MSG_DEBUG( "Running TrigIDTPMonitorElectron::acceptInputs" );
pass = true;
diff --git a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.h b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.h
index 68d83371d04de6973ceb89ddcdac2674c714e804..7607bb98324537761f3578b2fd984d4e3738e122 100644
--- a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.h
+++ b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.h
@@ -38,7 +38,6 @@ class TrigIDTPMonitorElectron: public HLT::FexAlgo{
~TrigIDTPMonitorElectron();
HLT::ErrorCode hltInitialize();
- HLT::ErrorCode hltBeginRun();
HLT::ErrorCode hltFinalize();
HLT::ErrorCode acceptInput(const HLT::TriggerElement* inputTE, bool& pass);
HLT::ErrorCode hltExecute(const HLT::TriggerElement* inputTE, HLT::TriggerElement* outputTE);
diff --git a/Trigger/TrigSteer/TrigInterfaces/TrigInterfaces/Algo.h b/Trigger/TrigSteer/TrigInterfaces/TrigInterfaces/Algo.h
index b6cdc0ca81cf215b24fcaa5b4c2f93b1376c025a..f725c6a47eb434c2542ac7b6315d7add2b41f718 100755
--- a/Trigger/TrigSteer/TrigInterfaces/TrigInterfaces/Algo.h
+++ b/Trigger/TrigSteer/TrigInterfaces/TrigInterfaces/Algo.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGINTERFACES_Algo_H
@@ -57,7 +57,6 @@ namespace HLT
* - hltInitialize()
* - hltStart()
* - hltBeginRun()
- * - hltEndRun()
* - hltStop()
* - hltFinalize()
*
@@ -74,21 +73,21 @@ namespace HLT
* \par Call sequence for OFFLINE running
* The call sequence for offline running is as follows:
\verbatim
- hltInitialize -> hltStart -> [hltBeginRun -> hltEndRun]+ -> hltStop -> hltFinalize \endverbatim
- * For each run-number change the hltBeginRun() and hltEndRun() methods are called. hltStart() and
+ hltInitialize -> hltStart -> [hltBeginRun]+ -> hltStop -> hltFinalize \endverbatim
+ * For each run-number change the hltBeginRun() method is called. hltStart() and
* hltStop() are called once at the beginning and end of the job.
*
* \par Call sequence for ONLINE running
* The call sequence for online running is as follows:
\verbatim
- hltInitialize -> [hltStart -> hltBeginRun -> hltEndRun -> hltStop]+ -> hltFinalize \endverbatim
+ hltInitialize -> [hltStart -> hltBeginRun -> hltStop]+ -> hltFinalize \endverbatim
* Compared to offline, the hltStart() and hltStop() methods are called at the beginning and
* end of each run, i.e. at every run-number change. This is to allow for resetting of
* monitoring histograms, etc. for each run.
*
* As a general rule, code that has to be executed once per run in the online but once per job in
* the offline (e.g. histogram booking) should be put into hltStart() and hltStop(). All other
- * run-dependent code should be put into hltBeginRun() and hltEndRun().
+ * run-dependent code should be put into hltBeginRun().
*/
class Algo : public AthAlgorithm, public IMonitoredAlgo {
@@ -135,24 +134,13 @@ namespace HLT
*/
virtual HLT::ErrorCode hltBeginRun() { return HLT::OK; }
- /**
- * @brief Method to be redefined by the user to implement the actions performed
- * by the algorithm at the EndRun state transition.
- * @return HLT::ErrorCode for the EndRun transition.
- *
- * This method should contain code that is exectuded on each run-number change
- * for both online and offline running.
- */
- virtual HLT::ErrorCode hltEndRun() { return HLT::OK; }
-
/**
* @brief Method to be redefined by the user to implement the actions performed
* by the algorithm at the Stop state transition.
* @return StatusCode for the Stop process.
*
* Offline this method is called once per job after the last event.
- * Online it is called at the end of each run (i.e. run-number change)
- * just after hltEndRun().
+ * Online it is called at the end of each run (i.e. run-number change).
*/
virtual HLT::ErrorCode hltStop() { return HLT::OK; }
@@ -283,14 +271,6 @@ namespace HLT
*/
StatusCode beginRun();
- /**
- * @brief Method performing the EndRun transition.
- * @return StatusCode for the EndRun process.
- *
- * Calls the public hltEndRun method; not to be re-implemented/used by developers.
- */
- StatusCode endRun();
-
/**
* @brief Method performing the Stop transition
* @return StatusCode for the Stop process.
@@ -525,14 +505,6 @@ namespace HLT
*/
StatusCode beginRunMonitors();
- /**
- * @brief Method performing monitoring operations associated to the EndRun transition.
- * @return StatusCode for the monitoring EndRun process, always StatusCode::SUCCESS.
- *
- * Currently does nothing.
- */
- StatusCode endRunMonitors();
-
/**
* @brief Method performing monitoring operations before the event.
* @return StatusCode for the pre-event monitoring process.
diff --git a/Trigger/TrigSteer/TrigInterfaces/src/Algo.cxx b/Trigger/TrigSteer/TrigInterfaces/src/Algo.cxx
index 0dcb53de074e4f0751872e38f1000a4bc54bdd45..49fbfe5206d4c61c6caaa5fb89f1b4b7cdb2feda 100755
--- a/Trigger/TrigSteer/TrigInterfaces/src/Algo.cxx
+++ b/Trigger/TrigSteer/TrigInterfaces/src/Algo.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include <sstream>
@@ -219,16 +219,6 @@ StatusCode Algo::beginRun()
}
-StatusCode Algo::endRun()
-{
- if (hltEndRun() != HLT::OK ) return StatusCode::FAILURE;
-
- if ( endRunMonitors().isFailure() ) {
- ATH_MSG_WARNING ( "Unable to uninitialize at endRun all monitors, continuing anyway");
- }
- return StatusCode::SUCCESS;
-}
-
StatusCode Algo::finalize()
{
// call initialize from derived class:
@@ -384,12 +374,6 @@ StatusCode Algo::beginRunMonitors()
}
-StatusCode Algo::endRunMonitors()
-{
- return StatusCode::SUCCESS;
-}
-
-
StatusCode Algo::beforeEventMonitors() {
ATH_MSG_VERBOSE ( "beforeEventMonitors " << name() );