From 645176ec682015530466012fae2ca493b87f4910 Mon Sep 17 00:00:00 2001
From: Charles Leggett <charles.g.leggett@gmail.com>
Date: Thu, 13 Dec 2018 22:10:01 +0000
Subject: [PATCH] Use Gaudi Reentrant Algorithm
---
.../CaloTests/CaloTests/AnalysisCal.h | 2 +-
.../CaloTests/src/MyAnalysisCal.cxx | 2 +-
.../CaloRec/ToolWithConstantsMixin.icc | 2 +-
Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx | 2 +-
Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h | 2 +-
.../CaloRec/src/CaloCell2ClusterMapper.cxx | 2 +-
.../CaloRec/src/CaloCell2ClusterMapper.h | 2 +-
Calorimeter/CaloRec/src/CaloClusterMaker.cxx | 2 +-
Calorimeter/CaloRec/src/CaloClusterMaker.h | 2 +-
Calorimeter/CaloRec/src/CaloTopoTowerAlg.cxx | 2 +-
Calorimeter/CaloRec/src/CaloTopoTowerAlg.h | 2 +-
.../CaloRec/src/CaloTopoTowerAlgorithm.cxx | 2 +-
.../CaloRec/src/CaloTopoTowerAlgorithm.h | 2 +-
.../CaloRec/src/CaloTowerAlgorithm.cxx | 2 +-
Calorimeter/CaloRec/src/CaloTowerAlgorithm.h | 2 +-
.../CaloRec/src/CaloTowerxAODFromCells.cxx | 2 +-
.../CaloRec/src/CaloTowerxAODFromCells.h | 2 +-
.../CaloRec/src/CaloTowerxAODFromClusters.cxx | 2 +-
.../CaloRec/src/CaloTowerxAODFromClusters.h | 2 +-
.../CaloRec/src/ToolWithConstantsMixin.cxx | 2 +-
.../AthAnalysisBaseComps/AthAnalysisHelper.h | 2 +-
.../AthenaBaseComps/AthLegacySequence.h | 69 ++++++
.../AthenaBaseComps/AthReentrantAlgorithm.h | 52 +---
.../AthenaBaseComps/src/AthLegacySequence.cxx | 32 +++
.../src/AthReentrantAlgorithm.cxx | 45 +---
.../test/AthReentrantAlgorithm_test.cxx | 10 +-
.../test/gt_AthExUnittest.cxx | 4 +-
.../AthenaExamples/AthExHive/src/HiveAlgR.cxx | 2 +-
.../AthenaExamples/AthExHive/src/HiveAlgR.h | 2 +-
.../AthExStoreGateExample/src/ExampleAlg.cxx | 2 +-
.../AthExStoreGateExample/src/ExampleAlg.h | 2 +-
.../src/ReadDataReentrant.cxx | 2 +-
.../src/ReadDataReentrant.h | 2 +-
.../src/WriteDataReentrant.cxx | 2 +-
.../src/WriteDataReentrant.h | 2 +-
.../AthExUnittest/test/gt_AthExUnittest.cxx | 4 +-
.../AthenaPython/AthenaPython/PyAthenaAlg.h | 2 -
Control/AthenaPython/src/PyAthenaAlg.cxx | 6 -
.../python/PyAthenaEventLoopMgr.py | 2 +-
Control/AthenaServices/src/AthIncFirerAlg.cxx | 24 +-
Control/AthenaServices/src/AthIncFirerAlg.h | 7 +-
.../DataModelTestDataCommon/src/CondAlg1.cxx | 2 +-
.../DataModelTestDataCommon/src/CondAlg1.h | 2 +-
.../src/CondReaderAlg.cxx | 2 +-
.../src/CondReaderAlg.h | 2 +-
.../src/MetaReaderAlg.cxx | 2 +-
.../src/MetaReaderAlg.h | 2 +-
.../src/xAODTestAlg.cxx | 2 +-
.../DataModelTestDataCommon/src/xAODTestAlg.h | 2 +-
.../src/xAODTestDecor.cxx | 2 +-
.../src/xAODTestDecor.h | 2 +-
.../src/xAODTestReadDecor.cxx | 2 +-
.../src/xAODTestReadDecor.h | 2 +-
.../src/xAODTestReadSymlink.cxx | 2 +-
.../src/xAODTestReadSymlink.h | 2 +-
.../src/xAODTestWriteCInfo.cxx | 2 +-
.../src/xAODTestWriteCInfo.h | 2 +-
.../src/xAODTestFilterCVec.cxx | 2 +-
.../src/xAODTestFilterCVec.h | 2 +-
.../src/xAODTestReadCInfo.cxx | 2 +-
.../src/xAODTestReadCInfo.h | 2 +-
.../src/xAODTestReadCVec.cxx | 2 +-
.../src/xAODTestReadCVec.h | 2 +-
.../src/xAODTestReadCView.cxx | 2 +-
.../src/xAODTestReadCView.h | 2 +-
.../src/xAODTestReadHVec.cxx | 2 +-
.../src/xAODTestReadHVec.h | 2 +-
.../src/xAODTestWrite.cxx | 2 +-
.../src/xAODTestWrite.h | 2 +-
.../src/xAODTestWriteCVec.cxx | 2 +-
.../src/xAODTestWriteCVec.h | 2 +-
.../src/xAODTestWriteCVecConst.cxx | 2 +-
.../src/xAODTestWriteCVecConst.h | 2 +-
.../src/xAODTestWriteCView.cxx | 2 +-
.../src/xAODTestWriteCView.h | 2 +-
.../src/xAODTestWriteHVec.cxx | 2 +-
.../src/xAODTestWriteHVec.h | 2 +-
.../src/xAODTestWriteSymlinks.cxx | 2 +-
.../src/xAODTestWriteSymlinks.h | 2 +-
.../GaudiSequencer/src/AthRetrySequencer.cxx | 8 +-
.../GaudiSequencer/src/AthRetrySequencer.h | 2 +-
Control/GaudiSequencer/src/AthSequencer.cxx | 234 ++++++++++--------
Control/GaudiSequencer/src/AthSequencer.h | 46 ++--
Control/SGComps/src/AddressRemappingSvc.cxx | 5 +-
Control/StoreGate/StoreGate/ReadDecorHandle.h | 2 +-
.../StoreGate/StoreGate/ReadDecorHandleKey.h | 2 +-
.../StoreGate/StoreGate/WriteDecorHandle.h | 2 +-
.../StoreGate/StoreGate/WriteDecorHandleKey.h | 2 +-
.../src/ReWriteData.cxx | 2 +-
.../src/ReWriteData.h | 2 +-
.../src/ReadData.cxx | 2 +-
.../src/ReadData.h | 2 +-
.../src/WriteCond.cxx | 2 +-
.../src/WriteCond.h | 2 +-
.../src/WriteData.cxx | 2 +-
.../src/WriteData.h | 2 +-
.../src/WriteTag.cxx | 2 +-
.../src/WriteTag.h | 2 +-
.../src/MakeInputDataHeader.cxx | 2 +-
.../src/MakeInputDataHeader.h | 2 +-
.../src/OnlineLumiCalibrationCondAlg.cxx | 2 +-
.../src/OnlineLumiCalibrationCondAlg.h | 2 +-
.../OnlineLumiCalibrationCondAlg_test.cxx | 2 +-
.../RegSelSvcTest/src/RegSelTestAlg.cxx | 2 +-
.../RegSelSvcTest/src/RegSelTestAlg.h | 2 +-
.../src/ROBDataProviderMTTest.cxx | 2 +-
.../src/ROBDataProviderMTTest.h | 2 +-
.../xAODEventInfoCnv/src/EventInfoCnvAlg.cxx | 4 +-
.../xAODEventInfoCnv/src/EventInfoCnvAlg.h | 2 +-
.../xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx | 2 +-
Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.h | 2 +-
.../LUCID_DigiTools/LUCID_DigiSettings.h | 2 +-
.../src/LUCID_DigiSettings.cxx | 2 +-
.../TrigExPartialEB/src/MTCalibPebHypoAlg.cxx | 4 +-
.../TrigExPartialEB/src/MTCalibPebHypoAlg.h | 2 +-
.../src/InDetBeamSpotReader.cxx | 2 +-
.../src/InDetBeamSpotReader.h | 2 +-
.../src/SpecialPixelMapCondAlg.cxx | 2 +-
.../src/SpecialPixelMapCondAlg.h | 2 +-
.../CaloClusterROI_Selector.h | 2 +-
.../src/CaloClusterROI_Selector.cxx | 2 +-
.../InDetExtensionProcessor.h | 2 +-
.../src/InDetExtensionProcessor.cxx | 2 +-
.../src/CacheCreator.cxx | 2 +-
.../src/CacheCreator.h | 2 +-
.../SiTrackerSpacePointFinder.h | 2 +-
.../src/SiTrackerSpacePointFinder.cxx | 2 +-
.../src/ToolTester.cxx | 2 +-
.../InDetTrackSelectionTool/src/ToolTester.h | 2 +-
.../InDetDetailedTrackTruthMaker.h | 2 +-
.../InDetTruthAlgs/PRD_MultiTruthMaker.h | 2 +-
.../src/InDetDetailedTrackTruthMaker.cxx | 4 +-
.../src/PRD_MultiTruthMaker.cxx | 2 +-
.../src/InDetPhysHitDecoratorAlg.cxx | 10 +-
.../src/InDetPhysHitDecoratorAlg.h | 7 +-
.../src/InDetPhysValTruthDecoratorAlg.cxx | 11 +-
.../src/InDetPhysValTruthDecoratorAlg.h | 9 +-
.../src/ParameterErrDecoratorAlg.cxx | 2 +-
.../src/ParameterErrDecoratorAlg.h | 2 +-
.../src/TruthClassDecoratorAlg.cxx | 10 +-
.../src/TruthClassDecoratorAlg.h | 9 +-
.../TrackClusterAssValidation.h | 2 +-
.../src/TrackClusterAssValidation.cxx | 2 +-
.../HoleSearchValidation.h | 2 +-
.../InDetSplittedTracksCreator.h | 2 +-
.../src/HoleSearchValidation.cxx | 2 +-
.../src/InDetSplittedTracksCreator.cxx | 2 +-
.../LArCellRec/src/LArNoisyROAlg.cxx | 2 +-
LArCalorimeter/LArCellRec/src/LArNoisyROAlg.h | 2 +-
.../LArCellRec/src/LArTimeVetoAlg.cxx | 2 +-
.../LArCellRec/src/LArTimeVetoAlg.h | 2 +-
.../LArDigitThinnerFromEMClust.h | 2 +-
.../src/LArDigitThinnerFromEMClust.cxx | 2 +-
.../LArROD/LArROD/LArDigitThinner.h | 2 +-
.../LArROD/LArROD/LArRawChannelBuilderAlg.h | 2 +-
LArCalorimeter/LArROD/src/LArDigitThinner.cxx | 2 +-
.../LArROD/src/LArRawChannelBuilderAlg.cxx | 2 +-
.../LArRecUtils/src/LArHVCondAlg.cxx | 2 +-
LArCalorimeter/LArRecUtils/src/LArHVCondAlg.h | 2 +-
.../src/LArHVPathologyDbCondAlg.cxx | 2 +-
.../LArRecUtils/src/LArHVPathologyDbCondAlg.h | 2 +-
.../MSVertexRecoAlg/MSVertexRecoAlg.h | 2 +-
.../MSVertexRecoAlg/src/MSVertexRecoAlg.cxx | 2 +-
.../AnalysisTools/AANTupleStream.h | 4 +-
.../AnalysisTools/src/AANTupleStream.cxx | 19 +-
.../src/PrimaryDPDPrescaler.cxx | 26 +-
.../PrimaryDPDMaker/src/PrimaryDPDPrescaler.h | 6 +-
Projects/AthSimulation/externals.txt | 2 +-
Projects/Athena/externals.txt | 2 +-
Projects/Athena/package_filters.txt | 4 +
.../METReconstruction/src/METReaderAlg.cxx | 2 +-
.../MET/METReconstruction/src/METReaderAlg.h | 2 +-
.../src/CaloClusterMatchLinkAlg.cxx | 2 +-
.../src/CaloClusterMatchLinkAlg.h | 2 +-
.../egammaAlgs/src/egammaForwardBuilder.cxx | 2 +-
.../egammaAlgs/src/egammaForwardBuilder.h | 2 +-
.../src/egammaTopoClusterCopier.cxx | 2 +-
.../egammaAlgs/src/egammaTopoClusterCopier.h | 2 +-
.../MCTruthAlgs/TrackRecordFilter.h | 2 +-
.../MCTruthAlgs/src/TrackRecordFilter.cxx | 2 +-
TestBeam/TBRec/src/TBAlgoSequencer.cxx | 22 +-
TestBeam/TBRec/src/TBAlgoSequencer.h | 7 +-
.../TileMuId/TileMuId/TileLookForMuAlg.h | 2 +-
.../TileMuId/src/TileLookForMuAlg.cxx | 2 +-
.../TileRecUtils/src/TileBeamElemDumper.cxx | 2 +-
.../TileRecUtils/src/TileBeamElemDumper.h | 2 +-
.../TileRecUtils/src/TileDQstatusAlg.cxx | 2 +-
.../TileRecUtils/src/TileDQstatusAlg.h | 2 +-
.../TileRecUtils/src/TileDigitsDumper.cxx | 2 +-
.../TileRecUtils/src/TileDigitsDumper.h | 2 +-
.../TileRecUtils/src/TileL2Dumper.cxx | 2 +-
.../TileRecUtils/src/TileL2Dumper.h | 2 +-
.../src/TileLaserObjectDumper.cxx | 2 +-
.../TileRecUtils/src/TileLaserObjectDumper.h | 2 +-
.../src/TileMuonReceiverDumper.cxx | 2 +-
.../TileRecUtils/src/TileMuonReceiverDumper.h | 2 +-
.../TileRecUtils/src/TileRawChannelDumper.cxx | 2 +-
.../TileRecUtils/src/TileRawChannelDumper.h | 2 +-
Tools/PyUtils/python/scripts/gen_klass.py | 4 +-
.../ActsGeometry/ActsExtrapolationAlg.h | 2 +-
.../ActsGeometry/src/ActsExtrapolationAlg.cxx | 2 +-
.../TrkCollectionAliasAlg.h | 2 +-
.../src/TrkCollectionAliasAlg.cxx | 2 +-
.../TrigCaloRec/src/HLTCaloCellMaker.cxx | 2 +-
.../TrigCaloRec/src/HLTCaloCellMaker.h | 2 +-
.../TrigCaloRec/src/HLTCaloCellSumMaker.cxx | 2 +-
.../TrigCaloRec/src/HLTCaloCellSumMaker.h | 2 +-
.../TrigEFMissingET/EFMissingETAlgMT.h | 2 +-
.../TrigEFMissingET/src/EFMissingETAlgMT.cxx | 2 +-
.../src/TestCaloDataAccess.cxx | 2 +-
.../TrigT2CaloCommon/src/TestCaloDataAccess.h | 2 +-
.../TrigT2CaloEgamma/T2CaloEgammaReFastAlgo.h | 2 +-
.../src/T2CaloEgammaReFastAlgo.cxx | 2 +-
.../src/TrigDecisionMakerMT.cxx | 2 +-
.../src/TrigDecisionMakerMT.h | 2 +-
.../TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx | 2 +-
.../TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h | 2 +-
.../TrigBjetHypo/src/TrigBjetHypoAlgMT.cxx | 2 +-
.../TrigBjetHypo/src/TrigBjetHypoAlgMT.h | 2 +-
.../src/TrigL2CaloHypoAlgMT.cxx | 2 +-
.../TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.h | 2 +-
.../src/TrigL2ElectronHypoAlgMT.cxx | 2 +-
.../src/TrigL2ElectronHypoAlgMT.h | 2 +-
.../src/TrigL2PhotonHypoAlgMT.cxx | 2 +-
.../src/TrigL2PhotonHypoAlgMT.h | 2 +-
.../TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx | 2 +-
.../TrigHLTJetHypo/src/TrigJetHypoAlgMT.h | 2 +-
.../src/TrigL2CaloRingerHypoAlgMT.cxx | 2 +-
.../src/TrigL2CaloRingerHypoAlgMT.h | 2 +-
.../TrigMuonHypo/TrigMufastHypoAlg.h | 2 +-
.../TrigMuonHypo/TrigMuisoHypoAlg.h | 2 +-
.../TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h | 2 +-
.../TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h | 2 +-
.../TrigMuonEFTrackIsolationHypoAlg.h | 2 +-
.../TrigMuonHypo/TrigmuCombHypoAlg.h | 2 +-
.../TrigMuonHypo/src/TrigMufastHypoAlg.cxx | 6 +-
.../TrigMuonHypo/src/TrigMuisoHypoAlg.cxx | 6 +-
.../src/TrigMuonEFCombinerHypoAlg.cxx | 6 +-
.../src/TrigMuonEFMSonlyHypoAlg.cxx | 6 +-
.../src/TrigMuonEFTrackIsolationHypoAlg.cxx | 2 +-
.../TrigMuonHypo/src/TrigmuCombHypoAlg.cxx | 6 +-
.../TrigSteerMonitor/src/TrigROBMoni.cxx | 6 +-
.../TrigSteerMonitor/src/TrigROBMoni.h | 2 +-
.../TrigTimeMonitor/src/TrigTimeHistTool.cxx | 2 +-
.../TrigTimeMonitor/src/TrigTimeTreeTool.cxx | 2 +-
.../DecisionHandling/HypoBase.h | 2 +-
.../DecisionHandling/InputMakerBase.h | 2 +-
.../DecisionHandling/TrigCompositeUtils.h | 8 +-
.../DecisionHandling/TrigCompositeUtils.icc | 4 +-
.../DecisionHandling/src/ComboHypo.cxx | 2 +-
.../DecisionHandling/src/ComboHypo.h | 2 +-
.../DecisionHandling/src/DumpDecisions.cxx | 2 +-
.../DecisionHandling/src/DumpDecisions.h | 2 +-
.../DecisionHandling/src/InputMakerForRoI.cxx | 2 +-
.../DecisionHandling/src/InputMakerForRoI.h | 2 +-
.../src/TriggerSummaryAlg.cxx | 2 +-
.../DecisionHandling/src/TriggerSummaryAlg.h | 2 +-
.../L1Decoder/src/CreateFullScanRoI.cxx | 2 +-
.../L1Decoder/src/CreateFullScanRoI.h | 2 +-
Trigger/TrigSteer/L1Decoder/src/L1Decoder.cxx | 2 +-
Trigger/TrigSteer/L1Decoder/src/L1Decoder.h | 2 +-
.../src/HLTResultMTByteStreamDecoderAlg.cxx | 4 +-
.../src/HLTResultMTByteStreamDecoderAlg.h | 2 +-
.../src/DecisionSummaryMakerAlg.cxx | 2 +-
.../src/DecisionSummaryMakerAlg.h | 2 +-
.../src/HLTResultMTMakerAlg.cxx | 2 +-
.../src/HLTResultMTMakerAlg.h | 2 +-
.../src/TriggerEDMDeserialiserAlg.cxx | 2 +-
.../src/TriggerEDMDeserialiserAlg.h | 2 +-
.../TrigSteering/TrigSteering/TrigSteer.h | 4 +-
.../TrigSteer/TrigSteering/src/Sequence.cxx | 2 +-
.../TrigSteering/src/SteeringChain.cxx | 2 +-
.../TrigSteer/TrigSteering/src/TrigSteer.cxx | 25 +-
.../src/EventViewCreatorAlgorithm.cxx | 4 +-
.../ViewAlgs/src/EventViewCreatorAlgorithm.h | 2 +-
.../src/EventViewCreatorAlgorithmWithJets.cxx | 4 +-
.../src/EventViewCreatorAlgorithmWithJets.h | 2 +-
Trigger/TrigSteer/ViewAlgs/src/MergeViews.cxx | 2 +-
Trigger/TrigSteer/ViewAlgs/src/MergeViews.h | 2 +-
.../ViewAlgsTest/src/TestViewMerger.cxx | 2 +-
.../ViewAlgsTest/src/TestViewMerger.h | 2 +-
.../src/RoiB2TopoInputDataCnv.cxx | 2 +-
.../src/RoiB2TopoInputDataCnv.h | 2 +-
.../TrigUpgradeTest/src/TestComboHypoAlg.cxx | 2 +-
.../TrigUpgradeTest/src/TestComboHypoAlg.h | 2 +-
.../TrigUpgradeTest/src/TestHypoAlg.cxx | 2 +-
.../TrigUpgradeTest/src/TestHypoAlg.h | 2 +-
.../TrigUpgradeTest/src/TestInputMaker.cxx | 2 +-
.../TrigUpgradeTest/src/TestInputMaker.h | 2 +-
289 files changed, 646 insertions(+), 639 deletions(-)
create mode 100644 Control/AthenaBaseComps/AthenaBaseComps/AthLegacySequence.h
create mode 100644 Control/AthenaBaseComps/src/AthLegacySequence.cxx
diff --git a/Calorimeter/CaloExample/CaloTests/CaloTests/AnalysisCal.h b/Calorimeter/CaloExample/CaloTests/CaloTests/AnalysisCal.h
index d4859d19c71f..3bc7a103484c 100644
--- a/Calorimeter/CaloExample/CaloTests/CaloTests/AnalysisCal.h
+++ b/Calorimeter/CaloExample/CaloTests/CaloTests/AnalysisCal.h
@@ -42,7 +42,7 @@ namespace MyAnalysisCal {
/** standard Athena-Algorithm method */
virtual StatusCode initialize() override;
/** standard Athena-Algorithm method */
- virtual StatusCode execute_r(const EventContext& ctx) const override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
/** standard Athena-Algorithm method */
virtual StatusCode finalize() override;
private:
diff --git a/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx b/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx
index 4e2bc56114e6..67ada897510e 100644
--- a/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx
+++ b/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx
@@ -51,7 +51,7 @@ namespace MyAnalysisCal {
}
//__________________________________________________________________________
- StatusCode AnalysisCal::execute_r (const EventContext& ctx) const
+ StatusCode AnalysisCal::execute (const EventContext& ctx) const
{
//.............................................
diff --git a/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.icc b/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.icc
index d16e950c9d8d..89ff976865d1 100644
--- a/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.icc
+++ b/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.icc
@@ -43,7 +43,7 @@ StatusCode do_declare (ToolWithConstantsMixin* self,
if (AlgTool* x = dynamic_cast<AlgTool*> (self)) {
x->declareProperty (name, c);
return StatusCode::SUCCESS;
- } else if (Algorithm* x = dynamic_cast<Algorithm*> (self)) {
+ } else if (Gaudi::Algorithm* x = dynamic_cast<Gaudi::Algorithm*> (self)) {
x->declareProperty (name, c);
return StatusCode::SUCCESS;
} else if (Service* x = dynamic_cast<Service*> (self)) {
diff --git a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx
index a0f324f807e5..eb23fe09a2cb 100644
--- a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx
+++ b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx
@@ -46,7 +46,7 @@ StatusCode CaloBCIDAvgAlg::finalize() {
//----------------------------------------------------------------------------------------
-StatusCode CaloBCIDAvgAlg::execute_r(const EventContext& ctx) const {
+StatusCode CaloBCIDAvgAlg::execute(const EventContext& ctx) const {
SG::ReadHandle<xAOD::EventInfo> ei(m_eventInfoKey,ctx);
diff --git a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h
index c53fa6597c6a..72f5c9879664 100644
--- a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h
+++ b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h
@@ -28,7 +28,7 @@ public:
// Algorithm virtual methods
StatusCode initialize();
- StatusCode execute_r(const EventContext& ctx) const;
+ StatusCode execute(const EventContext& ctx) const;
StatusCode finalize();
private:
diff --git a/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.cxx b/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.cxx
index 40e8eb77cc63..fe06a71efa81 100644
--- a/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.cxx
+++ b/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.cxx
@@ -80,7 +80,7 @@ StatusCode CaloCell2ClusterMapper::finalize()
//###############################################################################
-StatusCode CaloCell2ClusterMapper::execute_r(const EventContext& ctx) const {
+StatusCode CaloCell2ClusterMapper::execute(const EventContext& ctx) const {
// make a DataVector of Navigable CaloClusterContainer
ATH_MSG_DEBUG(" Recording Cell2Cluster Map " << m_mapOutputKey.key());
diff --git a/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.h b/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.h
index 6f497d6d699c..db39d8be16d6 100644
--- a/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.h
+++ b/Calorimeter/CaloRec/src/CaloCell2ClusterMapper.h
@@ -35,7 +35,7 @@ class CaloCell2ClusterMapper : public AthReentrantAlgorithm
CaloCell2ClusterMapper(const std::string& name, ISvcLocator* pSvcLocator);
virtual ~CaloCell2ClusterMapper();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
protected:
diff --git a/Calorimeter/CaloRec/src/CaloClusterMaker.cxx b/Calorimeter/CaloRec/src/CaloClusterMaker.cxx
index 20b364f66b7c..8819e2a15f6d 100644
--- a/Calorimeter/CaloRec/src/CaloClusterMaker.cxx
+++ b/Calorimeter/CaloRec/src/CaloClusterMaker.cxx
@@ -132,7 +132,7 @@ StatusCode CaloClusterMaker::finalize() {
//###############################################################################
-StatusCode CaloClusterMaker::execute_r (const EventContext& ctx) const
+StatusCode CaloClusterMaker::execute (const EventContext& ctx) const
{
// make a Cluster Container
diff --git a/Calorimeter/CaloRec/src/CaloClusterMaker.h b/Calorimeter/CaloRec/src/CaloClusterMaker.h
index b490c417a485..05c8fd631d24 100644
--- a/Calorimeter/CaloRec/src/CaloClusterMaker.h
+++ b/Calorimeter/CaloRec/src/CaloClusterMaker.h
@@ -40,7 +40,7 @@ class CaloClusterMaker : public AthReentrantAlgorithm
CaloClusterMaker(const std::string& name, ISvcLocator* pSvcLocator);
virtual ~CaloClusterMaker() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& ctx) const override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
virtual StatusCode finalize() override;
const std::string& getOutputContainerName() const;
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerAlg.cxx b/Calorimeter/CaloRec/src/CaloTopoTowerAlg.cxx
index e68e0b1e2e90..55afed800e3f 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerAlg.cxx
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerAlg.cxx
@@ -152,7 +152,7 @@ StatusCode CaloTopoTowerAlg::initialize()
///==============================================
/// EXECUTE
///==============================================
-StatusCode CaloTopoTowerAlg::execute_r (const EventContext& ctx) const
+StatusCode CaloTopoTowerAlg::execute (const EventContext& ctx) const
{
/// Say hello
ATH_MSG_DEBUG( "In CaloTopoTowerAlg::execute()" );
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerAlg.h b/Calorimeter/CaloRec/src/CaloTopoTowerAlg.h
index 0aaac831cef6..fb65ce621da9 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerAlg.h
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerAlg.h
@@ -61,7 +61,7 @@ class CaloTopoTowerAlg : public AthReentrantAlgorithm
virtual StatusCode finalize() override;
/// Execute
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
// Container name strings
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
index e652ebfc2526..6581b2a8cb6b 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
@@ -206,7 +206,7 @@ StatusCode CaloTopoTowerAlgorithm::initialize()
// Execute //
/////////////
-StatusCode CaloTopoTowerAlgorithm::execute_r (const EventContext& ctx) const
+StatusCode CaloTopoTowerAlgorithm::execute (const EventContext& ctx) const
{
//////////////////////////
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.h b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.h
index bd46bd5fe162..24c6f06327fc 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.h
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.h
@@ -50,7 +50,7 @@ class CaloTopoTowerAlgorithm : public AthReentrantAlgorithm
/// inherited from Algorithm
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
protected:
diff --git a/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx b/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx
index 0f477e0c074b..0ba432ed5354 100644
--- a/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx
+++ b/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx
@@ -114,7 +114,7 @@ StatusCode CaloTowerAlgorithm::initialize()
// Execute //
/////////////
-StatusCode CaloTowerAlgorithm::execute_r (const EventContext& ctx) const
+StatusCode CaloTowerAlgorithm::execute (const EventContext& ctx) const
{
//////////////////////////
diff --git a/Calorimeter/CaloRec/src/CaloTowerAlgorithm.h b/Calorimeter/CaloRec/src/CaloTowerAlgorithm.h
index a3142cbd5e4a..a642742773cd 100644
--- a/Calorimeter/CaloRec/src/CaloTowerAlgorithm.h
+++ b/Calorimeter/CaloRec/src/CaloTowerAlgorithm.h
@@ -46,7 +46,7 @@ class CaloTowerAlgorithm: public AthReentrantAlgorithm {
/// inherited from Algorithm
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
protected:
diff --git a/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.cxx b/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.cxx
index c57a41e3c2db..260a909d009f 100644
--- a/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.cxx
+++ b/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.cxx
@@ -45,7 +45,7 @@ StatusCode CaloTowerxAODFromCells::initialize() {
return initBase();
}
-StatusCode CaloTowerxAODFromCells::execute_r(const EventContext& ctx) const
+StatusCode CaloTowerxAODFromCells::execute(const EventContext& ctx) const
{
SG::ReadHandle<CaloCellContainer> inputCellContainer(m_inputCellContainerKey, ctx);
if (!inputCellContainer.isValid()) {
diff --git a/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.h b/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.h
index 4810f17ab2fe..d2bf214acad8 100644
--- a/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.h
+++ b/Calorimeter/CaloRec/src/CaloTowerxAODFromCells.h
@@ -33,7 +33,7 @@ public:
/// @name @c AthAlgorithm interface implementation
/// @{
virtual StatusCode initialize() override; ///< @brief Initialize algorithm
- virtual StatusCode execute_r(const EventContext& ctx) const override; ///< @brief Execute algorithm
+ virtual StatusCode execute(const EventContext& ctx) const override; ///< @brief Execute algorithm
virtual StatusCode finalize() override; ///< @brief Finalize algorithm
/// @}
diff --git a/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.cxx b/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.cxx
index 7236142f1827..358b544b3c5f 100644
--- a/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.cxx
+++ b/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.cxx
@@ -30,7 +30,7 @@ StatusCode CaloTowerxAODFromClusters::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode CaloTowerxAODFromClusters::execute_r(const EventContext& ctx) const
+StatusCode CaloTowerxAODFromClusters::execute(const EventContext& ctx) const
{
SG::ReadHandle<xAOD::CaloClusterContainer> inputClusterContainer(m_inputClusterContainerKey, ctx);
diff --git a/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.h b/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.h
index 6b4b24b3a19c..63ae13ce993d 100644
--- a/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.h
+++ b/Calorimeter/CaloRec/src/CaloTowerxAODFromClusters.h
@@ -27,7 +27,7 @@ public:
/// @name @c AthAlgorithm interface implementation
/// @{
virtual StatusCode initialize() override; ///< @brief Initialize algorithm
- virtual StatusCode execute_r(const EventContext&) const override; ///< @brief Execute algorithm
+ virtual StatusCode execute(const EventContext&) const override; ///< @brief Execute algorithm
virtual StatusCode finalize() override; ///< @brief Finalize algorithm
/// @}
diff --git a/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx b/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx
index d09335814330..17e9fae86693 100755
--- a/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx
+++ b/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx
@@ -75,7 +75,7 @@ ToolWithConstantsMixin::finish_ctor (const std::string& toolcls /*= ""*/)
if (m_toolcls.empty())
m_toolcls = thistool->type();
}
- else if (Algorithm* thisalg = dynamic_cast<Algorithm*> (this)) {
+ else if (Gaudi::Algorithm* thisalg = dynamic_cast<Gaudi::Algorithm*> (this)) {
thisalg->declareProperty ("detStoreKey", m_detStoreKey);
thisalg->declareProperty ("prefix", m_prefix);
thisalg->declareProperty ("useCallback", m_use_callback);
diff --git a/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h b/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h
index d05f7fc57052..128ed9f575b6 100644
--- a/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h
+++ b/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h
@@ -119,7 +119,7 @@ public:
///setProperty on an alg, even when initialized
template<typename W> static StatusCode setProperty(IAlgorithm* alg, const std::string& property, const W& value) {
- Algorithm* theAlg = dynamic_cast<Algorithm*>(alg);
+ Gaudi::Algorithm* theAlg = dynamic_cast<Gaudi::Algorithm*>(alg);
if(!theAlg) {
std::cout << "ERROR: alg is not an Algorithm. Cannot AthAnalysisHelper::setProperty on it" << std::endl;
return StatusCode::FAILURE;
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthLegacySequence.h b/Control/AthenaBaseComps/AthenaBaseComps/AthLegacySequence.h
new file mode 100644
index 000000000000..4745fe0a44a6
--- /dev/null
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthLegacySequence.h
@@ -0,0 +1,69 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+// AthLegacySequence.h
+// Header file for class AthLegacySequence
+///////////////////////////////////////////////////////////////////
+#ifndef ATHENABASECOMPS_ATHLEGACYEQUENCE_H
+#define ATHENABASECOMPS_ATHLEGACYEQUENCE_H 1
+
+#pragma once
+
+
+// Framework includes
+#include "AthenaBaseComps/AthCommonDataStore.h"
+#include "AthenaBaseComps/AthCommonMsg.h"
+#include "Gaudi/Sequence.h"
+#include "GaudiKernel/ThreadLocalContext.h"
+
+namespace Athena {
+ namespace details {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Woverloaded-virtual"
+ class AthLegacySequenceAdapter
+ : public AthCommonDataStore<AthCommonMsg< Gaudi::Sequence >>
+ {
+ public:
+
+ /// Constructor with parameters:
+ AthLegacySequenceAdapter(const std::string& name,
+ ISvcLocator* pSvcLocator);
+
+ virtual StatusCode execute() = 0;
+
+ const EventContext& getContext() const { return Gaudi::Hive::currentContext(); }
+
+ virtual const DataObjIDColl& extraOutputDeps() const override;
+
+ protected:
+ bool isReEntrant() const override final { return false; }
+
+ private:
+ StatusCode execute( const EventContext& ) const override final
+ {
+ return const_cast<AthLegacySequenceAdapter*>( this )->execute();
+ }
+
+ DataObjIDColl m_extendedExtraObjects;
+
+ };
+#pragma GCC diagnostic pop
+ }
+}
+
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Woverloaded-virtual"
+/// Alias for backward compatibility
+class AthLegacySequence : public Athena::details::AthLegacySequenceAdapter
+{
+public:
+ using Athena::details::AthLegacySequenceAdapter::AthLegacySequenceAdapter;
+ // this is to explicitly hide the other signature of `execute`
+ StatusCode execute() override = 0;
+};
+#pragma GCC diagnostic pop
+
+
+#endif //> !ATHENABASECOMPS_ATHLEGACYSEQUENCE_H
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthReentrantAlgorithm.h b/Control/AthenaBaseComps/AthenaBaseComps/AthReentrantAlgorithm.h
index 4472d43ea233..65b21b18b6a7 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/AthReentrantAlgorithm.h
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthReentrantAlgorithm.h
@@ -22,13 +22,7 @@
#include "AthenaBaseComps/AthMemMacros.h"
-// Framework includes
-#ifndef REENTRANT_GAUDI
- #define ReEntAlgorithm Algorithm
- #include "GaudiKernel/Algorithm.h"
-#else
- #include "GaudiKernel/ReEntAlgorithm.h"
-#endif
+#include "Gaudi/Algorithm.h"
/**
@@ -40,19 +34,19 @@
* derives from @c AthReentrantAlgorithm, then the same algorithm object may
* be used in multiple threads without cloning.
*
- * Rather than @c execute, a reentrant algorithm will call @c execute_r,
- * which has two differences. First, @c execute_r is @c const. If the
+ * Rather than @c execute, a reentrant algorithm will call @c execute,
+ * which has two differences. First, @c execute is @c const. If the
* same object is being used in multiple threads, it should not have any
* state which is being changed. Any attempt to get around this with
* @c mutable or @c const_cast should be viewed with great suspicion:
* that may not be thread-safe.
*
- * Second, the @c execute_r method takes an explicit event context argument.
+ * Second, the @c execute method takes an explicit event context argument.
* This may be used to find the proper store for the event being processed
* by the current thread.
*
* The typical usage will be to declare a key object as a property of the
- * algorithm and then construct a transient handle instance during @c execute_r
+ * algorithm and then construct a transient handle instance during @c execute
* from the key and the event context. For example:
*
*@code
@@ -74,7 +68,7 @@
* return StatusCode::SUCCESS;
* }
*
- * StatusCode MyAlg::execute_r (const EventContext& ctx) const
+ * StatusCode MyAlg::execute (const EventContext& ctx) const
* {
* SG::ReadHandle<MyObj> myobj (m_rhandle, ctx);
* const MyObj& p = *myobj;
@@ -85,7 +79,7 @@
class AthReentrantAlgorithm
- : public AthCommonDataStore<AthCommonMsg<ReEntAlgorithm>>
+ : public AthCommonDataStore<AthCommonMsg<Gaudi::Algorithm>>
{
///////////////////////////////////////////////////////////////////
// Public methods:
@@ -102,27 +96,6 @@ class AthReentrantAlgorithm
/// Destructor:
virtual ~AthReentrantAlgorithm() override;
-
-#ifndef REENTRANT_GAUDI
- /**
- * @brief Standard Gaudi execute method.
- *
- * This cannot be overridden; you should override the reentrant method
- * @c execute_r instead.
- */
- virtual StatusCode execute() override final;
-
-
- /**
- * @brief Reentrant execute method.
- * @param ctx The current event context.
- *
- * Override this for your algorithm.
- */
- virtual StatusCode execute_r (const EventContext& ctx) const = 0;
-#endif
-
-
/** Specify if the algorithm is clonable
*
* Reentrant algorithms are clonable.
@@ -137,16 +110,6 @@ class AthReentrantAlgorithm
virtual unsigned int cardinality() const override;
- /**
- * @brief Return the current event context.
- *
- * Override this because the base class version won't work correctly
- * for reentrant algorithms. (We shouldn't really be using this
- * for reentrant algorithms, but just in case.).
- */
- virtual const EventContext& getContext() const override;
-
-
/**
* @brief Execute an algorithm.
*
@@ -156,7 +119,6 @@ class AthReentrantAlgorithm
*/
virtual StatusCode sysExecute (const EventContext& ctx) override;
-
/**
* @brief Return the list of extra output dependencies.
diff --git a/Control/AthenaBaseComps/src/AthLegacySequence.cxx b/Control/AthenaBaseComps/src/AthLegacySequence.cxx
new file mode 100644
index 000000000000..eaea8b72b8bb
--- /dev/null
+++ b/Control/AthenaBaseComps/src/AthLegacySequence.cxx
@@ -0,0 +1,32 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+// AthenaBaseComps includes
+#include "AthenaBaseComps/AthLegacySequence.h"
+#include "AthAlgorithmDHUpdate.h"
+
+
+namespace Athena {
+ namespace details {
+ AthLegacySequenceAdapter::AthLegacySequenceAdapter(const std::string& name,
+ ISvcLocator* pSvcLocator):
+ ::AthCommonDataStore<AthCommonMsg<Gaudi::Sequence>> ( name, pSvcLocator)
+ {
+ setProperty("Cardinality", 1);
+ m_updateDataHandles =
+ std::make_unique<AthenaBaseComps::AthAlgorithmDHUpdate>
+ (m_extendedExtraObjects,
+ std::move (m_updateDataHandles));
+ }
+
+
+ const DataObjIDColl&
+ AthLegacySequenceAdapter::extraOutputDeps() const {
+ if (!m_extendedExtraObjects.empty()) {
+ return m_extendedExtraObjects;
+ }
+ return Gaudi::Sequence::extraOutputDeps();
+ }
+ }
+
+}
diff --git a/Control/AthenaBaseComps/src/AthReentrantAlgorithm.cxx b/Control/AthenaBaseComps/src/AthReentrantAlgorithm.cxx
index f60c8cd210d2..d958beeb8caf 100644
--- a/Control/AthenaBaseComps/src/AthReentrantAlgorithm.cxx
+++ b/Control/AthenaBaseComps/src/AthReentrantAlgorithm.cxx
@@ -19,7 +19,7 @@
AthReentrantAlgorithm::AthReentrantAlgorithm( const std::string& name,
ISvcLocator* pSvcLocator,
const std::string& version ) :
- ::AthCommonDataStore<AthCommonMsg<ReEntAlgorithm>> ( name, pSvcLocator, version )
+ ::AthCommonDataStore<AthCommonMsg<Gaudi::Algorithm>> ( name, pSvcLocator, version )
{
// Set up to run AthAlgorithmDHUpdate in sysInitialize before
@@ -38,19 +38,6 @@ AthReentrantAlgorithm::~AthReentrantAlgorithm()
ATH_MSG_DEBUG ("Calling destructor");
}
-#ifndef REENTRANT_GAUDI
-/**
- * @brief Standard Gaudi execute method.
- *
- * Find the event context and call @c execute_r.
- */
-StatusCode AthReentrantAlgorithm::execute()
-{
- return execute_r (Gaudi::Hive::currentContext());
-}
-#endif
-
-
/** Specify if the algorithm is clonable
*/
bool AthReentrantAlgorithm::isClonable() const
@@ -69,18 +56,6 @@ unsigned int AthReentrantAlgorithm::cardinality() const
return 0;
}
-/**
- * @brief Return the current event context.
- *
- * Override this because the base class version won't work correctly
- * for reentrant algorithms. (We shouldn't really be using this
- * for reentrant algorithms, but just in case.).
- */
-const EventContext& AthReentrantAlgorithm::getContext() const
-{
- return Gaudi::Hive::currentContext();
-}
-
/**
* @brief Execute an algorithm.
*
@@ -90,23 +65,7 @@ const EventContext& AthReentrantAlgorithm::getContext() const
*/
StatusCode AthReentrantAlgorithm::sysExecute (const EventContext& ctx)
{
- EventContext ctx2 = ctx;
- // sysExecute will assign the context we pass in to a member variable of
- // the algorithm. If the context is referencing any dynamic memory,
- // then we can end up with a double-delete. So clear out any extension ---
- // we won't actually use the context we pass to here for anything anyway.
-
- if (ctx.hasExtension<Atlas::ExtendedEventContext>()) {
- ctx2.setExtension( Atlas::ExtendedEventContext() );
- } else if (ctx.hasExtension()) {
- ATH_MSG_ERROR("EventContext " << ctx
- << " has an extended context of an unknown type: \""
- << System::typeinfoName( ctx.getExtensionType() )
- << "\". Can't progress.");
- return StatusCode::FAILURE;
- }
-
- return ::ReEntAlgorithm::sysExecute (ctx2);
+ return Gaudi::Algorithm::sysExecute (ctx);
}
diff --git a/Control/AthenaBaseComps/test/AthReentrantAlgorithm_test.cxx b/Control/AthenaBaseComps/test/AthReentrantAlgorithm_test.cxx
index 31df7275dcf8..93babbcf671b 100644
--- a/Control/AthenaBaseComps/test/AthReentrantAlgorithm_test.cxx
+++ b/Control/AthenaBaseComps/test/AthReentrantAlgorithm_test.cxx
@@ -45,7 +45,7 @@ public:
MyAlg (const std::string& name, ISvcLocator* svcLoc);
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual void declare(Gaudi::DataHandle& hnd) override;
virtual void addDependency (const DataObjID& obj, const Gaudi::DataHandle::Mode& mode) override;
@@ -83,7 +83,7 @@ StatusCode MyAlg::initialize()
}
-StatusCode MyAlg::execute_r (const EventContext& ctx) const
+StatusCode MyAlg::execute (const EventContext& ctx) const
{
pdict = ctx.getExtension<Atlas::ExtendedEventContext>().proxy();
return StatusCode::SUCCESS;
@@ -171,7 +171,7 @@ void test1 (ISvcLocator* svcLoc)
Gaudi::Hive::setCurrentContext (ctx);
- assert (alg.execute().isSuccess());
+ assert (alg.execute( ctx ).isSuccess());
assert (pdict == xdict);
DataObjIDColl exp = {
@@ -193,7 +193,7 @@ class MyArrAlg : public AthReentrantAlgorithm
public:
MyArrAlg (const std::string& name, ISvcLocator* svcLoc);
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
SG::ReadHandleKey<MyObj> rkey;
SG::WriteHandleKey<MyObj> wkey;
@@ -215,7 +215,7 @@ MyArrAlg::MyArrAlg (const std::string& name, ISvcLocator* svcLoc)
}
-StatusCode MyArrAlg::execute_r (const EventContext& /*ctx*/) const
+StatusCode MyArrAlg::execute (const EventContext& /*ctx*/) const
{
return StatusCode::SUCCESS;
}
diff --git a/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthExUnittest.cxx b/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthExUnittest.cxx
index 07cd88c2a673..c7db4954c332 100644
--- a/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthExUnittest.cxx
+++ b/Control/AthenaExamples/AthAsgExUnittest/test/gt_AthExUnittest.cxx
@@ -46,7 +46,7 @@ namespace Athena_test {
IAlgorithm* ialg= Algorithm::Factory::create( "MyPackageAlg",
"MyPackageAlg",
Gaudi::svcLocator() ).release();
- myAlg= dynamic_cast<Algorithm*>( ialg );
+ myAlg= dynamic_cast<Gaudi::Algorithm*>( ialg );
}
@@ -64,7 +64,7 @@ namespace Athena_test {
return std::stoi( prop );
}
- Algorithm* myAlg;
+ Gaudi::Algorithm* myAlg;
};
diff --git a/Control/AthenaExamples/AthExHive/src/HiveAlgR.cxx b/Control/AthenaExamples/AthExHive/src/HiveAlgR.cxx
index e433a9bce04c..5d87ca857cb5 100644
--- a/Control/AthenaExamples/AthExHive/src/HiveAlgR.cxx
+++ b/Control/AthenaExamples/AthExHive/src/HiveAlgR.cxx
@@ -38,7 +38,7 @@ StatusCode HiveAlgR::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode HiveAlgR::execute_r(const EventContext& ctx) const {
+StatusCode HiveAlgR::execute(const EventContext& ctx) const {
info() << "execute_R: " << index() << " on " << ctx << endmsg;
diff --git a/Control/AthenaExamples/AthExHive/src/HiveAlgR.h b/Control/AthenaExamples/AthExHive/src/HiveAlgR.h
index a7bcfbd16b6c..7be555e7b9ec 100644
--- a/Control/AthenaExamples/AthExHive/src/HiveAlgR.h
+++ b/Control/AthenaExamples/AthExHive/src/HiveAlgR.h
@@ -24,7 +24,7 @@ public:
// Define the initialize, execute and finalize methods:
StatusCode initialize();
- StatusCode execute_r(const EventContext&) const;
+ StatusCode execute(const EventContext&) const;
StatusCode finalize();
private:
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.cxx b/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.cxx
index 9d63867debb7..ddc3bc4496cf 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.cxx
+++ b/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.cxx
@@ -33,7 +33,7 @@ StatusCode ExampleAlg::initialize()
}
-StatusCode ExampleAlg::execute_r (const EventContext& ctx) const
+StatusCode ExampleAlg::execute (const EventContext& ctx) const
{
// Construct handles from the keys.
// Since this is a reentrant algorithm, we have an explicit event context,
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.h b/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.h
index de06b3e3853c..22d6b4708c97 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.h
+++ b/Control/AthenaExamples/AthExStoreGateExample/src/ExampleAlg.h
@@ -29,7 +29,7 @@ class ExampleAlg
public:
ExampleAlg (const std::string& name, ISvcLocator* svcLocator);
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
// Declare the keys used to access the data: one for reading and one
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.cxx b/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.cxx
index fcfe02f317d1..ba8920403c5b 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.cxx
+++ b/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.cxx
@@ -69,7 +69,7 @@ StatusCode ReadDataReentrant::initialize()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-StatusCode ReadDataReentrant::execute_r (const EventContext& ctx) const
+StatusCode ReadDataReentrant::execute (const EventContext& ctx) const
{
// An algorithm, like this one, retrieving an object from the StoreGate(SG)
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.h b/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.h
index d2f0fd136ece..93c54318dd3b 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.h
+++ b/Control/AthenaExamples/AthExStoreGateExample/src/ReadDataReentrant.h
@@ -31,7 +31,7 @@ class ReadDataReentrant
public:
ReadDataReentrant (const std::string& name, ISvcLocator* pSvcLocator);
virtual StatusCode initialize() override final;
- virtual StatusCode execute_r (const EventContext& ctx) const override final;
+ virtual StatusCode execute (const EventContext& ctx) const override final;
virtual StatusCode finalize() override final;
private:
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.cxx b/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.cxx
index 842a29da1d47..8ad1cc179eb5 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.cxx
+++ b/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.cxx
@@ -78,7 +78,7 @@ StatusCode WriteDataReentrant::initialize()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-StatusCode WriteDataReentrant::execute_r (const EventContext& ctx) const
+StatusCode WriteDataReentrant::execute (const EventContext& ctx) const
{
//this example illustrates how to record objects into the StoreGate(SG)
//with and without providing a key
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.h b/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.h
index 67221fa97b4c..7db055a45b86 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.h
+++ b/Control/AthenaExamples/AthExStoreGateExample/src/WriteDataReentrant.h
@@ -32,7 +32,7 @@ public:
WriteDataReentrant (const std::string& name, ISvcLocator* pSvcLocator);
virtual StatusCode initialize() override final;
virtual StatusCode finalize() override final;
- virtual StatusCode execute_r (const EventContext& ctx) const override final;
+ virtual StatusCode execute (const EventContext& ctx) const override final;
private:
SG::WriteHandleKey<MyDataObj> m_dobjKey;
diff --git a/Control/AthenaExamples/AthExUnittest/test/gt_AthExUnittest.cxx b/Control/AthenaExamples/AthExUnittest/test/gt_AthExUnittest.cxx
index 5c656b82bf44..e890dcb1be68 100644
--- a/Control/AthenaExamples/AthExUnittest/test/gt_AthExUnittest.cxx
+++ b/Control/AthenaExamples/AthExUnittest/test/gt_AthExUnittest.cxx
@@ -46,7 +46,7 @@ namespace Athena_test {
IAlgorithm* ialg= Algorithm::Factory::create( "AthExUnittestAlg",
"AthExUnittestAlg",
Gaudi::svcLocator() ).release();
- myAlg= dynamic_cast<Algorithm*>( ialg );
+ myAlg= dynamic_cast<Gaudi::Algorithm*>( ialg );
}
@@ -64,7 +64,7 @@ namespace Athena_test {
return std::stoi( prop );
}
- Algorithm* myAlg = nullptr;
+ Gaudi::Algorithm* myAlg = nullptr;
};
diff --git a/Control/AthenaPython/AthenaPython/PyAthenaAlg.h b/Control/AthenaPython/AthenaPython/PyAthenaAlg.h
index 0d1ddeec4ff0..b69045c2872e 100644
--- a/Control/AthenaPython/AthenaPython/PyAthenaAlg.h
+++ b/Control/AthenaPython/AthenaPython/PyAthenaAlg.h
@@ -51,8 +51,6 @@ class Alg : virtual public ::IPyComponent,
virtual StatusCode sysInitialize() override;
- virtual void resetExecuted() override;
-
///////////////////////////////////////////////////////////////////
// Const methods:
///////////////////////////////////////////////////////////////////
diff --git a/Control/AthenaPython/src/PyAthenaAlg.cxx b/Control/AthenaPython/src/PyAthenaAlg.cxx
index dd0bc8c06550..687b3b15abfd 100644
--- a/Control/AthenaPython/src/PyAthenaAlg.cxx
+++ b/Control/AthenaPython/src/PyAthenaAlg.cxx
@@ -99,12 +99,6 @@ Alg::execute()
return sc;
}
-void
-Alg::resetExecuted()
-{
- PyAthena::callPyMethod( m_self, "resetExecuted" ).ignore();
-}
-
StatusCode
Alg::sysInitialize()
{
diff --git a/Control/AthenaServices/python/PyAthenaEventLoopMgr.py b/Control/AthenaServices/python/PyAthenaEventLoopMgr.py
index ec08cccd8c0a..4de2415d8f35 100644
--- a/Control/AthenaServices/python/PyAthenaEventLoopMgr.py
+++ b/Control/AthenaServices/python/PyAthenaEventLoopMgr.py
@@ -130,7 +130,7 @@ class PyAthenaEventLoopMgr( PyGaudi.iService ):
if not alg._ialg:
alg.retrieveInterface()
ialg = alg._ialg
- ialg.resetExecuted()
+ ialg.execState(ctx).reset()
result = ialg.sysExecute(ctx)
if result.isFailure():
from AthenaCommon.Logging import log as msg
diff --git a/Control/AthenaServices/src/AthIncFirerAlg.cxx b/Control/AthenaServices/src/AthIncFirerAlg.cxx
index 07fcc114f63c..8d126b468823 100644
--- a/Control/AthenaServices/src/AthIncFirerAlg.cxx
+++ b/Control/AthenaServices/src/AthIncFirerAlg.cxx
@@ -5,14 +5,12 @@
#include "EventInfo/EventIncident.h"
#include "AthenaKernel/errorcheck.h"
-AthIncFirerAlg::AthIncFirerAlg( const std::string& name, ISvcLocator* pSvcLocator ):AthAlgorithm(name,pSvcLocator),m_Serial(false){
+AthIncFirerAlg::AthIncFirerAlg( const std::string& name, ISvcLocator* pSvcLocator ):AthReentrantAlgorithm(name,pSvcLocator),m_Serial(false){
declareProperty("Incidents",m_incLists,"Incidents to fire");
declareProperty("FireSerial",m_Serial,"Whether to fire serial incidents");
}
StatusCode AthIncFirerAlg::initialize(){
- auto sc=AthAlgorithm::initialize();
- if (sc.isFailure()) return sc;
m_incSvc = service("IncidentSvc",true);
//Copied from CPUCruncher.cpp
if (m_incLists.value().size()==0){
@@ -22,30 +20,14 @@ StatusCode AthIncFirerAlg::initialize(){
return StatusCode::SUCCESS;
}
-StatusCode AthIncFirerAlg::execute() {
- for(auto & i:m_incLists.value()){
- ATH_MSG_VERBOSE("Firing incident "<<i);
- if((i=="BeginEvent")||(i=="EndEvent")){
- const EventInfo* event(0);
- CHECK( evtStore()->retrieve(event) );
- m_incSvc->fireIncident(std::make_unique<EventIncident>(*event, name(),i));
- if(m_Serial.value())m_incSvc->fireIncident(EventIncident(*event, name(),i));
- }else{
- m_incSvc->fireIncident(std::make_unique<Incident>(name(),i));
- if(m_Serial.value())m_incSvc->fireIncident(Incident( name(),i));
- }
- }
- return StatusCode::SUCCESS;
-}
-
-StatusCode AthIncFirerAlg::execute_r(const EventContext& ctx)const {
+StatusCode AthIncFirerAlg::execute(const EventContext& ctx)const {
auto ctxcp=ctx;
for(auto & i:m_incLists.value()){
ATH_MSG_VERBOSE("Firing incident "<<i);
if((i=="BeginEvent")||(i=="EndEvent")){
const EventInfo* event(0);
- evtStore()->retrieve(event);
+ evtStore()->retrieve(event).ignore();
m_incSvc->fireIncident(std::make_unique<EventIncident>(*event, name(),i,ctxcp));
if(m_Serial.value())m_incSvc->fireIncident(EventIncident(*event, name(),i,ctxcp));
}else{
diff --git a/Control/AthenaServices/src/AthIncFirerAlg.h b/Control/AthenaServices/src/AthIncFirerAlg.h
index 964853371428..017da68379ea 100644
--- a/Control/AthenaServices/src/AthIncFirerAlg.h
+++ b/Control/AthenaServices/src/AthIncFirerAlg.h
@@ -4,18 +4,17 @@
#include <vector>
#include <string>
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/Property.h"
#include "GaudiKernel/ServiceHandle.h"
class IIncidentSvc;
-class AthIncFirerAlg : public AthAlgorithm{
+class AthIncFirerAlg : public AthReentrantAlgorithm{
public:
AthIncFirerAlg( const std::string& name, ISvcLocator* pSvcLocator );
StatusCode initialize() override;
- StatusCode execute() override;
- StatusCode execute_r(const EventContext& ctx) const ;
+ StatusCode execute(const EventContext& ctx) const ;
StatusCode finalize() override;
private:
// Gaudi::Property<std::vector<std::string>> m_incLists{this, "Incidents", {},"List of incidents to fire"};
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.cxx
index 1c4d514f58ea..0d7f4caf263d 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.cxx
@@ -45,7 +45,7 @@ StatusCode CondAlg1::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode CondAlg1::execute_r (const EventContext& ctx) const
+StatusCode CondAlg1::execute (const EventContext& ctx) const
{
SG::ReadCondHandle<AthenaAttributeList> attrList (m_attrListKey, ctx);
int xint = (**attrList)["xint"].data<int>();
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.h b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.h
index 5a8afa237244..37fda17d17c2 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondAlg1.h
@@ -46,7 +46,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx
index f91246d40b37..079279a66ec1 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.cxx
@@ -61,7 +61,7 @@ StatusCode CondReaderAlg::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode CondReaderAlg::execute_r (const EventContext& ctx) const
+StatusCode CondReaderAlg::execute (const EventContext& ctx) const
{
SG::ReadHandle<EventInfo> eventInfo (m_eventInfoKey, ctx);
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.h b/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.h
index 237d77c15482..06781d9024b3 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondReaderAlg.h
@@ -49,7 +49,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.cxx
index 61347ae0e6af..88fd2d9700d2 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.cxx
@@ -45,7 +45,7 @@ StatusCode MetaReaderAlg::initialize()
* @brief Algorithm execute method.
* @param ctx Event context.
*/
-StatusCode MetaReaderAlg::execute_r (const EventContext& ctx) const
+StatusCode MetaReaderAlg::execute (const EventContext& ctx) const
{
// Get proper dbkey.
const DataHeader* thisDH = nullptr;
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.h b/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.h
index c1f2bd4749b8..149fced29774 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/MetaReaderAlg.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm execute method.
* @param ctx Event context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.cxx
index 2f07dafba3e8..b79938bd03e5 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.cxx
@@ -44,7 +44,7 @@ StatusCode xAODTestAlg::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestAlg::execute_r (const EventContext& ctx) const
+StatusCode xAODTestAlg::execute (const EventContext& ctx) const
{
for (const auto& t : m_tools)
ATH_CHECK( t->doit (ctx) );
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.h b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.h
index 44f39f83de0d..cd2e5824a6e9 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestAlg.h
@@ -45,7 +45,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.cxx
index 551b35e9add8..e56022f27ccd 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.cxx
@@ -69,7 +69,7 @@ StatusCode xAODTestDecor::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestDecor::execute_r (const EventContext& ctx) const
+StatusCode xAODTestDecor::execute (const EventContext& ctx) const
{
SG::ReadHandle<EventInfo> eventInfo (m_eventInfoKey, ctx);
unsigned int count = eventInfo->event_ID()->event_number() + 1;
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.h b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.h
index cf0b32004c96..1251a2c6a1f5 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestDecor.h
@@ -52,7 +52,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.cxx
index 489b62499d2f..b3b0b48fc2f6 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.cxx
@@ -62,7 +62,7 @@ StatusCode xAODTestReadDecor::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestReadDecor::execute_r (const EventContext& ctx) const
+StatusCode xAODTestReadDecor::execute (const EventContext& ctx) const
{
{
std::ostringstream ss;
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.h b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.h
index 113f994046d7..62d92088f1b8 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadDecor.h
@@ -48,7 +48,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.cxx
index 31e3a94d7d75..0a5056e239a4 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.cxx
@@ -38,7 +38,7 @@ StatusCode xAODTestReadSymlink::initialize()
}
-StatusCode xAODTestReadSymlink::execute_r (const EventContext& ctx) const
+StatusCode xAODTestReadSymlink::execute (const EventContext& ctx) const
{
SG::ReadHandle<SG::AuxElement> c (m_objKey, ctx);
SG::ReadHandle<DMTest::S1> s1 (m_s1Key, ctx);
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.h b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.h
index 55561d6328b6..a8db4bc9dbb0 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestReadSymlink.h
@@ -48,7 +48,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.cxx
index 6eaeef6adf04..46c6935b81ef 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.cxx
@@ -55,7 +55,7 @@ StatusCode xAODTestWriteCInfo::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWriteCInfo::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWriteCInfo::execute (const EventContext& ctx) const
{
//SG::ReadHandle<xAOD::EventInfo> eventInfo (m_eventInfoKey, ctx);
//unsigned int count = eventInfo->eventNumber() + 1;
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.h b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.h
index ad3d2de6bf4c..0e4ee559826b 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/xAODTestWriteCInfo.h
@@ -53,7 +53,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.cxx b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.cxx
index 640f302d671f..7e97df33bc6c 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.cxx
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.cxx
@@ -54,7 +54,7 @@ StatusCode xAODTestFilterCVec::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestFilterCVec::execute_r (const EventContext& ctx) const
+StatusCode xAODTestFilterCVec::execute (const EventContext& ctx) const
{
SG::ReadHandle<DMTest::CVec> cvec (m_cvecKey, ctx);
const static C::Accessor<ElementLink<DMTest::CVec> > cEL ("cEL");
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.h b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.h
index f6220c7e8af2..7e1dbdc16c07 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.h
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestFilterCVec.h
@@ -50,7 +50,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.cxx b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.cxx
index 507990d44627..e01a0f3b89ac 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.cxx
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.cxx
@@ -51,7 +51,7 @@ StatusCode xAODTestReadCInfo::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestReadCInfo::execute_r (const EventContext& ctx) const
+StatusCode xAODTestReadCInfo::execute (const EventContext& ctx) const
{
static const C::Accessor<int> anInt2 ("anInt2");
static const C::Accessor<int> anInt10 ("anInt10");
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.h b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.h
index 22ddd89b1ac2..77fb515eb62d 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.h
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCInfo.h
@@ -47,7 +47,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const;
+ virtual StatusCode execute (const EventContext& ctx) const;
private:
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.cxx b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.cxx
index a9468898e3d0..54224900a2e3 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.cxx
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.cxx
@@ -65,7 +65,7 @@ StatusCode xAODTestReadCVec::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestReadCVec::execute_r (const EventContext& ctx) const
+StatusCode xAODTestReadCVec::execute (const EventContext& ctx) const
{
SG::ReadHandle<DMTest::CVec> cvec (m_cvecKey, ctx);
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.h b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.h
index d45f552feebe..4b2a74c25e5d 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.h
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCVec.h
@@ -50,7 +50,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.cxx b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.cxx
index a0a95e62e9f5..2c7fd98ac5e5 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.cxx
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.cxx
@@ -54,7 +54,7 @@ StatusCode xAODTestReadCView::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestReadCView::execute_r (const EventContext& ctx) const
+StatusCode xAODTestReadCView::execute (const EventContext& ctx) const
{
SG::ReadHandle<DMTest::CView> cview (m_cviewKey, ctx);
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.h b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.h
index 9a722b5977ad..eeb513f85077 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.h
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadCView.h
@@ -50,7 +50,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.cxx b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.cxx
index ea93300e21a6..ec6526dd0e9e 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.cxx
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.cxx
@@ -64,7 +64,7 @@ StatusCode xAODTestReadHVec::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestReadHVec::execute_r (const EventContext& ctx) const
+StatusCode xAODTestReadHVec::execute (const EventContext& ctx) const
{
const DMTest::HVec* hvec = SG::get (m_hvecKey, ctx);
std::cout << m_hvecKey.key() << ":";
diff --git a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.h b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.h
index c749ab28f13e..e6dc370b7bb7 100644
--- a/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.h
+++ b/Control/DataModelTest/DataModelTestDataRead/src/xAODTestReadHVec.h
@@ -51,7 +51,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.cxx
index 164615717c98..9e1fc6a73b10 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.cxx
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.cxx
@@ -77,7 +77,7 @@ StatusCode xAODTestWrite::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWrite::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWrite::execute (const EventContext& ctx) const
{
SG::ReadHandle<EventInfo> eventInfo (m_eventInfoKey, ctx);
unsigned int count = eventInfo->event_ID()->event_number() + 1;
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.h b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.h
index bf5af6cbee38..b85a3695688f 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.h
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWrite.h
@@ -53,7 +53,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.cxx
index 05bd50affc78..50bfe4227a12 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.cxx
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.cxx
@@ -71,7 +71,7 @@ StatusCode xAODTestWriteCVec::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWriteCVec::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWriteCVec::execute (const EventContext& ctx) const
{
//SG::ReadHandle<xAOD::EventInfo> eventInfo (m_eventInfoKey, ctx);
//unsigned int count = eventInfo->eventNumber() + 1;
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.h b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.h
index e7da4af15ade..151956d790d0 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.h
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVec.h
@@ -53,7 +53,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.cxx
index 3f54d8c62cfe..ce978de84878 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.cxx
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.cxx
@@ -50,7 +50,7 @@ StatusCode xAODTestWriteCVecConst::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWriteCVecConst::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWriteCVecConst::execute (const EventContext& ctx) const
{
auto coll = CxxUtils::make_unique<DMTest::CVec>();
auto store = CxxUtils::make_unique<DMTest::CAuxContainer>();
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.h b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.h
index 5802915bdc88..fd8d71abf2bf 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.h
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCVecConst.h
@@ -49,7 +49,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.cxx
index b9a3417d759c..96a4bf7e3a23 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.cxx
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.cxx
@@ -52,7 +52,7 @@ StatusCode xAODTestWriteCView::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWriteCView::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWriteCView::execute (const EventContext& ctx) const
{
SG::ReadHandle<DMTest::CVec> cvec (m_cvecKey, ctx);
auto cview = std::make_unique<ConstDataVector<DMTest::CView> >(SG::VIEW_ELEMENTS);
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.h b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.h
index 89cf85142768..46bc298d2576 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.h
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteCView.h
@@ -52,7 +52,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.cxx
index d091fc269321..b9598e414652 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.cxx
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.cxx
@@ -56,7 +56,7 @@ StatusCode xAODTestWriteHVec::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWriteHVec::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWriteHVec::execute (const EventContext& ctx) const
{
SG::ReadHandle<EventInfo> eventInfo (m_eventInfoKey, ctx);
unsigned int count = eventInfo->event_ID()->event_number() + 1;
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.h b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.h
index a932ea9f9ec6..389b258bfa21 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.h
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteHVec.h
@@ -53,7 +53,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/**
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.cxx b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.cxx
index 549dfef439f0..efac81f2886f 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.cxx
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.cxx
@@ -53,7 +53,7 @@ StatusCode xAODTestWriteSymlinks::initialize()
/**
* @brief Algorithm event processing.
*/
-StatusCode xAODTestWriteSymlinks::execute_r (const EventContext& ctx) const
+StatusCode xAODTestWriteSymlinks::execute (const EventContext& ctx) const
{
SG::ReadHandle<EventInfo> eventInfo (m_eventInfoKey, ctx);
SG::WriteHandle<DMTest::S2> s2 (m_s2Key, ctx);
diff --git a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.h b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.h
index e58707d95c4c..a5eab365e414 100644
--- a/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.h
+++ b/Control/DataModelTest/DataModelTestDataWrite/src/xAODTestWriteSymlinks.h
@@ -50,7 +50,7 @@ public:
/**
* @brief Algorithm event processing.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Control/GaudiSequencer/src/AthRetrySequencer.cxx b/Control/GaudiSequencer/src/AthRetrySequencer.cxx
index 39d9b9296457..c7a9b0f6d4c3 100644
--- a/Control/GaudiSequencer/src/AthRetrySequencer.cxx
+++ b/Control/GaudiSequencer/src/AthRetrySequencer.cxx
@@ -44,16 +44,16 @@ AthRetrySequencer::AthRetrySequencer( const std::string& name,
AthRetrySequencer::~AthRetrySequencer()
{}
-StatusCode AthRetrySequencer::execute()
+StatusCode AthRetrySequencer::execute( const EventContext& ctx ) const
{
ATH_MSG_DEBUG ("Executing " << name() << "...");
int iloop = 0;
while (iloop < m_maxRetries || m_maxRetries == -1) {
iloop += 1;
- this->AthSequencer::resetExecuted();
- if (this->AthSequencer::execute().isSuccess() &&
- filterPassed()) {
+ this->AthSequencer::resetExecuted( ctx );
+ if (this->AthSequencer::execute( ctx ).isSuccess() &&
+ this->execState(ctx).filterPassed()) {
return StatusCode::SUCCESS;
}
}
diff --git a/Control/GaudiSequencer/src/AthRetrySequencer.h b/Control/GaudiSequencer/src/AthRetrySequencer.h
index be5055033983..0654858d3801 100644
--- a/Control/GaudiSequencer/src/AthRetrySequencer.h
+++ b/Control/GaudiSequencer/src/AthRetrySequencer.h
@@ -47,7 +47,7 @@ class AthRetrySequencer
//AthRetrySequencer &operator=(const AthRetrySequencer &alg);
// Athena algorithm's Hooks
- virtual StatusCode execute();
+ virtual StatusCode execute( const EventContext& ) const override;
///////////////////////////////////////////////////////////////////
// Const methods:
diff --git a/Control/GaudiSequencer/src/AthSequencer.cxx b/Control/GaudiSequencer/src/AthSequencer.cxx
index 393fc3dc992d..5bee1662a514 100644
--- a/Control/GaudiSequencer/src/AthSequencer.cxx
+++ b/Control/GaudiSequencer/src/AthSequencer.cxx
@@ -31,6 +31,10 @@
#include <execinfo.h>
#endif
+/// timer will abort job once timeout for any algorithm or sequence is reached
+thread_local Athena::AlgorithmTimer s_abortTimer{ 0, NULL, Athena::AlgorithmTimer::DEFAULT };
+
+
#include "valgrind/valgrind.h"
/**
@@ -49,7 +53,7 @@ bool AthSequencer::m_installedSignalHandler;
**/
AthSequencer::AthSequencer( const std::string& name,
ISvcLocator* pSvcLocator ):
- AthAlgorithm (name, pSvcLocator),
+ ::AthCommonDataStore<AthCommonMsg<Gaudi::Sequence>> ( name, pSvcLocator ),
m_timeoutMilliseconds(0),
m_abortTimer(0, NULL, Athena::AlgorithmTimer::DEFAULT ),
m_continueEventloopOnFPE(false)
@@ -89,13 +93,6 @@ AthSequencer::AthSequencer( const std::string& name,
AthSequencer::~AthSequencer()
{}
-/// Mark as a sequencer.
-bool AthSequencer::isSequence() const
-{
- return true;
-}
-
-
StatusCode
AthSequencer::initialize()
{
@@ -107,52 +104,60 @@ AthSequencer::initialize()
m_timeoutMilliseconds = 0;
}
- std::vector<Algorithm*>* theAlgs;
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend;
+ std::vector<Gaudi::Algorithm*>* theAlgs;
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend;
if (!decodeMemberNames().isSuccess()) {
ATH_MSG_ERROR ("Unable to configure one or more sequencer members ");
return StatusCode::FAILURE;
}
+ StatusCode sc(StatusCode::SUCCESS);
// Loop over all sub-algorithms
theAlgs = subAlgorithms( );
itend = theAlgs->end( );
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
+ Gaudi::Algorithm* theAlgorithm = (*it);
if (!theAlgorithm->sysInitialize( ).isSuccess()) {
- ATH_MSG_ERROR ("Unable to initialize Algorithm " << theAlgorithm->name());
- return StatusCode::FAILURE;
+ ATH_MSG_ERROR ("Unable to initialize Algorithm "
+ << theAlgorithm->type() << "/" << theAlgorithm->name());
+ sc= StatusCode::FAILURE;
}
}
- return StatusCode::SUCCESS;
+ return sc;
}
StatusCode
AthSequencer::reinitialize()
{
+ StatusCode sc(StatusCode::SUCCESS);
// Bypass the loop if this sequencer is disabled
if ( isEnabled( ) ) {
// Loop over all members calling their reinitialize functions
// if they are not disabled.
- std::vector<Algorithm*>* theAlgms = subAlgorithms( );
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend = theAlgms->end( );
+ std::vector<Gaudi::Algorithm*>* theAlgms = subAlgorithms( );
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend = theAlgms->end( );
for (it = theAlgms->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
- if ( ! theAlgorithm->isEnabled( ) ) {
- theAlgorithm->reinitialize( ).ignore();
+ Gaudi::Algorithm* theAlgorithm = (*it);
+ if ( theAlgorithm->isEnabled( ) ) {
+ if (theAlgorithm->sysReinitialize( ).isFailure()) {
+ ATH_MSG_ERROR ("Unable to reinitialize Algorithm "
+ << theAlgorithm->type () << "/"
+ << theAlgorithm->name());
+ sc = StatusCode::FAILURE;
+ }
}
}
}
- return StatusCode::SUCCESS;
+ return sc;
}
StatusCode
-AthSequencer::execute()
+AthSequencer::execute( const EventContext& ctx ) const
{
volatile bool all_good = true;
volatile bool caughtfpe= false;
@@ -160,34 +165,32 @@ AthSequencer::execute()
bool seqPass = !m_modeOR;
ATH_MSG_DEBUG ("Executing " << name() << "...");
+
+ auto& state = execState( ctx );
// Bypass the loop if this sequencer is disabled or has already been executed
- if ( isEnabled( ) && ! isExecuted( ) ) {
+ if ( isEnabled( ) && state.state() != AlgExecState::State::Done ) {
// Prevent multiple executions of this sequencer for the current event
- setExecuted( true );
+ state.setState( AlgExecState::State::Executing );
// Loop over all algorithms calling their execute functions if they
// are (a) not disabled, and (b) aren't already executed. Note that
// in the latter case the filter state is still examined. Terminate
// the loop if an algorithm indicates that it's filter didn't pass.
- std::vector<Algorithm*>* subAlgms = subAlgorithms( );
- //volatile std::vector<Algorithm*>::iterator it;
- //std::vector<Algorithm*>::iterator itend = subAlgms->end( );
- //for (it = subAlgms->begin(); it != itend; it++) {
- //volatile Algorithm* theAlgorithm = (*it);
- for (Algorithm* theAlgorithm : *subAlgms) {
+ const std::vector<Gaudi::Algorithm*>* subAlgms = subAlgorithms( );
+ for (auto theAlgorithm : *subAlgms) {
if ( theAlgorithm->isEnabled( ) ) {
- if ( ! theAlgorithm->isExecuted( ) ) {
- sc = executeAlgorithm (theAlgorithm, all_good, caughtfpe);
+ if ( theAlgorithm->execState(ctx).state() == AlgExecState::State::None ) {
+ sc = executeAlgorithm (theAlgorithm, ctx, all_good, caughtfpe);
}
if ( all_good ) {
if ( !m_ignoreFilter ) {
// Take the filter passed status of this algorithm as my own status
- bool passed = theAlgorithm->filterPassed( );
- setFilterPassed( passed );
+ bool passed = theAlgorithm->execState( ctx ).filterPassed();
+ state.setFilterPassed( passed );
// The behaviour when the filter fails depends on the
// StopOverride property.
@@ -206,16 +209,18 @@ AthSequencer::execute()
}
}
- if ( !m_ignoreFilter && !m_names.empty() ) setFilterPassed( seqPass );
+ if ( !m_ignoreFilter && !m_names.empty() ) state.setFilterPassed( seqPass );
+ state.setState( AlgExecState::State::Done );
return caughtfpe ? StatusCode::RECOVERABLE : sc;
}
-StatusCode AthSequencer::executeAlgorithm (Algorithm* theAlgorithm,
+StatusCode AthSequencer::executeAlgorithm (Gaudi::Algorithm* theAlgorithm,
+ const EventContext& ctx,
volatile bool& all_good,
- volatile bool& caughtfpe)
+ volatile bool& caughtfpe) const
{
StatusCode sc = StatusCode::SUCCESS;
@@ -226,13 +231,11 @@ StatusCode AthSequencer::executeAlgorithm (Algorithm* theAlgorithm,
!sigsetjmp(s_fpe_landing_zone, 1) )
{
// Call the sysExecute() of the method the algorithm
- m_abortTimer.start(m_timeoutMilliseconds);
- sc = theAlgorithm->sysExecute( getContext() );
+ s_abortTimer.start(m_timeoutMilliseconds);
+ sc = theAlgorithm->sysExecute( ctx );
all_good = sc.isSuccess();
- // I think this should be done by the algorithm itself,
- // but just in case...
- theAlgorithm->setExecuted( true );
- int tmp=m_abortTimer.stop();
+
+ int tmp=s_abortTimer.stop();
// but printout only if non-zero timeout was used
if (m_timeoutMilliseconds) {
ATH_MSG_DEBUG ("Time left before interrupting <"
@@ -253,92 +256,98 @@ StatusCode AthSequencer::executeAlgorithm (Algorithm* theAlgorithm,
return sc;
}
-StatusCode
-AthSequencer::finalize()
-{
- ATH_MSG_DEBUG ("Finalizing " << name() << "...");
- return StatusCode::SUCCESS;
-}
-
StatusCode
AthSequencer::start()
{
+ StatusCode sc(StatusCode::SUCCESS);
#ifdef GAUDIKERNEL_STATEMACHINE_H_
- std::vector<Algorithm*>* theAlgs;
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend;
+ std::vector<Gaudi::Algorithm*>* theAlgs;
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend;
// Loop over all sub-algorithms
theAlgs = subAlgorithms( );
itend = theAlgs->end( );
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
+ Gaudi::Algorithm* theAlgorithm = (*it);
if (!theAlgorithm->sysStart( ).isSuccess()) {
- ATH_MSG_ERROR ("Unable to start Algorithm " << theAlgorithm->name());
- return StatusCode::FAILURE;
+ ATH_MSG_ERROR ("Unable to start Algorithm "
+ << theAlgorithm->type () << "/"
+ << theAlgorithm->name());
+ sc = StatusCode::FAILURE;
}
}
#endif // !GAUDIKERNEL_STATEMACHINE_H_
-
- return StatusCode::SUCCESS;
+ return sc;
}
StatusCode
AthSequencer::stop()
{
+ StatusCode sc(StatusCode::SUCCESS);
#ifdef GAUDIKERNEL_STATEMACHINE_H_
// Loop over all sub-algorithms if they are not disabled.
- std::vector<Algorithm*>* theAlgs;
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend;
+ std::vector<Gaudi::Algorithm*>* theAlgs;
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend;
theAlgs = subAlgorithms( );
itend = theAlgs->end( );
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
+ Gaudi::Algorithm* theAlgorithm = (*it);
if (theAlgorithm->sysStop( ).isFailure()) {
- ATH_MSG_ERROR ("Unable to stop Algorithm " << theAlgorithm->name());
+ ATH_MSG_ERROR ("Unable to stop Algorithm "
+ << theAlgorithm->type () << "/"
+ << theAlgorithm->name());
+ sc = StatusCode::FAILURE;
}
}
#endif // !GAUDIKERNEL_STATEMACHINE_H_
- return StatusCode::SUCCESS;
+ return sc;
}
StatusCode
AthSequencer::beginRun()
{
// Bypass the loop if this sequencer is disabled
+ StatusCode sc(StatusCode::SUCCESS);
if ( isEnabled( ) ) {
// Loop over all members calling their sysInitialize functions
// if they are not disabled. Note that the Algoriithm::sysInitialize
// function protects this from affecting Algorithms that have already
// been initialized.
- std::vector<Algorithm*>* theAlgs = subAlgorithms( );
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend = theAlgs->end( );
+ std::vector<Gaudi::Algorithm*>* theAlgs = subAlgorithms( );
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend = theAlgs->end( );
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
+ Gaudi::Algorithm* theAlgorithm = (*it);
if (!theAlgorithm->sysInitialize( ).isSuccess()) {
ATH_MSG_ERROR
("Unable to initialize Algorithm " << theAlgorithm->name());
- return StatusCode::FAILURE;
+ sc = StatusCode::FAILURE;
+ return sc;
}
}
// Loop over all members calling their beginRun functions
// if they are not disabled.
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
- if ( ! theAlgorithm->isEnabled( ) ) {
+ Gaudi::Algorithm* theAlgorithm = (*it);
+ if ( theAlgorithm->isEnabled( ) ) {
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
- theAlgorithm->beginRun( ).ignore();
+ if (theAlgorithm->sysBeginRun( ).isFailure()) {
+ ATH_MSG_ERROR("Unable to BeginRun Algorithm "
+ << theAlgorithm->type() << "/"
+ << theAlgorithm->name());
+ sc = StatusCode::FAILURE;
+ }
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
@@ -347,50 +356,56 @@ AthSequencer::beginRun()
}
- return StatusCode::SUCCESS;
+ return sc;
}
StatusCode
AthSequencer::endRun()
{
+ StatusCode sc(StatusCode::SUCCESS);
// Bypass the loop if this sequencer is disabled
if ( isEnabled( ) ) {
// Loop over all members calling their endRun functions
// if they are not disabled.
- std::vector<Algorithm*>* theAlgms = subAlgorithms( );
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend = theAlgms->end( );
+ std::vector<Gaudi::Algorithm*>* theAlgms = subAlgorithms( );
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend = theAlgms->end( );
for (it = theAlgms->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
- if ( ! theAlgorithm->isEnabled( ) ) {
+ Gaudi::Algorithm* theAlgorithm = (*it);
+ if ( theAlgorithm->isEnabled( ) ) {
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
- theAlgorithm->endRun( ).ignore();
+ if ( theAlgorithm->sysEndRun( ).isFailure() ) {
+ ATH_MSG_ERROR("Unable to EndRun Algorithm "
+ << theAlgorithm->type() << "/"
+ << theAlgorithm->name());
+ sc = StatusCode::FAILURE;
+ }
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
}
}
- return StatusCode::SUCCESS;
+ return sc;
}
void
-AthSequencer::resetExecuted( )
+AthSequencer::resetExecuted( const EventContext& ctx ) const
{
- Algorithm::resetExecuted( );
+ execState(ctx).reset();
// Loop over all members calling their resetExecuted functions
// if they are not disabled.
- std::vector<Algorithm*>* subAlgms = subAlgorithms( );
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend = subAlgms->end( );
+ const std::vector<Gaudi::Algorithm*>* subAlgms = subAlgorithms( );
+ std::vector<Gaudi::Algorithm*>::const_iterator it;
+ std::vector<Gaudi::Algorithm*>::const_iterator itend = subAlgms->end( );
for (it = subAlgms->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
- theAlgorithm->resetExecuted( );
+ Gaudi::Algorithm* theAlgorithm = (*it);
+ theAlgorithm->execState(ctx).reset();
}
}
@@ -401,7 +416,7 @@ AthSequencer::isStopOverride( ) const
}
StatusCode
-AthSequencer::append( Algorithm* pAlgorithm )
+AthSequencer::append( Gaudi::Algorithm* pAlgorithm )
{
return append( pAlgorithm, subAlgorithms( ) );
}
@@ -409,13 +424,13 @@ AthSequencer::append( Algorithm* pAlgorithm )
StatusCode
AthSequencer::createAndAppend( const std::string& type,
const std::string& name,
- Algorithm*& pAlgorithm )
+ Gaudi::Algorithm*& pAlgorithm )
{
return createAndAppend( type, name, pAlgorithm, subAlgorithms( ) );
}
StatusCode
-AthSequencer::remove( Algorithm* pAlgorithm )
+AthSequencer::remove( Gaudi::Algorithm* pAlgorithm )
{
return remove (pAlgorithm->name());
}
@@ -444,16 +459,16 @@ AthSequencer::membershipHandler( Property& /* theProp */ )
**/
StatusCode
-AthSequencer::append( Algorithm* pAlgorithm,
- std::vector<Algorithm*>* theAlgs )
+AthSequencer::append( Gaudi::Algorithm* pAlgorithm,
+ std::vector<Gaudi::Algorithm*>* theAlgs )
{
bool all_good = true;
// Check that the specified algorithm doesn't already exist
// in the membership list
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend = theAlgs->end( );
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend = theAlgs->end( );
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
+ Gaudi::Algorithm* theAlgorithm = (*it);
if ( theAlgorithm == pAlgorithm ) {
all_good = false;
break;
@@ -469,8 +484,8 @@ AthSequencer::append( Algorithm* pAlgorithm,
StatusCode
AthSequencer::createAndAppend( const std::string& type,
const std::string& algName,
- Algorithm*& pAlgorithm,
- std::vector<Algorithm*>* theAlgs )
+ Gaudi::Algorithm*& pAlgorithm,
+ std::vector<Gaudi::Algorithm*>* theAlgs )
{
StatusCode result = StatusCode::FAILURE;
IAlgManager* theAlgMgr;
@@ -484,7 +499,7 @@ AthSequencer::createAndAppend( const std::string& type,
result = theAlgMgr->createAlgorithm( type, algName, tmp );
if ( result.isSuccess( ) ) {
try{
- pAlgorithm = dynamic_cast<Algorithm*>(tmp);
+ pAlgorithm = dynamic_cast<Gaudi::Algorithm*>(tmp);
theAlgs->push_back( pAlgorithm );
} catch(...){
ATH_MSG_ERROR ("Unable to create Algorithm " << algName);
@@ -498,7 +513,7 @@ AthSequencer::createAndAppend( const std::string& type,
StatusCode
AthSequencer::decodeNames( Gaudi::Property<std::vector<std::string>>& theNames,
- std::vector<Algorithm*>* theAlgs )
+ std::vector<Gaudi::Algorithm*>* theAlgs )
{
StatusCode result;
IAlgManager* theAlgMgr;
@@ -536,10 +551,10 @@ AthSequencer::decodeNames( Gaudi::Property<std::vector<std::string>>& theNames,
// Check whether the suppied name corresponds to an existing
// Algorithm object.
IAlgorithm* theIAlg;
- Algorithm* theAlgorithm;
+ Gaudi::Algorithm* theAlgorithm;
StatusCode status = theAlgMgr->getAlgorithm( theName, theIAlg );
if ( status.isSuccess( ) ) {
- theAlgorithm = dynamic_cast<Algorithm*>(theIAlg);
+ theAlgorithm = dynamic_cast<Gaudi::Algorithm*>(theIAlg);
if (!theAlgorithm) {
ATH_MSG_WARNING
(theName << " is not an Algorithm - Failed dynamic cast");
@@ -581,7 +596,7 @@ AthSequencer::decodeNames( Gaudi::Property<std::vector<std::string>>& theNames,
if ( result.isSuccess() && !theAlgs->empty() ) {
msg(MSG::DEBUG) << "Member list: ";
bool first = true;
- for (Algorithm* alg : *theAlgs) {
+ for (Gaudi::Algorithm* alg : *theAlgs) {
if (first)
first = false;
else
@@ -599,15 +614,15 @@ AthSequencer::decodeNames( Gaudi::Property<std::vector<std::string>>& theNames,
StatusCode
AthSequencer::remove( const std::string& algname,
- std::vector<Algorithm*>* theAlgs )
+ std::vector<Gaudi::Algorithm*>* theAlgs )
{
StatusCode result = StatusCode::FAILURE;
// Test that the algorithm exists in the member list
- std::vector<Algorithm*>::iterator it;
- std::vector<Algorithm*>::iterator itend = theAlgs->end( );
+ std::vector<Gaudi::Algorithm*>::iterator it;
+ std::vector<Gaudi::Algorithm*>::iterator itend = theAlgs->end( );
for (it = theAlgs->begin(); it != itend; it++) {
- Algorithm* theAlgorithm = (*it);
+ Gaudi::Algorithm* theAlgorithm = (*it);
if ( theAlgorithm->name( ) == algname ) {
// Algorithm with specified name exists in the algorithm list - remove it
@@ -671,7 +686,7 @@ void AthSequencer::fpe_callback( int /* sig_number */, siginfo_t *info, void* /*
}
void
-AthSequencer::cleanupAfterFPE(siginfo_t *info)
+AthSequencer::cleanupAfterFPE(siginfo_t *info) const
{
if (info->si_signo != SIGFPE) /* should never happen */
{
@@ -696,6 +711,7 @@ AthSequencer::cleanupAfterFPE(siginfo_t *info)
// now have to unwind gaudi stack
// Check if the AlgContextSvc is running
IAlgContextSvc* algContextSvc(0);
+ EventContext ctx = Gaudi::Hive::currentContext();
if (service("AlgContextSvc", algContextSvc, /*createIf=*/ false).isSuccess() && algContextSvc)
{
IAlgorithm* alg = algContextSvc->currentAlg();
@@ -718,7 +734,7 @@ AthSequencer::cleanupAfterFPE(siginfo_t *info)
}
}
while ( algContextSvc->algorithms().size() && algContextSvc->currentAlg()->name() != this->name() )
- if ( algContextSvc->unSetCurrentAlg(algContextSvc->currentAlg()).isFailure() )
+ if ( algContextSvc->unSetCurrentAlg(algContextSvc->currentAlg(),ctx).isFailure() )
this->msg() << "cannot unwind: " << algContextSvc->currentAlg();
this->msg() << endmsg;
}
diff --git a/Control/GaudiSequencer/src/AthSequencer.h b/Control/GaudiSequencer/src/AthSequencer.h
index 516d33275e0c..13fa4d45e993 100644
--- a/Control/GaudiSequencer/src/AthSequencer.h
+++ b/Control/GaudiSequencer/src/AthSequencer.h
@@ -13,8 +13,11 @@
#define GAUDISEQUENCER_ATHSEQUENCER_H
// Include files
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthCommonDataStore.h"
+#include "AthenaBaseComps/AthCommonMsg.h"
+
#include "GaudiKernel/Property.h"
+#include "Gaudi/Sequence.h"
#include "AthenaKernel/AlgorithmTimer.h"
@@ -34,7 +37,8 @@
** terminated and the AthSequencer assumes the same filtered state as the
** last member.
**/
-class AthSequencer : public AthAlgorithm
+class AthSequencer
+ : public AthCommonDataStore<AthCommonMsg<Gaudi::Sequence>>
{
public:
@@ -54,8 +58,6 @@ public:
** Public Function Members **
*****************************/
- /// Mark as a sequencer.
- virtual bool isSequence() const override final;
/**
** Initialization of a sequencer. Typically things like histogram creation,
@@ -74,13 +76,8 @@ public:
** The actions to be performed by the sequencer on an event. This method
** is invoked once per event.
**/
- virtual StatusCode execute( ) override;
-
- /**
- ** AthSequencer finalization.
- **/
- virtual StatusCode finalize( ) override;
-
+ virtual StatusCode execute( const EventContext& ctx ) const override;
+
/**
** AthSequencer beginRun.
**/
@@ -102,7 +99,7 @@ public:
/**
** Reset the AthSequencer executed state for the current event.
**/
- virtual void resetExecuted( ) override;
+ virtual void resetExecuted( const EventContext& ctx ) const;
/**
** Has the StopOverride mode been set?
@@ -112,7 +109,7 @@ public:
/**
** Append an algorithm to the sequencer.
**/
- StatusCode append( Algorithm* pAlgorithm );
+ StatusCode append( Gaudi::Algorithm* pAlgorithm );
/**
** Create a algorithm and append it to the sequencer. A call to this method
@@ -126,13 +123,13 @@ public:
StatusCode createAndAppend(
const std::string& type, // The concrete algorithm class of the algorithm
const std::string& name, // The name to be given to the algorithm
- Algorithm*& pAlgorithm // Set to point to the newly created algorithm object
+ Gaudi::Algorithm*& pAlgorithm // Set to point to the newly created algorithm object
);
/**
** Remove the specified algorithm from the sequencer
**/
- StatusCode remove( Algorithm* pAlgorithm );
+ StatusCode remove( Gaudi::Algorithm* pAlgorithm );
StatusCode remove( const std::string& name );
/// Decode Member Name list
@@ -152,8 +149,8 @@ protected:
/**
** Append an algorithm to the sequencer.
**/
- StatusCode append( Algorithm* pAlgorithm,
- std::vector<Algorithm*>* theAlgs );
+ StatusCode append( Gaudi::Algorithm* pAlgorithm,
+ std::vector<Gaudi::Algorithm*>* theAlgs );
/**
** Create a algorithm and append it to the sequencer. A call to this method
@@ -167,21 +164,21 @@ protected:
StatusCode createAndAppend(
const std::string& type, // The concrete algorithm class of the algorithm
const std::string& name, // The name to be given to the algorithm
- Algorithm*& pAlgorithm, // Set to point to the newly created algorithm object
- std::vector<Algorithm*>* theAlgs
+ Gaudi::Algorithm*& pAlgorithm, // Set to point to the newly created algorithm object
+ std::vector<Gaudi::Algorithm*>* theAlgs
);
/**
** Decode algorithm names, creating or appending algorithms as appropriate
**/
StatusCode decodeNames( Gaudi::Property<std::vector<std::string>>& theNames,
- std::vector<Algorithm*>* theAlgs );
+ std::vector<Gaudi::Algorithm*>* theAlgs );
/**
** Remove the specified algorithm from the sequencer
**/
- StatusCode remove( const std::string& algname, std::vector<Algorithm*>* theAlgs );
+ StatusCode remove( const std::string& algname, std::vector<Gaudi::Algorithm*>* theAlgs );
private:
@@ -201,9 +198,10 @@ private:
/// Run one algorithm.
/// Broken out to avoid warnings related to longjmp.
- StatusCode executeAlgorithm (Algorithm* theAlgorithm,
+ StatusCode executeAlgorithm (Gaudi::Algorithm* theAlgorithm,
+ const EventContext& ctx,
volatile bool& all_good,
- volatile bool& caughtfpe);
+ volatile bool& caughtfpe) const;
/**************************
** Private Data Members **
@@ -247,7 +245,7 @@ private:
static void fpe_trap_enable();
static void fpe_callback(int, siginfo_t*, void*);
static bool prepareCatchAndEnableFPE();
- void cleanupAfterFPE(siginfo_t*);
+ void cleanupAfterFPE(siginfo_t*) const;
static void uninstallFPESignalHandler();
static const size_t s_maxArraySize = 50;
diff --git a/Control/SGComps/src/AddressRemappingSvc.cxx b/Control/SGComps/src/AddressRemappingSvc.cxx
index e97654674287..8efdb0af1a2d 100644
--- a/Control/SGComps/src/AddressRemappingSvc.cxx
+++ b/Control/SGComps/src/AddressRemappingSvc.cxx
@@ -465,7 +465,7 @@ void AddressRemappingSvc::initDeletes()
m_haveDeletes = true;
for (IAlgorithm* ialg : m_algResourcePool->getFlatAlgList()) {
- if (Algorithm* alg = dynamic_cast<Algorithm*> (ialg)) {
+ if (Gaudi::Algorithm* alg = dynamic_cast<Gaudi::Algorithm*> (ialg)) {
// Need to ignore SGInputLoader; it'll have output deps
// on everything being read.
if (alg->name() == "SGInputLoader") continue;
@@ -488,7 +488,10 @@ void AddressRemappingSvc::initDeletes()
}
}
}
+ } else {
+ ATH_MSG_WARNING(ialg->name() << " doesn't seem to be an Algorithm" );
}
+
}
}
//______________________________________________________________________________
diff --git a/Control/StoreGate/StoreGate/ReadDecorHandle.h b/Control/StoreGate/StoreGate/ReadDecorHandle.h
index 025ca9964e6e..83884e546853 100644
--- a/Control/StoreGate/StoreGate/ReadDecorHandle.h
+++ b/Control/StoreGate/StoreGate/ReadDecorHandle.h
@@ -73,7 +73,7 @@ namespace SG {
* ...
* }
*
- * StatusCode MyAlgorithm::execute_r (const EventContext& ctx) const
+ * StatusCode MyAlgorithm::execute (const EventContext& ctx) const
* {
* SG::ReadDecorHandle<MyCont, float> h (m_key, ctx);
* for (const MyObj& o : *h) { // Access the container.
diff --git a/Control/StoreGate/StoreGate/ReadDecorHandleKey.h b/Control/StoreGate/StoreGate/ReadDecorHandleKey.h
index 1e4f643519d5..d05be29b4aa3 100644
--- a/Control/StoreGate/StoreGate/ReadDecorHandleKey.h
+++ b/Control/StoreGate/StoreGate/ReadDecorHandleKey.h
@@ -55,7 +55,7 @@ namespace SG {
* ...
* }
*
- * StatusCode MyAlgorithm::execute_r (const EventContext& ctx) const
+ * StatusCode MyAlgorithm::execute (const EventContext& ctx) const
* {
* SG::ReadDecorHandle<MyCont, float> h (m_key, ctx);
* for (const MyObj& o : *h) { // Access the container.
diff --git a/Control/StoreGate/StoreGate/WriteDecorHandle.h b/Control/StoreGate/StoreGate/WriteDecorHandle.h
index ced61555169e..c50b96f81bd7 100644
--- a/Control/StoreGate/StoreGate/WriteDecorHandle.h
+++ b/Control/StoreGate/StoreGate/WriteDecorHandle.h
@@ -75,7 +75,7 @@ namespace SG {
* ...
* }
*
- * StatusCode MyAlgorithm::execute_r (const EventContext& ctx) const
+ * StatusCode MyAlgorithm::execute (const EventContext& ctx) const
* {
* SG::WriteDecorHandle<MyCont, float> h (m_key, ctx);
* for (const MyObj& o : *h) { // Access the container.
diff --git a/Control/StoreGate/StoreGate/WriteDecorHandleKey.h b/Control/StoreGate/StoreGate/WriteDecorHandleKey.h
index 8576bc78b070..e8820fb81ebe 100644
--- a/Control/StoreGate/StoreGate/WriteDecorHandleKey.h
+++ b/Control/StoreGate/StoreGate/WriteDecorHandleKey.h
@@ -60,7 +60,7 @@ namespace SG {
* ...
* }
*
- * StatusCode MyAlgorithm::execute_r (const EventContext& ctx) const
+ * StatusCode MyAlgorithm::execute (const EventContext& ctx) const
* {
* SG::WriteDecorHandle<MyCont, float> h (m_key, ctx);
* for (const MyObj& o : *h) { // Access the container.
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.cxx
index cdd88c845a48..4c45d79ceff2 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.cxx
@@ -41,7 +41,7 @@ StatusCode ReWriteData::initialize() {
return StatusCode::SUCCESS;
}
//___________________________________________________________________________
-StatusCode ReWriteData::execute_r (const EventContext& ctx) const {
+StatusCode ReWriteData::execute (const EventContext& ctx) const {
ATH_MSG_DEBUG("in execute()");
if (!m_exampleHitKey.key().empty()) {
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.h b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.h
index 2d98b4f84f02..5a564c8162fe 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.h
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReWriteData.h
@@ -32,7 +32,7 @@ public: // Constructor and Destructor
public:
/// Gaudi Service Interface method implementations:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.cxx
index 446a26a5f3b3..0cff7e2dc641 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.cxx
@@ -54,7 +54,7 @@ StatusCode ReadData::initialize() {
return StatusCode::SUCCESS;
}
//___________________________________________________________________________
-StatusCode ReadData::execute_r (const EventContext& ctx) const {
+StatusCode ReadData::execute (const EventContext& ctx) const {
ATH_MSG_DEBUG("in execute()");
SG::ConstIterator<EventStreamInfo> esi1, esi2;
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.h b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.h
index 62bad7121f90..4c209285fa85 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.h
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/ReadData.h
@@ -34,7 +34,7 @@ public: // Constructor and Destructor
public:
/// Gaudi Service Interface method implementations:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.cxx
index 85e08478ebc8..a28b1e16e362 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.cxx
@@ -45,7 +45,7 @@ StatusCode WriteCond::initialize() {
return StatusCode::SUCCESS;
}
//___________________________________________________________________________
-StatusCode WriteCond::execute_r (const EventContext& ctx) const {
+StatusCode WriteCond::execute (const EventContext& ctx) const {
ATH_MSG_DEBUG("in execute()");
SG::ReadHandle<ExampleHitContainer> hits (m_exampleHitKey, ctx);
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.h b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.h
index 813489ff99da..330b4fa343a8 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.h
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteCond.h
@@ -30,7 +30,7 @@ public: // Constructor and Destructor
public:
/// Gaudi Service Interface method implementations:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode stop() override;
private:
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.cxx
index 014e904dd27b..e06c58555536 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.cxx
@@ -32,7 +32,7 @@ StatusCode WriteData::initialize() {
return StatusCode::SUCCESS;
}
//___________________________________________________________________________
-StatusCode WriteData::execute_r (const EventContext& ctx) const {
+StatusCode WriteData::execute (const EventContext& ctx) const {
ATH_MSG_DEBUG("in execute()");
int eventNumber = ctx.eventID().event_number();
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.h b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.h
index 03ccdcd06917..0eedbdc1d1fa 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.h
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteData.h
@@ -30,7 +30,7 @@ public: // Constructor and Destructor
public:
/// Gaudi Service Interface method implementations:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
SG::WriteHandleKey<ExampleHitContainer> m_exampleHitKey { this, "ExampleHitKey", "MyHits" };
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.cxx
index 4d55425c6c6f..d51e4620a5f2 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.cxx
@@ -50,7 +50,7 @@ StatusCode WriteTag::initialize() {
return StatusCode::SUCCESS;
}
//___________________________________________________________________________
-StatusCode WriteTag::execute_r (const EventContext& ctx) const {
+StatusCode WriteTag::execute (const EventContext& ctx) const {
ATH_MSG_DEBUG("in execute()");
unsigned int eventNumber = ctx.eventID().event_number();
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.h b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.h
index 7d7d1006a8f3..874f3f5124fb 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.h
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/WriteTag.h
@@ -33,7 +33,7 @@ public: // Constructor and Destructor
public:
/// Gaudi Service Interface method implementations:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.cxx
index a34750fb2167..1f20118e7e8e 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.cxx
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.cxx
@@ -34,7 +34,7 @@ StatusCode MakeInputDataHeader::initialize() {
return(StatusCode::SUCCESS);
}
//___________________________________________________________________________
-StatusCode MakeInputDataHeader::execute_r (const EventContext& ctx) const
+StatusCode MakeInputDataHeader::execute (const EventContext& ctx) const
{
SG::ReadHandle<DataHeader> dh (m_streamName, ctx);
ATH_CHECK( dh.alias (m_aliasName) );
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.h b/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.h
index a99cf8fc9bdb..4fc503d7ac30 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.h
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/MakeInputDataHeader.h
@@ -38,7 +38,7 @@ public:
virtual ~MakeInputDataHeader();
/// AthAlgorithm Interface method implementations:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& ctx) const override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.cxx b/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.cxx
index 1085be4378ff..81783c7e1cb8 100644
--- a/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.cxx
+++ b/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.cxx
@@ -34,7 +34,7 @@ OnlineLumiCalibrationCondAlg::initialize()
StatusCode
-OnlineLumiCalibrationCondAlg::execute_r (const EventContext& ctx) const
+OnlineLumiCalibrationCondAlg::execute (const EventContext& ctx) const
{
SG::ReadCondHandle<CondAttrListCollection> calibrationFolder
(m_calibrationFolderName, ctx);
diff --git a/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.h b/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.h
index 4b3966d57342..d267e68b5e2e 100644
--- a/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.h
+++ b/Database/CoolLumiUtilities/src/OnlineLumiCalibrationCondAlg.h
@@ -29,7 +29,7 @@ public:
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondAlg_test.cxx b/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondAlg_test.cxx
index d0ad5af704a7..3eaea94dc889 100644
--- a/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondAlg_test.cxx
+++ b/Database/CoolLumiUtilities/test/OnlineLumiCalibrationCondAlg_test.cxx
@@ -104,7 +104,7 @@ void test1 (ISvcLocator* svcloc)
ServiceHandle<StoreGateSvc> conditionStore ("ConditionStore", "test");
assert( conditionStore->record (std::move (cc1), "testcalib") );
- assert( alg.execute_r (ctx).isSuccess() );
+ assert( alg.execute (ctx).isSuccess() );
CondCont<OnlineLumiCalibrationCondData>* cc2 = nullptr;
assert( conditionStore->retrieve (cc2, "OnlineLumiCalibrationCondData").isSuccess() );
diff --git a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
index 78301af97fd7..c483744ceddb 100644
--- a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
+++ b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
@@ -29,7 +29,7 @@ StatusCode RegSelTestAlg::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode RegSelTestAlg::execute_r(const EventContext& /*context*/) const {
+StatusCode RegSelTestAlg::execute(const EventContext& /*context*/) const {
ATH_MSG_DEBUG ("Executing " << name() << "...");
if ( m_mt )
CHECK( mt() );
diff --git a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.h b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.h
index 724b2a257314..6ff141f9dffa 100644
--- a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.h
+++ b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.h
@@ -25,7 +25,7 @@ class RegSelTestAlg
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
StatusCode dump() const;
StatusCode mt() const;
diff --git a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx
index 4d712dc83cca..1f796ef516ac 100644
--- a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx
+++ b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx
@@ -57,7 +57,7 @@ private:
-StatusCode ROBDataProviderMTTest::execute_r( const EventContext& context ) const
+StatusCode ROBDataProviderMTTest::execute( const EventContext& context ) const
{
// will be asking for many ROBs from the list and check if all of them come from the same physical event
const RawEvent* ev = m_robDataProvider->getEvent( context );
diff --git a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.h b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.h
index 12468b2d71dd..853641e4c39c 100644
--- a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.h
+++ b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.h
@@ -28,7 +28,7 @@ class ROBDataProviderMTTest
//ROBDataProviderMTTest &operator=(const ROBDataProviderMTTest &alg);
StatusCode initialize() override;
- StatusCode execute_r(const EventContext& context) const override;
+ StatusCode execute(const EventContext& context) const override;
StatusCode finalize() override;
private:
diff --git a/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.cxx b/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.cxx
index cdc4b67c9f96..9ad9029219a1 100644
--- a/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.cxx
+++ b/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.cxx
@@ -59,7 +59,7 @@ namespace xAODMaker {
return StatusCode::SUCCESS;
}
- StatusCode EventInfoCnvAlg::execute_r (const EventContext& ctx) const {
+ StatusCode EventInfoCnvAlg::execute (const EventContext& ctx) const {
// Check if anything needs to be done:
// FIXME: Job configuration should be fixed so we don't need this test.
@@ -158,7 +158,7 @@ namespace xAODMaker {
ATH_MSG_DEBUG( "Preparing xAOD::EventInfo object in beginRun()" );
// Run the conversion using the execute function:
- CHECK( execute_r (Gaudi::Hive::currentContext()) );
+ CHECK( execute (Gaudi::Hive::currentContext()) );
}
// Return gracefully:
diff --git a/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.h b/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.h
index ba1887428768..40781a4634a5 100644
--- a/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.h
+++ b/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvAlg.h
@@ -43,7 +43,7 @@ namespace xAODMaker {
/// Function initialising the algorithm
virtual StatusCode initialize() override;
/// Function executing the algorithm
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
/// Function executed at the beginning of the job, once the first event
/// from the input file is already open
diff --git a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx
index 6fe5bd6b2116..1e8ed9c0126c 100644
--- a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx
+++ b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx
@@ -85,7 +85,7 @@ namespace xAODMaker {
}
- StatusCode xAODTruthCnvAlg::execute_r (const EventContext& ctx) const {
+ StatusCode xAODTruthCnvAlg::execute (const EventContext& ctx) const {
SG::WriteHandle<xAODTruthParticleLinkVector> truthLinkVec(m_truthLinkContainerKey, ctx);
ATH_CHECK(truthLinkVec.record(std::make_unique<xAODTruthParticleLinkVector>()));
diff --git a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.h b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.h
index 10b3fb5c02b7..dcdccf5d2bb2 100644
--- a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.h
+++ b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.h
@@ -53,7 +53,7 @@ namespace xAODMaker {
/// Function initialising the algorithm
virtual StatusCode initialize() override;
/// Function executing the algorithm
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/ForwardDetectors/LUCID/LUCID_DigiTools/LUCID_DigiTools/LUCID_DigiSettings.h b/ForwardDetectors/LUCID/LUCID_DigiTools/LUCID_DigiTools/LUCID_DigiSettings.h
index b217134a1252..fcc929838aa5 100644
--- a/ForwardDetectors/LUCID/LUCID_DigiTools/LUCID_DigiTools/LUCID_DigiSettings.h
+++ b/ForwardDetectors/LUCID/LUCID_DigiTools/LUCID_DigiTools/LUCID_DigiSettings.h
@@ -27,7 +27,7 @@ class LUCID_DigiSettings {
double GetDigiParDouble(std::string);
int GetDigiParInt (std::string);
- void OverwriteDigiParProperties(Algorithm*);
+ void OverwriteDigiParProperties(Gaudi::Algorithm*);
void OverwriteDigiParValues();
void Print() const;
diff --git a/ForwardDetectors/LUCID/LUCID_DigiTools/src/LUCID_DigiSettings.cxx b/ForwardDetectors/LUCID/LUCID_DigiTools/src/LUCID_DigiSettings.cxx
index 7085cc2676a4..37fe7480ba4c 100644
--- a/ForwardDetectors/LUCID/LUCID_DigiTools/src/LUCID_DigiSettings.cxx
+++ b/ForwardDetectors/LUCID/LUCID_DigiTools/src/LUCID_DigiSettings.cxx
@@ -45,7 +45,7 @@ void LUCID_DigiSettings::SetDefaultValues() {
m_tdcFedNoiseFactor = 0.8;
}
-void LUCID_DigiSettings::OverwriteDigiParProperties(Algorithm* alg) {
+void LUCID_DigiSettings::OverwriteDigiParProperties(Gaudi::Algorithm* alg) {
std::map <std::string, parDouble>::iterator doubleMapIt = m_doubleMap.begin();
std::map <std::string, parInt>::iterator intMapIt = m_intMap.begin();
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.cxx
index 9d8a72ff20be..45ff6f53daab 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.cxx
@@ -42,9 +42,9 @@ StatusCode MTCalibPebHypoAlg::finalize() {
}
// =============================================================================
-// Implementation of AthReentrantAlgorithm::execute_r
+// Implementation of AthReentrantAlgorithm::execute
// =============================================================================
-StatusCode MTCalibPebHypoAlg::execute_r(const EventContext& eventContext) const {
+StatusCode MTCalibPebHypoAlg::execute(const EventContext& eventContext) const {
ATH_MSG_DEBUG("Executing " << name());
// New output
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.h b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.h
index 81cf142d5455..af8791804762 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.h
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/MTCalibPebHypoAlg.h
@@ -22,7 +22,7 @@ public:
// ------------------------- AthReentrantAlgorithm methods -------------------
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
- virtual StatusCode execute_r(const EventContext& eventContext) const override;
+ virtual StatusCode execute(const EventContext& eventContext) const override;
private:
ToolHandleArray<MTCalibPebHypoTool> m_hypoTools {this, "HypoTools", {}, "Tools to perform selection"};
};
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.cxx
index a7cee61fc80e..bdd0ef2c8497 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.cxx
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.cxx
@@ -27,7 +27,7 @@ StatusCode InDet::InDetBeamSpotReader::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode InDet::InDetBeamSpotReader::execute_r(const EventContext& ctx) const {
+StatusCode InDet::InDetBeamSpotReader::execute(const EventContext& ctx) const {
ATH_MSG_DEBUG( "in execute()");
//get the set of
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.h b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.h
index 3be3e5f167a2..8533e0c82474 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.h
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.h
@@ -27,7 +27,7 @@ namespace InDet {
//Standard constructor and methods
InDetBeamSpotReader (const std::string& name, ISvcLocator* pSvcLocator);
StatusCode initialize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
StatusCode finalize() override;
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx
index 69ed0bb97d54..16ca558d36b2 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx
@@ -151,7 +151,7 @@ StatusCode SpecialPixelMapCondAlg::initialize()
return StatusCode::SUCCESS;
}
-StatusCode SpecialPixelMapCondAlg::execute_r (const EventContext& ctx) const
+StatusCode SpecialPixelMapCondAlg::execute (const EventContext& ctx) const
{
ATH_MSG_DEBUG("Entering SpecialPixelMapCondAlg");
const std::array<const SG::ReadCondHandleKey<CondAttrListCollection>*, s_max> condarray{{ &m_ConAttrList1, &m_ConAttrList2, &m_ConAttrList3, &m_ConAttrList4 }};
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.h
index 57b77ee1dfd9..02be8f33b188 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.h
@@ -23,7 +23,7 @@ class SpecialPixelMapCondAlg: public AthReentrantAlgorithm {
~SpecialPixelMapCondAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext&) const override;
+ virtual StatusCode execute (const EventContext&) const override;
private:
diff --git a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/InDetCaloClusterROISelector/CaloClusterROI_Selector.h b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/InDetCaloClusterROISelector/CaloClusterROI_Selector.h
index 312c5d863fbf..d737c2760af0 100755
--- a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/InDetCaloClusterROISelector/CaloClusterROI_Selector.h
+++ b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/InDetCaloClusterROISelector/CaloClusterROI_Selector.h
@@ -44,7 +44,7 @@ class CaloClusterROI_Selector : public AthReentrantAlgorithm
/** @brief finalize method*/
StatusCode finalize();
/** @brief execute method*/
- StatusCode execute_r(const EventContext& ctx) const;
+ StatusCode execute(const EventContext& ctx) const;
private:
diff --git a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/CaloClusterROI_Selector.cxx b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/CaloClusterROI_Selector.cxx
index ded679b271a6..6f77152ac95d 100755
--- a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/CaloClusterROI_Selector.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/CaloClusterROI_Selector.cxx
@@ -77,7 +77,7 @@ StatusCode InDet::CaloClusterROI_Selector::finalize()
}
// ======================================================================
-StatusCode InDet::CaloClusterROI_Selector::execute_r(const EventContext& ctx) const
+StatusCode InDet::CaloClusterROI_Selector::execute(const EventContext& ctx) const
{
//
// athena execute method
diff --git a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/InDetExtensionProcessor/InDetExtensionProcessor.h b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/InDetExtensionProcessor/InDetExtensionProcessor.h
index 3e525a67b8e5..9a08f71ead06 100755
--- a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/InDetExtensionProcessor/InDetExtensionProcessor.h
+++ b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/InDetExtensionProcessor/InDetExtensionProcessor.h
@@ -40,7 +40,7 @@ public:
InDetExtensionProcessor(const std::string &name,ISvcLocator *pSvcLocator);
virtual StatusCode initialize();
- virtual StatusCode execute_r(const EventContext& ctx) const;
+ virtual StatusCode execute(const EventContext& ctx) const;
virtual StatusCode finalize();
private:
diff --git a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/InDetExtensionProcessor.cxx b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/InDetExtensionProcessor.cxx
index ad32cae93dd9..97414860ef42 100755
--- a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/InDetExtensionProcessor.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/InDetExtensionProcessor.cxx
@@ -115,7 +115,7 @@ StatusCode InDet::InDetExtensionProcessor::initialize()
//==================================================================================================
// Execute method:
-StatusCode InDet::InDetExtensionProcessor::execute_r(const EventContext& ctx) const
+StatusCode InDet::InDetExtensionProcessor::execute(const EventContext& ctx) const
{
// process the extensions
SG::ReadHandle<TrackCollection> tracks(m_trackName, ctx);
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.cxx
index 2e5411fead0b..ed8be743ba73 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.cxx
@@ -55,7 +55,7 @@ namespace InDet{
CacheCreator::~CacheCreator() {}
- StatusCode CacheCreator::execute_r (const EventContext& ctx) const
+ StatusCode CacheCreator::execute (const EventContext& ctx) const
{
if(!m_disableTRT) ATH_CHECK(CreateContainer(m_rioContainerCacheKey, m_pTRTHelper->straw_layer_hash_max(), ctx));
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.h b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.h
index 1ed4085d859a..2f47911654d8 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.h
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.h
@@ -37,7 +37,7 @@ namespace InDet{
CacheCreator(const std::string &name,ISvcLocator *pSvcLocator);
virtual ~CacheCreator() ;
virtual StatusCode initialize () override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
//No need for finalize
protected:
const TRT_ID* m_pTRTHelper;
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h
index 1ebf0e96642b..0f89649a0022 100755
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h
+++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h
@@ -95,7 +95,7 @@ namespace InDet {
StatusCode initialize() override;
- StatusCode execute_r (const EventContext& ctx) const override;
+ StatusCode execute (const EventContext& ctx) const override;
StatusCode finalize() override;
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx
index 0230f094c480..6cd6c38df275 100755
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx
+++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx
@@ -164,7 +164,7 @@ StatusCode SiTrackerSpacePointFinder::initialize()
//-------------------------------------------------------------------------
-StatusCode SiTrackerSpacePointFinder::execute_r (const EventContext& ctx) const
+StatusCode SiTrackerSpacePointFinder::execute (const EventContext& ctx) const
{
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.cxx
index 47abf1be458a..27acecaf8ef6 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.cxx
@@ -44,7 +44,7 @@ StatusCode InDet::ToolTester::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode InDet::ToolTester::execute_r(const EventContext &ctx) const {
+StatusCode InDet::ToolTester::execute(const EventContext &ctx) const {
// Retrieve the tracks:
SG::ReadHandle<xAOD::TrackParticleContainer> tracks(m_sgKey,ctx);
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.h b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.h
index 08bc2a208ce1..445d5290a1de 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/ToolTester.h
@@ -34,7 +34,7 @@ namespace InDet {
/// Function initialising the algorithm
virtual StatusCode initialize();
/// Function executing the algorithm
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
private:
/// StoreGate key for the track container to investigate
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/InDetDetailedTrackTruthMaker.h b/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/InDetDetailedTrackTruthMaker.h
index 264c084ed3b0..fd60e199cdcf 100755
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/InDetDetailedTrackTruthMaker.h
+++ b/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/InDetDetailedTrackTruthMaker.h
@@ -34,7 +34,7 @@ public:
InDetDetailedTrackTruthMaker(const std::string &name,ISvcLocator *pSvcLocator);
virtual StatusCode initialize();
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
virtual StatusCode finalize();
private:
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/PRD_MultiTruthMaker.h b/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/PRD_MultiTruthMaker.h
index 84f3abd67dcd..83a06f5e02a1 100755
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/PRD_MultiTruthMaker.h
+++ b/InnerDetector/InDetTruth/InDetTruthAlgs/InDetTruthAlgs/PRD_MultiTruthMaker.h
@@ -32,7 +32,7 @@ public:
PRD_MultiTruthMaker(const std::string &name,ISvcLocator *pSvcLocator);
virtual StatusCode initialize();
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
virtual StatusCode finalize();
private:
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/src/InDetDetailedTrackTruthMaker.cxx b/InnerDetector/InDetTruth/InDetTruthAlgs/src/InDetDetailedTrackTruthMaker.cxx
index 9262a1c5cb52..eccdd3a9556a 100755
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/src/InDetDetailedTrackTruthMaker.cxx
+++ b/InnerDetector/InDetTruth/InDetTruthAlgs/src/InDetDetailedTrackTruthMaker.cxx
@@ -64,9 +64,9 @@ StatusCode InDetDetailedTrackTruthMaker::finalize()
}
// -----------------------------------------------------------------------------------------------------
-StatusCode InDetDetailedTrackTruthMaker::execute_r(const EventContext &ctx) const
+StatusCode InDetDetailedTrackTruthMaker::execute(const EventContext &ctx) const
{
- ATH_MSG_DEBUG ("InDetDetailedTrackTruthMaker::execute_r(...)");
+ ATH_MSG_DEBUG ("InDetDetailedTrackTruthMaker::execute(...)");
//----------------------------------------------------------------
// Retrieve track collection
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/src/PRD_MultiTruthMaker.cxx b/InnerDetector/InDetTruth/InDetTruthAlgs/src/PRD_MultiTruthMaker.cxx
index 060e76998f87..5fd65d0558e3 100755
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/src/PRD_MultiTruthMaker.cxx
+++ b/InnerDetector/InDetTruth/InDetTruthAlgs/src/PRD_MultiTruthMaker.cxx
@@ -81,7 +81,7 @@ StatusCode PRD_MultiTruthMaker::finalize()
}
// -----------------------------------------------------------------------------------------------------
-StatusCode PRD_MultiTruthMaker::execute_r(const EventContext &ctx) const {
+StatusCode PRD_MultiTruthMaker::execute(const EventContext &ctx) const {
ATH_MSG_DEBUG ("PRD_MultiTruthMaker::execute()");
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.cxx
index 5aa001129a2d..c986a0642bb8 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.cxx
@@ -32,7 +32,7 @@
InDetPhysHitDecoratorAlg::InDetPhysHitDecoratorAlg(const std::string& name, ISvcLocator* pSvcLocator) :
- AthAlgorithm(name,pSvcLocator),
+ AthReentrantAlgorithm(name,pSvcLocator),
m_holeSearchTool("InDet::InDetTrackHoleSearchTool"),
m_updatorHandle("Trk::KalmanUpdator/TrkKalmanUpdator"),
m_residualPullCalculator("Trk::ResidualPullCalculator/ResidualPullCalculator"),
@@ -109,15 +109,9 @@ InDetPhysHitDecoratorAlg::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode
-InDetPhysHitDecoratorAlg::execute() {
- const EventContext context{ Gaudi::Hive::currentContext() };
- return execute_r(context);
-}
-
// to migrate to AthReentrantAlgorithm later
StatusCode
-InDetPhysHitDecoratorAlg::execute_r(const EventContext &ctx) const {
+InDetPhysHitDecoratorAlg::execute(const EventContext &ctx) const {
SG::ReadHandle<xAOD::TrackParticleContainer> ptracks(m_trkParticleName);
if ((not ptracks.isValid())) {
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.h
index b1f08b4df07e..8a95ee104972 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysHitDecoratorAlg.h
@@ -12,7 +12,7 @@
**/
// STL includes
#include <string>
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "xAODTracking/TrackParticleContainer.h"
#include "StoreGate/WriteDecorHandle.h"
@@ -33,7 +33,7 @@ namespace Trk {
// class to decorate xAOD::TruthParticles with additional information required by validation
-class InDetPhysHitDecoratorAlg: public AthAlgorithm {
+class InDetPhysHitDecoratorAlg: public AthReentrantAlgorithm {
public:
// L0PIXBARR : layer0 of pixel barrel (IBL in Run2)
// PIXEL : in barrel all layers appart from layer0. In end-caps all disks/rings.
@@ -48,8 +48,7 @@ public:
~InDetPhysHitDecoratorAlg ();
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
- virtual StatusCode execute() override;
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
private:
bool
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.cxx
index b6f1a3e80421..454606b04199 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.cxx
@@ -27,7 +27,7 @@
InDetPhysValTruthDecoratorAlg::InDetPhysValTruthDecoratorAlg(const std::string& name, ISvcLocator* pSvcLocator) :
- AthAlgorithm(name, pSvcLocator),
+ AthReentrantAlgorithm(name, pSvcLocator),
m_beamSpotSvc("BeamCondSvc", name) {
}
@@ -71,14 +71,7 @@ InDetPhysValTruthDecoratorAlg::finalize() {
}
StatusCode
-InDetPhysValTruthDecoratorAlg::execute() {
- const EventContext context{ Gaudi::Hive::currentContext() };
- return execute_r(context);
-}
-
-// to migrate to AthReentrantAlgorithm later
-StatusCode
-InDetPhysValTruthDecoratorAlg::execute_r(const EventContext &ctx) const {
+InDetPhysValTruthDecoratorAlg::execute(const EventContext &ctx) const {
SG::ReadHandle<xAOD::TruthParticleContainer> ptruth(m_truthParticleName);
if ((not ptruth.isValid())) {
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.h
index 6a9ad9d4475c..11202a332889 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValTruthDecoratorAlg.h
@@ -13,7 +13,7 @@
// STL includes
#include <string>
#include "xAODTruth/TruthParticleContainer.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "TrkExInterfaces/IExtrapolator.h"
@@ -29,17 +29,14 @@
class IBeamCondSvc;
// class to decorate xAOD::TruthParticles with additional information required by validation
-class InDetPhysValTruthDecoratorAlg: public AthAlgorithm {
+class InDetPhysValTruthDecoratorAlg: public AthReentrantAlgorithm {
public:
InDetPhysValTruthDecoratorAlg(const std::string& name, ISvcLocator* pSvcLocator);
virtual
~InDetPhysValTruthDecoratorAlg ();
virtual StatusCode initialize();
virtual StatusCode finalize();
- virtual StatusCode execute() override;
-
- // to migrate to AthReentrantAlgorithm later
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
private:
bool decorateTruth(const xAOD::TruthParticle& particle,
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.cxx
index f8d5d429ee12..0f7ebce677ff 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.cxx
@@ -44,7 +44,7 @@ ParameterErrDecoratorAlg::finalize() {
}
StatusCode
-ParameterErrDecoratorAlg::execute_r(const EventContext &ctx) const {
+ParameterErrDecoratorAlg::execute(const EventContext &ctx) const {
SG::ReadHandle<xAOD::TrackParticleContainer> ptracks(m_trkParticleName);
if ((not ptracks.isValid())) {
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.h
index a9850f563f07..02ad809325d4 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/ParameterErrDecoratorAlg.h
@@ -28,7 +28,7 @@ public:
~ParameterErrDecoratorAlg();
virtual StatusCode initialize();
virtual StatusCode finalize();
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
private:
virtual bool decorateTrack(const xAOD::TrackParticle& particle,
std::vector< SG::WriteDecorHandle<xAOD::TrackParticleContainer,float> > &float_decor) const;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.cxx
index 5a83ab72e827..dcc8674da31f 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.cxx
@@ -13,7 +13,7 @@
TruthClassDecoratorAlg::TruthClassDecoratorAlg(const std::string& name, ISvcLocator* pSvcLocator) :
- AthAlgorithm(name,pSvcLocator)
+ AthReentrantAlgorithm(name,pSvcLocator)
{
}
@@ -37,15 +37,9 @@ TruthClassDecoratorAlg::finalize() {
}
-StatusCode
-TruthClassDecoratorAlg::execute() {
- const EventContext context{ Gaudi::Hive::currentContext() };
- return execute_r(context);
-}
-
// to migrate to AthReentrantAlgorithm later
StatusCode
-TruthClassDecoratorAlg::execute_r(const EventContext &ctx) const {
+TruthClassDecoratorAlg::execute(const EventContext &ctx) const {
SG::ReadHandle<xAOD::TruthParticleContainer> ptruth(m_truthParticleName);
if ((not ptruth.isValid())) {
return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.h
index 8284785db4e2..2cb5b6b9d0c7 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TruthClassDecoratorAlg.h
@@ -13,7 +13,7 @@
// STL includes
#include <string>
#include "xAODTruth/TruthParticleContainer.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/EventContext.h"
#include "StoreGate/WriteDecorHandleKey.h"
@@ -24,7 +24,7 @@
#include "InDetPhysValMonitoring/IAthSelectionTool.h"
// class to decorate xAOD::TruthParticles with type and origin, required by validation
-class TruthClassDecoratorAlg: public AthAlgorithm {
+class TruthClassDecoratorAlg: public AthReentrantAlgorithm {
public:
TruthClassDecoratorAlg(const std::string& name, ISvcLocator* pSvcLocator);
virtual ~TruthClassDecoratorAlg () {/*nop*/
@@ -32,10 +32,7 @@ public:
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
- virtual StatusCode execute() override;
-
- // to migrate to AthReentrantAlgorithm later
- virtual StatusCode execute_r(const EventContext &ctx) const;
+ virtual StatusCode execute(const EventContext &ctx) const;
private:
bool decorateTruth(const xAOD::TruthParticle& particle,
diff --git a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/InDetTrackClusterAssValidation/TrackClusterAssValidation.h b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/InDetTrackClusterAssValidation/TrackClusterAssValidation.h
index 2c5e0093f483..a90bdc2c0dd1 100755
--- a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/InDetTrackClusterAssValidation/TrackClusterAssValidation.h
+++ b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/InDetTrackClusterAssValidation/TrackClusterAssValidation.h
@@ -85,7 +85,7 @@ namespace InDet {
TrackClusterAssValidation(const std::string &name, ISvcLocator *pSvcLocator);
virtual ~TrackClusterAssValidation() {}
StatusCode initialize();
- StatusCode execute_r(const EventContext& ctx) const;
+ StatusCode execute(const EventContext& ctx) const;
StatusCode finalize();
protected:
diff --git a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx
index 8e4affef115d..17649691cbed 100755
--- a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/TrackClusterAssValidation.cxx
@@ -144,7 +144,7 @@ StatusCode InDet::TrackClusterAssValidation::initialize()
// Execute
///////////////////////////////////////////////////////////////////
-StatusCode InDet::TrackClusterAssValidation::execute_r(const EventContext& ctx) const
+StatusCode InDet::TrackClusterAssValidation::execute(const EventContext& ctx) const
{
if(!m_usePIX && !m_useSCT) return StatusCode::SUCCESS;
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/HoleSearchValidation.h b/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/HoleSearchValidation.h
index f896325e29e4..770427d5a4a6 100755
--- a/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/HoleSearchValidation.h
+++ b/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/HoleSearchValidation.h
@@ -58,7 +58,7 @@ namespace InDet {
/** standard Athena-Algorithm method */
StatusCode initialize();
/** standard Athena-Algorithm method */
- StatusCode execute_r(const EventContext& ctx) const;
+ StatusCode execute(const EventContext& ctx) const;
/** standard Athena-Algorithm method */
StatusCode finalize();
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/InDetSplittedTracksCreator.h b/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/InDetSplittedTracksCreator.h
index 1e40a80f9123..6fd969ce5e61 100644
--- a/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/InDetSplittedTracksCreator.h
+++ b/InnerDetector/InDetValidation/InDetTrackValidation/InDetTrackValidation/InDetSplittedTracksCreator.h
@@ -35,7 +35,7 @@ public:
/** standard Athena-Algorithm method */
StatusCode initialize();
/** standard Athena-Algorithm method */
- StatusCode execute_r(const EventContext& ctx) const;
+ StatusCode execute(const EventContext& ctx) const;
/** standard Athena-Algorithm method */
StatusCode finalize();
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/src/HoleSearchValidation.cxx b/InnerDetector/InDetValidation/InDetTrackValidation/src/HoleSearchValidation.cxx
index 6186436a7cbc..6322b581f67a 100755
--- a/InnerDetector/InDetValidation/InDetTrackValidation/src/HoleSearchValidation.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackValidation/src/HoleSearchValidation.cxx
@@ -154,7 +154,7 @@ StatusCode HoleSearchValidation::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode HoleSearchValidation::execute_r(const EventContext& ctx) const {
+StatusCode HoleSearchValidation::execute(const EventContext& ctx) const {
std::array<bool,Parts::kNParts> remove_parts;
for (unsigned int part_i=0; part_i<Parts::kNParts; ++part_i) {
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/src/InDetSplittedTracksCreator.cxx b/InnerDetector/InDetValidation/InDetTrackValidation/src/InDetSplittedTracksCreator.cxx
index 4376a4523bb9..cd5604f46528 100644
--- a/InnerDetector/InDetValidation/InDetTrackValidation/src/InDetSplittedTracksCreator.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackValidation/src/InDetSplittedTracksCreator.cxx
@@ -47,7 +47,7 @@ StatusCode InDet::InDetSplittedTracksCreator::initialize(){
return StatusCode::SUCCESS;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-StatusCode InDet::InDetSplittedTracksCreator::execute_r(const EventContext& ctx) const {
+StatusCode InDet::InDetSplittedTracksCreator::execute(const EventContext& ctx) const {
ATH_MSG_DEBUG("InDetSplittedTracksCreator execute()");
ATH_MSG_DEBUG("Input Track Collection: " << m_TrackCol);
diff --git a/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx b/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx
index 751ba1962a14..af1babc4fc48 100644
--- a/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx
@@ -34,7 +34,7 @@ StatusCode LArNoisyROAlg::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode LArNoisyROAlg::execute_r (const EventContext& ctx) const
+StatusCode LArNoisyROAlg::execute (const EventContext& ctx) const
{
SG::ReadHandle<CaloCellContainer> cellContainer(m_CaloCellContainerName, ctx);
if (!cellContainer.isValid()) {
diff --git a/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.h b/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.h
index 9ada3ebafcd6..1f706dcdffa9 100644
--- a/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.h
+++ b/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.h
@@ -35,7 +35,7 @@ class LArNoisyROAlg : public AthReentrantAlgorithm
LArNoisyROAlg(const std::string &name,ISvcLocator *pSvcLocator);
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
diff --git a/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx b/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx
index 822c0f056807..d03908a402ac 100644
--- a/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx
@@ -45,7 +45,7 @@ StatusCode LArTimeVetoAlg::finalize()
}
//__________________________________________________________________________
-StatusCode LArTimeVetoAlg::execute_r( const EventContext& ctx ) const
+StatusCode LArTimeVetoAlg::execute( const EventContext& ctx ) const
{
ATH_MSG_DEBUG("LArTimeVetoAlg execute()");
diff --git a/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.h b/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.h
index e4e5478e3243..87a34c39a99e 100644
--- a/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.h
+++ b/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.h
@@ -24,7 +24,7 @@ class LArTimeVetoAlg : public AthReentrantAlgorithm {
~LArTimeVetoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
private:
diff --git a/LArCalorimeter/LArClusterRec/LArClusterRec/LArDigitThinnerFromEMClust.h b/LArCalorimeter/LArClusterRec/LArClusterRec/LArDigitThinnerFromEMClust.h
index aaf8ce4129d8..31759dd1c341 100755
--- a/LArCalorimeter/LArClusterRec/LArClusterRec/LArDigitThinnerFromEMClust.h
+++ b/LArCalorimeter/LArClusterRec/LArClusterRec/LArDigitThinnerFromEMClust.h
@@ -43,7 +43,7 @@ class LArDigitThinnerFromEMClust : public AthReentrantAlgorithm
~LArDigitThinnerFromEMClust();
StatusCode initialize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
StatusCode finalize() override;
private:
diff --git a/LArCalorimeter/LArClusterRec/src/LArDigitThinnerFromEMClust.cxx b/LArCalorimeter/LArClusterRec/src/LArDigitThinnerFromEMClust.cxx
index 0f9a71a8ded8..0c7bf3cceadb 100755
--- a/LArCalorimeter/LArClusterRec/src/LArDigitThinnerFromEMClust.cxx
+++ b/LArCalorimeter/LArClusterRec/src/LArDigitThinnerFromEMClust.cxx
@@ -47,7 +47,7 @@ StatusCode LArDigitThinnerFromEMClust::finalize() {
}
-StatusCode LArDigitThinnerFromEMClust::execute_r(const EventContext& ctx) const {
+StatusCode LArDigitThinnerFromEMClust::execute(const EventContext& ctx) const {
//Get inputs from read handles:
SG::ReadHandle<LArDigitContainer> inputContainer(m_inputContainerKey,ctx);
diff --git a/LArCalorimeter/LArROD/LArROD/LArDigitThinner.h b/LArCalorimeter/LArROD/LArROD/LArDigitThinner.h
index 069d42705444..e8b4b4081cc7 100755
--- a/LArCalorimeter/LArROD/LArROD/LArDigitThinner.h
+++ b/LArCalorimeter/LArROD/LArROD/LArDigitThinner.h
@@ -43,7 +43,7 @@ class LArDigitThinner : public AthReentrantAlgorithm
~LArDigitThinner();
StatusCode initialize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
StatusCode finalize() override;
private:
diff --git a/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderAlg.h b/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderAlg.h
index cc4921c3d9d6..f393c21811a2 100644
--- a/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderAlg.h
+++ b/LArCalorimeter/LArROD/LArROD/LArRawChannelBuilderAlg.h
@@ -30,7 +30,7 @@ class LArRawChannelBuilderAlg : public AthReentrantAlgorithm {
LArRawChannelBuilderAlg(const std::string& name, ISvcLocator* pSvcLocator);
StatusCode initialize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
StatusCode finalize() override;
diff --git a/LArCalorimeter/LArROD/src/LArDigitThinner.cxx b/LArCalorimeter/LArROD/src/LArDigitThinner.cxx
index 578b6eb4aad1..48f23506b331 100755
--- a/LArCalorimeter/LArROD/src/LArDigitThinner.cxx
+++ b/LArCalorimeter/LArROD/src/LArDigitThinner.cxx
@@ -136,7 +136,7 @@ StatusCode LArDigitThinner::finalize()
}
-StatusCode LArDigitThinner::execute_r(const EventContext& ctx) const {
+StatusCode LArDigitThinner::execute(const EventContext& ctx) const {
initCutValues(ctx); //Should return right away if the cut values are already initialized
diff --git a/LArCalorimeter/LArROD/src/LArRawChannelBuilderAlg.cxx b/LArCalorimeter/LArROD/src/LArRawChannelBuilderAlg.cxx
index fe5bf88b8e83..06a86f4a7eeb 100644
--- a/LArCalorimeter/LArROD/src/LArRawChannelBuilderAlg.cxx
+++ b/LArCalorimeter/LArROD/src/LArRawChannelBuilderAlg.cxx
@@ -30,7 +30,7 @@ StatusCode LArRawChannelBuilderAlg::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode LArRawChannelBuilderAlg::execute_r(const EventContext& ctx) const {
+StatusCode LArRawChannelBuilderAlg::execute(const EventContext& ctx) const {
//Get event inputs from read handles:
SG::ReadHandle<LArDigitContainer> inputContainer(m_digitKey,ctx);
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
index 646e08e20c7c..56284850ad2e 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.cxx
@@ -127,7 +127,7 @@ StatusCode LArHVCondAlg::initialize(){
}
-StatusCode LArHVCondAlg::execute_r(const EventContext& ctx) const {
+StatusCode LArHVCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_DEBUG("executing");
bool doHVData=false;
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.h b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.h
index b715569aa23a..b69427da2f83 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.h
+++ b/LArCalorimeter/LArRecUtils/src/LArHVCondAlg.h
@@ -55,7 +55,7 @@ class LArHVCondAlg: public AthReentrantAlgorithm
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
private:
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.cxx b/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.cxx
index 4312ee307aa5..6c20c20337a8 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.cxx
@@ -109,7 +109,7 @@ AthenaAttributeList* LArHVPathologyDbCondAlg::hvPathology2AttrList(const LArHVPa
}
*/
-StatusCode LArHVPathologyDbCondAlg::execute_r(const EventContext& ctx) const {
+StatusCode LArHVPathologyDbCondAlg::execute(const EventContext& ctx) const {
SG::WriteCondHandle<LArHVPathology > writeHandle{m_hvPAthologyKey, ctx};
diff --git a/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.h b/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.h
index 5006fd67d1ba..95c034f44fff 100755
--- a/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.h
+++ b/LArCalorimeter/LArRecUtils/src/LArHVPathologyDbCondAlg.h
@@ -31,7 +31,7 @@ class LArHVPathologyDbCondAlg: public AthReentrantAlgorithm
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
- virtual StatusCode execute_r(const EventContext& ctx) const override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
private:
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/MSVertexRecoAlg/MSVertexRecoAlg.h b/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/MSVertexRecoAlg/MSVertexRecoAlg.h
index fbbb7eda3ec4..00741af01daf 100644
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/MSVertexRecoAlg/MSVertexRecoAlg.h
+++ b/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/MSVertexRecoAlg/MSVertexRecoAlg.h
@@ -20,7 +20,7 @@ class MSVertexRecoAlg : public AthReentrantAlgorithm
~MSVertexRecoAlg();
StatusCode initialize() override;
- StatusCode execute_r (const EventContext& ctx) const override;
+ StatusCode execute (const EventContext& ctx) const override;
StatusCode finalize() override;
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/MSVertexRecoAlg.cxx b/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/MSVertexRecoAlg.cxx
index b0b5a2c344ad..3d9b0d6be1eb 100644
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/MSVertexRecoAlg.cxx
+++ b/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/MSVertexRecoAlg.cxx
@@ -48,7 +48,7 @@ StatusCode MSVertexRecoAlg::initialize(){
//** ----------------------------------------------------------------------------------------------------------------- **//
-StatusCode MSVertexRecoAlg::execute_r (const EventContext& ctx) const {
+StatusCode MSVertexRecoAlg::execute (const EventContext& ctx) const {
std::vector<Tracklet> tracklets;
std::vector<MSVertex*> vertices;
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/AnalysisTools/AANTupleStream.h b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/AnalysisTools/AANTupleStream.h
index 5476ffa4470b..acbf504a1a37 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/AnalysisTools/AANTupleStream.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/AnalysisTools/AANTupleStream.h
@@ -10,7 +10,7 @@
#include "GaudiKernel/IAddressCreator.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIoComponent.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthLegacySequence.h"
#include <map>
#include <vector>
@@ -30,7 +30,7 @@ class TTree;
class TBranch;
class AANTupleStream : virtual public IIoComponent,
- public AthAlgorithm
+ public AthLegacySequence
{
public:
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
index c6199a7623b7..4375cdd5c952 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/AANTupleStream.cxx
@@ -47,7 +47,7 @@ using namespace AANTupleParams;
// Standard Constructor
AANTupleStream::AANTupleStream(const std::string& name, ISvcLocator* pSvcLocator)
- : AthAlgorithm(name, pSvcLocator),
+ : AthLegacySequence(name, pSvcLocator),
m_persSvc ("EventPersistencySvc", name),
m_attribSpec(0),
m_schemaDone(false),
@@ -153,8 +153,8 @@ StatusCode AANTupleStream::initialize()
}
ATH_MSG_DEBUG ("End initialize ");
-
- return StatusCode::SUCCESS;
+
+ return AthLegacySequence::initialize();
}
@@ -195,7 +195,7 @@ StatusCode AANTupleStream::finalize()
gDirectory->cd(curDir.c_str());
}
- return StatusCode::SUCCESS;
+ return AthLegacySequence::finalize();
}
@@ -606,6 +606,8 @@ StatusCode AANTupleStream::execute_subAlgos()
ATH_MSG_DEBUG ("in execute_subAlgos() ...");
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+
// -- run subalgorithms
for ( unsigned int i=0; i < m_membersNames.size(); ++i )
{
@@ -613,7 +615,7 @@ StatusCode AANTupleStream::execute_subAlgos()
// skip disabled algo
if (! (*(this->subAlgorithms()))[i]->isEnabled()) continue ;
- sc = (*(this->subAlgorithms()))[i]->execute();
+ sc = (*(this->subAlgorithms()))[i]->execute(ctx);
if ( sc.isFailure())
{
ATH_MSG_ERROR
@@ -695,14 +697,17 @@ bool AANTupleStream::isEventAccepted() const
// no filter
if (m_acceptAlgs.empty())
return true;
-
+
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+
// loop over all algs
std::vector<Algorithm*>::const_iterator it;
std::vector<Algorithm*>::const_iterator itend = m_acceptAlgs.end();
for (it = m_acceptAlgs.begin(); it != itend; ++it)
{
const Algorithm* theAlgorithm = (*it);
- if ( theAlgorithm->isExecuted() && (! theAlgorithm->filterPassed()))
+ if ( theAlgorithm->execState(ctx).state() == AlgExecState::State::Done &&
+ ( ! theAlgorithm->execState(ctx).filterPassed() ) )
return false;
}
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx
index f103251e46e3..6c7ce63a88aa 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.cxx
@@ -74,13 +74,13 @@ StatusCode PrimaryDPDPrescaler::initialize()
//Print summary info and declare all child filters to CutFlwSvc
ATH_MSG_DEBUG( "Accept Algs, Size: " << m_theAcceptAlgs.size() << " Empty: " << m_theAcceptAlgs.empty() );
- for(std::vector<Algorithm*>::iterator i=m_theAcceptAlgs.begin(),end=m_theAcceptAlgs.end(); i != end; ++i) {
+ for(std::vector<Gaudi::Algorithm*>::iterator i=m_theAcceptAlgs.begin(),end=m_theAcceptAlgs.end(); i != end; ++i) {
ATH_MSG_DEBUG( (*i)->name() );
cutFlowSvc()->registerCut((*i)->name(), "", cutID());
}
ATH_MSG_DEBUG( "Require Algs, Size: " << m_theRequireAlgs.size() << " Empty: " << m_theRequireAlgs.empty() );
- for(std::vector<Algorithm*>::iterator i=m_theRequireAlgs.begin(),end=m_theRequireAlgs.end(); i != end; ++i) {
+ for(std::vector<Gaudi::Algorithm*>::iterator i=m_theRequireAlgs.begin(),end=m_theRequireAlgs.end(); i != end; ++i) {
ATH_MSG_DEBUG( (*i)->name() );
cutFlowSvc()->registerCut((*i)->name(), "", cutID());
}
@@ -270,7 +270,7 @@ void PrimaryDPDPrescaler::handle(const Incident& inc) {
//__________________________________________________________________________
-StatusCode PrimaryDPDPrescaler::decodeAlgorithms(StringArrayProperty *theAlgNames, std::vector<Algorithm*> *theAlgs)
+StatusCode PrimaryDPDPrescaler::decodeAlgorithms(StringArrayProperty *theAlgNames, std::vector<Gaudi::Algorithm*> *theAlgs)
{
// Reset the list of Algorithms
theAlgs->clear( );
@@ -291,21 +291,21 @@ StatusCode PrimaryDPDPrescaler::decodeAlgorithms(StringArrayProperty *theAlgName
// Algorithm object.
const std::string& theName = (*it);
IAlgorithm* theIAlg;
- Algorithm* theAlgorithm;
+ Gaudi::Algorithm* theAlgorithm;
result = theAlgMgr->getAlgorithm( theName, theIAlg );
if ( result.isSuccess( ) ) {
try{
- theAlgorithm = dynamic_cast<Algorithm*>(theIAlg);
+ theAlgorithm = dynamic_cast<Gaudi::Algorithm*>(theIAlg);
} catch(...){
result = StatusCode::FAILURE;
}
}
if ( result.isSuccess( ) ) {
// Check that the specified algorithm doesn't already exist in the list
- std::vector<Algorithm*>::iterator ita;
- std::vector<Algorithm*>::iterator itaend = theAlgs->end( );
+ std::vector<Gaudi::Algorithm*>::iterator ita;
+ std::vector<Gaudi::Algorithm*>::iterator itaend = theAlgs->end( );
for (ita = theAlgs->begin(); ita != itaend; ita++) {
- Algorithm* existAlgorithm = (*ita);
+ Gaudi::Algorithm* existAlgorithm = (*ita);
if ( theAlgorithm == existAlgorithm ) {
result = StatusCode::FAILURE;
break;
@@ -332,7 +332,7 @@ StatusCode PrimaryDPDPrescaler::decodeAlgorithms(StringArrayProperty *theAlgName
//__________________________________________________________________________
bool PrimaryDPDPrescaler::isEventAccepted()
{
- typedef std::vector<Algorithm*>::iterator AlgIter;
+ typedef std::vector<Gaudi::Algorithm*>::iterator AlgIter;
bool result = true;
// Loop over all Algorithms in the accept list to see
@@ -352,6 +352,8 @@ bool PrimaryDPDPrescaler::isEventAccepted()
bool passRequireAlgs(true);
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+
// Accept Algs (OR)
bool isPassed(false);
if ( m_theAcceptAlgs.empty() )
@@ -360,7 +362,8 @@ bool PrimaryDPDPrescaler::isEventAccepted()
}
for(AlgIter i=m_theAcceptAlgs.begin(),end=m_theAcceptAlgs.end(); i != end; ++i)
{
- if ( (*i)->isExecuted() && (*i)->filterPassed() )
+ if ( (*i)->execState(ctx).state() == AlgExecState::State::Done &&
+ (*i)->execState(ctx).filterPassed() )
{
isPassed = true;
break;
@@ -373,7 +376,8 @@ bool PrimaryDPDPrescaler::isEventAccepted()
bool isFailed(false);
for(AlgIter i=m_theRequireAlgs.begin(),end=m_theRequireAlgs.end(); i != end; ++i)
{
- if ( (*i)->isExecuted() && !(*i)->filterPassed() )
+ if ( (*i)->execState(ctx).state() == AlgExecState::State::Done &&
+ ! (*i)->execState(ctx).filterPassed() )
{
isFailed = true;
break;
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
index 90b76e6e7f61..759de6ede7e7 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
@@ -46,7 +46,7 @@ public:
// Private methods
private:
- StatusCode decodeAlgorithms(StringArrayProperty *theAlgNames, std::vector<Algorithm*> *theAlgs);
+ StatusCode decodeAlgorithms(StringArrayProperty *theAlgNames, std::vector<Gaudi::Algorithm*> *theAlgs);
bool isEventAccepted();
void ResetSelfDescription();
@@ -78,10 +78,10 @@ private:
double m_prescale;
/// List of algorithms to combine with logical OR
- std::vector<Algorithm*> m_theAcceptAlgs;
+ std::vector<Gaudi::Algorithm*> m_theAcceptAlgs;
/// List of algorithms to combine with logical AND
- std::vector<Algorithm*> m_theRequireAlgs;
+ std::vector<Gaudi::Algorithm*> m_theRequireAlgs;
/// List of algorithms names to combine with logical OR
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 8e6da56d3719..6ef7f9b82ab2 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -9,4 +9,4 @@
AthSimulationExternalsVersion = 2.0.15
# The version of atlas/Gaudi to use:
-GaudiVersion = v30r5.003
+GaudiVersion = v31r0.000
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index 3d7575d135ab..9527c8037d38 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -9,4 +9,4 @@
AthenaExternalsVersion = 2.0.15
# The version of atlas/Gaudi to use:
-GaudiVersion = v30r5.003
+GaudiVersion = v31r0.000
diff --git a/Projects/Athena/package_filters.txt b/Projects/Athena/package_filters.txt
index 0bc39015a1ad..2c431ffaabe6 100644
--- a/Projects/Athena/package_filters.txt
+++ b/Projects/Athena/package_filters.txt
@@ -64,3 +64,7 @@
# Don't build PerfMonVTune which has external Intel tool dependency
- Control/PerformanceMonitoring/PerfMonVTune
+
+# Old packages that don't work with AthenaMT
+- LArCalorimeter/LArSim
+- PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils
diff --git a/Reconstruction/MET/METReconstruction/src/METReaderAlg.cxx b/Reconstruction/MET/METReconstruction/src/METReaderAlg.cxx
index 8578113b765c..347e5f2fc3d7 100644
--- a/Reconstruction/MET/METReconstruction/src/METReaderAlg.cxx
+++ b/Reconstruction/MET/METReconstruction/src/METReaderAlg.cxx
@@ -62,7 +62,7 @@ namespace met {
//**********************************************************************
- StatusCode METReaderAlg::execute_r (const EventContext& ctx) const{
+ StatusCode METReaderAlg::execute (const EventContext& ctx) const{
ATH_MSG_VERBOSE("Executing " << name() << "...");
// Loop over tools.
diff --git a/Reconstruction/MET/METReconstruction/src/METReaderAlg.h b/Reconstruction/MET/METReconstruction/src/METReaderAlg.h
index 932ccc688b4f..befc14ef5d58 100644
--- a/Reconstruction/MET/METReconstruction/src/METReaderAlg.h
+++ b/Reconstruction/MET/METReconstruction/src/METReaderAlg.h
@@ -26,7 +26,7 @@ namespace met {
/// Athena algorithm's Hooks
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx b/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx
index 125240dd1a23..fb4b6e926cd7 100644
--- a/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx
+++ b/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx
@@ -73,7 +73,7 @@ namespace ClusterMatching {
return StatusCode::SUCCESS;
}
- StatusCode CaloClusterMatchLinkAlg::execute_r(const EventContext& ctx) const
+ StatusCode CaloClusterMatchLinkAlg::execute(const EventContext& ctx) const
{
ATH_MSG_DEBUG ("Executing " << name() << "...");
diff --git a/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.h b/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.h
index b0db9fb7dfd4..2cc19713aa61 100644
--- a/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.h
+++ b/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.h
@@ -44,7 +44,7 @@ namespace ClusterMatching {
// Athena algorithm's Hooks
virtual StatusCode initialize();
- virtual StatusCode execute_r(const EventContext& ctx) const;
+ virtual StatusCode execute(const EventContext& ctx) const;
virtual StatusCode finalize();
///////////////////////////////////////////////////////////////////
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.cxx
index a021c920ee85..d50a56161fcf 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.cxx
@@ -91,7 +91,7 @@ StatusCode egammaForwardBuilder::finalize()
}
// ======================================================================
-StatusCode egammaForwardBuilder::execute_r(const EventContext& ctx) const
+StatusCode egammaForwardBuilder::execute(const EventContext& ctx) const
{
ATH_MSG_DEBUG("Executing egammaForwardBuilder ");
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.h b/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.h
index babf2d4e0b3b..9af4efff34b8 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.h
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaForwardBuilder.h
@@ -60,7 +60,7 @@ class egammaForwardBuilder : public AthReentrantAlgorithm
/** @brief finalize method*/
virtual StatusCode finalize() override final;
/** @brief execute method*/
- virtual StatusCode execute_r(const EventContext& ctx) const override final;
+ virtual StatusCode execute(const EventContext& ctx) const override final;
private:
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.cxx
index 95fdb681f65f..e571a700fb73 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.cxx
@@ -62,7 +62,7 @@ StatusCode egammaTopoClusterCopier::finalize() {
}
// =========================================================================
-StatusCode egammaTopoClusterCopier::execute_r(const EventContext& ctx) const {
+StatusCode egammaTopoClusterCopier::execute(const EventContext& ctx) const {
SG::ReadHandle<xAOD::CaloClusterContainer> inputTopoclusters(m_inputTopoCollection, ctx);
SG::WriteHandle<xAOD::CaloClusterContainer> outputTopoclustersShallow(m_outputTopoCollectionShallow, ctx);
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.h b/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.h
index 4966225d0268..3daa11244329 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.h
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaTopoClusterCopier.h
@@ -23,7 +23,7 @@ class egammaTopoClusterCopier : public AthReentrantAlgorithm {
/** @brief initialize method */
virtual StatusCode initialize() override final;
/** @brief execute on container */
- virtual StatusCode execute_r(const EventContext& ctx) const override final;
+ virtual StatusCode execute(const EventContext& ctx) const override final;
/** @brief finalize method */
virtual StatusCode finalize() override final;
diff --git a/Simulation/G4Utilities/MCTruthAlgs/MCTruthAlgs/TrackRecordFilter.h b/Simulation/G4Utilities/MCTruthAlgs/MCTruthAlgs/TrackRecordFilter.h
index c84ebd79f358..efda43314d69 100755
--- a/Simulation/G4Utilities/MCTruthAlgs/MCTruthAlgs/TrackRecordFilter.h
+++ b/Simulation/G4Utilities/MCTruthAlgs/MCTruthAlgs/TrackRecordFilter.h
@@ -26,7 +26,7 @@ public:
StatusCode initialize() override;
StatusCode finalize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
private:
SG::ReadHandleKey<TrackRecordCollection> m_inputKey;
diff --git a/Simulation/G4Utilities/MCTruthAlgs/src/TrackRecordFilter.cxx b/Simulation/G4Utilities/MCTruthAlgs/src/TrackRecordFilter.cxx
index d0002f3986f5..7dbd73b229c1 100755
--- a/Simulation/G4Utilities/MCTruthAlgs/src/TrackRecordFilter.cxx
+++ b/Simulation/G4Utilities/MCTruthAlgs/src/TrackRecordFilter.cxx
@@ -43,7 +43,7 @@ StatusCode TrackRecordFilter::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode TrackRecordFilter::execute_r(const EventContext& ctx) const {
+StatusCode TrackRecordFilter::execute(const EventContext& ctx) const {
// Get message service
ATH_MSG_DEBUG ( "TrackRecordFilter::execute()" );
diff --git a/TestBeam/TBRec/src/TBAlgoSequencer.cxx b/TestBeam/TBRec/src/TBAlgoSequencer.cxx
index f10becf0d506..2ebd155c0aef 100644
--- a/TestBeam/TBRec/src/TBAlgoSequencer.cxx
+++ b/TestBeam/TBRec/src/TBAlgoSequencer.cxx
@@ -16,7 +16,7 @@
TBAlgoSequencer::TBAlgoSequencer(const std::string& name,
ISvcLocator* pSvcLocator) :
- AthAlgorithm(name,pSvcLocator)
+ ::AthLegacySequence ( name, pSvcLocator )
, m_timingOn(true)
, m_eventPrintFreq(100)
, m_eventCounter(0)
@@ -56,7 +56,7 @@ TBAlgoSequencer::initialize()
! registerAlgs.isFailure() )
{
ListItem theAlgItem(*subAlgos);
- Algorithm* theAlgo;
+ Gaudi::Algorithm* theAlgo;
registerAlgs = createSubAlgorithm(theAlgItem.type(),theAlgItem.name(),
theAlgo);
if ( ! registerAlgs.isFailure() && theAlgo != 0 )
@@ -93,9 +93,14 @@ TBAlgoSequencer::initialize()
m_rejectPattern.clear();
- return numberOfAlgorithms > 0
- ? StatusCode::SUCCESS
- : StatusCode::FAILURE;
+ // return numberOfAlgorithms > 0
+ // ? StatusCode::SUCCESS
+ // : StatusCode::FAILURE;
+
+ if (numberOfAlgorithms == 0) return StatusCode::FAILURE;
+
+ return AthLegacySequence::initialize();
+
}
/////////////
@@ -137,12 +142,14 @@ TBAlgoSequencer::execute()
AlgoIterator algoCounter = m_subAlgos.begin();
StatusCode executeAlgs;
+ const EventContext& ctx = getContext();
+
unsigned int algoIndex = 0;
while ( ! executeAlgs.isFailure() && algoCounter != m_subAlgos.end() )
{
// execute the algorithm
if ( m_timingOn ) theTicker->chronoStart(m_algoNameStore[algoIndex]);
- executeAlgs = (*algoCounter)->execute();
+ executeAlgs = (*algoCounter)->execute(ctx);
if ( m_timingOn ) theTicker->chronoStop(m_algoNameStore[algoIndex]);
// failure/reject
if ( executeAlgs.isFailure() )
@@ -264,6 +271,7 @@ TBAlgoSequencer::finalize()
ATH_MSG_INFO
( "======================================================== " );
- return StatusCode::SUCCESS;
+
+ return AthLegacySequence::finalize();
}
diff --git a/TestBeam/TBRec/src/TBAlgoSequencer.h b/TestBeam/TBRec/src/TBAlgoSequencer.h
index d21fcdf5dd80..1566142c1480 100755
--- a/TestBeam/TBRec/src/TBAlgoSequencer.h
+++ b/TestBeam/TBRec/src/TBAlgoSequencer.h
@@ -11,7 +11,8 @@
// //
///////////////////////////////////////////////////////////////////////////////
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthLegacySequence.h"
+
#include <string>
#include <vector>
@@ -19,11 +20,11 @@
class StoreGateSvc;
-class TBAlgoSequencer : public AthAlgorithm
+class TBAlgoSequencer : public AthLegacySequence
{
typedef std::string KeyType;
- typedef std::vector<Algorithm*> AlgoStore;
+ typedef std::vector<Gaudi::Algorithm*> AlgoStore;
typedef AlgoStore::iterator AlgoIterator;
public:
diff --git a/TileCalorimeter/TileMuId/TileMuId/TileLookForMuAlg.h b/TileCalorimeter/TileMuId/TileMuId/TileLookForMuAlg.h
index 7ad48b8a60f1..af6181678c78 100755
--- a/TileCalorimeter/TileMuId/TileMuId/TileLookForMuAlg.h
+++ b/TileCalorimeter/TileMuId/TileMuId/TileLookForMuAlg.h
@@ -48,7 +48,7 @@ class TileLookForMuAlg: public AthReentrantAlgorithm {
virtual ~TileLookForMuAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
diff --git a/TileCalorimeter/TileMuId/src/TileLookForMuAlg.cxx b/TileCalorimeter/TileMuId/src/TileLookForMuAlg.cxx
index 89571a11404d..01e677edb703 100755
--- a/TileCalorimeter/TileMuId/src/TileLookForMuAlg.cxx
+++ b/TileCalorimeter/TileMuId/src/TileLookForMuAlg.cxx
@@ -100,7 +100,7 @@ StatusCode TileLookForMuAlg::initialize() {
/////////////////////////////////////////////////////////////////////////////////
//Execution /
/////////////////////////////////////////////////////////////////////////////////
-StatusCode TileLookForMuAlg::execute_r (const EventContext& ctx) const {
+StatusCode TileLookForMuAlg::execute (const EventContext& ctx) const {
ATH_MSG_DEBUG("TileLookForMuAlg execution started");
diff --git a/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.cxx
index 977e4f640ddd..f65eabf31d87 100644
--- a/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.cxx
@@ -40,7 +40,7 @@ StatusCode TileBeamElemDumper::initialize()
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
-StatusCode TileBeamElemDumper::execute_r (const EventContext& ctx) const
+StatusCode TileBeamElemDumper::execute (const EventContext& ctx) const
{
std::string fname = CxxUtils::strformat ("%s%s_%08u_%08lu.dump",
m_prefix.value().c_str(),
diff --git a/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.h b/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.h
index 9dcf3b0b64d1..2cc0c353cd1d 100644
--- a/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileBeamElemDumper.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.cxx b/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.cxx
index 562eececf444..3b259a007585 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.cxx
@@ -55,7 +55,7 @@ StatusCode TileDQstatusAlg::initialize()
* @brief Gaudi execute method.
* @param ctx Event context.
*/
-StatusCode TileDQstatusAlg::execute_r (const EventContext& ctx) const
+StatusCode TileDQstatusAlg::execute (const EventContext& ctx) const
{
auto dqstatus = std::make_unique<TileDQstatus>();
diff --git a/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.h b/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.h
index 29385046411b..59d669ff21a4 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.h
+++ b/TileCalorimeter/TileRecUtils/src/TileDQstatusAlg.h
@@ -56,7 +56,7 @@ public:
* @brief Gaudi execute method.
* @param ctx Event context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.cxx
index 4584e32a6228..6c5e1cb20238 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.cxx
@@ -43,7 +43,7 @@ StatusCode TileDigitsDumper::initialize()
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
-StatusCode TileDigitsDumper::execute_r (const EventContext& ctx) const
+StatusCode TileDigitsDumper::execute (const EventContext& ctx) const
{
if (!m_altContKey.key().empty()) {
SG::ReadHandle<TileDigitsContainer> altCont (m_altContKey, ctx);
diff --git a/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.h b/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.h
index 501efd757faf..6a21a149ae02 100644
--- a/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileDigitsDumper.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/TileCalorimeter/TileRecUtils/src/TileL2Dumper.cxx b/TileCalorimeter/TileRecUtils/src/TileL2Dumper.cxx
index 8a731996b690..e3f84153fd5c 100644
--- a/TileCalorimeter/TileRecUtils/src/TileL2Dumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileL2Dumper.cxx
@@ -40,7 +40,7 @@ StatusCode TileL2Dumper::initialize()
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
-StatusCode TileL2Dumper::execute_r (const EventContext& ctx) const
+StatusCode TileL2Dumper::execute (const EventContext& ctx) const
{
std::string fname = CxxUtils::strformat ("%s%s_%08u_%08lu.dump",
m_prefix.value().c_str(),
diff --git a/TileCalorimeter/TileRecUtils/src/TileL2Dumper.h b/TileCalorimeter/TileRecUtils/src/TileL2Dumper.h
index 368379badfd1..d5c5a310a528 100644
--- a/TileCalorimeter/TileRecUtils/src/TileL2Dumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileL2Dumper.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.cxx
index c969c075ea18..da2754dc514e 100644
--- a/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.cxx
@@ -41,7 +41,7 @@ StatusCode TileLaserObjectDumper::initialize()
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
-StatusCode TileLaserObjectDumper::execute_r (const EventContext& ctx) const
+StatusCode TileLaserObjectDumper::execute (const EventContext& ctx) const
{
std::string fname = CxxUtils::strformat ("%s%s_%08u_%08lu.dump",
m_prefix.value().c_str(),
diff --git a/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.h b/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.h
index c953c0a23081..ad458a8eda30 100644
--- a/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileLaserObjectDumper.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.cxx
index d676d51ba124..faf244c0cb9c 100644
--- a/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.cxx
@@ -41,7 +41,7 @@ StatusCode TileMuonReceiverDumper::initialize()
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
-StatusCode TileMuonReceiverDumper::execute_r (const EventContext& ctx) const
+StatusCode TileMuonReceiverDumper::execute (const EventContext& ctx) const
{
std::string fname = CxxUtils::strformat ("%s%s_%08u_%08lu.dump",
m_prefix.value().c_str(),
diff --git a/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.h b/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.h
index 9af75e8b83ca..ad56a6e270a1 100644
--- a/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileMuonReceiverDumper.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.cxx
index 4879ff2be102..0995c768dde1 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.cxx
@@ -43,7 +43,7 @@ StatusCode TileRawChannelDumper::initialize()
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
-StatusCode TileRawChannelDumper::execute_r (const EventContext& ctx) const
+StatusCode TileRawChannelDumper::execute (const EventContext& ctx) const
{
if (!m_altContKey.key().empty()) {
SG::ReadHandle<TileRawChannelContainer> altCont (m_altContKey, ctx);
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.h b/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.h
index 2e6e0fa0b590..0d27cd0b598d 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.h
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelDumper.h
@@ -47,7 +47,7 @@ public:
* @brief Algorithm event processing.
* @param ctx Event Context.
*/
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
private:
diff --git a/Tools/PyUtils/python/scripts/gen_klass.py b/Tools/PyUtils/python/scripts/gen_klass.py
index 6dfe33145024..8b76c4c07907 100644
--- a/Tools/PyUtils/python/scripts/gen_klass.py
+++ b/Tools/PyUtils/python/scripts/gen_klass.py
@@ -269,7 +269,7 @@ public:
virtual ~%(klass)s() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
private:
@@ -306,7 +306,7 @@ StatusCode %(klass)s::finalize()
return StatusCode::SUCCESS;
}
-StatusCode %(klass)s::execute_r(const EventContext& context) const
+StatusCode %(klass)s::execute(const EventContext& context) const
{
return StatusCode::SUCCESS;
}
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
index 804781a38aa8..8199f5b18be8 100755
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
@@ -51,7 +51,7 @@ class ActsExtrapolationAlg : public AthReentrantAlgorithm {
public:
ActsExtrapolationAlg (const std::string& name, ISvcLocator* pSvcLocator);
StatusCode initialize() override;
- StatusCode execute_r(const EventContext& ctx) const override;
+ StatusCode execute(const EventContext& ctx) const override;
StatusCode finalize() override;
private:
diff --git a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx
index f3b6efd85c0d..7116c589e66a 100755
--- a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx
@@ -58,7 +58,7 @@ StatusCode ActsExtrapolationAlg::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode ActsExtrapolationAlg::execute_r(const EventContext& ctx) const
+StatusCode ActsExtrapolationAlg::execute(const EventContext& ctx) const
{
ATH_MSG_VERBOSE(name() << "::" << __FUNCTION__);
diff --git a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/TrkCollectionAliasAlg/TrkCollectionAliasAlg.h b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/TrkCollectionAliasAlg/TrkCollectionAliasAlg.h
index 76247d48f6bd..f04d848c4987 100755
--- a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/TrkCollectionAliasAlg/TrkCollectionAliasAlg.h
+++ b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/TrkCollectionAliasAlg/TrkCollectionAliasAlg.h
@@ -39,7 +39,7 @@ namespace Trk
/** standard Athena-Algorithm method */
StatusCode initialize();
/** standard Athena-Algorithm method */
- StatusCode execute_r(const EventContext& ctx) const;
+ StatusCode execute(const EventContext& ctx) const;
/** standard Athena-Algorithm method */
StatusCode finalize();
diff --git a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/TrkCollectionAliasAlg.cxx b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/TrkCollectionAliasAlg.cxx
index 74255a52b705..5f8f82ab459c 100755
--- a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/TrkCollectionAliasAlg.cxx
+++ b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/TrkCollectionAliasAlg.cxx
@@ -43,7 +43,7 @@ StatusCode Trk::TrkCollectionAliasAlg::finalize()
//================ Execution ====================================================
-StatusCode Trk::TrkCollectionAliasAlg::execute_r(const EventContext& ctx) const
+StatusCode Trk::TrkCollectionAliasAlg::execute(const EventContext& ctx) const
{
SG::ReadHandle<TrackCollection> tracks(m_collectionName, ctx );
return tracks.alias(m_aliasName);
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
index cf49de8f78d3..66e7c47f03ac 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
@@ -44,7 +44,7 @@ StatusCode HLTCaloCellMaker::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode HLTCaloCellMaker::execute_r( const EventContext& context ) const {
+StatusCode HLTCaloCellMaker::execute( const EventContext& context ) const {
auto roisHandle = SG::makeHandle( m_roiCollectionKey );
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h
index 8bc57f098566..db57c58b91c2 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h
@@ -39,7 +39,7 @@ class HLTCaloCellMaker: public AthReentrantAlgorithm {
HLTCaloCellMaker(const std::string & name, ISvcLocator* pSvcLocator);
~HLTCaloCellMaker();
- StatusCode execute_r(const EventContext& context ) const ;
+ StatusCode execute(const EventContext& context ) const ;
StatusCode initialize();
private:
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.cxx
index dbe2c9194df9..873b4471cc9d 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.cxx
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.cxx
@@ -36,7 +36,7 @@ StatusCode HLTCaloCellSumMaker::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode HLTCaloCellSumMaker::execute_r( const EventContext& /*context*/ ) const {
+StatusCode HLTCaloCellSumMaker::execute( const EventContext& /*context*/ ) const {
if ( m_roiMode ) {
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.h b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.h
index 95349f86e121..573c70c15335 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.h
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellSumMaker.h
@@ -29,7 +29,7 @@ class HLTCaloCellSumMaker: public AthReentrantAlgorithm {
HLTCaloCellSumMaker(const std::string & name, ISvcLocator* pSvcLocator);
~HLTCaloCellSumMaker();
- StatusCode execute_r(const EventContext& context ) const ;
+ StatusCode execute(const EventContext& context ) const ;
StatusCode initialize();
private:
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/TrigEFMissingET/EFMissingETAlgMT.h b/Trigger/TrigAlgorithms/TrigEFMissingET/TrigEFMissingET/EFMissingETAlgMT.h
index 6c844543d122..3c463bc32749 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/TrigEFMissingET/EFMissingETAlgMT.h
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/TrigEFMissingET/EFMissingETAlgMT.h
@@ -32,7 +32,7 @@ class EFMissingETAlgMT : public ::AthReentrantAlgorithm
//EFMissingETMT &operator=(const EFMissingETMT &alg);
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
private:
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETAlgMT.cxx b/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETAlgMT.cxx
index 55b1375d0a63..1deffc8ab57d 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETAlgMT.cxx
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/src/EFMissingETAlgMT.cxx
@@ -41,7 +41,7 @@ double toLinGeV( double x, double fallback = 0, double epsilon = 1e-6 ) {
}
-StatusCode EFMissingETAlgMT::execute_r( const EventContext& context ) const {
+StatusCode EFMissingETAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
using namespace Monitored;
auto totalTimer = MonitoredTimer::declare( "TIME_Total" );
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx
index 0d5c56479898..99ac204d60a5 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx
@@ -326,7 +326,7 @@ void TestCaloDataAccess::emulateFixedRoIs( const EventContext& context, std::vec
}
-StatusCode TestCaloDataAccess::execute_r( const EventContext& context ) const {
+StatusCode TestCaloDataAccess::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
std::vector<ParallelCallTest*> allRoIs;
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.h b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.h
index 4e1adeb69133..2773288de16e 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.h
@@ -26,7 +26,7 @@ class TestCaloDataAccess
TestCaloDataAccess( const std::string& name, ISvcLocator* pSvcLocator );
virtual ~TestCaloDataAccess();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
private:
TestCaloDataAccess();
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CaloEgammaReFastAlgo.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CaloEgammaReFastAlgo.h
index cac73b16f541..e8eaf1b5b194 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CaloEgammaReFastAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CaloEgammaReFastAlgo.h
@@ -47,7 +47,7 @@ class T2CaloEgammaReFastAlgo: public AthReentrantAlgorithm {
/** main execute will call FEX IAlgToolCalo::execute() to process RoI.
called by the Steering per EMRoI. */
- StatusCode execute_r(const EventContext& context ) const;
+ StatusCode execute(const EventContext& context ) const;
/** initialize. Called by the Steering. */
StatusCode initialize();
/** hltFinalize. Called by the Steering. */
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
index 5b16ba06c3b4..23bf17a054db 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
@@ -73,7 +73,7 @@ StatusCode T2CaloEgammaReFastAlgo::initialize()
}
-StatusCode T2CaloEgammaReFastAlgo::execute_r(const EventContext& context) const
+StatusCode T2CaloEgammaReFastAlgo::execute(const EventContext& context) const
{
// Time total T2CaloEgamma execution time.
// if ( m_timersvc ) m_timer[0]->start();
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
index 63f722c1d4e0..53a9b8cc4b22 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.cxx
@@ -66,7 +66,7 @@ StatusCode TrigDecisionMakerMT::finalize()
}
-StatusCode TrigDecisionMakerMT::execute_r(const EventContext& context) const
+StatusCode TrigDecisionMakerMT::execute(const EventContext& context) const
{
// increment event counter
m_nEvents++;
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h
index 1d9e3a0af5e7..4a9866733263 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMakerMT.h
@@ -76,7 +76,7 @@ namespace TrigDec {
// IAlgorithm virtual methods to implement
virtual StatusCode initialize() override; //!< std Gaudi initialize method -> read-in trigger configuration
- virtual StatusCode execute_r( const EventContext& context ) const override; //!< Re-entrant execute to create the xAOD::TrigDecision
+ virtual StatusCode execute( const EventContext& context ) const override; //!< Re-entrant execute to create the xAOD::TrigDecision
virtual StatusCode finalize() override; //!< std Gaudi finalize method -> print out statistics
StatusCode getL1Result (const LVL1CTP::Lvl1Result*& result, const EventContext& context) const; //!< retrieve LVL1 result (called in execute)
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx
index b9c8b500004b..d08371839771 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.cxx
@@ -42,7 +42,7 @@ StatusCode TrigBjetEtHypoAlgMT::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode TrigBjetEtHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigBjetEtHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_INFO ( "Executing " << name() << "..." );
// ==========================================================================================================================
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h
index 675eac792f5e..fa57097df4b8 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetEtHypoAlgMT.h
@@ -34,7 +34,7 @@ class TrigBjetEtHypoAlgMT : public ::HypoBase {
virtual ~TrigBjetEtHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.cxx
index fa48a143de29..3d5da42c57c2 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.cxx
@@ -42,7 +42,7 @@ StatusCode TrigBjetHypoAlgMT::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode TrigBjetHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigBjetHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
SG::ReadHandle< TrigCompositeUtils::DecisionContainer > prevDecisionHandle = SG::makeHandle( decisionInput(),context );
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.h
index a4d71f886a8e..e14151578489 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetHypoAlgMT.h
@@ -34,7 +34,7 @@ class TrigBjetHypoAlgMT : public ::HypoBase {
virtual ~TrigBjetHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx
index c85abd2c4bf6..b5d7bcf9eb11 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.cxx
@@ -33,7 +33,7 @@ StatusCode TrigL2CaloHypoAlgMT::finalize() {
}
-StatusCode TrigL2CaloHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigL2CaloHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
if( not previousDecisionsHandle.isValid() ) {//implicit
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.h
index 39d75c7f156c..a7a7d4697ba6 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlgMT.h
@@ -27,7 +27,7 @@ class TrigL2CaloHypoAlgMT : public ::HypoBase {
virtual ~TrigL2CaloHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.cxx
index 439a3922b24c..4d0b00160313 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.cxx
@@ -38,7 +38,7 @@ StatusCode TrigL2ElectronHypoAlgMT::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode TrigL2ElectronHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigL2ElectronHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
if( not previousDecisionsHandle.isValid() ) {//implicit
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.h
index de5c9354cfb0..530a4f1970d8 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlgMT.h
@@ -30,7 +30,7 @@ class TrigL2ElectronHypoAlgMT : public ::HypoBase
virtual ~TrigL2ElectronHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx
index 5eee805ee8ad..84267f8b9667 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.cxx
@@ -38,7 +38,7 @@ StatusCode TrigL2PhotonHypoAlgMT::finalize() {
}
-StatusCode TrigL2PhotonHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigL2PhotonHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
if( not previousDecisionsHandle.isValid() ) {//implicit
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.h
index b0c40fb1f76a..2961c2f5ef65 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypoAlgMT.h
@@ -33,7 +33,7 @@ class TrigL2PhotonHypoAlgMT : public ::HypoBase
virtual ~TrigL2PhotonHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx
index b655c25ca093..e9d1626f1379 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx
@@ -34,7 +34,7 @@ StatusCode TrigJetHypoAlgMT::initialize() {
}
-StatusCode TrigJetHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigJetHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h
index c9284f39d28f..d4413eb184e5 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.h
@@ -26,7 +26,7 @@ class TrigJetHypoAlgMT : public ::HypoBase {
virtual ~TrigJetHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.cxx
index 31dded544e14..5e2a85c76c9c 100644
--- a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.cxx
@@ -34,7 +34,7 @@ StatusCode TrigL2CaloRingerHypoAlgMT::initialize() {
}
-StatusCode TrigL2CaloRingerHypoAlgMT::execute_r( const EventContext& context ) const {
+StatusCode TrigL2CaloRingerHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
// prepare decisions container and link back to the clusters, and decision on clusters
diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.h b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.h
index a6bb833cd96f..2163e6e2840f 100644
--- a/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/src/TrigL2CaloRingerHypoAlgMT.h
@@ -27,7 +27,7 @@ class TrigL2CaloRingerHypoAlgMT
virtual ~TrigL2CaloRingerHypoAlgMT();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
index f0e47910b76f..c8582c347b07 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
@@ -33,7 +33,7 @@ class TrigMufastHypoAlg
virtual ~TrigMufastHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoAlg.h
index a1f2d650b0fc..7c312b640cd9 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuisoHypoAlg.h
@@ -42,7 +42,7 @@ class TrigMuisoHypoAlg
virtual ~TrigMuisoHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h
index d1b8a8436f0f..01e488d97d9d 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFCombinerHypoAlg.h
@@ -34,7 +34,7 @@ class TrigMuonEFCombinerHypoAlg
virtual ~TrigMuonEFCombinerHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
index de0f356c40da..52d0cc03178b 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
@@ -34,7 +34,7 @@ class TrigMuonEFMSonlyHypoAlg
virtual ~TrigMuonEFMSonlyHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoAlg.h
index c6fd5ff06fe4..490db37657c8 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFTrackIsolationHypoAlg.h
@@ -34,7 +34,7 @@ class TrigMuonEFTrackIsolationHypoAlg
virtual ~TrigMuonEFTrackIsolationHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h
index 6562a9155bf5..42e381e5de83 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h
@@ -34,7 +34,7 @@ class TrigmuCombHypoAlg
virtual ~TrigmuCombHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoAlg.cxx
index 66634e983a4f..b76a04d17880 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMufastHypoAlg.cxx
@@ -53,11 +53,11 @@ StatusCode TrigMufastHypoAlg::finalize()
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-StatusCode TrigMufastHypoAlg::execute_r( const EventContext& context ) const
+StatusCode TrigMufastHypoAlg::execute( const EventContext& context ) const
{
// common for all Hypos, to move in the base class
- ATH_MSG_DEBUG("StatusCode TrigMufastHypoAlg::execute_r start");
+ ATH_MSG_DEBUG("StatusCode TrigMufastHypoAlg::execute start");
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
if( not previousDecisionsHandle.isValid() ) {//implicit
ATH_MSG_DEBUG( "No implicit RH for previous decisions "<< decisionInput().key()<<": is this expected?" );
@@ -142,7 +142,7 @@ StatusCode TrigMufastHypoAlg::execute_r( const EventContext& context ) const
}
- ATH_MSG_DEBUG("StatusCode TrigMufastHypoAlg::execute_r success");
+ ATH_MSG_DEBUG("StatusCode TrigMufastHypoAlg::execute success");
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoAlg.cxx
index 24be8036725e..ee8041bba84f 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuisoHypoAlg.cxx
@@ -50,10 +50,10 @@ StatusCode TrigMuisoHypoAlg::finalize()
}
-StatusCode TrigMuisoHypoAlg::execute_r( const EventContext& context) const
+StatusCode TrigMuisoHypoAlg::execute( const EventContext& context) const
{
// common for all Hypos, to move in the base class
- ATH_MSG_DEBUG("StatusCode TrigMuisoHypoAlg::execute_r start");
+ ATH_MSG_DEBUG("StatusCode TrigMuisoHypoAlg::execute start");
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
if( not previousDecisionsHandle.isValid() ) {//implicit
ATH_MSG_DEBUG( "No implicit RH for previous decisions "<< decisionInput().key()<<": is this expected?" );
@@ -128,7 +128,7 @@ StatusCode TrigMuisoHypoAlg::execute_r( const EventContext& context) const
}
- ATH_MSG_DEBUG("StatusCode TrigMuisoHypoAlg::execute_r success");
+ ATH_MSG_DEBUG("StatusCode TrigMuisoHypoAlg::execute success");
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoAlg.cxx
index 1db2340bed6f..6deee0ce7584 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFCombinerHypoAlg.cxx
@@ -54,9 +54,9 @@ StatusCode TrigMuonEFCombinerHypoAlg::finalize()
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-StatusCode TrigMuonEFCombinerHypoAlg::execute_r( const EventContext& context ) const
+StatusCode TrigMuonEFCombinerHypoAlg::execute( const EventContext& context ) const
{
- ATH_MSG_DEBUG("StatusCode TrigMuonEFCombinerHypoAlg::execute_r start");
+ ATH_MSG_DEBUG("StatusCode TrigMuonEFCombinerHypoAlg::execute start");
// common for all hypos, to move in the base class
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
@@ -146,7 +146,7 @@ StatusCode TrigMuonEFCombinerHypoAlg::execute_r( const EventContext& context ) c
} else ATH_MSG_WARNING( "Output decisions are NOT valid with key : " << decisionOutput().key() );
}
- ATH_MSG_DEBUG("StatusCode TrigMuonEFCombinerHypoAlg::execute_r success");
+ ATH_MSG_DEBUG("StatusCode TrigMuonEFCombinerHypoAlg::execute success");
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoAlg.cxx
index 1a8f180b3e7f..c301fbfa3f47 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFMSonlyHypoAlg.cxx
@@ -54,9 +54,9 @@ StatusCode TrigMuonEFMSonlyHypoAlg::finalize()
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-StatusCode TrigMuonEFMSonlyHypoAlg::execute_r( const EventContext& context ) const
+StatusCode TrigMuonEFMSonlyHypoAlg::execute( const EventContext& context ) const
{
- ATH_MSG_DEBUG("StatusCode TrigMuonEFMSonlyHypoAlg::execute_r start");
+ ATH_MSG_DEBUG("StatusCode TrigMuonEFMSonlyHypoAlg::execute start");
// common for all hypos, to move in the base class
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
@@ -146,7 +146,7 @@ StatusCode TrigMuonEFMSonlyHypoAlg::execute_r( const EventContext& context ) con
} else ATH_MSG_WARNING( "Output decisions are NOT valid with key : " << decisionOutput().key() );
}
- ATH_MSG_DEBUG("StatusCode TrigMuonEFMSonlyHypoAlg::execute_r success");
+ ATH_MSG_DEBUG("StatusCode TrigMuonEFMSonlyHypoAlg::execute success");
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoAlg.cxx
index ab0f9afd912d..f3826e60d652 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFTrackIsolationHypoAlg.cxx
@@ -53,7 +53,7 @@ StatusCode TrigMuonEFTrackIsolationHypoAlg::finalize()
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-StatusCode TrigMuonEFTrackIsolationHypoAlg::execute_r( const EventContext& context ) const
+StatusCode TrigMuonEFTrackIsolationHypoAlg::execute( const EventContext& context ) const
{
ATH_MSG_DEBUG("Executing ...");
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoAlg.cxx
index 9de510e8c804..72609a6d2a91 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigmuCombHypoAlg.cxx
@@ -55,10 +55,10 @@ StatusCode TrigmuCombHypoAlg::finalize()
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
-StatusCode TrigmuCombHypoAlg::execute_r(const EventContext& context) const
+StatusCode TrigmuCombHypoAlg::execute(const EventContext& context) const
{
// common for all Hypos, to move in the base class
- ATH_MSG_DEBUG("StatusCode TrigmuCombHypoAlg::execute_r start");
+ ATH_MSG_DEBUG("StatusCode TrigmuCombHypoAlg::execute start");
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context);
if ( not previousDecisionsHandle.isValid() ) {//implicit
ATH_MSG_DEBUG( "No implicit ReadHandles for previous decisions " << decisionInput().key() << ": is this expected?");
@@ -133,7 +133,7 @@ StatusCode TrigmuCombHypoAlg::execute_r(const EventContext& context) const
}
}
- ATH_MSG_DEBUG("StatusCode TrigmuCombHypoAlg::execute_r success");
+ ATH_MSG_DEBUG("StatusCode TrigmuCombHypoAlg::execute success");
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.cxx
index 3d42335fe415..7a9e1a901de1 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.cxx
@@ -84,7 +84,7 @@ StatusCode TrigROBMoni::initialize()
if ( m_steering ) {
// Make list of algorithms able to request data (all but Hypo)
- vector<Algorithm*>::const_iterator a;
+ vector<Gaudi::Algorithm*>::const_iterator a;
for ( a = m_steering->subAlgorithms()->begin();
a != m_steering->subAlgorithms()->end(); ++a ) {
if ( dynamic_cast<const HLT::TECreateAlgo*>(*a) ) m_fexAlgos.push_back(*a);
@@ -153,7 +153,7 @@ StatusCode TrigROBMoni::bookHists()
m_fexAlgos.size(), 0, m_fexAlgos.size(),
m_fexAlgos.size(), 0, m_fexAlgos.size());
- vector<Algorithm*>::const_iterator a;
+ vector<Gaudi::Algorithm*>::const_iterator a;
int bin;
for ( a = m_fexAlgos.begin(), bin=1; a != m_fexAlgos.end(); ++a, ++bin ) {
m_h_shared_requests->GetXaxis()->SetBinLabel(bin, (*a)->name().c_str());
@@ -341,7 +341,7 @@ StatusCode HistSet<HTYPE>::book(TrigMonitorToolBase::TrigMonGroup& monGroup,
hist[SDGROUP]->GetXaxis()->SetBinLabel(bin, (*sdg).second.c_str());
}
- //vector<Algorithm*>::const_iterator a;
+ //vector<Gaudi::Algorithm*>::const_iterator a;
//for ( a = montool->m_fexAlgos.begin(), bin=1;
// a != montool->m_fexAlgos.end(); ++a, ++bin ) {
// hist[ALGO]->GetXaxis()->SetBinLabel(bin, (*a)->name().c_str());
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.h b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.h
index 2974759e0abf..9c3670b2b103 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.h
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigROBMoni.h
@@ -148,7 +148,7 @@ private:
const HLT::TrigSteer* m_steering;
/// Steering FEX algos (the ones that can request data)
- std::vector<Algorithm*> m_fexAlgos;
+ std::vector<Gaudi::Algorithm*> m_fexAlgos;
/// Map to assign ROB history codes to bins
std::map<robmonitor::ROBHistory, short> m_ROBHistoryToBin;
diff --git a/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeHistTool.cxx b/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeHistTool.cxx
index 7df3776e4220..49e9e6e9e78f 100755
--- a/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeHistTool.cxx
+++ b/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeHistTool.cxx
@@ -66,7 +66,7 @@ StatusCode TrigTimeHistTool::bookHists()
ATH_CHECK(timerSvc.retrieve());
// find out for whom we are running (i.e. Algo)
- const Algorithm *parentAlg = dynamic_cast<const Algorithm*>(parent());
+ const Gaudi::Algorithm *parentAlg = dynamic_cast<const Gaudi::Algorithm*>(parent());
if ( parentAlg )
m_parentName = parentAlg->name();
diff --git a/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeTreeTool.cxx b/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeTreeTool.cxx
index f0cb0cc94334..a6a20a9b48c9 100755
--- a/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeTreeTool.cxx
+++ b/Trigger/TrigMonitoring/TrigTimeMonitor/src/TrigTimeTreeTool.cxx
@@ -47,7 +47,7 @@ StatusCode TrigTimeTreeTool::bookHists() {
ATH_CHECK(rootHistSvc.retrieve());
// find out for whom we are running (i.e. Algo)
- const Algorithm *parentAlg = dynamic_cast<const Algorithm*>(parent());
+ const Gaudi::Algorithm *parentAlg = dynamic_cast<const Gaudi::Algorithm*>(parent());
if ( parentAlg )
m_parentName = parentAlg->name();
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/HypoBase.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/HypoBase.h
index 3a83457515bd..dfbb61fcbd84 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/HypoBase.h
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/HypoBase.h
@@ -24,7 +24,7 @@ This is a base class for HLT Hypos to reduce boilerplate and enforce the common
/// initialise this base class and renounce input decision key handles
virtual StatusCode sysInitialize() override;
/// execute to be implemented in derived clas
- virtual StatusCode execute_r(const EventContext&) const override = 0;
+ virtual StatusCode execute(const EventContext&) const override = 0;
virtual StatusCode finalize() override = 0;
virtual StatusCode initialize() override = 0;
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h
index e904f8e67e1f..7c5ce693f4f0 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h
@@ -24,7 +24,7 @@ This is a base class for HLT InputMakers to reduce boilerplate and enforce the c
/// initialise this base class and renounce input decision key handles
virtual StatusCode sysInitialize() override;
/// execute to be implemented in derived clas
- virtual StatusCode execute_r(const EventContext&) const override = 0;
+ virtual StatusCode execute(const EventContext&) const override = 0;
virtual StatusCode finalize() override = 0;
virtual StatusCode initialize() override = 0;
protected:
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h
index dc0c230132d4..c78f3be5a119 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h
@@ -31,7 +31,7 @@ namespace TrigCompositeUtils {
* @brief Creates and right away records the Container CONT with the key.
* Returns the WriteHandle.
* No Aux store.
- * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+ * If possible provide the context that comes via an argument to execute otherwise it will default to looking it up which is slower.
**/
template<class CONT>
SG::WriteHandle<CONT> createAndStoreNoAux( const SG::WriteHandleKey<CONT>& key, const EventContext& ctx = Gaudi::Hive::currentContext());
@@ -40,7 +40,7 @@ namespace TrigCompositeUtils {
* @brief Creates and right away records the Container CONT with the key.
* Returns the WriteHandle.
* With Aux store.
- * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+ * If possible provide the context that comes via an argument to execute otherwise it will default to looking it up which is slower.
**/
template<class CONT, class AUX>
SG::WriteHandle<CONT> createAndStoreWithAux( const SG::WriteHandleKey<CONT>& key, const EventContext& ctx = Gaudi::Hive::currentContext());
@@ -48,7 +48,7 @@ namespace TrigCompositeUtils {
/**
* @brief Creates and right away records the DecisionContainer with the key.
* Returns the WriteHandle.
- * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+ * If possible provide the context that comes via an argument to execute otherwise it will default to looking it up which is slower.
**/
SG::WriteHandle<DecisionContainer> createAndStore( const SG::WriteHandleKey<DecisionContainer>& key, const EventContext& ctx = Gaudi::Hive::currentContext() );
@@ -67,7 +67,7 @@ namespace TrigCompositeUtils {
* output->push_back(d);
* If provided, the name is assigned to the TC object
* Note that the supplied DecisionContainer must have been recorded in the event store.
- * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+ * If possible provide the context that comes via an argument to execute otherwise it will default to looking it up which is slower.
**/
Decision* newDecisionIn ( DecisionContainer* dc, const std::string& name = "", const EventContext& ctx = Gaudi::Hive::currentContext() );
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
index a11b4bb04e09..93edfe6534b6 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
@@ -7,7 +7,7 @@ namespace TrigCompositeUtils {
* @brief Creates and right away records the Container CONT with the key.
* No Aux store.
* Returns the WriteHandle.
- * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+ * If possible provide the context that comes via an argument to execute otherwise it will default to looking it up which is slower.
**/
template<class CONT>
SG::WriteHandle<CONT> createAndStoreNoAux( const SG::WriteHandleKey<CONT>& key, const EventContext& ctx ) {
@@ -21,7 +21,7 @@ namespace TrigCompositeUtils {
* @brief Creates and right away records the Container CONT with the key.
* With Aux store.
* Returns the WriteHandle.
- * If possible provide the context that comes via an argument to execute_r otherwise it will default to looking it up which is slower.
+ * If possible provide the context that comes via an argument to execute otherwise it will default to looking it up which is slower.
**/
template<class CONT, class AUX>
SG::WriteHandle<CONT> createAndStoreWithAux( const SG::WriteHandleKey<CONT>& key, const EventContext& ctx ) {
diff --git a/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx b/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx
index 0408728dccd2..3627d105dead 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.cxx
@@ -167,7 +167,7 @@ void ComboHypo::fillDecisionsMap( std::vector< MultiplicityMap >& dmap, const E
}
}
-StatusCode ComboHypo::execute_r(const EventContext& context ) const {
+StatusCode ComboHypo::execute(const EventContext& context ) const {
ATH_MSG_DEBUG( "Executing " << name() << "..." );
diff --git a/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.h b/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.h
index df97b79b2c68..73879a2ce883 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/ComboHypo.h
@@ -27,7 +27,7 @@ public:
virtual ~ComboHypo() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx
index f05fdb890ec8..46fb361a6da8 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx
@@ -42,7 +42,7 @@ StatusCode DumpDecisions::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode DumpDecisions:: execute_r( const EventContext& ctx ) const {
+StatusCode DumpDecisions:: execute( const EventContext& ctx ) const {
using namespace TrigCompositeUtils;
// DecisionInput decisionInput;
auto decisionInput = SG::makeHandle( m_decisionKey, ctx );
diff --git a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.h b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.h
index 71ec3ce57ac5..dc0af6a29777 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.h
@@ -31,7 +31,7 @@ class DumpDecisions
// Athena algorithm's Hooks
StatusCode initialize() override;
- StatusCode execute_r( const EventContext& ctx ) const override;
+ StatusCode execute( const EventContext& ctx ) const override;
StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
index fdcdb8307ae9..b116703641bb 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
@@ -31,7 +31,7 @@ StatusCode InputMakerForRoI::finalize() {
}
-StatusCode InputMakerForRoI::execute_r( const EventContext& context ) const {
+StatusCode InputMakerForRoI::execute( const EventContext& context ) const {
ATH_MSG_DEBUG( "Executing " << name() << "..." );
// call base class helper method to read input decisions, loop over them create outputs and connect them, returns with outputHandles filled
diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h
index a9cc8db965f5..0f015a076142 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h
@@ -24,7 +24,7 @@
InputMakerForRoI( const std::string& name, ISvcLocator* pSvcLocator );
virtual ~ InputMakerForRoI();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext&) const override;
+ virtual StatusCode execute(const EventContext&) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx
index 5bdc223042b2..332b3dd1692d 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx
@@ -45,7 +45,7 @@ StatusCode TriggerSummaryAlg::initialize()
return StatusCode::SUCCESS;
}
-StatusCode TriggerSummaryAlg::execute_r(const EventContext& context) const
+StatusCode TriggerSummaryAlg::execute(const EventContext& context) const
{
// that is certain input
diff --git a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.h b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.h
index 10f0f19d7add..e1e58dce8d24 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.h
@@ -26,7 +26,7 @@ class TriggerSummaryAlg : public ::AthReentrantAlgorithm {
virtual ~TriggerSummaryAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
private:
diff --git a/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.cxx b/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.cxx
index 5dc84ebea373..fa9c2a3a4b54 100644
--- a/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.cxx
+++ b/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.cxx
@@ -27,7 +27,7 @@ StatusCode CreateFullScanRoI::finalize()
return StatusCode::SUCCESS;
}
-StatusCode CreateFullScanRoI::execute_r(const EventContext& ctx) const
+StatusCode CreateFullScanRoI::execute(const EventContext& ctx) const
{
using namespace TrigCompositeUtils;
SG::WriteHandle<TrigRoiDescriptorCollection> handle1 = createAndStoreNoAux(m_roisKey, ctx );
diff --git a/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.h b/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.h
index 884eec97ca47..7c2e0acda93f 100644
--- a/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.h
+++ b/Trigger/TrigSteer/L1Decoder/src/CreateFullScanRoI.h
@@ -20,7 +20,7 @@ public:
virtual ~CreateFullScanRoI() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/L1Decoder/src/L1Decoder.cxx b/Trigger/TrigSteer/L1Decoder/src/L1Decoder.cxx
index 69930d8318c3..7a48e1618f1b 100644
--- a/Trigger/TrigSteer/L1Decoder/src/L1Decoder.cxx
+++ b/Trigger/TrigSteer/L1Decoder/src/L1Decoder.cxx
@@ -63,7 +63,7 @@ StatusCode L1Decoder::readConfiguration() {
return StatusCode::SUCCESS;
}
-StatusCode L1Decoder::execute_r (const EventContext& ctx) const {
+StatusCode L1Decoder::execute (const EventContext& ctx) const {
{
auto timeStampHandle = SG::makeHandle( m_startStampKey, ctx );
ATH_CHECK( timeStampHandle.record( std::make_unique<TrigTimeStamp>() ) );
diff --git a/Trigger/TrigSteer/L1Decoder/src/L1Decoder.h b/Trigger/TrigSteer/L1Decoder/src/L1Decoder.h
index dff2b0dcbcf6..21d7b7791891 100644
--- a/Trigger/TrigSteer/L1Decoder/src/L1Decoder.h
+++ b/Trigger/TrigSteer/L1Decoder/src/L1Decoder.h
@@ -30,7 +30,7 @@ public:
L1Decoder(const std::string& name, ISvcLocator* pSvcLocator);
virtual StatusCode initialize() override;
virtual void handle(const Incident& incident) override;
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode finalize() override;
protected: // protected to support unit testing
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.cxx b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.cxx
index afec96c42b8d..85e0064e0d7f 100644
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.cxx
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.cxx
@@ -38,9 +38,9 @@ StatusCode HLTResultMTByteStreamDecoderAlg::finalize() {
}
// =============================================================================
-// Implementation of AthReentrantAlgorithm::execute_r
+// Implementation of AthReentrantAlgorithm::execute
// =============================================================================
-StatusCode HLTResultMTByteStreamDecoderAlg::execute_r(const EventContext& eventContext) const {
+StatusCode HLTResultMTByteStreamDecoderAlg::execute(const EventContext& eventContext) const {
ATH_MSG_DEBUG("Executing " << name());
// Create and record the HLTResultMT object
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.h b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.h
index 64e4b468ea58..cf9b1eb5c114 100644
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.h
+++ b/Trigger/TrigSteer/TrigHLTResultByteStream/src/HLTResultMTByteStreamDecoderAlg.h
@@ -25,7 +25,7 @@ public:
// ------------------------- AthReentrantAlgorithm methods -------------------
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
- virtual StatusCode execute_r(const EventContext& eventContext) const override;
+ virtual StatusCode execute(const EventContext& eventContext) const override;
private:
// ------------------------- Properties --------------------------------------
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.cxx
index c1c18bdb09eb..b39c0a242a60 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.cxx
@@ -28,7 +28,7 @@ StatusCode DecisionSummaryMakerAlg::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode DecisionSummaryMakerAlg::execute_r(const EventContext& context) const {
+StatusCode DecisionSummaryMakerAlg::execute(const EventContext& context) const {
SG::WriteHandle<TrigCompositeUtils::DecisionContainer> outputHandle = TrigCompositeUtils::createAndStore( m_summaryKey, context );
auto container = outputHandle.ptr();
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.h b/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.h
index 4fc76f6d72ca..ab6e7740a364 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.h
@@ -19,7 +19,7 @@ public:
virtual ~DecisionSummaryMakerAlg() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.cxx
index f73e203cec8a..17fae8a7e6be 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.cxx
@@ -19,6 +19,6 @@ StatusCode HLTResultMTMakerAlg::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode HLTResultMTMakerAlg::execute_r(const EventContext& context) const {
+StatusCode HLTResultMTMakerAlg::execute(const EventContext& context) const {
return m_resultMaker->makeResult(context);
}
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.h b/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.h
index 3a53f49c3530..b5b4577f2dfb 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTResultMTMakerAlg.h
@@ -18,7 +18,7 @@ public:
virtual ~HLTResultMTMakerAlg() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
index a4cbf6356c6c..ffa7506e9973 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
@@ -34,7 +34,7 @@ StatusCode TriggerEDMDeserialiserAlg::finalize()
return StatusCode::SUCCESS;
}
-StatusCode TriggerEDMDeserialiserAlg::execute_r(const EventContext& context) const
+StatusCode TriggerEDMDeserialiserAlg::execute(const EventContext& context) const
{
size_t buffSize = m_initialSerialisationBufferSize;
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.h b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.h
index b5dd0bd519e5..5b90c8094c48 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.h
@@ -34,7 +34,7 @@ public:
virtual ~TriggerEDMDeserialiserAlg() override;
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext& context) const override;
+ virtual StatusCode execute(const EventContext& context) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigSteer/TrigSteering/TrigSteering/TrigSteer.h b/Trigger/TrigSteer/TrigSteering/TrigSteering/TrigSteer.h
index 7d27e2fe44fc..0a5e47ea228f 100755
--- a/Trigger/TrigSteer/TrigSteering/TrigSteering/TrigSteer.h
+++ b/Trigger/TrigSteer/TrigSteering/TrigSteering/TrigSteer.h
@@ -33,7 +33,7 @@
#include "TrigConfHLTData/HLTSequence.h"
#include "TrigNavigation/Navigation.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthLegacySequence.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIncidentListener.h"
@@ -101,7 +101,7 @@ namespace HLT {
@author Nicolas Berger <Nicolas.Berger@cern.ch>
@author Tomasz Bold <Tomasz.Bold@cern.ch>
*/
- class TrigSteer : public AthAlgorithm,
+ class TrigSteer : public AthLegacySequence,
public Athena::TimeoutMaster,
public virtual ISequenceProvider,
public virtual IIncidentListener
diff --git a/Trigger/TrigSteer/TrigSteering/src/Sequence.cxx b/Trigger/TrigSteer/TrigSteering/src/Sequence.cxx
index 696e1d402f6d..9ca0d442a3b6 100755
--- a/Trigger/TrigSteer/TrigSteering/src/Sequence.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/Sequence.cxx
@@ -73,7 +73,7 @@ Sequence::Sequence(std::vector<unsigned int> inputTypes,
return;
}
- const Algorithm* parentAlg = dynamic_cast<const Algorithm*>(ntool->parent()); // this is the way to get parent alg name (TrigSteer_L2/EF) ugh we need better way.
+ const Gaudi::Algorithm* parentAlg = dynamic_cast<const Gaudi::Algorithm*>(ntool->parent()); // this is the way to get parent alg name (TrigSteer_L2/EF) ugh we need better way.
if ( !parentAlg ) {
m_config->getMsgStream() << MSG::WARNING << "No parent algorithm for the sequence" << endmsg;
return;
diff --git a/Trigger/TrigSteer/TrigSteering/src/SteeringChain.cxx b/Trigger/TrigSteer/TrigSteering/src/SteeringChain.cxx
index 28facadea11a..b2d2b5f1fa9f 100644
--- a/Trigger/TrigSteer/TrigSteering/src/SteeringChain.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/SteeringChain.cxx
@@ -125,7 +125,7 @@ SteeringChain::SteeringChain( const TrigConf::HLTChain* configChain, ISequencePr
m_config->getMsgStream() << MSG::WARNING << "Navigation tool not available" << endmsg;
return;
}
- const Algorithm* parentAlg = dynamic_cast<const Algorithm*>(ntool->parent()); // this is the way to get parent alg name (TrigSteer_L2/EF) ugh we need better way.
+ const Gaudi::Algorithm* parentAlg = dynamic_cast<const Gaudi::Algorithm*>(ntool->parent()); // this is the way to get parent alg name (TrigSteer_L2/EF) ugh we need better way.
if ( !parentAlg ) {
m_config->getMsgStream() << MSG::WARNING << "Parent alg not available" << endmsg;
return;
diff --git a/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx b/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
index 07c4c97239b4..a18eeeaedb2b 100755
--- a/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
@@ -88,7 +88,7 @@ using namespace HLT;
using namespace std;
TrigSteer::TrigSteer(const std::string& name, ISvcLocator* pSvcLocator)
- : AthAlgorithm(name, pSvcLocator),
+ : AthLegacySequence(name, pSvcLocator),
m_config(0),
m_stepForEB(0),
m_configSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", name),
@@ -417,12 +417,10 @@ StatusCode TrigSteer::initialize()
}
-
-
-
ATH_MSG_DEBUG("initializing done");
- return StatusCode::SUCCESS;
+ ATH_MSG_DEBUG("initializing subAlgs");
+ return AthLegacySequence::initialize();
}
@@ -449,7 +447,7 @@ StatusCode TrigSteer::finalize()
delete m_config; m_config=0;
- return StatusCode::SUCCESS;
+ return AthLegacySequence::finalize();
}
@@ -1023,7 +1021,7 @@ HLT::Algo* TrigSteer::getAlgo(std::string name)
if (iter != m_algos.end())
algo = iter->second;
else {
- Algorithm* algPointer;
+ Gaudi::Algorithm* algPointer;
if (createSubAlgorithm(subAlg_type, subAlg_name, algPointer).isSuccess()) {
algo = static_cast<HLT::Algo*>(algPointer);
algo->setConfig(m_config);
@@ -1136,7 +1134,7 @@ HLT::Sequence* TrigSteer::createSequence(const TrigConf::HLTSequence& seq, const
// get input TE types and sequences
std::vector<unsigned int> inputTypes;
- std::vector< Sequence* > inputSequences;
+ std::vector< HLT::Sequence* > inputSequences;
for( TrigConf::HLTTriggerElement* inputTE : seq.inputTEs() ) {
unsigned int inputId = inputTE->id();
@@ -1144,7 +1142,7 @@ HLT::Sequence* TrigSteer::createSequence(const TrigConf::HLTSequence& seq, const
// make sure we have the sequences producing these inputTEs:
if ( producedFirstAtLevel(inputId) == m_hltLevel ) {
- Sequence* newseq = findSeqForOutputTeType( inputId );
+ HLT::Sequence* newseq = findSeqForOutputTeType( inputId );
// if seq not NULL and not in vector already, save it:
if (newseq && find(inputSequences.begin(), inputSequences.end(), newseq) == inputSequences.end() ) {
inputSequences.push_back(newseq);
@@ -1160,7 +1158,7 @@ HLT::Sequence* TrigSteer::createSequence(const TrigConf::HLTSequence& seq, const
// get topo_start_from TE types
const TrigConf::HLTTriggerElement* hltTopoTE = seq.topoStartTE();
std::vector<unsigned int> topoStartTypes;
- Sequence * topoStartFromSequence = 0;
+ HLT::Sequence * topoStartFromSequence = 0;
// only add an entry if pointer not NULL
if (hltTopoTE) {
topoStartTypes.push_back( hltTopoTE->id() );
@@ -1188,7 +1186,7 @@ HLT::Sequence* TrigSteer::createSequence(const TrigConf::HLTSequence& seq, const
HLT::Sequence* newseq = new HLT::Sequence(inputTypes, outputType,
firstAlgo, tailAlgos, m_config, topoStartTypes);
- for (std::vector< Sequence* >::const_iterator it = inputSequences.begin();
+ for (std::vector< HLT::Sequence* >::const_iterator it = inputSequences.begin();
it != inputSequences.end(); ++it) {
newseq->m_previousSequences.push_back( *it );
}
@@ -1238,7 +1236,8 @@ StatusCode TrigSteer::start()
ATH_MSG_DEBUG("monitoring tools bookHists done " << m_monTools << " " << m_opiTools);
- return StatusCode::SUCCESS;
+ return AthLegacySequence::start();
+
}
@@ -1281,7 +1280,7 @@ StatusCode TrigSteer::stop()
ATH_MSG_DEBUG("monitoring tools finalHists done " << m_monTools << " " << m_opiTools);
- return StatusCode::SUCCESS;
+ return AthLegacySequence::stop();
}
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
index f10503ada9c6..6b9f57f65614 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
@@ -25,7 +25,7 @@ StatusCode EventViewCreatorAlgorithm::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode EventViewCreatorAlgorithm::execute_r( const EventContext& context ) const {
+StatusCode EventViewCreatorAlgorithm::execute( const EventContext& context ) const {
auto outputHandles = decisionOutputs().makeHandles( context );
// make and store the views
auto viewsHandle = SG::makeHandle( m_viewsKey );
@@ -35,7 +35,7 @@ StatusCode EventViewCreatorAlgorithm::execute_r( const EventContext& context ) c
auto contexts = std::vector<EventContext>( );
unsigned int viewCounter = 0;
- unsigned int conditionsRun = getContext().getExtension<Atlas::ExtendedEventContext>().conditionsRun();
+ unsigned int conditionsRun = context.getExtension<Atlas::ExtendedEventContext>().conditionsRun();
// const TrigRoiDescriptor* previousRoI = 0;
// mapping RoI with index of the View in the vector
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h
index 8a85120a95ac..4e2b4974950b 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h
@@ -32,7 +32,7 @@ class EventViewCreatorAlgorithm : public ::InputMakerBase
EventViewCreatorAlgorithm( const std::string& name, ISvcLocator* pSvcLocator );
virtual ~EventViewCreatorAlgorithm();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext&) const override;
+ virtual StatusCode execute(const EventContext&) const override;
virtual StatusCode finalize() override { return StatusCode::SUCCESS; }
protected:
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.cxx b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.cxx
index 21544ce9036b..0dc87e50cfa8 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.cxx
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.cxx
@@ -25,7 +25,7 @@ StatusCode EventViewCreatorAlgorithmWithJets::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode EventViewCreatorAlgorithmWithJets::execute_r( const EventContext& context ) const {
+StatusCode EventViewCreatorAlgorithmWithJets::execute( const EventContext& context ) const {
auto outputHandles = decisionOutputs().makeHandles( context );
// make and store the views
auto viewsHandle = SG::makeHandle( m_viewsKey );
@@ -35,7 +35,7 @@ StatusCode EventViewCreatorAlgorithmWithJets::execute_r( const EventContext& con
auto contexts = std::vector<EventContext>( );
unsigned int viewCounter = 0;
- unsigned int conditionsRun = getContext().getExtension<Atlas::ExtendedEventContext>().conditionsRun();
+ unsigned int conditionsRun = context.getExtension<Atlas::ExtendedEventContext>().conditionsRun();
// const TrigRoiDescriptor* previousRoI = 0;
// mapping RoI with index of the View in the vector
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.h b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.h
index ff84d82709d4..6d39520d6e56 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.h
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithmWithJets.h
@@ -21,7 +21,7 @@ class EventViewCreatorAlgorithmWithJets : public EventViewCreatorAlgorithm {
virtual ~EventViewCreatorAlgorithmWithJets();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext&) const override;
+ virtual StatusCode execute(const EventContext&) const override;
private:
diff --git a/Trigger/TrigSteer/ViewAlgs/src/MergeViews.cxx b/Trigger/TrigSteer/ViewAlgs/src/MergeViews.cxx
index bcb8ce19512f..a930db5a5314 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/MergeViews.cxx
+++ b/Trigger/TrigSteer/ViewAlgs/src/MergeViews.cxx
@@ -11,7 +11,7 @@ StatusCode MergeViews::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode MergeViews::execute_r( const EventContext& context ) const {
+StatusCode MergeViews::execute( const EventContext& context ) const {
auto viewsHandle = SG::makeHandle( m_viewsKey, context );
const ViewContainer& viewsRef = *viewsHandle;
diff --git a/Trigger/TrigSteer/ViewAlgs/src/MergeViews.h b/Trigger/TrigSteer/ViewAlgs/src/MergeViews.h
index 51ccf3339f6c..d07e60f4b04d 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/MergeViews.h
+++ b/Trigger/TrigSteer/ViewAlgs/src/MergeViews.h
@@ -9,7 +9,7 @@ class MergeViews : virtual public AthReentrantAlgorithm {
public:
MergeViews(const std::string& name, ISvcLocator* pSvcLocator);
StatusCode initialize() override;
- StatusCode execute_r( const EventContext& context ) const override;
+ StatusCode execute( const EventContext& context ) const override;
private:
SG::ReadHandleKey< ViewContainer > m_viewsKey { this, "Views", "Views", "Collection of views to read from" };
ToolHandleArray<IViewsMergerTool> m_mergingTools {this, "MergingTools", {}, "Merging tools used to perform the merging action" };
diff --git a/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.cxx b/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.cxx
index 58aba2667043..b62dec32b329 100644
--- a/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.cxx
+++ b/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.cxx
@@ -34,7 +34,7 @@ StatusCode TestViewMerger::initialize() {
}
-//StatusCode TestViewMerger::execute_r( const EventContext& ctx ) const {
+//StatusCode TestViewMerger::execute( const EventContext& ctx ) const {
StatusCode TestViewMerger::execute(){
// auto viewsHandle = SG::makeHandle( m_viewsKey, ctx );
auto viewsHandle = SG::makeHandle( m_viewsKey );
diff --git a/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.h b/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.h
index fde767a3c160..13c7b85b641e 100644
--- a/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.h
+++ b/Trigger/TrigSteer/ViewAlgsTest/src/TestViewMerger.h
@@ -26,7 +26,7 @@ public:
TestViewMerger( const std::string& name, ISvcLocator* pSvcLocator );
StatusCode initialize();
StatusCode execute();
- // StatusCode execute_r( const EventContext& ctx ) const;
+ // StatusCode execute( const EventContext& ctx ) const;
private:
SG::ReadHandleKey< ViewContainer > m_viewsKey; // will be used in evt context
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx
index b3fd0d71f413..f0572ac9b0e3 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx
@@ -52,7 +52,7 @@ LVL1::RoiB2TopoInputDataCnv::initialize()
}
StatusCode
-LVL1::RoiB2TopoInputDataCnv::execute_r (const EventContext& ctx) const
+LVL1::RoiB2TopoInputDataCnv::execute (const EventContext& ctx) const
{
ATH_MSG_DEBUG ("Executing " << name() << "...");
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.h b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.h
index 98a1e46d94f4..b3d947a2e471 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.h
@@ -35,7 +35,7 @@ namespace LVL1 {
virtual ~RoiB2TopoInputDataCnv();
// Athena algorithm's Hooks
- virtual StatusCode execute_r (const EventContext& ctx) const override;
+ virtual StatusCode execute (const EventContext& ctx) const override;
virtual StatusCode initialize() override;
//Finalize not overriden because no work is required
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.cxx
index 6d125cd6ca59..0bba744bd22d 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.cxx
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.cxx
@@ -163,7 +163,7 @@ namespace HLTTest {
// }
- StatusCode TestComboHypoAlg::execute_r( const EventContext& context ) const {
+ StatusCode TestComboHypoAlg::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ("Executing " << name() << "...");
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.h b/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.h
index fcea988e91ee..b9dd34708198 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.h
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.h
@@ -29,7 +29,7 @@ namespace HLTTest {
//TestComboHypoAlg &operator=(const TestComboHypoAlg &alg);
StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
//StatusCode execute() override;
StatusCode finalize() override;
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx
index eacfb63beaa7..3df9f4318bd6 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx
@@ -27,7 +27,7 @@ namespace HLTTest {
}
- StatusCode TestHypoAlg::execute_r( const EventContext& context ) const {
+ StatusCode TestHypoAlg::execute( const EventContext& context ) const {
ATH_MSG_DEBUG( "Executing " << name() << "..." );
if ( m_recoInput.key().empty() ) {
ATH_MSG_DEBUG( "No input configured, not producing the output" );
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.h b/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.h
index 17f3acd6bf34..07ec5d0e4122 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.h
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.h
@@ -28,7 +28,7 @@ namespace HLTTest {
virtual ~TestHypoAlg();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r( const EventContext& context ) const override;
+ virtual StatusCode execute( const EventContext& context ) const override;
virtual StatusCode finalize() override;
private:
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx
index 34331f60ec25..4a4a72d69bbf 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx
@@ -34,7 +34,7 @@ namespace HLTTest {
}
- StatusCode TestInputMaker::execute_r( const EventContext& context ) const {
+ StatusCode TestInputMaker::execute( const EventContext& context ) const {
ATH_MSG_DEBUG( "Executing " << name() << "..." );
// call base class helper method to read input decisions, loop over them create outputs and connect them, returns with outputHandles filled
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.h b/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.h
index 85e463865d97..8039db3e582b 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.h
+++ b/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.h
@@ -29,7 +29,7 @@ namespace HLTTest {
TestInputMaker( const std::string& name, ISvcLocator* pSvcLocator );
virtual ~TestInputMaker();
virtual StatusCode initialize() override;
- virtual StatusCode execute_r(const EventContext&) const override;
+ virtual StatusCode execute(const EventContext&) const override;
virtual StatusCode finalize() override;
private:
--
GitLab