From 5253f60c77e1aa5ec538abc1c93d0210959b920f Mon Sep 17 00:00:00 2001
From: Charles Leggett <charles.g.leggett@gmail.com>
Date: Fri, 14 Aug 2020 18:26:00 +0000
Subject: [PATCH] update Gaudi to v34r0.003
---
.../src/DummyLumirangeTool.h | 2 +-
.../src/EventTagReader.cxx | 2 +-
.../share/AtlfastPoolWriteOptions.ref | 4 +-
.../AthenaPoolTestData/TestGaudiProperty.h | 20 +--
.../src/TestGaudiProperty.cxx | 8 +-
.../src/CaloRunClusterCorrections.cxx | 6 +-
.../CaloTests/src/CreateHits.cxx.test | 2 +-
.../CaloExample/CaloTests/src/MyAnalysis.cxx | 2 +-
.../CaloTests/src/MyAnalysisCal.cxx | 2 +-
.../CaloRec/CaloRec/ToolWithConstantsMixin.h | 2 +-
.../src/CaloCellContainerFinalizerTool.cxx | 2 +-
.../CaloRec/src/CaloTopoTowerAlgorithm.cxx | 2 +-
.../CaloRec/src/CaloTowerAlgorithm.cxx | 2 +-
.../CaloRec/src/ToolWithConstantsMixin.cxx | 2 +-
.../src/CaloSurfaceBuilder.cxx | 2 +-
.../src/CaloSurfaceHelper.cxx | 2 +-
.../src/CaloTriggerTowerService.cxx | 2 +-
.../CaloUtils/CaloUtils/ToolWithConstants.h | 2 +-
.../src/CaloTopoTowerBuilderTool.cxx | 2 +-
.../CaloUtils/src/CaloTowerBuilderTool.cxx | 2 +-
Commission/CommissionRec/src/ComTimeRec.cxx | 2 +-
.../AthAnalysisAlgorithm.h | 2 +-
.../src/AthAnalysisAlgorithm.cxx | 2 +-
.../AthCUDAServices/src/KernelRunnerSvc.h | 2 +-
.../AthCUDAServices/src/StreamPoolSvc.h | 2 +-
.../src/AsgExampleAlgorithm.cxx | 2 +-
.../AsgTools/AsgTools/AsgTool.icc | 15 +-
Control/AthViews/src_dflow/DFlowAlg1.cxx | 2 +-
Control/AthViews/src_dflow/DFlowAlg2.cxx | 2 +-
Control/AthViews/src_dflow/DFlowAlg3.cxx | 2 +-
Control/AthViews/src_dflow/ViewMergeAlg.cxx | 2 +-
.../AthViews/src_dflow/ViewSubgraphAlg.cxx | 12 +-
.../AthenaBaseComps/AthCommonDataStore.h | 28 ++--
.../AthenaBaseComps/AthCommonDataStore.icc | 2 +-
.../AthenaBaseComps/AthFilterAlgorithm.h | 4 +-
.../AthenaBaseComps/AthMessaging.h | 2 +-
.../AthenaBaseComps/FilteredAlgorithm.h | 2 +-
Control/AthenaBaseComps/src/AthCnvSvc.cxx | 2 +-
.../src/AthFilterAlgorithm.cxx | 2 +-
.../src/AthHistogramAlgorithm.cxx | 2 +-
.../src/AthHistogramFilterAlgorithm.cxx | 2 +-
.../AthExHelloWorld/src/HelloAlg.h | 2 +-
.../AthenaExamples/AthExHistNtup/src/Hist.cxx | 2 +-
.../AthenaExamples/AthExHistNtup/src/Ntup.cxx | 2 +-
.../src/AnotherConcreteSvc.cxx | 2 +-
.../AthExJobOptions/src/ConcreteSvc.cxx | 2 +-
.../AthExMonitored/src/MonitoredAlg.h | 2 +-
.../src_dflow/DFlowAlg1.cxx | 2 +-
.../src_dflow/DFlowAlg2.cxx | 2 +-
.../src_dflow/DFlowAlg3.cxx | 2 +-
.../AthExThinning/src_lib/CreateData.cxx | 2 +-
.../AthExThinning/src_lib/ReadThinnedData.cxx | 2 +-
.../src_lib/WriteThinnedData.cxx | 2 +-
Control/AthenaKernel/src/CloneService.cxx | 4 +-
Control/AthenaKernel/src/CloneTool.cxx | 4 +-
.../AthenaMonitoring/src/AthenaMonManager.cxx | 2 +-
.../AthenaPython/AthenaPython/PyProperty.h | 6 +-
Control/AthenaPython/src/PyComponentMgr.cxx | 2 +-
.../src/PyJobOptionsCatalogue.cxx | 2 +-
.../AthenaPython/src/PyJobOptionsCatalogue.h | 4 +-
Control/AthenaPython/src/PyJobOptionsSvc.cxx | 8 +-
Control/AthenaPython/src/PyJobOptionsSvc.h | 8 +-
Control/AthenaPython/src/PyProperty.cxx | 4 +-
.../share/FPEControlSvc_test.ref | 12 +-
.../AthenaServices/src/AthDictLoaderSvc.cxx | 2 +-
Control/AthenaServices/src/AthIncFirerAlg.h | 2 +-
.../AthenaServices/src/AthenaEventLoopMgr.cxx | 8 +-
.../AthenaServices/src/AthenaEventLoopMgr.h | 8 +-
.../src/AthenaHiveEventLoopMgr.cxx | 10 +-
.../src/AthenaHiveEventLoopMgr.h | 8 +-
.../src/AthenaJobOptionsSvc.cxx | 14 +-
.../AthenaServices/src/AthenaJobOptionsSvc.h | 4 +-
.../src/AthenaMtesEventLoopMgr.cxx | 8 +-
.../src/AthenaMtesEventLoopMgr.h | 8 +-
.../AthenaServices/src/AthenaOutputStream.cxx | 8 +-
.../AthenaServices/src/AthenaOutputStream.h | 10 +-
Control/AthenaServices/src/CoreDumpSvc.cxx | 4 +-
Control/AthenaServices/src/CoreDumpSvc.h | 2 +-
.../AthenaServices/src/EvtIdModifierSvc.cxx | 2 +-
Control/AthenaServices/src/FPEControlSvc.cxx | 2 +-
Control/AthenaServices/src/FPEControlSvc.h | 4 +-
.../AthenaServices/src/LoggedMessageSvc.cxx | 10 +-
Control/AthenaServices/src/LoggedMessageSvc.h | 12 +-
Control/AthenaServices/src/MemoryRescueSvc.h | 2 +-
Control/AthenaServices/src/MetaDataSvc.cxx | 4 +-
Control/AthenaServices/src/MetaDataSvc.h | 2 +-
.../src/MixingEventSelector.cxx | 2 +-
.../AthenaServices/src/MixingEventSelector.h | 4 +-
.../AthenaServices/src/MultipleEventLoopMgr.h | 2 +-
.../src/OutputStreamSequencerSvc.h | 2 +-
.../AthenaServices/src/PageAccessControlSvc.h | 2 +-
.../src/SimplePOSIXTimeKeeperSvc.cxx | 2 +-
.../src/SimplePOSIXTimeKeeperSvc.h | 4 +-
Control/AthenaServices/src/TestRandomSeqAlg.h | 2 +-
Control/GaudiSequencer/src/AthEventCounter.h | 2 +-
Control/GaudiSequencer/src/AthPrescaler.h | 2 +-
.../GaudiSequencer/src/AthRetrySequencer.cxx | 2 +-
Control/GaudiSequencer/src/AthSequencer.cxx | 2 +-
Control/GaudiSequencer/src/AthSequencer.h | 6 +-
Control/IOVSvc/src/CondInputLoader.cxx | 8 +-
Control/IOVSvc/src/CondInputLoader.h | 2 +-
.../PerfMonComps/src/CallGraphBuilderSvc.cxx | 2 +-
.../src/PerfMonStorePayloadMon.cxx | 2 +-
.../PerfMonComps/src/PerfMonSvc.cxx | 6 +-
.../PerfMonComps/src/PerfMonSvc.h | 4 +-
.../PerfMonComps/src/PerfMonUtils.cxx | 2 +-
.../PerfMonTests/src/PerfMonTestBasicAlg.cxx | 2 +-
.../src/PerfMonTestCpuCruncherAlg.cxx | 2 +-
.../src/PerfMonTestErroneousAlg.cxx | 2 +-
.../PerfMonTests/src/PerfMonTestLeakyAlg.cxx | 2 +-
.../PerfMonTests/src/PerfMonTestMallocAlg.cxx | 2 +-
.../src/PerfMonTestManyLeaksAlg.cxx | 2 +-
.../PerfMonTests/src/PerfMonTestNoopAlg.cxx | 2 +-
Control/PileUpComps/src/ArrayBM.h | 2 +-
Control/PileUpComps/src/BkgStreamsCache.cxx | 2 +-
Control/PileUpComps/src/BkgStreamsCache.h | 4 +-
Control/PileUpComps/src/FixedArrayBM.h | 2 +-
Control/PileUpComps/src/LumiProfileSvc.h | 2 +-
Control/PileUpComps/src/NoProfileSvc.h | 2 +-
Control/PileUpComps/src/PileUpEventLoopMgr.h | 2 +-
Control/PileUpComps/src/StepArrayBM.h | 2 +-
.../PileUpTools/PileUpTools/PileUpMergeSvc.h | 2 +-
Control/RngComps/src/AtDSFMTGenSvc.h | 2 +-
Control/RngComps/src/AtRanluxGenSvc.h | 2 +-
Control/SGComps/src/AddressRemappingSvc.h | 2 +-
Control/SGComps/src/ProxyProviderSvc.cxx | 2 +-
Control/SGComps/src/ProxyProviderSvc.h | 4 +-
Control/SGComps/src/SGFolder.h | 2 +-
Control/SGComps/src/SGInputLoader.cxx | 4 +-
Control/SGComps/src/SGInputLoader.h | 2 +-
Control/SGMon/SGAudSvc/src/SGAudSvc.cxx | 2 +-
Control/StoreGate/StoreGate/StoreGateSvc.h | 4 +-
.../StoreGate/VarHandleKeyArrayProperty.h | 6 +-
.../StoreGate/VarHandleKeyProperty.h | 6 +-
Control/StoreGate/StoreGate/tools/SGImplSvc.h | 4 +-
Control/StoreGate/src/SGImplSvc.cxx | 2 +-
Control/StoreGate/src/StoreGateSvc.cxx | 8 +-
.../src/VarHandleKeyArrayProperty.cxx | 4 +-
.../StoreGate/src/VarHandleKeyProperty.cxx | 4 +-
.../test/VarHandleKeyProperty_test.cxx | 6 +-
.../StoreGate/test/VarHandleProperty_test.cxx | 6 +-
.../StoreGateTests/src/SgStressConsumer.cxx | 2 +-
.../StoreGateTests/src/SgStressProducer.cxx | 2 +-
Control/Valkyrie/src/ValgrindSvc.cxx | 2 +-
.../src/RequireUniqueEvent.cxx | 2 +-
.../src/AthenaPoolAddressProviderSvc.h | 2 +-
.../src/CondProxyProvider.h | 2 +-
.../src/EventSelectorAthenaPool.cxx | 2 +-
.../src/EventSelectorAthenaPool.h | 2 +-
.../src/EventInfoAttListTool.cxx | 2 +-
.../AthenaRoot/AthenaRootComps/src/IoSvc.cxx | 2 +-
.../AthenaRootComps/src/NtupleCnvSvc.cxx | 2 +-
.../src/RootAsciiDumperAlg.cxx | 2 +-
.../src/RootAsciiDumperAlgHandle.cxx | 2 +-
.../src/RootNtupleEventSelector.cxx | 2 +-
.../src/RootNtupleEventSelector.h | 4 +-
.../AthenaRootComps/src/xAODCnvSvc.cxx | 2 +-
.../AthenaRootComps/src/xAODEventSelector.cxx | 2 +-
.../AthenaRootComps/src/xAODEventSelector.h | 2 +-
Database/IOVDbSvc/src/IOVDbSvc.cxx | 4 +-
Database/RDBAccessSvc/src/RDBAccessSvc.h | 2 +-
.../src/RegistrationStream.cxx | 6 +-
.../src/RegistrationStream.h | 8 +-
.../src/RegistrationStreamLCGTool.h | 2 +-
.../GeoModel/GeoModelSvc/src/GeoModelSvc.h | 2 +-
.../IdDictDetDescrCnv/src/IdDictCnvTest.cxx | 2 +-
.../RegSelSvcTest/src/RegSelTestAlg.cxx | 2 +-
.../RegionSelector/src/RegSelSvc.cxx | 4 +-
.../src/ByteStreamEventStorageInputSvc.cxx | 2 +-
.../src/EventSelectorByteStream.cxx | 2 +-
.../src/EventSelectorByteStream.h | 2 +-
.../src/ROBDataProviderMTTest.cxx | 2 +-
.../src/DumpEventDataToJsonAlg.cxx | 2 +-
.../src/SkimDecisionMultiFilter.cxx | 2 +-
.../EventCommonAlgs/INav4MomDumper.h | 2 +-
Event/EventCommonAlgs/src/I4MomDumper.cxx | 6 +-
Event/EventCommonAlgs/src/I4MomDumper.h | 4 +-
Event/EventCommonAlgs/src/INav4MomDumper.cxx | 4 +-
.../xAODCoreCnv/src/ROOTHeaderLoaderSvc.h | 2 +-
Event/xAOD/xAODJetCnv/src/JetCnvAlg.cxx | 2 +-
Event/xAOD/xAODTauCnv/src/TauJetCnvAlg.cxx | 2 +-
Event/xAOD/xAODTauCnv/src/TauJetCnvTool.cxx | 2 +-
.../AFP_Digitization/AFP_PileUpTool.h | 2 +-
.../src/ALFA_BeamTransport.cxx | 2 +-
.../ALFA_Digitization/ALFA_PileUpTool.h | 2 +-
.../LUCID_Digitization/src/LUCID_PileUpTool.h | 2 +-
.../ZDC_SimuDigitization/ZDC_PileUpTool.h | 2 +-
.../ReweightTools/src/PDFReweightTool.cxx | 2 +-
Generators/HepMCAnalysis_i/src/GetEvents.cxx | 2 +-
.../HepMCAnalysis_i/src/HepMCAnalysis.cxx | 2 +-
Generators/HforTool/src/HforTool.cxx | 2 +-
.../src/McAsciiEventSelector.h | 2 +-
.../McEventSelector/McEventSelector.h | 2 +-
.../src/ByteStreamEmonInputSvc.cxx | 2 +-
.../src/ByteStreamEmonInputSvc.h | 2 +-
.../TrigExL2muCalibTest/src/L2muCalibTest.cxx | 8 +-
HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx | 2 +-
.../src/HltROBDataProviderSvc.cxx | 4 +-
.../TrigServices/src/TrigMessageSvc.h | 2 +-
.../src/PixelCablingCondAlg.h | 2 +-
.../src/PixelChargeCalibCondAlg.h | 2 +-
.../src/PixelChargeLUTCalibCondAlg.h | 2 +-
.../src/PixelConfigCondAlg.h | 2 +-
.../src/PixelDCSCondHVAlg.h | 2 +-
.../src/PixelDCSCondStateAlg.h | 2 +-
.../src/PixelDCSCondStatusAlg.h | 2 +-
.../src/PixelDCSCondTempAlg.h | 2 +-
.../src/PixelDeadMapCondAlg.h | 2 +-
.../src/PixelDistortionAlg.h | 2 +-
.../src/PixelHitDiscCnfgAlg.h | 2 +-
.../src/PixelOfflineCalibCondAlg.h | 2 +-
.../src/PixelReadoutSpeedAlg.h | 2 +-
.../src/PixelTDAQCondAlg.h | 2 +-
.../src/PixeldEdxAlg.h | 2 +-
.../src/SCT_ConditionsParameterCondAlg.h | 2 +-
.../src/SCT_DCSConditionsHVCondAlg.h | 2 +-
.../src/SCT_DCSConditionsStatCondAlg.h | 2 +-
.../src/SCT_DCSConditionsTempCondAlg.h | 2 +-
.../src/SCT_ModuleVetoCondAlg.h | 2 +-
.../src/SCT_ReadCalibChipGainCondAlg.h | 2 +-
.../src/SCT_ReadCalibChipNoiseCondAlg.h | 2 +-
.../src/SCT_ReadCalibDataCondAlg.h | 2 +-
.../src/SCT_DCSConditionsTool.h | 2 +-
.../TRT_ConditionsAlgs/src/TRTActiveCondAlg.h | 2 +-
.../TRT_ConditionsAlgs/src/TRTHTCondAlg.h | 2 +-
.../TRT_ConditionsAlgs/src/TRTHWMapCondAlg.h | 2 +-
.../TRT_ConditionsAlgs/src/TRTPhaseCondAlg.h | 2 +-
.../TRT_ConditionsAlgs/src/TRTStrawCondAlg.h | 2 +-
.../TRT_ConditionsAlgs/src/TRTToTCondAlg.h | 2 +-
.../PixelGeoModel/IBLParameterSvc.h | 2 +-
.../src/EnergyDepositionTool.h | 2 +-
.../PixelDigitization/src/FrontEndSimTool.h | 2 +-
.../PixelDigitization/src/RadDamageUtil.h | 2 +-
.../src/SCT_DigitizationTool.cxx | 2 +-
.../src/SCT_DigitizationTool.h | 2 +-
.../src/IDPerfMonEoverP.cxx | 2 +-
.../src/TrackVertexAssoTestAlg.cxx | 2 +-
.../src/LArPedestalInPhysicsMaker.cxx | 2 +-
.../LArCellRec/src/LArCellDeadOTXCorr.h | 2 +-
LArCalorimeter/LArCellRec/src/LArHVFraction.h | 2 +-
.../LArCellRec/src/LArTimeVetoAlg.cxx | 2 +-
.../LArClusterCollisionTimeAlg.h | 2 +-
.../LArCondUtils/src/LArHV2Ntuple.cxx | 2 +-
.../LArDetDescr/src/LArRecoMaterialTool.cxx | 2 +-
.../LArDetDescr/src/LArRecoSimpleGeomTool.cxx | 2 +-
.../LArDigitization/LArHitFilter.h | 2 +-
.../LArDigitization/LArHitMerger.h | 2 +-
.../LArDigitization/LArPileUpTool.h | 2 +-
.../TestLArDetDescr/src/TestCaloDDE.cxx | 2 +-
.../TestLArDetDescr/src/TestCaloGeom.cxx | 2 +-
.../TestLArDetDescr/src/TestLArMaterial.cxx | 2 +-
.../TestLArDetDescr/src/TestLArTT.cxx | 2 +-
.../src/TestLArHWID_Algo.cxx | 2 +-
.../TestLArHardwareID/src/initTTMap_Algo.cxx | 2 +-
.../src/reinitTTMap_Algo.cxx | 2 +-
.../TestLArHardwareID/src/testTTMap_Algo.cxx | 2 +-
.../src/updateTTMap_Algo.cxx | 2 +-
.../LArG4EC/src/CalibrationCalculator.cc | 2 +-
.../LArG4/LArG4EC/src/CalibrationCalculator.h | 2 +-
.../LArG4/LArG4EC/src/EnergyCalculator.cc | 4 +-
.../LArG4/LArG4EC/src/EnergyCalculator.h | 4 +-
.../LArG4FastSimSvc/LArG4FastSimSvc.h | 2 +-
.../src/LArHECCalibrationWheelCalculator.cc | 2 +-
.../src/LArHECCalibrationWheelCalculator.h | 2 +-
.../src/LocalCalibrationCalculator.cc | 2 +-
.../LArG4HEC/src/LocalCalibrationCalculator.h | 2 +-
.../LArL1Sim/LArL1Sim/LArSCL1Maker.h | 2 +-
.../LArL1Sim/LArL1Sim/LArTTL1Maker.h | 2 +-
LArCalorimeter/LArL1Sim/src/LArSCL1Maker.cxx | 2 +-
LArCalorimeter/LArL1Sim/src/LArTTL1Calib.cxx | 2 +-
.../LArSim/src/LArFakeHitProducer.cxx | 2 +-
LArCalorimeter/LArSim/src/LArHitMaker.cxx | 2 +-
LArCalorimeter/LArSim/src/LArHitProducer.cxx | 2 +-
LArCalorimeter/LArSim/src/LArHitReader.cxx | 2 +-
.../LArCalibTest/src/FixLArElecCalib.cxx | 2 +-
.../LArTest/LArCalibTest/src/FixLArIdMap.cxx | 2 +-
.../LArTest/LArCalibTest/src/LArOFCtoOFC.cxx | 2 +-
.../LArCalibTest/src/LArShapeToSCShape.cxx | 2 +-
.../LArConditionsTest/src/LArCondDataTest.cxx | 2 +-
.../src/LArConditionsTestAlg.cxx | 2 +-
.../src/BunchCrossingCondTest.h | 2 +-
.../src/RPC_RawDataProviderTool.cxx | 6 +-
.../MuonCondAlg/MuonAlignmentErrorDbAlg.h | 2 +-
.../MuonCondSvc/src/CSC_DCSConditionsSvc.cxx | 2 +-
.../src/MDT_DCSConditionsRun2Svc.cxx | 2 +-
.../MuonCondSvc/src/MDT_DCSConditionsSvc.cxx | 2 +-
.../MuonCondSvc/src/MDT_DQConditionsSvc.cxx | 2 +-
.../src/MDT_DeadTubeConditionsSvc.cxx | 2 +-
.../MuonCondSvc/src/RPC_DCSConditionsSvc.cxx | 2 +-
.../src/RPC_STATUSConditionsSvc.cxx | 2 +-
.../src/TGC_STATUSConditionsSvc.cxx | 2 +-
.../CscPeakThresholdClusterBuilderTool.cxx | 2 +-
.../src/CscThresholdClusterBuilder.cxx | 2 +-
.../src/CscThresholdClusterBuilderTool.cxx | 2 +-
.../src/AthExReadD3pdEvtStore.cxx | 2 +-
.../src/AthExReadD3pdNtuple.cxx | 2 +-
.../src/WriteTruthParticles.cxx | 2 +-
.../AnalysisTest/src/ReadINav4MomAssocs.cxx | 2 +-
.../AnalysisTest/src/WriteINav4MomAssocs.cxx | 2 +-
.../EventUtils/src/AddVarAlg.cxx | 2 +-
.../AnalysisCommon/EventUtils/src/AddVarAlg.h | 16 +-
.../AnalysisCommon/EventUtils/src/CutAlg.cxx | 2 +-
.../EventUtils/src/EventDecisionAlg.cxx | 2 +-
.../EventUtils/src/ParticleCombinerAlg.h | 24 +--
.../EventUtils/src/ParticleCombinerTool.h | 2 +-
.../EventUtils/src/ParticleSelectionAlg.cxx | 2 +-
.../EventUtils/src/ParticleSortingAlg.cxx | 2 +-
.../EventUtils/src/ParticleSortingAlg.h | 16 +-
.../PileupReweighting/PileupReweightingTool.h | 2 +-
.../Root/PileupReweightingTool.cxx | 4 +-
.../ThinningUtils/src/ThinCaloCellsAlg.cxx | 2 +-
.../ThinningUtils/src/ThinCaloCellsAlg.h | 8 +-
.../ThinningUtils/src/ThinCaloClustersAlg.cxx | 2 +-
.../ThinningUtils/src/ThinCaloClustersAlg.h | 12 +-
.../ThinningUtils/src/ThinGeantTruthAlg.cxx | 2 +-
.../ThinningUtils/src/ThinIParticlesAlg.cxx | 2 +-
.../ThinningUtils/src/ThinIParticlesAlg.h | 12 +-
.../src/ThinInDetForwardTrackParticlesAlg.cxx | 2 +-
.../src/ThinNegativeEnergyCaloClustersAlg.cxx | 2 +-
.../src/ThinNegativeEnergyNeutralPFOsAlg.cxx | 2 +-
.../src/ThinTrackParticlesAlg.cxx | 2 +-
.../ThinningUtils/src/ThinTrackParticlesAlg.h | 28 ++--
.../src/UserAnalysisOverlapCheckingTool.cxx | 2 +-
.../src/UserAnalysisOverlapRemovalTool.cxx | 2 +-
.../src/UserAnalysisPreparationTool.cxx | 2 +-
PhysicsAnalysis/AraTool/AraTool/AraToolBase.h | 6 +-
.../AssociationComps/src/AssocBuilder.cxx | 8 +-
.../AssociationComps/src/AssocBuilder.h | 6 +-
.../AssociationComps/src/AssocDumper.cxx | 6 +-
.../AssociationComps/src/AssocDumper.h | 4 +-
.../AssociationComps/src/DeltaROverlapTool.h | 4 +-
.../D2PDMaker/D2PDElectronSelector.h | 144 +++++++++---------
.../D2PDMaker/D2PDMaker/D2PDJetSelector.h | 88 +++++------
.../D2PDMaker/D2PDMaker/D2PDMuonSelector.h | 4 +-
.../D2PDMaker/D2PDMaker/D2PDPhotonSelector.h | 140 ++++++++---------
.../D2PDMaker/D2PDMaker/D2PDSelectorBase.h | 40 ++---
.../D2PDMaker/D2PDMaker/D2PDTauSelector.h | 20 +--
.../D2PDMaker/D2PDTrackParticleSelector.h | 20 +--
.../src/CollectionGetterRegistryTool.cxx | 2 +-
.../src/CompactHardTruth.cxx | 2 +-
.../src/MuonTPJpsiVertexFittingAlg.cxx | 2 +-
.../src/EgammaTagTool.cxx | 2 +-
.../src/ElectronTagTool.cxx | 2 +-
.../src/PhotonTagTool.cxx | 2 +-
.../EventTagUtils/RegistrationStreamTrig.h | 2 +-
.../EventTagUtils/src/EventInfoTagTool.cxx | 2 +-
.../EventTagUtils/src/GlobalEventTagTool.cxx | 2 +-
.../src/GlobalTriggerTagTool.cxx | 2 +-
.../src/RawInfoSummaryForTagTool.cxx | 2 +-
.../src/ExoticPhysTagTool.cxx | 2 +-
.../src/HeavyIonPhysTagTool.cxx | 2 +-
.../src/HiggsPhysTagTool.cxx | 2 +-
.../src/JetMissingEtIdentificationTagTool.cxx | 2 +-
.../JetTagCalibration/CalibrationBroker.h | 2 +-
.../src/JetTaggingTagTool.cxx | 2 +-
.../MuonID/MuonTagTools/src/MuonTagTool.cxx | 2 +-
.../PrimaryDPDMaker/src/PrimaryDPDPrescaler.h | 2 +-
.../src/muonTrkTrackThinTool.cxx | 2 +-
.../SUSYPhysTagTools/src/SUSYPhysTagTool.cxx | 2 +-
.../SUSYPhys/SUSYTools/src/ApplySUSYTools.cxx | 2 +-
.../src/StandardModelTagTool.cxx | 2 +-
.../src/TauIdentificationTagTool.cxx | 2 +-
.../TauID/TauTagTools/src/TauJetTagTool.cxx | 2 +-
.../McParticleAlgs/src/McAodFilter.cxx | 2 +-
.../McParticleAlgs/src/McAodValidationAlg.cxx | 2 +-
.../src/TruthParticleBuilder.cxx | 6 +-
.../McParticleAlgs/src/TruthParticleBuilder.h | 4 +-
.../src/RootTruthParticleCnvTool.cxx | 6 +-
.../src/RootTruthParticleCnvTool.h | 8 +-
.../McParticleTests/src/McAodMcTopAna.cxx | 2 +-
.../src/McAodMcTopAna_solution.cxx | 2 +-
.../McParticleTests/src/McAodSymLinkTests.cxx | 2 +-
.../McParticleTools/src/EtaPtFilterTool.cxx | 4 +-
.../McParticleTools/src/EtaPtFilterTool.h | 4 +-
.../src/GenAodValidationTool.cxx | 2 +-
.../src/HepMcFloatWriterTool.cxx | 2 +-
.../src/HepMcFloatWriterTool.h | 2 +-
.../McParticleTools/src/HepMcReaderTool.cxx | 2 +-
.../McParticleTools/src/HepMcReaderTool.h | 2 +-
.../src/HepMcTupleWriterTool.cxx | 4 +-
.../src/HepMcTupleWriterTool.h | 2 +-
.../McParticleTools/src/HepMcWriterTool.cxx | 2 +-
.../McParticleTools/src/HepMcWriterTool.h | 2 +-
.../src/McAodTupleWriterTool.cxx | 4 +-
.../src/McAodTupleWriterTool.h | 2 +-
.../McParticleTools/src/McAodWriterTool.cxx | 2 +-
.../McParticleTools/src/McAodWriterTool.h | 2 +-
.../McParticleTools/src/McVtxFilterTool.cxx | 4 +-
.../McParticleTools/src/McVtxFilterTool.h | 4 +-
.../McParticleTools/src/NoopFilterTool.cxx | 2 +-
.../src/TruthIsolationTool.cxx | 4 +-
.../McParticleTools/src/TruthIsolationTool.h | 4 +-
Projects/AthGeneration/externals.txt | 2 +-
Projects/AthSimulation/externals.txt | 2 +-
Projects/Athena/externals.txt | 2 +-
.../HIGlobal/HIGlobal/HIEventShapeMaker.h | 2 +-
.../src/JetGoodiesFiller.cxx | 2 +-
.../src/MuonGoodiesFiller.cxx | 2 +-
.../src/BasicPlotsTool.cxx | 2 +-
.../src/ContainerComparatorTool.cxx | 2 +-
.../MissingETPerformance/src/EtaRingsTool.cxx | 2 +-
.../src/FakeMissingETTool.cxx | 2 +-
.../src/LinearityTool.cxx | 2 +-
.../src/MissingETCompositionTool.cxx | 2 +-
.../src/MissingETScaleTool.cxx | 2 +-
.../MissingETPerformance/src/MuonTool.cxx | 2 +-
.../src/ResolutionTool.cxx | 2 +-
.../MissingETPerformance/src/ZMuMuTool.cxx | 2 +-
.../MissingETPerformance/src/ZeeTool.cxx | 2 +-
Reconstruction/RecAlgs/src/JobOptsDumperAlg.h | 2 +-
.../src/CaloClusterMatchLinkAlg.cxx | 2 +-
.../src/egammaPreSamplerShape.cxx | 2 +-
.../src/egammaTrkRefitterTool.cxx | 2 +-
.../egammaValidation/src/EfficiencyPlot.cxx | 2 +-
.../egammaValidation/src/EgammaMonitoring.h | 2 +-
.../src/ParticleHistograms.cxx | 2 +-
.../egamma/egammaValidation/src/WidthPlot.cxx | 2 +-
.../tauRecTools/Root/TauRecToolBase.cxx | 4 +-
.../src/CrabKissingVertexPositioner.cxx | 2 +-
.../src/CrabKissingVertexPositioner.h | 2 +-
.../src/CaloCellContainerFCSFinalizerTool.cxx | 2 +-
.../G4Sim/G4HiveEx/src/G4InputLoader.cxx | 2 +-
.../src/MergeGenericMuonSimHitCollTool.h | 2 +-
.../MCTruthSimAlgs/src/MergeMcEventCollTool.h | 2 +-
.../src/MergeRecoTimingObjTool.h | 2 +-
.../src/MergeTrackRecordCollTool.h | 2 +-
.../MCTruthSimAlgs/src/MergeTruthJetsTool.h | 2 +-
.../src/NewMergeMcEventCollTool.h | 2 +-
.../src/SimpleMergeMcEventCollTool.h | 2 +-
.../ISF_Core/ISF_Algorithms/src/SimKernel.cxx | 2 +-
.../src/BaseSimulationSelector.cxx | 2 +-
.../src/BaseSimulationSelector.h | 2 +-
.../src/LarEMSamplingFraction.cxx | 2 +-
.../TBCaloGeometry/src/TBCaloCoordinate.cxx | 2 +-
TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx | 2 +-
.../TileConditions/src/TileEMScaleCondAlg.h | 2 +-
.../TileRecUtils/src/TileCellMaskingTool.cxx | 2 +-
.../src/TileRawChannelBuilderFitFilter.cxx | 2 +-
.../TileRawChannelBuilderFitFilterCool.cxx | 2 +-
.../src/TileRawChannelBuilderFlatFilter.cxx | 2 +-
.../src/TileRawChannelBuilderMF.cxx | 2 +-
.../src/TileRawChannelBuilderManyAmps.cxx | 2 +-
.../src/TileRawChannelBuilderOpt2Filter.cxx | 2 +-
.../src/TileRawChannelBuilderQIEFilter.cxx | 2 +-
.../src/TileRawChannelBuilderWienerFilter.cxx | 2 +-
.../TileSimUtils/src/TileCalibHitCntNtup.cxx | 2 +-
.../TileSimUtils/src/TileCalibHitNtuple.cxx | 2 +-
.../ActsGeometry/ActsExCellWriterSvc.h | 2 +-
.../ActsGeometry/ActsExtrapolationAlg.h | 2 +-
.../ActsGeometry/ActsExtrapolationTool.h | 2 +-
.../ActsGeometry/ActsMaterialJsonWriterTool.h | 2 +-
.../ActsGeometry/ActsMaterialMapping.h | 2 +-
.../ActsGeometry/ActsMaterialTrackWriterSvc.h | 2 +-
.../ActsGeometry/ActsObjWriterTool.h | 2 +-
.../ActsGeometry/ActsPropStepRootWriterSvc.h | 2 +-
.../ActsGeometry/ActsSurfaceMappingTool.h | 2 +-
.../ActsGeometry/ActsVolumeMappingTool.h | 2 +-
.../ActsGeometry/ActsWriteTrackingGeometry.h | 2 +-
.../ActsWriteTrackingGeometryTransforms.h | 2 +-
.../ActsAdaptiveMultiPriVtxFinderTool.h | 2 +-
.../TrkDetDescrSvc/TrackingGeometrySvc.h | 2 +-
.../TrkExAlgs/ExtrapolatorComparisonTest.h | 2 +-
.../TrkExAlgs/PropResultRootWriterSvc.h | 2 +-
.../src/RIO_OnTrackErrorScalingCondAlg.h | 2 +-
...RIO_OnTrackErrorScalingDbOverrideCondAlg.h | 2 +-
.../src/GaussianDensityTestAlg.cxx | 2 +-
.../src/ImagingSeedTuningAlg.cxx | 2 +-
.../src/TrigCaloCell2ClusterMapper.cxx | 2 +-
.../src/TrigCaloTopoTowerAlgorithm.cxx | 2 +-
.../TrigEFMissingET/src/FexBase.h | 2 +-
.../TrigEgammaRec/src/TrigEgammaRec.cxx | 2 +-
.../TrigGenericAlgs/DetectorTimingAlgo.h | 4 +-
.../TrigGenericAlgs/L1CorrelationAlgo.h | 4 +-
.../src/DetectorTimingAlgo.cxx | 4 +-
.../TrigGenericAlgs/src/L1CorrelationAlgo.cxx | 4 +-
.../TrigGenericAlgs/src/ROBRequestAlgo.cxx | 6 +-
.../TrigGenericAlgs/src/ROBRequestAlgo.h | 4 +-
.../TrigHIRec/src/TrigHIClusterMaker.cxx | 2 +-
.../TrigMinBias/src/TrackCountHypoAlgMT.h | 2 +-
.../TrigMinBias/src/TrackCountHypoTool.h | 2 +-
.../src/TestCaloDataAccess.cxx | 2 +-
.../TrigT2MinBias/src/SPCountHypoAlgMT.h | 2 +-
.../TrigT2MinBias/src/SPCountHypoTool.h | 2 +-
.../TrigTauRec/src/TrigTauRecMerged.cxx | 2 +-
.../Root/TrigDecisionTool.cxx | 4 +-
.../TrigDecisionTool/TrigDecisionTool.h | 2 +-
.../Root/TrigEgammaAnalysisBaseTool.cxx | 8 +-
.../TrigEgammaAnalysisBaseTool.h | 10 +-
.../src/TrigEgammaAnalysisAlg.cxx | 2 +-
.../src/TrigEgammaTDToolTest.cxx | 2 +-
.../src/TrigEgammaEmulationToolAlg.cxx | 2 +-
.../src/TrigEgammaEmulationToolTest.cxx | 2 +-
.../TrigEgammaMatchingToolMT.h | 2 +-
.../src/TrigEgammaMatchingToolTest.cxx | 2 +-
.../src/TrigConfigSvcAthD3PD.cxx | 8 +-
.../TriggerMatchingTool/Root/MatchingTool.cxx | 2 +-
.../TriggerMatchingTool/MatchingTool.h | 2 +-
.../TrigConfigSvc/src/DSConfigSvc.cxx | 2 +-
.../TrigConfigSvc/src/HLTConfigSvc.cxx | 2 +-
.../src/TrigConfJobOptionsSvc.cxx | 2 +-
.../TrigConfigSvc/src/TrigConfJobOptionsSvc.h | 2 +-
.../src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx | 2 +-
Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx | 2 +-
.../src/TrigEgammaFastCaloHypoAlgMT.cxx | 2 +-
.../src/TrigEgammaFastElectronHypoAlgMT.cxx | 2 +-
.../src/TrigEgammaFastElectronHypoTool.h | 2 +-
.../src/TrigEgammaFastPhotonHypoAlgMT.cxx | 2 +-
.../src/TrigEgammaFastPhotonHypoTool.h | 2 +-
.../src/TrigEgammaPrecisionCaloHypoAlgMT.cxx | 2 +-
.../TrigEgammaPrecisionElectronHypoAlgMT.cxx | 2 +-
.../TrigEgammaPrecisionPhotonHypoAlgMT.cxx | 2 +-
.../TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx | 2 +-
.../JetHypoExerciserAlg.h | 2 +-
.../JetHypoExerciserCompareAlg.h | 2 +-
.../src/TrigMissingETHypoAlgMT.cxx | 2 +-
.../src/TrigStreamerHypoAlgMT.cxx | 2 +-
.../TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx | 2 +-
.../TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx | 2 +-
.../TrigTauHypo/src/TrigTauGenericHypoMT.h | 2 +-
.../src/TrigTrackPreSelHypoAlgMT.cxx | 2 +-
.../TrigTauHypo/src/TrigTrackPreSelHypoTool.h | 2 +-
.../src/BphysTrigDecoratorAlg.cxx | 2 +-
.../TrigSteerMonitor/src/TrigCorMoni.cxx | 2 +-
.../TrigSteerMonitor/src/TrigRateMoni.cxx | 2 +-
.../src/TrigSignatureMoni.cxx | 2 +-
.../src/TrigSignatureMoniMT.cxx | 2 +-
.../DecisionHandling/IViewCreatorROITool.h | 2 +-
.../DecisionHandling/src/DumpDecisions.cxx | 2 +-
.../DecisionHandling/src/RoRSeqFilter.cxx | 2 +-
.../src/TriggerSummaryAlg.cxx | 2 +-
.../TrigSteering/src/RandomScaler.cxx | 2 +-
.../src/RoiB2TopoInputDataCnv.cxx | 2 +-
.../src/DeriveSimulationInputs.h | 2 +-
Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h | 2 +-
.../TrigT1CaloSim/src/TriggerTowerMaker.h | 2 +-
.../TrigT1/TrigT1NSW/src/NSWL1Simulation.h | 2 +-
.../TrigT1NSWSimTools/MMFPGAOfflineTool.h | 2 +-
.../TrigT1NSWSimTools/MMStripTdsOfflineTool.h | 2 +-
.../TrigT1NSWSimTools/PadTdsOfflineTool.h | 2 +-
.../src/ExampleL1TriggerByteStreamTool.h | 2 +-
.../TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h | 2 +-
.../src/MergingEventLoopMgr.h | 2 +-
542 files changed, 1020 insertions(+), 1003 deletions(-)
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/DummyLumirangeTool.h b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/DummyLumirangeTool.h
index aca6d4c2820..23c56db6b82 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/DummyLumirangeTool.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/DummyLumirangeTool.h
@@ -19,7 +19,7 @@
//<<<<<< INCLUDES >>>>>>
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/WriteHandleKey.h"
#include "DBDataModel/CollectionMetadata.h"
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagReader.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagReader.cxx
index 4690e1a347c..7a75fac1b1a 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagReader.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagReader.cxx
@@ -12,7 +12,7 @@
#include "EventTagReader.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ISvcLocator.h"
#include "CoralBase/AttributeListSpecification.h"
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref
index 6e3be6c88bc..4650da8aeb0 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref
@@ -545,7 +545,7 @@ AthenaSealSvc.IgnoreNames += [ "IAppMgrUI" ]
AthenaSealSvc.IgnoreNames += [ "IProperty" ]
AthenaSealSvc.IgnoreNames += [ "Property" ]
AthenaSealSvc.IgnoreNames += [ "std::vector<Property*>" ]
-AthenaSealSvc.IgnoreNames += [ "std::vector<const Property*>" ]
+AthenaSealSvc.IgnoreNames += [ "std::vector<const Gaudi::Details::PropertyBase*>" ]
AthenaSealSvc.IgnoreNames += [ "std::list<IAlgorithm*>" ]
AthenaSealSvc.IgnoreNames += [ "std::list<IService*>" ]
AthenaSealSvc.IgnoreNames += [ "std::list<const IFactory*>" ]
@@ -884,7 +884,7 @@ AthenaSealSvc.IgnoreNames += [ "IAppMgrUI" ]
AthenaSealSvc.IgnoreNames += [ "IProperty" ]
AthenaSealSvc.IgnoreNames += [ "Property" ]
AthenaSealSvc.IgnoreNames += [ "std::vector<Property*>" ]
-AthenaSealSvc.IgnoreNames += [ "std::vector<const Property*>" ]
+AthenaSealSvc.IgnoreNames += [ "std::vector<const Gaudi::Details::PropertyBase*>" ]
AthenaSealSvc.IgnoreNames += [ "std::list<IAlgorithm*>" ]
AthenaSealSvc.IgnoreNames += [ "std::list<IService*>" ]
AthenaSealSvc.IgnoreNames += [ "std::list<const IFactory*>" ]
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TestGaudiProperty.h b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TestGaudiProperty.h
index b3d69c66c98..2983684df67 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TestGaudiProperty.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TestGaudiProperty.h
@@ -8,7 +8,7 @@
#define ATLASHISTORY_TESTGAUDIPROPERTY_H
//#include "GaudiKernel/HistoryObj.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include <vector>
@@ -27,17 +27,17 @@ class TestGaudiProperty {
public:
- //typedef std::vector< std::pair<std::string,const Property*> > PropertyList;
- //typedef std::vector< const Property* > PropertyList;
- //typedef const Property* PropertyList;
+ //typedef std::vector< std::pair<std::string,const Gaudi::Details::PropertyBase*> > PropertyList;
+ //typedef std::vector< const Gaudi::Details::PropertyBase* > PropertyList;
+ //typedef const Gaudi::Details::PropertyBase* PropertyList;
private: // data
//PropertyList m_props;
//Property m_p1;
- Property* m_pptr;
- const Property* m_cptr;
- std::vector<Property*> m_ncprops;
+ Gaudi::Details::PropertyBase* m_pptr;
+ const Gaudi::Details::PropertyBase* m_cptr;
+ std::vector<Gaudi::Details::PropertyBase*> m_ncprops;
public: // functions
@@ -47,11 +47,11 @@ public: // functions
// Destructor.
~TestGaudiProperty();
- //void addProperty( const std::string&, const Property* );
- //void addProperty( const Property* );
+ //void addProperty( const std::string&, const Gaudi::Details::PropertyBase* );
+ //void addProperty( const Gaudi::Details::PropertyBase* );
//const PropertyList& properties() const { return m_props; }
- const Property* property() const { return m_cptr; }
+ const Gaudi::Details::PropertyBase* property() const { return m_cptr; }
private:
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/src/TestGaudiProperty.cxx b/AtlasTest/DatabaseTest/AthenaPoolTestData/src/TestGaudiProperty.cxx
index a7e5ccecc03..db91e721a19 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/src/TestGaudiProperty.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/src/TestGaudiProperty.cxx
@@ -17,7 +17,7 @@
///////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/System.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaPoolTestData/TestGaudiProperty.h"
#include <cstdlib>
@@ -47,11 +47,11 @@ TestGaudiProperty::~TestGaudiProperty() {
}
/*
void
-//TestGaudiProperty::addProperty(const std::string& client, const Property* prop) {
-TestGaudiProperty::addProperty(const Property* prop) {
+//TestGaudiProperty::addProperty(const std::string& client, const Gaudi::Details::PropertyBase* prop) {
+TestGaudiProperty::addProperty(const Gaudi::Details::PropertyBase* prop) {
// if (m_props.find(prop) == m_props.end()) {
//m_props.push_back( prop);
- //m_ncprops.push_back( const_cast<Property*>(prop));
+ //m_ncprops.push_back( const_cast<Gaudi::Details::PropertyBase*>(prop));
//m_p1 = *prop;
//m_pptr = m_ncprops[0];
m_cptr = prop;
diff --git a/Calorimeter/CaloClusterCorrection/src/CaloRunClusterCorrections.cxx b/Calorimeter/CaloClusterCorrection/src/CaloRunClusterCorrections.cxx
index 38505930eff..3a740a80a77 100644
--- a/Calorimeter/CaloClusterCorrection/src/CaloRunClusterCorrections.cxx
+++ b/Calorimeter/CaloClusterCorrection/src/CaloRunClusterCorrections.cxx
@@ -22,7 +22,7 @@
#include "AthenaKernel/errorcheck.h"
#include "CxxUtils/Array.h"
#include "AthenaKernel/getMessageSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/IToolSvc.h"
@@ -771,10 +771,10 @@ CaloRunClusterCorrections::orderCorrections ATLAS_NOT_THREAD_SAFE (bool allowMis
// Tool is being initialized from JO. Find the order property from JOS.
tool.order = -1;
std::string fullname = this->name() + "." + tool.name;
- const std::vector<const Property*>* props =
+ const std::vector<const Gaudi::Details::PropertyBase*>* props =
m_jos->getProperties (fullname);
for (size_t iprop = 0; iprop < props->size(); iprop++) {
- const Property& prop = *(*props)[iprop];
+ const Gaudi::Details::PropertyBase& prop = *(*props)[iprop];
if (prop.name() == "order") {
tool.order = std::atoi (prop.toString().c_str());
break;
diff --git a/Calorimeter/CaloExample/CaloTests/src/CreateHits.cxx.test b/Calorimeter/CaloExample/CaloTests/src/CreateHits.cxx.test
index 09a627154c4..ef5d33b8907 100644
--- a/Calorimeter/CaloExample/CaloTests/src/CreateHits.cxx.test
+++ b/Calorimeter/CaloExample/CaloTests/src/CreateHits.cxx.test
@@ -1,5 +1,5 @@
#include "MyAnalysis/CreateHits.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/NTuple.h"
diff --git a/Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx b/Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx
index ed1ed34de97..2756af7f5f5 100644
--- a/Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx
+++ b/Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx
@@ -3,7 +3,7 @@
*/
#include "CaloTests/Analysis.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/NTuple.h"
diff --git a/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx b/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx
index d295484870f..378cdcf0a7c 100644
--- a/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx
+++ b/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx
@@ -3,7 +3,7 @@
*/
#include "CaloTests/AnalysisCal.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/NTuple.h"
diff --git a/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.h b/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.h
index 60c51cb6e64..960a3b9ad98 100644
--- a/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.h
+++ b/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.h
@@ -264,7 +264,7 @@ public:
*
* This version is used by Gaudi as of v19.
*/
- virtual StatusCode setProperty (const Property& p);
+ virtual StatusCode setProperty (const Gaudi::Details::PropertyBase& p);
private:
diff --git a/Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.cxx b/Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.cxx
index 076aaeb93ca..15d6c679e11 100644
--- a/Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.cxx
+++ b/Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.cxx
@@ -18,7 +18,7 @@ PURPOSE: Apply necessary finalising operation to CaloCellContainer
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
index 244221bcc85..ee3957648a4 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
@@ -3,7 +3,7 @@
*/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Algorithm.h"
#include "GaudiKernel/ListItem.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx b/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx
index 0ba432ed535..e3b9394e36c 100644
--- a/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx
+++ b/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx
@@ -3,7 +3,7 @@
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx b/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx
index c51928e24c0..f1417885688 100755
--- a/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx
+++ b/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx
@@ -374,7 +374,7 @@ ToolWithConstantsMixin::setProperty (const std::string& propname,
* This version is used by Gaudi as of v19.
*/
StatusCode
-ToolWithConstantsMixin::setProperty (const Property& p)
+ToolWithConstantsMixin::setProperty (const Gaudi::Details::PropertyBase& p)
{
return CaloRec::ToolWithConstantsMixin::setProperty (p.name(), p.toString());
}
diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx
index 587a211e719..4a995f81839 100755
--- a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx
@@ -10,7 +10,7 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx
index fc31c387ea4..7d4ae6c7430 100755
--- a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx
@@ -10,7 +10,7 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx b/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx
index 5d5d2ad7790..2303f481704 100644
--- a/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx
+++ b/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx
@@ -8,7 +8,7 @@
#include <fstream>
#include <iostream>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "LArIdentifier/LArIdManager.h"
#include "LArIdentifier/LArOnlineID.h"
#include "LArIdentifier/LArOnlID_Exception.h"
diff --git a/Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h b/Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h
index ab861b18228..5e1fc1f9a48 100644
--- a/Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h
+++ b/Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h
@@ -26,7 +26,7 @@
#include "StoreGate/ReadCondHandle.h"
#include "AthenaKernel/errorcheck.h"
#include "CxxUtils/concepts.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include <sstream>
#include <type_traits>
diff --git a/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx b/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx
index 399f602cf0e..2457a0a5dc9 100644
--- a/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx
+++ b/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx
@@ -7,7 +7,7 @@
#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/IToolSvc.h"
//#include "GaudiKernel/IChronoStatSvc.h"
diff --git a/Calorimeter/CaloUtils/src/CaloTowerBuilderTool.cxx b/Calorimeter/CaloUtils/src/CaloTowerBuilderTool.cxx
index 250bcb88c70..1da262c46bc 100644
--- a/Calorimeter/CaloUtils/src/CaloTowerBuilderTool.cxx
+++ b/Calorimeter/CaloUtils/src/CaloTowerBuilderTool.cxx
@@ -6,7 +6,7 @@
#include "CLHEP/Units/SystemOfUnits.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/IToolSvc.h"
//#include "GaudiKernel/IChronoStatSvc.h"
diff --git a/Commission/CommissionRec/src/ComTimeRec.cxx b/Commission/CommissionRec/src/ComTimeRec.cxx
index 0d24ad3a1de..7d3d63ee312 100755
--- a/Commission/CommissionRec/src/ComTimeRec.cxx
+++ b/Commission/CommissionRec/src/ComTimeRec.cxx
@@ -6,7 +6,7 @@
#include "CLHEP/Units/SystemOfUnits.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CommissionEvent/ComTime.h"
diff --git a/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisAlgorithm.h b/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisAlgorithm.h
index a96d7cd6d86..452a448e25c 100644
--- a/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisAlgorithm.h
+++ b/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisAlgorithm.h
@@ -58,7 +58,7 @@ public:
virtual StatusCode sysExecute(const EventContext&) override;
protected:
- void updateEvtStore(Property& prop);
+ void updateEvtStore(Gaudi::Details::PropertyBase& prop);
/// Function called when first execute is encountered
/// user can read event information with evtStore()
diff --git a/Control/AthAnalysisBaseComps/src/AthAnalysisAlgorithm.cxx b/Control/AthAnalysisBaseComps/src/AthAnalysisAlgorithm.cxx
index 5a3a154d2b7..efa1033ec7b 100644
--- a/Control/AthAnalysisBaseComps/src/AthAnalysisAlgorithm.cxx
+++ b/Control/AthAnalysisBaseComps/src/AthAnalysisAlgorithm.cxx
@@ -42,7 +42,7 @@ AthAnalysisAlgorithm::AthAnalysisAlgorithm( const std::string& name
AthAnalysisAlgorithm::~AthAnalysisAlgorithm() { }
-void AthAnalysisAlgorithm::updateEvtStore(Property& prop) {
+void AthAnalysisAlgorithm::updateEvtStore(Gaudi::Details::PropertyBase& prop) {
evtStore().release().ignore();
evtStore().setTypeAndName(prop.toString());
}
diff --git a/Control/AthCUDA/AthCUDAServices/src/KernelRunnerSvc.h b/Control/AthCUDA/AthCUDAServices/src/KernelRunnerSvc.h
index 77e421fca78..a08d2d3261f 100644
--- a/Control/AthCUDA/AthCUDAServices/src/KernelRunnerSvc.h
+++ b/Control/AthCUDA/AthCUDAServices/src/KernelRunnerSvc.h
@@ -14,7 +14,7 @@
// Framework include(s).
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthService.h"
// System include(s).
diff --git a/Control/AthCUDA/AthCUDAServices/src/StreamPoolSvc.h b/Control/AthCUDA/AthCUDAServices/src/StreamPoolSvc.h
index a2cc443540a..eaf07b97737 100644
--- a/Control/AthCUDA/AthCUDAServices/src/StreamPoolSvc.h
+++ b/Control/AthCUDA/AthCUDAServices/src/StreamPoolSvc.h
@@ -12,7 +12,7 @@
#include "AthCUDAInterfaces/IStreamPoolSvc.h"
// Framework include(s).
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthService.h"
// System include(s).
diff --git a/Control/AthToolSupport/AsgExampleTools/src/AsgExampleAlgorithm.cxx b/Control/AthToolSupport/AsgExampleTools/src/AsgExampleAlgorithm.cxx
index 915d0e9c3e1..50d2f9fe3ef 100644
--- a/Control/AthToolSupport/AsgExampleTools/src/AsgExampleAlgorithm.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/src/AsgExampleAlgorithm.cxx
@@ -1,7 +1,7 @@
// AsgExampleAlgorithm.cxx
#include "AsgExampleAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AsgExampleTools/IAsgHelloTool.h"
#include "AsgTools/AsgTool.h"
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgTool.icc b/Control/AthToolSupport/AsgTools/AsgTools/AsgTool.icc
index 095fa4162ca..6a8a5a8c7c0 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/AsgTool.icc
+++ b/Control/AthToolSupport/AsgTools/AsgTools/AsgTool.icc
@@ -17,7 +17,7 @@ namespace asg {
const T* AsgTool::getProperty( const std::string& name ) const {
// Get the property object (if it exists):
- const Property* prop = m_properties->getProperty( name );
+ const Property* prop = m_properties->getProperty( name );
if( ! prop ) {
ATH_MSG_WARNING( "Property with name \"" << name << "\" not found" );
return 0;
@@ -43,16 +43,23 @@ namespace asg {
#ifndef XAOD_STANDALONE
// Gaudi/Athena include(s):
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/System.h"
+using Property = Gaudi::Details::PropertyBase;
+
+template <class TYPE, class VERIFIER = Gaudi::Details::Property::NullVerifier,
+ class HANDLERS = Gaudi::Details::Property::UpdateHandler>
+using PropertyWithValue = Gaudi::Property<TYPE, VERIFIER, HANDLERS>;
+
+
namespace asg {
template< class T >
const T* AsgTool::getProperty( const std::string& name ) const {
// Get the property object (if it exists):
- const Property* prop = Gaudi::Utils::getProperty( this, name );
+ const Gaudi::Details::PropertyBase* prop = Gaudi::Utils::getProperty( this, name );
if( ! prop ) {
ATH_MSG_WARNING( "Property with name \"" << name << "\" not found" );
return 0;
@@ -60,7 +67,7 @@ namespace asg {
// Try to cast it to the required type:
const PropertyWithValue< T >* tprop =
- dynamic_cast< const PropertyWithValue< T >* >( prop );
+ dynamic_cast< const PropertyWithValue< T >* >( prop );
if( ! tprop ) {
ATH_MSG_WARNING( "Property \"" << name << "\" is of type: "
<< System::typeinfoName( *( prop->type_info() ) ) );
diff --git a/Control/AthViews/src_dflow/DFlowAlg1.cxx b/Control/AthViews/src_dflow/DFlowAlg1.cxx
index 0dc04c3a799..a53e052cf73 100644
--- a/Control/AthViews/src_dflow/DFlowAlg1.cxx
+++ b/Control/AthViews/src_dflow/DFlowAlg1.cxx
@@ -16,7 +16,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
diff --git a/Control/AthViews/src_dflow/DFlowAlg2.cxx b/Control/AthViews/src_dflow/DFlowAlg2.cxx
index ea4e53ba146..a5abe581ee4 100644
--- a/Control/AthViews/src_dflow/DFlowAlg2.cxx
+++ b/Control/AthViews/src_dflow/DFlowAlg2.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
#include "StoreGate/UpdateHandle.h"
diff --git a/Control/AthViews/src_dflow/DFlowAlg3.cxx b/Control/AthViews/src_dflow/DFlowAlg3.cxx
index 87c2d846043..cb4516bf87f 100644
--- a/Control/AthViews/src_dflow/DFlowAlg3.cxx
+++ b/Control/AthViews/src_dflow/DFlowAlg3.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
#include "AthenaKernel/ExtendedEventContext.h"
diff --git a/Control/AthViews/src_dflow/ViewMergeAlg.cxx b/Control/AthViews/src_dflow/ViewMergeAlg.cxx
index 85917cd530f..bbb334ae75c 100644
--- a/Control/AthViews/src_dflow/ViewMergeAlg.cxx
+++ b/Control/AthViews/src_dflow/ViewMergeAlg.cxx
@@ -9,7 +9,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
diff --git a/Control/AthViews/src_dflow/ViewSubgraphAlg.cxx b/Control/AthViews/src_dflow/ViewSubgraphAlg.cxx
index e77052339ec..1c2537c4f91 100644
--- a/Control/AthViews/src_dflow/ViewSubgraphAlg.cxx
+++ b/Control/AthViews/src_dflow/ViewSubgraphAlg.cxx
@@ -4,7 +4,7 @@
#include "ViewSubgraphAlg.h"
#include "AthViews/ViewHelper.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/WriteHandle.h"
namespace AthViews {
@@ -43,6 +43,16 @@ StatusCode ViewSubgraphAlg::execute()
ATH_MSG_DEBUG ("Executing " << name() << "...");
const EventContext& ctx = getContext();
+
+ //Start scheduler profiling
+ auto profileCallback = [this, slot=ctx.slot()]( IScheduler::OccupancySnapshot snap ) -> void {
+ std::string states = "";
+ for ( int const stateTotal : snap.states[slot] ) {
+ states += std::to_string( stateTotal ) + " ";
+ }
+ ATH_MSG_INFO( "Slot " << slot << " snapshot time " << snap.time.time_since_epoch().count() << " states: " << states );
+ };
+ m_scheduler->recordOccupancy( 0, std::move( profileCallback ) );
//Make a vector of dummy data to initialise the views
std::vector<int> viewData;
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.h b/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.h
index cdd63e5d899..73d1a3010cb 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.h
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.h
@@ -71,7 +71,7 @@ public:
"retrieve data during the course of the job" );
auto props = this->getProperties();
- for( Property* prop : props ) {
+ for( Gaudi::Details::PropertyBase* prop : props ) {
if (prop->name() == "ExtraOutputs" || prop->name() == "ExtraInputs") {
prop->declareUpdateHandler
(&AthCommonDataStore<PBASE>::extraDeps_update_handler, this);
@@ -150,7 +150,7 @@ public:
//
template <class T>
- Property& declareProperty(Gaudi::Property<T> &t) {
+ Gaudi::Details::PropertyBase& declareProperty(Gaudi::Property<T> &t) {
typedef typename SG::HandleClassifier<T>::type htype;
return AthCommonDataStore<PBASE>::declareGaudiProperty(t, htype());
}
@@ -161,7 +161,7 @@ public:
*
*/
template <class T>
- Property& declareGaudiProperty(Gaudi::Property<T> &hndl,
+ Gaudi::Details::PropertyBase& declareGaudiProperty(Gaudi::Property<T> &hndl,
const SG::VarHandleKeyType&)
{
return *AthCommonDataStore<PBASE>::declareProperty(hndl.name(),
@@ -175,7 +175,7 @@ public:
*
*/
template <class T>
- Property& declareGaudiProperty(Gaudi::Property<T> &hndl,
+ Gaudi::Details::PropertyBase& declareGaudiProperty(Gaudi::Property<T> &hndl,
const SG::VarHandleKeyArrayType&)
{
return *AthCommonDataStore<PBASE>::declareProperty(hndl.name(),
@@ -189,7 +189,7 @@ public:
*
*/
template <class T>
- Property& declareGaudiProperty(Gaudi::Property<T> &hndl,
+ Gaudi::Details::PropertyBase& declareGaudiProperty(Gaudi::Property<T> &hndl,
const SG::VarHandleType&)
{
return *AthCommonDataStore<PBASE>::declareProperty(hndl.name(),
@@ -204,7 +204,7 @@ public:
*
*/
template <class T>
- Property& declareGaudiProperty(Gaudi::Property<T> &t, const SG::NotHandleType&)
+ Gaudi::Details::PropertyBase& declareGaudiProperty(Gaudi::Property<T> &t, const SG::NotHandleType&)
{
return PBASE::declareProperty(t);
}
@@ -226,7 +226,7 @@ public:
* The property value object is put on the input and output lists as
* appropriate; then we forward to the base class.
*/
- Property* declareProperty(const std::string& name,
+ Gaudi::Details::PropertyBase* declareProperty(const std::string& name,
SG::VarHandleKey& hndl,
const std::string& doc,
const SG::VarHandleKeyType&)
@@ -250,7 +250,7 @@ public:
* The property value object is put on the input and output lists as
* appropriate; then we forward to the base class.
*/
- Property* declareProperty(const std::string& name,
+ Gaudi::Details::PropertyBase* declareProperty(const std::string& name,
SG::VarHandleBase& hndl,
const std::string& doc,
const SG::VarHandleType&)
@@ -264,7 +264,7 @@ public:
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
- Property* declareProperty(const std::string& name,
+ Gaudi::Details::PropertyBase* declareProperty(const std::string& name,
SG::VarHandleKeyArray& hndArr,
const std::string& doc,
const SG::VarHandleKeyArrayType&)
@@ -281,7 +281,7 @@ public:
hndArr.setOwner(this);
m_vhka.push_back(&hndArr);
- Property* p = PBASE::declareProperty(name, hndArr, doc);
+ Gaudi::Details::PropertyBase* p = PBASE::declareProperty(name, hndArr, doc);
if (p != 0) {
p->declareUpdateHandler(&AthCommonDataStore<PBASE>::updateVHKA, this);
} else {
@@ -313,7 +313,7 @@ public:
// to work by overriding those methods and adding in the current contents
// of the arrays.
- void updateVHKA(Property& /*p*/) {
+ void updateVHKA(Gaudi::Details::PropertyBase& /*p*/) {
// debug() << "updateVHKA for property " << p.name() << " " << p.toString()
// << " size: " << m_vhka.size() << endmsg;
for (auto &a : m_vhka) {
@@ -338,7 +338,7 @@ public:
* of @c declareProperty.
*/
template <class T>
- Property* declareProperty(const std::string& name,
+ Gaudi::Details::PropertyBase* declareProperty(const std::string& name,
T& property,
const std::string& doc,
const SG::NotHandleType&)
@@ -357,7 +357,7 @@ public:
* for VarHandle/Key/KeyArray.
*/
template <class T>
- Property* declareProperty(const std::string& name,
+ Gaudi::Details::PropertyBase* declareProperty(const std::string& name,
T& property,
const std::string& doc="none")
{
@@ -396,7 +396,7 @@ protected:
* supplied via the ExtraInputs and ExtraOuputs Properties to add
* the StoreName if it's not explicitly given
*/
- void extraDeps_update_handler( Property& ExtraDeps );
+ void extraDeps_update_handler( Gaudi::Details::PropertyBase& ExtraDeps );
};
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.icc b/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.icc
index 450b269cc2f..db28551c2c5 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.icc
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.icc
@@ -19,7 +19,7 @@
#include "AthenaBaseComps/AthAlgStartVisitor.h"
template <class PBASE>
-void AthCommonDataStore<PBASE>::extraDeps_update_handler( Property& ExtraDeps )
+void AthCommonDataStore<PBASE>::extraDeps_update_handler( Gaudi::Details::PropertyBase& ExtraDeps )
{
DataObjIDColl newColl;
Gaudi::Property<DataObjIDColl> *prop = dynamic_cast<Gaudi::Property<DataObjIDColl>*> (&ExtraDeps);
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthFilterAlgorithm.h b/Control/AthenaBaseComps/AthenaBaseComps/AthFilterAlgorithm.h
index f36a3a2964b..7b42e7cb6ad 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/AthFilterAlgorithm.h
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthFilterAlgorithm.h
@@ -91,7 +91,7 @@ class AthFilterAlgorithm
//special case: post-python default value of property FilterDescription sent to ICutFlowSvc only if not explicitly specified before
bool m_resetSelfDescription;
- void doNotResetSelfDescription( Property& );
+ void doNotResetSelfDescription( Gaudi::Details::PropertyBase& );
SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey
{ this, "EventInfoKey", "EventInfo", "" };
@@ -134,7 +134,7 @@ CutIdentifier AthFilterAlgorithm::cutID()
inline
void
-AthFilterAlgorithm::doNotResetSelfDescription( Property& )
+AthFilterAlgorithm::doNotResetSelfDescription( Gaudi::Details::PropertyBase& )
{
m_resetSelfDescription=false;
}
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h b/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h
index f7afeada679..1982e96201e 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h
@@ -19,7 +19,7 @@
// framework includes
#include "GaudiKernel/IMessageSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthMsgStreamMacros.h"
#include <boost/thread/tss.hpp>
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/FilteredAlgorithm.h b/Control/AthenaBaseComps/AthenaBaseComps/FilteredAlgorithm.h
index 2c8e5a00e0e..771586e07a2 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/FilteredAlgorithm.h
+++ b/Control/AthenaBaseComps/AthenaBaseComps/FilteredAlgorithm.h
@@ -18,7 +18,7 @@
#include "GaudiKernel/IDataSelector.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaKernel/IDecisionSvc.h"
diff --git a/Control/AthenaBaseComps/src/AthCnvSvc.cxx b/Control/AthenaBaseComps/src/AthCnvSvc.cxx
index 180c50d10bd..bb3d9a5a969 100644
--- a/Control/AthenaBaseComps/src/AthCnvSvc.cxx
+++ b/Control/AthenaBaseComps/src/AthCnvSvc.cxx
@@ -12,7 +12,7 @@
// STL includes
// Framework includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/System.h"
#include "GaudiKernel/IConverter.h"
diff --git a/Control/AthenaBaseComps/src/AthFilterAlgorithm.cxx b/Control/AthenaBaseComps/src/AthFilterAlgorithm.cxx
index 78746db210c..55868f9d79c 100644
--- a/Control/AthenaBaseComps/src/AthFilterAlgorithm.cxx
+++ b/Control/AthenaBaseComps/src/AthFilterAlgorithm.cxx
@@ -17,7 +17,7 @@
// STL includes
// Framework includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
///////////////////////////////////////////////////////////////////
diff --git a/Control/AthenaBaseComps/src/AthHistogramAlgorithm.cxx b/Control/AthenaBaseComps/src/AthHistogramAlgorithm.cxx
index b590e1b21ba..2e9fd336431 100644
--- a/Control/AthenaBaseComps/src/AthHistogramAlgorithm.cxx
+++ b/Control/AthenaBaseComps/src/AthHistogramAlgorithm.cxx
@@ -17,7 +17,7 @@
#include <map>
// Framework includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx b/Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx
index 56471016bba..dc49753b528 100644
--- a/Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx
+++ b/Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx
@@ -16,7 +16,7 @@
#include <string>
// Framework includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/Control/AthenaExamples/AthExHelloWorld/src/HelloAlg.h b/Control/AthenaExamples/AthExHelloWorld/src/HelloAlg.h
index f059acf68e8..e5beb63b785 100755
--- a/Control/AthenaExamples/AthExHelloWorld/src/HelloAlg.h
+++ b/Control/AthenaExamples/AthExHelloWorld/src/HelloAlg.h
@@ -9,7 +9,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include <vector>
diff --git a/Control/AthenaExamples/AthExHistNtup/src/Hist.cxx b/Control/AthenaExamples/AthExHistNtup/src/Hist.cxx
index 1adbd7e4c8a..94a423fad74 100755
--- a/Control/AthenaExamples/AthExHistNtup/src/Hist.cxx
+++ b/Control/AthenaExamples/AthExHistNtup/src/Hist.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// ROOT includes
#include "TH1F.h"
diff --git a/Control/AthenaExamples/AthExHistNtup/src/Ntup.cxx b/Control/AthenaExamples/AthExHistNtup/src/Ntup.cxx
index 190a3bd89d7..3856936b58f 100755
--- a/Control/AthenaExamples/AthExHistNtup/src/Ntup.cxx
+++ b/Control/AthenaExamples/AthExHistNtup/src/Ntup.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// ROOT includes
#include "TTree.h"
diff --git a/Control/AthenaExamples/AthExJobOptions/src/AnotherConcreteSvc.cxx b/Control/AthenaExamples/AthExJobOptions/src/AnotherConcreteSvc.cxx
index 21a81fbf117..c7f7cb2b421 100644
--- a/Control/AthenaExamples/AthExJobOptions/src/AnotherConcreteSvc.cxx
+++ b/Control/AthenaExamples/AthExJobOptions/src/AnotherConcreteSvc.cxx
@@ -12,7 +12,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// AthExJobOptions includes
#include "AnotherConcreteSvc.h"
diff --git a/Control/AthenaExamples/AthExJobOptions/src/ConcreteSvc.cxx b/Control/AthenaExamples/AthExJobOptions/src/ConcreteSvc.cxx
index 3555f2d0153..bcf16e08e20 100644
--- a/Control/AthenaExamples/AthExJobOptions/src/ConcreteSvc.cxx
+++ b/Control/AthenaExamples/AthExJobOptions/src/ConcreteSvc.cxx
@@ -12,7 +12,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// AthExJobOptions includes
#include "ConcreteSvc.h"
diff --git a/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.h b/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.h
index c84ce038cf9..d0303a5f0fe 100644
--- a/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.h
+++ b/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.h
@@ -6,7 +6,7 @@
#define ATHEXMONITORED_MONITOREDALG_H 1
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg1.cxx b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg1.cxx
index 0a148ca555c..3a7cf42e010 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg1.cxx
+++ b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg1.cxx
@@ -16,7 +16,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg2.cxx b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg2.cxx
index 07843671a64..84f9f1a6b2d 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg2.cxx
+++ b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg2.cxx
@@ -16,7 +16,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg3.cxx b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg3.cxx
index 3c25ef9ea65..09b8d58b5f3 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg3.cxx
+++ b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg3.cxx
@@ -18,7 +18,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
namespace SG {
template<>
diff --git a/Control/AthenaExamples/AthExThinning/src_lib/CreateData.cxx b/Control/AthenaExamples/AthExThinning/src_lib/CreateData.cxx
index dc888c9f957..9d59e4d9a5f 100644
--- a/Control/AthenaExamples/AthExThinning/src_lib/CreateData.cxx
+++ b/Control/AthenaExamples/AthExThinning/src_lib/CreateData.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/SystemOfUnits.h"
// StoreGate
diff --git a/Control/AthenaExamples/AthExThinning/src_lib/ReadThinnedData.cxx b/Control/AthenaExamples/AthExThinning/src_lib/ReadThinnedData.cxx
index 041cd35a159..3f12abfedb1 100644
--- a/Control/AthenaExamples/AthExThinning/src_lib/ReadThinnedData.cxx
+++ b/Control/AthenaExamples/AthExThinning/src_lib/ReadThinnedData.cxx
@@ -14,7 +14,7 @@
// FrameWork includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/SystemOfUnits.h"
// StoreGate
diff --git a/Control/AthenaExamples/AthExThinning/src_lib/WriteThinnedData.cxx b/Control/AthenaExamples/AthExThinning/src_lib/WriteThinnedData.cxx
index fd310189da9..4fee9df108f 100644
--- a/Control/AthenaExamples/AthExThinning/src_lib/WriteThinnedData.cxx
+++ b/Control/AthenaExamples/AthExThinning/src_lib/WriteThinnedData.cxx
@@ -15,7 +15,7 @@
#include <sstream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/SystemOfUnits.h"
// StoreGate
diff --git a/Control/AthenaKernel/src/CloneService.cxx b/Control/AthenaKernel/src/CloneService.cxx
index c104c611393..f5e720ef209 100644
--- a/Control/AthenaKernel/src/CloneService.cxx
+++ b/Control/AthenaKernel/src/CloneService.cxx
@@ -73,8 +73,8 @@ namespace CloneService {
}
//now copy parent's properties into child
- std::vector<Property*>::const_iterator iProp(parent->getProperties().begin());
- std::vector<Property*>::const_iterator eProp(parent->getProperties().end());
+ std::vector<Gaudi::Details::PropertyBase*>::const_iterator iProp(parent->getProperties().begin());
+ std::vector<Gaudi::Details::PropertyBase*>::const_iterator eProp(parent->getProperties().end());
while (iProp != eProp &&
(child->setProperty(**iProp)).isSuccess()) ++iProp;
if (iProp != eProp) {
diff --git a/Control/AthenaKernel/src/CloneTool.cxx b/Control/AthenaKernel/src/CloneTool.cxx
index bfbbd0c6909..b118346cb63 100644
--- a/Control/AthenaKernel/src/CloneTool.cxx
+++ b/Control/AthenaKernel/src/CloneTool.cxx
@@ -46,8 +46,8 @@ namespace CloneTool {
}
//now copy cloned's properties into result
- std::vector<Property*>::const_iterator iProp(pCloned->getProperties().begin());
- std::vector<Property*>::const_iterator eProp(pCloned->getProperties().end());
+ std::vector<Gaudi::Details::PropertyBase*>::const_iterator iProp(pCloned->getProperties().begin());
+ std::vector<Gaudi::Details::PropertyBase*>::const_iterator eProp(pCloned->getProperties().end());
AlgTool* aResult=dynamic_cast<AlgTool*>(result);
if (0 == aResult) {
diff --git a/Control/AthenaMonitoring/src/AthenaMonManager.cxx b/Control/AthenaMonitoring/src/AthenaMonManager.cxx
index 3c2bae6dd60..9e50504f57e 100644
--- a/Control/AthenaMonitoring/src/AthenaMonManager.cxx
+++ b/Control/AthenaMonitoring/src/AthenaMonManager.cxx
@@ -21,7 +21,7 @@
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaMonitoring/IMonitorToolBase.h"
diff --git a/Control/AthenaPython/AthenaPython/PyProperty.h b/Control/AthenaPython/AthenaPython/PyProperty.h
index 9f917c488b6..94aeff7cb6c 100644
--- a/Control/AthenaPython/AthenaPython/PyProperty.h
+++ b/Control/AthenaPython/AthenaPython/PyProperty.h
@@ -18,7 +18,7 @@
#include <typeinfo>
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CxxUtils/checker_macros.h"
// Forward declaration
@@ -50,10 +50,10 @@ class ATLAS_NOT_THREAD_SAFE PyProperty
/// @c Property implementation
///@{
/// export the property value to the destination
- virtual bool load (Property& dest) const override;
+ virtual bool load (Gaudi::Details::PropertyBase& dest) const override;
/// import the property value from source
- virtual bool assign (const Property& src) override;
+ virtual bool assign (const Gaudi::Details::PropertyBase& src) override;
/// export the property value as a @c std::string
virtual std::string toString() const override;
diff --git a/Control/AthenaPython/src/PyComponentMgr.cxx b/Control/AthenaPython/src/PyComponentMgr.cxx
index f7ca99964d7..893e93d2c9b 100755
--- a/Control/AthenaPython/src/PyComponentMgr.cxx
+++ b/Control/AthenaPython/src/PyComponentMgr.cxx
@@ -25,7 +25,7 @@ SG_BASES1(PyObject, SG::NoBase);
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaPython/IPyComponent.h"
// PyROOT includes
diff --git a/Control/AthenaPython/src/PyJobOptionsCatalogue.cxx b/Control/AthenaPython/src/PyJobOptionsCatalogue.cxx
index 6967e5cfa91..1db168f58af 100644
--- a/Control/AthenaPython/src/PyJobOptionsCatalogue.cxx
+++ b/Control/AthenaPython/src/PyJobOptionsCatalogue.cxx
@@ -80,7 +80,7 @@ PyJobOptionsCatalogue::clients() const
/// add a property to the catalogue
StatusCode
PyJobOptionsCatalogue::add_property (const std::string& client,
- const Property* prop)
+ const Gaudi::Details::PropertyBase* prop)
{
if (!prop) {
return StatusCode::FAILURE;
diff --git a/Control/AthenaPython/src/PyJobOptionsCatalogue.h b/Control/AthenaPython/src/PyJobOptionsCatalogue.h
index ec45f4b917d..af56d709360 100644
--- a/Control/AthenaPython/src/PyJobOptionsCatalogue.h
+++ b/Control/AthenaPython/src/PyJobOptionsCatalogue.h
@@ -18,7 +18,7 @@
// Gaudi includes
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CxxUtils/checker_macros.h"
// Forward declaration
@@ -68,7 +68,7 @@ public:
/// add a property to the catalogue
StatusCode
- add_property (const std::string& client, const Property* prop);
+ add_property (const std::string& client, const Gaudi::Details::PropertyBase* prop);
/// remove a property from the catalogue
StatusCode
diff --git a/Control/AthenaPython/src/PyJobOptionsSvc.cxx b/Control/AthenaPython/src/PyJobOptionsSvc.cxx
index 04daac3feaf..cb30ddd2027 100644
--- a/Control/AthenaPython/src/PyJobOptionsSvc.cxx
+++ b/Control/AthenaPython/src/PyJobOptionsSvc.cxx
@@ -19,7 +19,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/System.h"
// PyRoot
@@ -140,7 +140,7 @@ PyJobOptionsSvc::setMyProperties (const std::string& client,
/// Add a property into the JobOptions catalog
StatusCode
PyJobOptionsSvc::addPropertyToCatalogue (const std::string& client,
- const Property& property)
+ const Gaudi::Details::PropertyBase& property)
{
ATH_MSG_VERBOSE ("::addPropToCat (client=[" << client << "], prop=["
<< property.name() << ", "
@@ -153,7 +153,7 @@ PyJobOptionsSvc::addPropertyToCatalogue (const std::string& client,
return m_catalogue.add_property (client, pyprop->clone());
}
- Property *p = new StringProperty (property.name(), "");
+ Gaudi::Details::PropertyBase *p = new StringProperty (property.name(), "");
if (!property.load (*p)) {
delete p; p = 0;
return StatusCode::FAILURE;
@@ -221,7 +221,7 @@ PyJobOptionsSvc::readOptions (const std::string& file,
// /// IProperty implementation (needed for initialisation)
// StatusCode
-// PyJobOptionsSvc::setProperty(const Property& p)
+// PyJobOptionsSvc::setProperty(const Gaudi::Details::PropertyBase& p)
// {
// return m_pmgr.setProperty (p);
// }
diff --git a/Control/AthenaPython/src/PyJobOptionsSvc.h b/Control/AthenaPython/src/PyJobOptionsSvc.h
index 35ea7306da2..83ddc9ae2fb 100644
--- a/Control/AthenaPython/src/PyJobOptionsSvc.h
+++ b/Control/AthenaPython/src/PyJobOptionsSvc.h
@@ -22,7 +22,7 @@
// GaudiKernel
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/PropertyHolder.h"
//#include "GaudiKernel/PropertyMgr.h"
@@ -83,7 +83,7 @@ class ATLAS_NOT_THREAD_SAFE PyJobOptionsSvc
/// Add a property into the JobOptions catalog
virtual
StatusCode addPropertyToCatalogue (const std::string& client,
- const Property& property ) override;
+ const Gaudi::Details::PropertyBase& property ) override;
/// Remove a property from the JobOptions catalog
virtual
StatusCode removePropertyFromCatalogue (const std::string& client,
@@ -91,7 +91,7 @@ class ATLAS_NOT_THREAD_SAFE PyJobOptionsSvc
/// Get the properties associated to a given client
virtual
- // const std::vector<const Property*>*
+ // const std::vector<const Gaudi::Details::PropertyBase*>*
const std::vector<const Gaudi::Details::PropertyBase*>*
getProperties (const std::string& client) const override;
@@ -117,7 +117,7 @@ class ATLAS_NOT_THREAD_SAFE PyJobOptionsSvc
///@}
/// IProperty implementation (needed for initialisation)
- // StatusCode setProperty(const Property& p);
+ // StatusCode setProperty(const Gaudi::Details::PropertyBase& p);
// StatusCode getProperty(Property *p) const;
private:
diff --git a/Control/AthenaPython/src/PyProperty.cxx b/Control/AthenaPython/src/PyProperty.cxx
index edcac28adb3..21c9f33bc72 100644
--- a/Control/AthenaPython/src/PyProperty.cxx
+++ b/Control/AthenaPython/src/PyProperty.cxx
@@ -158,14 +158,14 @@ PyProperty::~PyProperty()
/// export the property value to the destination
bool
-PyProperty::load (Property& dest) const
+PyProperty::load (Gaudi::Details::PropertyBase& dest) const
{
return dest.assign (*this);
}
/// import the property value from source
bool
-PyProperty::assign (const Property& src)
+PyProperty::assign (const Gaudi::Details::PropertyBase& src)
{
const PyProperty *p = dynamic_cast<const PyProperty*> (&src);
if (p) {
diff --git a/Control/AthenaServices/share/FPEControlSvc_test.ref b/Control/AthenaServices/share/FPEControlSvc_test.ref
index f7b1bcefc26..be20ec0c2d0 100644
--- a/Control/AthenaServices/share/FPEControlSvc_test.ref
+++ b/Control/AthenaServices/share/FPEControlSvc_test.ref
@@ -13,15 +13,15 @@ ApplicationMgr SUCCESS
====================================================================================================================================
/cvmfs/sft.cern.ch/lcg/contrib/gcc/4.9.3/x86_64-slc6/include/c++/4.9.3/bits/regex.h:1545:11: runtime error: load of value 176, which is not a valid value for type 'bool'
ApplicationMgr INFO Successfully loaded modules : AthenaServices
-FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Property&)): Enable: divbyzero overflow invalid Disable: (none)
+FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Gaudi::Details::PropertyBase&)): Enable: divbyzero overflow invalid Disable: (none)
ApplicationMgr INFO Application Manager Configured successfully
-FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Property&)): Enable: divbyzero overflow invalid Disable: (none)
+FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Gaudi::Details::PropertyBase&)): Enable: divbyzero overflow invalid Disable: (none)
EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
HistogramPersis...WARNING Histograms saving not required.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr Ready
-FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Property&)): Enable: (none) Disable: divbyzero
-FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Property&)): Enable: divbyzero Disable: (none)
-FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Property&)): Unknown exception name: fooo
-FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Property&)): Enable: divbyzero Disable: (none)
+FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Gaudi::Details::PropertyBase&)): Enable: (none) Disable: divbyzero
+FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Gaudi::Details::PropertyBase&)): Enable: divbyzero Disable: (none)
+FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Gaudi::Details::PropertyBase&)): Unknown exception name: fooo
+FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Gaudi::Details::PropertyBase&)): Enable: divbyzero Disable: (none)
diff --git a/Control/AthenaServices/src/AthDictLoaderSvc.cxx b/Control/AthenaServices/src/AthDictLoaderSvc.cxx
index 9d16659fc4e..65dcba79599 100644
--- a/Control/AthenaServices/src/AthDictLoaderSvc.cxx
+++ b/Control/AthenaServices/src/AthDictLoaderSvc.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/System.h"
#include "AthenaKernel/BaseInfo.h"
diff --git a/Control/AthenaServices/src/AthIncFirerAlg.h b/Control/AthenaServices/src/AthIncFirerAlg.h
index e705254e407..6170c424c2f 100644
--- a/Control/AthenaServices/src/AthIncFirerAlg.h
+++ b/Control/AthenaServices/src/AthIncFirerAlg.h
@@ -8,7 +8,7 @@
#include <vector>
#include <string>
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
class IIncidentSvc;
diff --git a/Control/AthenaServices/src/AthenaEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaEventLoopMgr.cxx
index b43bd47b299..f6059f351d5 100644
--- a/Control/AthenaServices/src/AthenaEventLoopMgr.cxx
+++ b/Control/AthenaServices/src/AthenaEventLoopMgr.cxx
@@ -210,7 +210,7 @@ StatusCode AthenaEventLoopMgr::initialize()
error() << "Could not dcast HistPersSvc to a Service"
<< endmsg;
} else {
- const Property &prop = s->getProperty("OutputFile");
+ const Gaudi::Details::PropertyBase &prop = s->getProperty("OutputFile");
std::string val;
try {
const StringProperty &sprop = dynamic_cast<const StringProperty&>( prop );
@@ -329,7 +329,7 @@ StatusCode AthenaEventLoopMgr::initialize()
// property handlers
//=========================================================================
void
-AthenaEventLoopMgr::setupTimeKeeper(Property&) {
+AthenaEventLoopMgr::setupTimeKeeper(Gaudi::Details::PropertyBase&) {
const std::string& tkName(m_timeKeeperName.value());
// We do not expect a TimeKeeper necessarily being declared
if( tkName != "NONE" && tkName.length() != 0) {
@@ -342,7 +342,7 @@ AthenaEventLoopMgr::setupTimeKeeper(Property&) {
}
void
-AthenaEventLoopMgr::setClearStorePolicy(Property&) {
+AthenaEventLoopMgr::setClearStorePolicy(Gaudi::Details::PropertyBase&) {
const std::string& policyName = m_clearStorePolicy.value();
if ( policyName != "BeginEvent" &&
@@ -362,7 +362,7 @@ AthenaEventLoopMgr::setClearStorePolicy(Property&) {
}
void
-AthenaEventLoopMgr::setupPreSelectTools(Property&) {
+AthenaEventLoopMgr::setupPreSelectTools(Gaudi::Details::PropertyBase&) {
m_toolInvoke.clear();
m_toolReject.clear();
diff --git a/Control/AthenaServices/src/AthenaEventLoopMgr.h b/Control/AthenaServices/src/AthenaEventLoopMgr.h
index 9301cf1171e..d1c0b436c14 100644
--- a/Control/AthenaServices/src/AthenaEventLoopMgr.h
+++ b/Control/AthenaServices/src/AthenaEventLoopMgr.h
@@ -14,7 +14,7 @@
#include <string>
#include <vector>
#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/IChronoStatSvc.h"
@@ -109,7 +109,7 @@ protected:
/// @property Name of TimeKeeper to use. NONE or empty string (default) means no time limit control on event loop
StringProperty m_timeKeeperName;
/// @property update handler:sets up the time keeper
- void setupTimeKeeper(Property&);
+ void setupTimeKeeper(Gaudi::Details::PropertyBase&);
/// @property Failure mode
IntegerProperty m_failureMode;
@@ -133,7 +133,7 @@ protected:
bool m_useSecondaryEventNumber;
/// property update handler:sets up the Pre-selection tools
- void setupPreSelectTools(Property&);
+ void setupPreSelectTools(Gaudi::Details::PropertyBase&);
/// @property configure the policy wrt handling of when 'clear-event-store'
/// has to happen: BeginEvent xor EndEvent.
@@ -142,7 +142,7 @@ protected:
/// property update handler:set the clear-store policy value and check its
/// value.
- void setClearStorePolicy(Property& clearStorePolicy);
+ void setClearStorePolicy(Gaudi::Details::PropertyBase& clearStorePolicy);
/// Dump out histograms as needed
virtual StatusCode writeHistograms(bool force=false);
diff --git a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
index bb123abf9ed..523cb839583 100644
--- a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
+++ b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
@@ -32,7 +32,7 @@
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/AppReturnCode.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/EventIDBase.h"
#include "GaudiKernel/ThreadLocalContext.h"
@@ -249,7 +249,7 @@ StatusCode AthenaHiveEventLoopMgr::initialize()
error() << "Could not dcast HistPersSvc to a Service"
<< endmsg;
} else {
- const Property &prop = s->getProperty("OutputFile");
+ const Gaudi::Details::PropertyBase &prop = s->getProperty("OutputFile");
std::string val;
try {
const StringProperty &sprop = dynamic_cast<const StringProperty&>( prop );
@@ -358,7 +358,7 @@ AthenaHiveEventLoopMgr::eventStore() const {
// property handlers
//=========================================================================
void
-AthenaHiveEventLoopMgr::setupTimeKeeper(Property&) {
+AthenaHiveEventLoopMgr::setupTimeKeeper(Gaudi::Details::PropertyBase&) {
const std::string& tkName(m_timeKeeperName.value());
// We do not expect a TimeKeeper necessarily being declared
if( tkName != "NONE" && tkName.length() != 0) {
@@ -371,7 +371,7 @@ AthenaHiveEventLoopMgr::setupTimeKeeper(Property&) {
}
void
-AthenaHiveEventLoopMgr::setClearStorePolicy(Property&) {
+AthenaHiveEventLoopMgr::setClearStorePolicy(Gaudi::Details::PropertyBase&) {
const std::string& policyName = m_clearStorePolicy.value();
if ( policyName != "BeginEvent" &&
@@ -390,7 +390,7 @@ AthenaHiveEventLoopMgr::setClearStorePolicy(Property&) {
}
void
-AthenaHiveEventLoopMgr::setupPreSelectTools(Property&) {
+AthenaHiveEventLoopMgr::setupPreSelectTools(Gaudi::Details::PropertyBase&) {
m_toolInvoke.clear();
m_toolReject.clear();
diff --git a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.h b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.h
index bcf09819ce8..c9109cf6bc3 100644
--- a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.h
+++ b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.h
@@ -15,7 +15,7 @@
#include <vector>
#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/MsgStream.h"
@@ -118,7 +118,7 @@ protected:
/// @property Name of TimeKeeper to use. NONE or empty string (default) means no time limit control on event loop
StringProperty m_timeKeeperName;
/// @property update handler:sets up the time keeper
- void setupTimeKeeper(Property&);
+ void setupTimeKeeper(Gaudi::Details::PropertyBase&);
/// @property Failure mode
IntegerProperty m_failureMode;
@@ -139,7 +139,7 @@ protected:
tool_store m_tools; ///< internal tool store
/// property update handler:sets up the Pre-selection tools
- void setupPreSelectTools(Property&);
+ void setupPreSelectTools(Gaudi::Details::PropertyBase&);
/// @property configure the policy wrt handling of when 'clear-event-store'
/// has to happen: BeginEvent xor EndEvent.
@@ -151,7 +151,7 @@ protected:
/// property update handler:set the clear-store policy value and check its
/// value.
- void setClearStorePolicy(Property& clearStorePolicy);
+ void setClearStorePolicy(Gaudi::Details::PropertyBase& clearStorePolicy);
/// Dump out histograms as needed
virtual StatusCode writeHistograms(bool force=false);
diff --git a/Control/AthenaServices/src/AthenaJobOptionsSvc.cxx b/Control/AthenaServices/src/AthenaJobOptionsSvc.cxx
index 4ae151e7dec..d240557213a 100644
--- a/Control/AthenaServices/src/AthenaJobOptionsSvc.cxx
+++ b/Control/AthenaServices/src/AthenaJobOptionsSvc.cxx
@@ -18,7 +18,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/SmartIF.h"
#include "GaudiKernel/System.h"
#include "GaudiKernel/IAlgTool.h"
@@ -28,7 +28,7 @@
namespace Athena {
- std::string pythonize_value(const Property* prop);
+ std::string pythonize_value(const Gaudi::Details::PropertyBase* prop);
///////////////////////////////////////////////////////////////////
// Public methods:
@@ -173,7 +173,7 @@ JobOptionsSvc::queryInterface(const InterfaceID& riid, void** ppvInterface)
///////////////////////////////////////////////////////////////////
void
-JobOptionsSvc::propertyHandler(Property& p)
+JobOptionsSvc::propertyHandler(Gaudi::Details::PropertyBase& p)
{
if (!m_jobosvc.retrieve().isSuccess()) {
ATH_MSG_ERROR("could not retrieve service ["
@@ -216,8 +216,8 @@ JobOptionsSvc::setMyProperties( const std::string& client, IProperty* me )
fprintf(m_cat_fd, "\n%s'%s' : {\n", _INDENT, client.c_str());
fprintf(m_cat_fd, "%s'props': {\n", _INDENT _INDENT);
- const std::vector<Property*>& props = me->getProperties();
- for ( std::vector<Property*>::const_iterator
+ const std::vector<Gaudi::Details::PropertyBase*>& props = me->getProperties();
+ for ( std::vector<Gaudi::Details::PropertyBase*>::const_iterator
iprop = props.begin(),
iend = props.end();
iprop != iend;
@@ -302,7 +302,7 @@ JobOptionsSvc::setMyProperties( const std::string& client, IProperty* me )
/// Add a property into the JobOptions catalog
StatusCode
JobOptionsSvc::addPropertyToCatalogue( const std::string& client,
- const Property& property )
+ const Gaudi::Details::PropertyBase& property )
{
return m_jobosvc->addPropertyToCatalogue(client, property);
}
@@ -351,7 +351,7 @@ JobOptionsSvc::readOptions( const std::string& file ,
std::string
-pythonize_value(const Property* p)
+pythonize_value(const Gaudi::Details::PropertyBase* p)
{
std::string pvalue = p->toString();
const std::type_info& ti = *p->type_info();
diff --git a/Control/AthenaServices/src/AthenaJobOptionsSvc.h b/Control/AthenaServices/src/AthenaJobOptionsSvc.h
index cb37443d7e4..8a75ea2d077 100644
--- a/Control/AthenaServices/src/AthenaJobOptionsSvc.h
+++ b/Control/AthenaServices/src/AthenaJobOptionsSvc.h
@@ -72,7 +72,7 @@ class JobOptionsSvc
/// Add a property into the JobOptions catalog
virtual StatusCode addPropertyToCatalogue( const std::string& client,
- const Property& property );
+ const Gaudi::Details::PropertyBase& property );
/// Remove a property from the JobOptions catalog
virtual StatusCode removePropertyFromCatalogue( const std::string& client,
const std::string& name );
@@ -118,7 +118,7 @@ class JobOptionsSvc
JobOptionsSvc();
/// Property handler
- void propertyHandler(Property& p);
+ void propertyHandler(Gaudi::Details::PropertyBase& p);
/// handle to the "real" @c IJobOptionsSvc we are proxying
ServiceHandle<IJobOptionsSvc> m_jobosvc;
diff --git a/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx
index dd0c0420b73..fa97ddab83b 100644
--- a/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx
+++ b/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx
@@ -201,7 +201,7 @@ StatusCode AthenaMtesEventLoopMgr::initialize()
error() << "Could not dcast HistPersSvc to a Service" << endmsg;
}
else {
- const Property &prop = s->getProperty("OutputFile");
+ const Gaudi::Details::PropertyBase &prop = s->getProperty("OutputFile");
std::string val;
try {
const StringProperty &sprop = dynamic_cast<const StringProperty&>(prop);
@@ -309,7 +309,7 @@ AthenaMtesEventLoopMgr::eventStore() const {
// property handlers
//=========================================================================
void
-AthenaMtesEventLoopMgr::setupTimeKeeper(Property&) {
+AthenaMtesEventLoopMgr::setupTimeKeeper(Gaudi::Details::PropertyBase&) {
const std::string& tkName(m_timeKeeperName.value());
// We do not expect a TimeKeeper necessarily being declared
if( tkName != "NONE" && tkName.length() != 0) {
@@ -322,7 +322,7 @@ AthenaMtesEventLoopMgr::setupTimeKeeper(Property&) {
}
void
-AthenaMtesEventLoopMgr::setClearStorePolicy(Property&) {
+AthenaMtesEventLoopMgr::setClearStorePolicy(Gaudi::Details::PropertyBase&) {
const std::string& policyName = m_clearStorePolicy.value();
if ( policyName != "BeginEvent" &&
@@ -341,7 +341,7 @@ AthenaMtesEventLoopMgr::setClearStorePolicy(Property&) {
}
void
-AthenaMtesEventLoopMgr::setupPreSelectTools(Property&) {
+AthenaMtesEventLoopMgr::setupPreSelectTools(Gaudi::Details::PropertyBase&) {
m_toolInvoke.clear();
m_toolReject.clear();
diff --git a/Control/AthenaServices/src/AthenaMtesEventLoopMgr.h b/Control/AthenaServices/src/AthenaMtesEventLoopMgr.h
index 12e7fbaed03..8b6e787d544 100644
--- a/Control/AthenaServices/src/AthenaMtesEventLoopMgr.h
+++ b/Control/AthenaServices/src/AthenaMtesEventLoopMgr.h
@@ -8,7 +8,7 @@
#define ATHENASERVICES_ATHENAMTESEVENTLOOPMGR_H
#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/MinimalEventLoopMgr.h"
@@ -100,7 +100,7 @@ protected:
/// @property Name of TimeKeeper to use. NONE or empty string (default) means no time limit control on event loop
StringProperty m_timeKeeperName;
/// @property update handler:sets up the time keeper
- void setupTimeKeeper(Property&);
+ void setupTimeKeeper(Gaudi::Details::PropertyBase&);
/// @property Failure mode
IntegerProperty m_failureMode;
@@ -121,7 +121,7 @@ protected:
tool_store m_tools; ///< internal tool store
/// property update handler:sets up the Pre-selection tools
- void setupPreSelectTools(Property&);
+ void setupPreSelectTools(Gaudi::Details::PropertyBase&);
/// @property configure the policy wrt handling of when 'clear-event-store'
/// has to happen: BeginEvent xor EndEvent.
@@ -133,7 +133,7 @@ protected:
/// property update handler:set the clear-store policy value and check its
/// value.
- void setClearStorePolicy(Property& clearStorePolicy);
+ void setClearStorePolicy(Gaudi::Details::PropertyBase& clearStorePolicy);
/// Dump out histograms as needed
virtual StatusCode writeHistograms(bool force=false);
diff --git a/Control/AthenaServices/src/AthenaOutputStream.cxx b/Control/AthenaServices/src/AthenaOutputStream.cxx
index 973d575a279..8730feaf57c 100644
--- a/Control/AthenaServices/src/AthenaOutputStream.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStream.cxx
@@ -1039,7 +1039,7 @@ void AthenaOutputStream::handleVariableSelection (SG::IAuxStoreIO& auxio,
}
-void AthenaOutputStream::itemListHandler(Property& /* theProp */) {
+void AthenaOutputStream::itemListHandler(Gaudi::Details::PropertyBase& /* theProp */) {
// Assuming concrete SG::Folder also has an itemList property
IProperty *pAsIProp(nullptr);
if ((m_p2BWritten.retrieve()).isFailure() ||
@@ -1049,7 +1049,7 @@ void AthenaOutputStream::itemListHandler(Property& /* theProp */) {
}
}
-void AthenaOutputStream::excludeListHandler(Property& /* theProp */) {
+void AthenaOutputStream::excludeListHandler(Gaudi::Details::PropertyBase& /* theProp */) {
IProperty *pAsIProp(nullptr);
if ((m_decoder.retrieve()).isFailure() ||
nullptr == (pAsIProp = dynamic_cast<IProperty*>(&*m_decoder)) ||
@@ -1058,7 +1058,7 @@ void AthenaOutputStream::excludeListHandler(Property& /* theProp */) {
}
}
-void AthenaOutputStream::compressionListHandlerHigh(Property& /* theProp */) {
+void AthenaOutputStream::compressionListHandlerHigh(Gaudi::Details::PropertyBase& /* theProp */) {
IProperty *pAsIProp(nullptr);
if ((m_compressionDecoderHigh.retrieve()).isFailure() ||
nullptr == (pAsIProp = dynamic_cast<IProperty*>(&*m_compressionDecoderHigh)) ||
@@ -1067,7 +1067,7 @@ void AthenaOutputStream::compressionListHandlerHigh(Property& /* theProp */) {
}
}
-void AthenaOutputStream::compressionListHandlerLow(Property& /* theProp */) {
+void AthenaOutputStream::compressionListHandlerLow(Gaudi::Details::PropertyBase& /* theProp */) {
IProperty *pAsIProp(nullptr);
if ((m_compressionDecoderLow.retrieve()).isFailure() ||
nullptr == (pAsIProp = dynamic_cast<IProperty*>(&*m_compressionDecoderLow)) ||
diff --git a/Control/AthenaServices/src/AthenaOutputStream.h b/Control/AthenaServices/src/AthenaOutputStream.h
index dee78c511c8..ae7ad6ae5d8 100644
--- a/Control/AthenaServices/src/AthenaOutputStream.h
+++ b/Control/AthenaServices/src/AthenaOutputStream.h
@@ -17,7 +17,7 @@
// Required for inheritance
#include "GaudiKernel/IDataSelector.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
@@ -166,13 +166,13 @@ private:
protected:
/// Handler for ItemNames Property
- void itemListHandler(Property& /* theProp */);
+ void itemListHandler(Gaudi::Details::PropertyBase& /* theProp */);
/// Handler for ItemNames Property
- void excludeListHandler(Property& /* theProp */);
+ void excludeListHandler(Gaudi::Details::PropertyBase& /* theProp */);
/// Handler for ItemNames Property
- void compressionListHandlerHigh(Property& /* theProp */);
+ void compressionListHandlerHigh(Gaudi::Details::PropertyBase& /* theProp */);
/// Handler for ItemNames Property
- void compressionListHandlerLow(Property& /* theProp */);
+ void compressionListHandlerLow(Gaudi::Details::PropertyBase& /* theProp */);
public:
typedef std::vector<std::pair<std::string, std::string> > TypeKeyPairs;
diff --git a/Control/AthenaServices/src/CoreDumpSvc.cxx b/Control/AthenaServices/src/CoreDumpSvc.cxx
index a82b0bd65c5..e210dd68131 100644
--- a/Control/AthenaServices/src/CoreDumpSvc.cxx
+++ b/Control/AthenaServices/src/CoreDumpSvc.cxx
@@ -33,7 +33,7 @@
#include "TSystem.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IAlgorithm.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/IAlgContextSvc.h"
@@ -186,7 +186,7 @@ CoreDumpSvc::~CoreDumpSvc()
CoreDumpSvcHandler::coreDumpSvc = nullptr;
}
-void CoreDumpSvc::propertyHandler(Property& p)
+void CoreDumpSvc::propertyHandler(Gaudi::Details::PropertyBase& p)
{
CoreDumpSvcHandler::callOldHandler = m_callOldHandler;
CoreDumpSvcHandler::stackTrace = m_stackTrace;
diff --git a/Control/AthenaServices/src/CoreDumpSvc.h b/Control/AthenaServices/src/CoreDumpSvc.h
index d57e1030466..56dd1ee3d21 100644
--- a/Control/AthenaServices/src/CoreDumpSvc.h
+++ b/Control/AthenaServices/src/CoreDumpSvc.h
@@ -122,7 +122,7 @@ private:
///@}
/// Property handler
- void propertyHandler(Property& p);
+ void propertyHandler(Gaudi::Details::PropertyBase& p);
/// Print core dump records to configured stream
void print();
diff --git a/Control/AthenaServices/src/EvtIdModifierSvc.cxx b/Control/AthenaServices/src/EvtIdModifierSvc.cxx
index c87c7d397f8..699b0481f1c 100644
--- a/Control/AthenaServices/src/EvtIdModifierSvc.cxx
+++ b/Control/AthenaServices/src/EvtIdModifierSvc.cxx
@@ -16,7 +16,7 @@
#include <set>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/Control/AthenaServices/src/FPEControlSvc.cxx b/Control/AthenaServices/src/FPEControlSvc.cxx
index 18918a7b3de..1b6c7e370be 100644
--- a/Control/AthenaServices/src/FPEControlSvc.cxx
+++ b/Control/AthenaServices/src/FPEControlSvc.cxx
@@ -152,7 +152,7 @@ std::string mask_to_string (int mask)
/**
* @brief Property change handler.
*/
-void FPEControlSvc::prophand (Property& /*prop*/)
+void FPEControlSvc::prophand (Gaudi::Details::PropertyBase& /*prop*/)
{
if (!m_haveEnv) {
// Save the current FP environment.
diff --git a/Control/AthenaServices/src/FPEControlSvc.h b/Control/AthenaServices/src/FPEControlSvc.h
index bc5d7a1e350..96d42d34abd 100644
--- a/Control/AthenaServices/src/FPEControlSvc.h
+++ b/Control/AthenaServices/src/FPEControlSvc.h
@@ -19,7 +19,7 @@
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ServiceHandle.h"
#include <fenv.h>
@@ -98,7 +98,7 @@ private:
std::string m_feSetRounding;
/// Property change handler.
- void prophand (Property& prop);
+ void prophand (Gaudi::Details::PropertyBase& prop);
};
#endif // not ATHENASERVICES_FPECONTROLSVC_H
diff --git a/Control/AthenaServices/src/LoggedMessageSvc.cxx b/Control/AthenaServices/src/LoggedMessageSvc.cxx
index 28447720999..3e2c884f502 100644
--- a/Control/AthenaServices/src/LoggedMessageSvc.cxx
+++ b/Control/AthenaServices/src/LoggedMessageSvc.cxx
@@ -161,7 +161,7 @@ StatusCode LoggedMessageSvc::reinitialize() {
//#############################################################################
-void LoggedMessageSvc::initColors(Property& /*prop*/) {
+void LoggedMessageSvc::initColors(Gaudi::Details::PropertyBase& /*prop*/) {
if (m_color == true) {
@@ -203,7 +203,7 @@ void LoggedMessageSvc::initColors(Property& /*prop*/) {
//#############################################################################
-void LoggedMessageSvc::setupColors(Property& prop) {
+void LoggedMessageSvc::setupColors(Gaudi::Details::PropertyBase& prop) {
if (! m_color) return;
@@ -255,7 +255,7 @@ void LoggedMessageSvc::setupColors(Property& prop) {
}
//#############################################################################
-void LoggedMessageSvc::setupLimits(Property& prop) {
+void LoggedMessageSvc::setupLimits(Gaudi::Details::PropertyBase& prop) {
//int ic = 0;
if (prop.name() == "fatalLimit") {
@@ -292,7 +292,7 @@ void LoggedMessageSvc::setupLimits(Property& prop) {
}
//#############################################################################
-void LoggedMessageSvc::setupThreshold(Property& prop) {
+void LoggedMessageSvc::setupThreshold(Gaudi::Details::PropertyBase& prop) {
int ic = 0;
if (prop.name() == "setFatal") {
@@ -346,7 +346,7 @@ void LoggedMessageSvc::setupThreshold(Property& prop) {
//#############################################################################
-void LoggedMessageSvc::setupInactCount(Property& prop) {
+void LoggedMessageSvc::setupInactCount(Gaudi::Details::PropertyBase& prop) {
if (prop.name() == "countInactive") {
#ifndef NDEBUG
BooleanProperty *p = dynamic_cast<BooleanProperty*>(&prop);
diff --git a/Control/AthenaServices/src/LoggedMessageSvc.h b/Control/AthenaServices/src/LoggedMessageSvc.h
index 6711834a170..9899f6df593 100644
--- a/Control/AthenaServices/src/LoggedMessageSvc.h
+++ b/Control/AthenaServices/src/LoggedMessageSvc.h
@@ -18,7 +18,7 @@
#include "GaudiKernel/Service.h"
#include "GaudiKernel/IMessageSvc.h"
#include "GaudiKernel/Message.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthService.h"
#include "AthenaKernel/ILoggedMessageSvc.h"
@@ -188,11 +188,11 @@ private:
typedef std::map<std::string, std::ostream*> LoggedStreamsMap_t;
LoggedStreamsMap_t m_loggedStreams;
- void initColors(Property& prop);
- void setupColors(Property& prop);
- void setupLimits(Property& prop);
- void setupThreshold(Property& prop);
- void setupInactCount(Property& prop);
+ void initColors(Gaudi::Details::PropertyBase& prop);
+ void setupColors(Gaudi::Details::PropertyBase& prop);
+ void setupLimits(Gaudi::Details::PropertyBase& prop);
+ void setupThreshold(Gaudi::Details::PropertyBase& prop);
+ void setupInactCount(Gaudi::Details::PropertyBase& prop);
void setupLogStreams();
diff --git a/Control/AthenaServices/src/MemoryRescueSvc.h b/Control/AthenaServices/src/MemoryRescueSvc.h
index 70cc901f61b..85d14207694 100644
--- a/Control/AthenaServices/src/MemoryRescueSvc.h
+++ b/Control/AthenaServices/src/MemoryRescueSvc.h
@@ -20,7 +20,7 @@
#endif
#ifndef GAUDIKERNEL_PROPERTY_H
-# include "GaudiKernel/Property.h"
+# include "Gaudi/Property.h"
#endif
diff --git a/Control/AthenaServices/src/MetaDataSvc.cxx b/Control/AthenaServices/src/MetaDataSvc.cxx
index 3a965561060..b7a084be195 100644
--- a/Control/AthenaServices/src/MetaDataSvc.cxx
+++ b/Control/AthenaServices/src/MetaDataSvc.cxx
@@ -146,9 +146,9 @@ StatusCode MetaDataSvc::initialize() {
if (!joSvc.retrieve().isSuccess()) {
ATH_MSG_WARNING("Cannot get JobOptionsSvc.");
} else {
- const std::vector<const Property*>* evtselProps = joSvc->getProperties("EventSelector");
+ const std::vector<const Gaudi::Details::PropertyBase*>* evtselProps = joSvc->getProperties("EventSelector");
if (evtselProps != nullptr) {
- for (std::vector<const Property*>::const_iterator iter = evtselProps->begin(),
+ for (std::vector<const Gaudi::Details::PropertyBase*>::const_iterator iter = evtselProps->begin(),
last = evtselProps->end(); iter != last; iter++) {
if ((*iter)->name() == "InputCollections") {
// Get EventSelector to force in-time initialization and FirstInputFile incident
diff --git a/Control/AthenaServices/src/MetaDataSvc.h b/Control/AthenaServices/src/MetaDataSvc.h
index 2809547d119..5ee9cf87d65 100644
--- a/Control/AthenaServices/src/MetaDataSvc.h
+++ b/Control/AthenaServices/src/MetaDataSvc.h
@@ -12,7 +12,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h" // no forward decl: typedef
+#include "Gaudi/Property.h" // no forward decl: typedef
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/IIoComponent.h"
#include "GaudiKernel/IFileMgr.h" // for FILEMGR_CALLBACK_ARGS
diff --git a/Control/AthenaServices/src/MixingEventSelector.cxx b/Control/AthenaServices/src/MixingEventSelector.cxx
index e009192398c..219ec8739ea 100644
--- a/Control/AthenaServices/src/MixingEventSelector.cxx
+++ b/Control/AthenaServices/src/MixingEventSelector.cxx
@@ -124,7 +124,7 @@ MixingEventSelector::finalize() {
void
-MixingEventSelector::setUpTriggerList(Property&) {
+MixingEventSelector::setUpTriggerList(Gaudi::Details::PropertyBase&) {
m_trigList = TriggerList();
for_each(m_triggerListProp.value().begin(), m_triggerListProp.value().end(),
bind1st(mem_fun(&MixingEventSelector::decodeTrigger), this));
diff --git a/Control/AthenaServices/src/MixingEventSelector.h b/Control/AthenaServices/src/MixingEventSelector.h
index bf486ec6717..1bbbe3ca5e9 100644
--- a/Control/AthenaServices/src/MixingEventSelector.h
+++ b/Control/AthenaServices/src/MixingEventSelector.h
@@ -27,7 +27,7 @@
#include "GaudiKernel/IConverter.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/Property.h" /*StringArrayProperty*/
+#include "Gaudi/Property.h" /*StringArrayProperty*/
class ISvcLocator;
@@ -136,7 +136,7 @@ public:
/// TriggerList property call-back. Decode TriggerList, obtain selector ptrs
/// and store them alongside fractions in m_trigList
- void setUpTriggerList(Property& trigList);
+ void setUpTriggerList(Gaudi::Details::PropertyBase& trigList);
/// functor that creates a Trigger object and adds it to m_trigList
void decodeTrigger(std::string triggDescr);
diff --git a/Control/AthenaServices/src/MultipleEventLoopMgr.h b/Control/AthenaServices/src/MultipleEventLoopMgr.h
index 3f07c7b2ed8..a1d1374d2fe 100644
--- a/Control/AthenaServices/src/MultipleEventLoopMgr.h
+++ b/Control/AthenaServices/src/MultipleEventLoopMgr.h
@@ -14,7 +14,7 @@
#include <string>
#ifndef GAUDIKERNEL_PROPERTY_H
-# include "GaudiKernel/Property.h"
+# include "Gaudi/Property.h"
#endif
#ifndef GAUDIKERNEL_SERVICEHANDLE_H
# include "GaudiKernel/ServiceHandle.h"
diff --git a/Control/AthenaServices/src/OutputStreamSequencerSvc.h b/Control/AthenaServices/src/OutputStreamSequencerSvc.h
index 893bd27b04c..f1e74b1a5c4 100644
--- a/Control/AthenaServices/src/OutputStreamSequencerSvc.h
+++ b/Control/AthenaServices/src/OutputStreamSequencerSvc.h
@@ -11,7 +11,7 @@
**/
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" // no forward decl: typedef
+#include "Gaudi/Property.h" // no forward decl: typedef
#include "GaudiKernel/IIncidentListener.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Control/AthenaServices/src/PageAccessControlSvc.h b/Control/AthenaServices/src/PageAccessControlSvc.h
index 5469bffc30d..1cd8ab6d203 100644
--- a/Control/AthenaServices/src/PageAccessControlSvc.h
+++ b/Control/AthenaServices/src/PageAccessControlSvc.h
@@ -23,7 +23,7 @@
#include "AthenaBaseComps/AthService.h"
#include "CxxUtils/PageAccessControl.h"
#include "CxxUtils/PtrAccessSEGVHandler.h"
-#include "GaudiKernel/Property.h" /*BooleanProperty*/
+#include "Gaudi/Property.h" /*BooleanProperty*/
// Forward declarations
template <class TYPE> class SvcFactory;
diff --git a/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.cxx b/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.cxx
index 2d4326defe2..cc78f1de1a1 100644
--- a/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.cxx
+++ b/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.cxx
@@ -31,7 +31,7 @@ SimplePOSIXTimeKeeperSvc::queryInterface(const InterfaceID& riid,
}
void
-SimplePOSIXTimeKeeperSvc::decodeAllocTime(Property&) {
+SimplePOSIXTimeKeeperSvc::decodeAllocTime(Gaudi::Details::PropertyBase&) {
m_allocTime = 100 * m_allocTimeProp;
}
diff --git a/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.h b/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.h
index 4d8a52527f5..f84bbfb6260 100644
--- a/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.h
+++ b/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.h
@@ -10,7 +10,7 @@
#include "AthenaKernel/POSIXTimeKeeper.h"
#endif
#ifndef GAUDIKERNEL_PROPERTY_H
- #include "GaudiKernel/Property.h"
+ #include "Gaudi/Property.h"
#endif
#ifndef ATHENABASECOMPS_ATHSERVICE_H
#include "AthenaBaseComps/AthService.h"
@@ -59,7 +59,7 @@ public:
// Standard Destructor
virtual ~SimplePOSIXTimeKeeperSvc();
private:
- void decodeAllocTime(Property&);
+ void decodeAllocTime(Gaudi::Details::PropertyBase&);
time_t m_allocTime; ///< allocated job cpu time (in 1/100 sec)
IntegerProperty m_allocTimeProp;///< property: alloc job cpu time (in sec)
};
diff --git a/Control/AthenaServices/src/TestRandomSeqAlg.h b/Control/AthenaServices/src/TestRandomSeqAlg.h
index 75f3d23bd24..83a1eff1a06 100644
--- a/Control/AthenaServices/src/TestRandomSeqAlg.h
+++ b/Control/AthenaServices/src/TestRandomSeqAlg.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
namespace CLHEP { class HepRandomEngine; }
/** @class TestRandomSegAlg
diff --git a/Control/GaudiSequencer/src/AthEventCounter.h b/Control/GaudiSequencer/src/AthEventCounter.h
index 053c86294ae..eda3a324da6 100644
--- a/Control/GaudiSequencer/src/AthEventCounter.h
+++ b/Control/GaudiSequencer/src/AthEventCounter.h
@@ -12,7 +12,7 @@
#define GAUDISEQUENCER_ATHEVENTCOUNTER_H
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class AthEventCounter : public AthAlgorithm
{
diff --git a/Control/GaudiSequencer/src/AthPrescaler.h b/Control/GaudiSequencer/src/AthPrescaler.h
index d7ac062ef87..e22d3d27045 100644
--- a/Control/GaudiSequencer/src/AthPrescaler.h
+++ b/Control/GaudiSequencer/src/AthPrescaler.h
@@ -13,7 +13,7 @@
#define GAUDISEQUENCER_ATHPRESCALER_H
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class AthPrescaler:public AthAlgorithm
{
diff --git a/Control/GaudiSequencer/src/AthRetrySequencer.cxx b/Control/GaudiSequencer/src/AthRetrySequencer.cxx
index c7a9b0f6d4c..71fe5118dae 100644
--- a/Control/GaudiSequencer/src/AthRetrySequencer.cxx
+++ b/Control/GaudiSequencer/src/AthRetrySequencer.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
diff --git a/Control/GaudiSequencer/src/AthSequencer.cxx b/Control/GaudiSequencer/src/AthSequencer.cxx
index 555f25d1159..ae51a3cba43 100644
--- a/Control/GaudiSequencer/src/AthSequencer.cxx
+++ b/Control/GaudiSequencer/src/AthSequencer.cxx
@@ -364,7 +364,7 @@ AthSequencer::decodeMemberNames( )
}
void
-AthSequencer::membershipHandler( Property& /* theProp */ )
+AthSequencer::membershipHandler( Gaudi::Details::PropertyBase& /* theProp */ )
{
if ( isInitialized() ) decodeMemberNames().ignore();
}
diff --git a/Control/GaudiSequencer/src/AthSequencer.h b/Control/GaudiSequencer/src/AthSequencer.h
index a78b225c548..393633a5331 100644
--- a/Control/GaudiSequencer/src/AthSequencer.h
+++ b/Control/GaudiSequencer/src/AthSequencer.h
@@ -16,7 +16,7 @@
#include "AthenaBaseComps/AthCommonDataStore.h"
#include "AthenaBaseComps/AthCommonMsg.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Gaudi/Sequence.h"
#include <setjmp.h>
@@ -124,13 +124,13 @@ public:
StatusCode decodeMemberNames( );
/// "Members" property handler
- void membershipHandler( Property& theProp );
+ void membershipHandler( Gaudi::Details::PropertyBase& theProp );
/// Decode branch member naem list
StatusCode decodeBranchMemberNames( );
/// "BranchMembers" propertry handler
- void branchMembershipHandler( Property& theProp );
+ void branchMembershipHandler( Gaudi::Details::PropertyBase& theProp );
protected:
diff --git a/Control/IOVSvc/src/CondInputLoader.cxx b/Control/IOVSvc/src/CondInputLoader.cxx
index fceda41da3e..ff3f6acc4d2 100644
--- a/Control/IOVSvc/src/CondInputLoader.cxx
+++ b/Control/IOVSvc/src/CondInputLoader.cxx
@@ -11,7 +11,7 @@
#include "CondInputLoader.h"
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IClassIDSvc.h"
#include "StoreGate/ReadHandle.h"
#include "AthenaKernel/errorcheck.h"
@@ -66,7 +66,7 @@ CondInputLoader::CondInputLoader( const std::string& name,
// Property declaration
//
auto props = getProperties();
- for( Property* prop : props ) {
+ for( Gaudi::Details::PropertyBase* prop : props ) {
if (prop->name() == "ExtraOutputs" || prop->name() == "ExtraInputs") {
prop->declareUpdateHandler
(&CondInputLoader::extraDeps_update_handler, this);
@@ -165,7 +165,7 @@ CondInputLoader::initialize()
// Update the properties, set the ExtraOutputs for Alg deps
- const Property &p = getProperty("Load");
+ const Gaudi::Details::PropertyBase &p = getProperty("Load");
ATH_MSG_DEBUG("setting prop ExtraOutputs to " << p.toString());
if (!setProperty("ExtraOutputs", p).isSuccess()) {
@@ -357,7 +357,7 @@ CondInputLoader::execute()
// need to override the handling of the DataObjIDs that's done by
// AthAlgorithm, so we don't inject the name of the Default Store
void
-CondInputLoader::extraDeps_update_handler( Property& /*ExtraDeps*/ )
+CondInputLoader::extraDeps_update_handler( Gaudi::Details::PropertyBase& /*ExtraDeps*/ )
{
// do nothing
}
diff --git a/Control/IOVSvc/src/CondInputLoader.h b/Control/IOVSvc/src/CondInputLoader.h
index aec51a8ff34..a02804346a3 100644
--- a/Control/IOVSvc/src/CondInputLoader.h
+++ b/Control/IOVSvc/src/CondInputLoader.h
@@ -43,7 +43,7 @@ class CondInputLoader
// need to override the ExtraInputs/Outputs property handler
// from AthAlgorithm
- void extraDeps_update_handler(Property&);
+ void extraDeps_update_handler(Gaudi::Details::PropertyBase&);
/// Containers
Gaudi::Property<DataObjIDColl> m_load{this,"Load",{},
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphBuilderSvc.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphBuilderSvc.cxx
index 067e3a34a80..bcaf76a03d5 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphBuilderSvc.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphBuilderSvc.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// PerfMonComps includes
#include "CallGraphBuilderSvc.h"
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonStorePayloadMon.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonStorePayloadMon.cxx
index e26148cfe15..53160ac8bb5 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonStorePayloadMon.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonStorePayloadMon.cxx
@@ -22,7 +22,7 @@
#include <sstream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "SGTools/DataProxy.h"
// pmon edm
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.cxx
index 19356020672..045b3030ff2 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.cxx
@@ -35,7 +35,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
#include "GaudiKernel/IChronoStatSvc.h"
@@ -1095,12 +1095,12 @@ void PerfMonSvc::undeclareAll( const IInterface* iowner )
///////////////////////////////////////////////////////////////////
// Non-const methods:
///////////////////////////////////////////////////////////////////
-void PerfMonSvc::setupProfiledAlgList( Property& /*profiledAlgNames*/ )
+void PerfMonSvc::setupProfiledAlgList( Gaudi::Details::PropertyBase& /*profiledAlgNames*/ )
{
return;
}
-void PerfMonSvc::setupIoContainerList( Property& /*ioContainerNames*/ )
+void PerfMonSvc::setupIoContainerList( Gaudi::Details::PropertyBase& /*ioContainerNames*/ )
{
}
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.h b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.h
index 1540aa3a340..976f515e8bf 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.h
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.h
@@ -221,10 +221,10 @@ private:
PerfMonSvc();
/// callback to synchronize the list of algorithms to be profiled
- void setupProfiledAlgList( Property& profiledAlgNames );
+ void setupProfiledAlgList( Gaudi::Details::PropertyBase& profiledAlgNames );
/// callback to synchronize the list of I/O containers to be monitored
- void setupIoContainerList( Property& ioContainerNames );
+ void setupIoContainerList( Gaudi::Details::PropertyBase& ioContainerNames );
/// loop over user-declared variables (via the @c IMonitorSvc interface)
/// and poll the data
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonUtils.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonUtils.cxx
index b90359deb79..abff933e1d3 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonUtils.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonUtils.cxx
@@ -15,7 +15,7 @@
// Framework includes
#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/SmartIF.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IAuditorSvc.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx
index 2fecb7dba4b..7b7dd67f404 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "PerfMonKernel/IPerfMonSvc.h"
#include "AthenaKernel/CLASS_DEF.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestCpuCruncherAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestCpuCruncherAlg.cxx
index b55394d8222..0af3fbe1080 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestCpuCruncherAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestCpuCruncherAlg.cxx
@@ -15,7 +15,7 @@
#include <cmath>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
// PerfMonTests includes
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx
index e14ce41e9fe..ae18a8beeeb 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// PerfMonTests includes
#include "PerfMonTestErroneousAlg.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.cxx
index 5c33146b407..71898701b60 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// PerfMonTests includes
#include "PerfMonTestLeakyAlg.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.cxx
index 355a8ec75f1..e6be77aa447 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.cxx
@@ -14,7 +14,7 @@
#include <vector>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
// CLHEP includes
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.cxx
index c85af253a76..223c1e657ec 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// PerfMonTests includes
#include "PerfMonTestManyLeaksAlg.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.cxx
index bf53de8b2c2..1db0085ed69 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// PerfMonTests includes
#include "PerfMonTestNoopAlg.h"
diff --git a/Control/PileUpComps/src/ArrayBM.h b/Control/PileUpComps/src/ArrayBM.h
index 3ad51af3f3a..5ba940eabe3 100644
--- a/Control/PileUpComps/src/ArrayBM.h
+++ b/Control/PileUpComps/src/ArrayBM.h
@@ -15,7 +15,7 @@
* @author Paolo Calafiura - ATLAS Collaboration
*/
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "PileUpTools/IBeamIntensity.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Control/PileUpComps/src/BkgStreamsCache.cxx b/Control/PileUpComps/src/BkgStreamsCache.cxx
index 19c12ac71e4..5544502f045 100644
--- a/Control/PileUpComps/src/BkgStreamsCache.cxx
+++ b/Control/PileUpComps/src/BkgStreamsCache.cxx
@@ -80,7 +80,7 @@ BkgStreamsCache::~BkgStreamsCache()
}
void
-BkgStreamsCache::PileUpEventTypeHandler(Property&)
+BkgStreamsCache::PileUpEventTypeHandler(Gaudi::Details::PropertyBase&)
{
m_pileUpEventType = xAOD::EventInfo::PileUpInt2Type( m_pileUpEventTypeProp.value() );
}
diff --git a/Control/PileUpComps/src/BkgStreamsCache.h b/Control/PileUpComps/src/BkgStreamsCache.h
index da3ba4cd572..847f710618e 100644
--- a/Control/PileUpComps/src/BkgStreamsCache.h
+++ b/Control/PileUpComps/src/BkgStreamsCache.h
@@ -17,7 +17,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "PileUpTools/PileUpStream.h"
#include "PileUpTools/IBkgStreamsCache.h"
@@ -123,7 +123,7 @@ private:
Gaudi::Property<std::string> m_randomStreamName;
/// the type of events in this cache
Gaudi::CheckedProperty<unsigned short> m_pileUpEventTypeProp;
- void PileUpEventTypeHandler(Property&);
+ void PileUpEventTypeHandler(Gaudi::Details::PropertyBase&);
/// the type of events in this cache
xAOD::EventInfo::PileUpType m_pileUpEventType;
/// subtract from number of events at bunch xing = 0
diff --git a/Control/PileUpComps/src/FixedArrayBM.h b/Control/PileUpComps/src/FixedArrayBM.h
index cd038f68d06..f2e9976cb9e 100644
--- a/Control/PileUpComps/src/FixedArrayBM.h
+++ b/Control/PileUpComps/src/FixedArrayBM.h
@@ -15,7 +15,7 @@
*
* @author John Chapman - ATLAS Collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "PileUpTools/IBeamIntensity.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Control/PileUpComps/src/LumiProfileSvc.h b/Control/PileUpComps/src/LumiProfileSvc.h
index 4596fc73eba..f060ce1423a 100644
--- a/Control/PileUpComps/src/LumiProfileSvc.h
+++ b/Control/PileUpComps/src/LumiProfileSvc.h
@@ -13,7 +13,7 @@
*/
#include "PileUpTools/IBeamLuminosity.h"
#include "AthenaBaseComps/AthService.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class LumiProfileSvc : public extends<AthService, IBeamLuminosity>
{
diff --git a/Control/PileUpComps/src/NoProfileSvc.h b/Control/PileUpComps/src/NoProfileSvc.h
index 8194fe25410..5aef57ec40b 100644
--- a/Control/PileUpComps/src/NoProfileSvc.h
+++ b/Control/PileUpComps/src/NoProfileSvc.h
@@ -13,7 +13,7 @@
*/
#include "PileUpTools/IBeamLuminosity.h"
#include "AthenaBaseComps/AthService.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class NoProfileSvc : public extends<AthService, IBeamLuminosity>
{
diff --git a/Control/PileUpComps/src/PileUpEventLoopMgr.h b/Control/PileUpComps/src/PileUpEventLoopMgr.h
index 0dd7117de5d..22bceb61106 100644
--- a/Control/PileUpComps/src/PileUpEventLoopMgr.h
+++ b/Control/PileUpComps/src/PileUpEventLoopMgr.h
@@ -18,7 +18,7 @@
#include "PileUpTools/PileUpStream.h"
// Gaudi headers
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/IAlgExecStateSvc.h"
diff --git a/Control/PileUpComps/src/StepArrayBM.h b/Control/PileUpComps/src/StepArrayBM.h
index 7ade012693b..858e5a33b80 100644
--- a/Control/PileUpComps/src/StepArrayBM.h
+++ b/Control/PileUpComps/src/StepArrayBM.h
@@ -15,7 +15,7 @@
* $Id: BkgStreamsStepCache.h,v 1.10 2008-08-28 01:11:06 calaf Exp $
* @author Will Buttinger - ATLAS Collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "PileUpTools/IBeamIntensity.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Control/PileUpTools/PileUpTools/PileUpMergeSvc.h b/Control/PileUpTools/PileUpTools/PileUpMergeSvc.h
index e17497eb62a..07d113b7a0c 100755
--- a/Control/PileUpTools/PileUpTools/PileUpMergeSvc.h
+++ b/Control/PileUpTools/PileUpTools/PileUpMergeSvc.h
@@ -20,7 +20,7 @@
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Property.h" /*StringArrayProperty*/
+#include "Gaudi/Property.h" /*StringArrayProperty*/
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/Control/RngComps/src/AtDSFMTGenSvc.h b/Control/RngComps/src/AtDSFMTGenSvc.h
index 525a574a795..5161bb17ced 100644
--- a/Control/RngComps/src/AtDSFMTGenSvc.h
+++ b/Control/RngComps/src/AtDSFMTGenSvc.h
@@ -21,7 +21,7 @@
#include "AthenaBaseComps/AthService.h"
#include "CLHEP/Random/RandomEngine.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class IAlgorithm;
class ISvcLocator;
diff --git a/Control/RngComps/src/AtRanluxGenSvc.h b/Control/RngComps/src/AtRanluxGenSvc.h
index 4f05712f3c9..0b247522f6a 100644
--- a/Control/RngComps/src/AtRanluxGenSvc.h
+++ b/Control/RngComps/src/AtRanluxGenSvc.h
@@ -18,7 +18,7 @@
#include "AthenaKernel/IAtRndmGenSvc.h"
#include "GaudiKernel/IIncidentListener.h"
#include "AthenaBaseComps/AthService.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Random/Ranlux64Engine.h"
diff --git a/Control/SGComps/src/AddressRemappingSvc.h b/Control/SGComps/src/AddressRemappingSvc.h
index 51212b90dce..078fe72b1bd 100644
--- a/Control/SGComps/src/AddressRemappingSvc.h
+++ b/Control/SGComps/src/AddressRemappingSvc.h
@@ -15,7 +15,7 @@
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" // no forward decl: typedef
+#include "Gaudi/Property.h" // no forward decl: typedef
#include "AthenaKernel/IAddressProvider.h"
#include "AthenaKernel/IInputRename.h"
#include "AthenaKernel/RCUObject.h"
diff --git a/Control/SGComps/src/ProxyProviderSvc.cxx b/Control/SGComps/src/ProxyProviderSvc.cxx
index 06a4b847fab..7a433abf7d8 100644
--- a/Control/SGComps/src/ProxyProviderSvc.cxx
+++ b/Control/SGComps/src/ProxyProviderSvc.cxx
@@ -294,7 +294,7 @@ const EventContext& ProxyProviderSvc::contextFromStore (IProxyRegistry& ds) cons
void
-ProxyProviderSvc::providerNamesPropertyHandler( Property& /*theProp*/ ) {
+ProxyProviderSvc::providerNamesPropertyHandler( Gaudi::Details::PropertyBase& /*theProp*/ ) {
//add declared providers to the list;
std::vector<std::string>::const_iterator iN(m_providerNames.value().begin());
std::vector<std::string>::const_iterator iEnd(m_providerNames.value().end());
diff --git a/Control/SGComps/src/ProxyProviderSvc.h b/Control/SGComps/src/ProxyProviderSvc.h
index cedefd94c7e..9b5e876f455 100644
--- a/Control/SGComps/src/ProxyProviderSvc.h
+++ b/Control/SGComps/src/ProxyProviderSvc.h
@@ -16,7 +16,7 @@
#include "AthenaKernel/IProxyProviderSvc.h"
#include "AthenaKernel/StoreID.h"
-#include "GaudiKernel/Property.h" /*StringArrayProperty*/
+#include "Gaudi/Property.h" /*StringArrayProperty*/
#include "GaudiKernel/StatusCode.h"
#include <cassert>
#include <list>
@@ -103,7 +103,7 @@ private:
StringArrayProperty m_providerNames{this,"ProviderNames",{},
"names of the services to be use as address providers","OrderedSet<std::string>"};
/// the handler for m_providerNames
- void providerNamesPropertyHandler( Property& theProp );
+ void providerNamesPropertyHandler( Gaudi::Details::PropertyBase& theProp );
StatusCode doPreLoadProxies(IProxyRegistry& storeToModify);
diff --git a/Control/SGComps/src/SGFolder.h b/Control/SGComps/src/SGFolder.h
index 011fdc7a76a..ab48af801b5 100644
--- a/Control/SGComps/src/SGFolder.h
+++ b/Control/SGComps/src/SGFolder.h
@@ -92,7 +92,7 @@ namespace SG {
ServiceHandle<IClassIDSvc> m_pCLIDSvc;
/// property: the list of items (data objects identified by a class name/key pair)
StringArrayProperty m_itemList;
- void decodeItemList(Property&) {
+ void decodeItemList(Gaudi::Details::PropertyBase&) {
const bool DONTCHECKVALIDCLID(false);
updateItemList(DONTCHECKVALIDCLID);
}
diff --git a/Control/SGComps/src/SGInputLoader.cxx b/Control/SGComps/src/SGInputLoader.cxx
index 8e277cc5df3..6bc175d0ef4 100644
--- a/Control/SGComps/src/SGInputLoader.cxx
+++ b/Control/SGComps/src/SGInputLoader.cxx
@@ -11,7 +11,7 @@
#include "SGInputLoader.h"
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/errorcheck.h"
#include "StoreGate/VarHandleKey.h"
#include "AthenaKernel/StoreID.h"
@@ -141,7 +141,7 @@ SGInputLoader::execute()
//---------------------------------------------------------------------------------
void
-SGInputLoader::loader(Property& p ) {
+SGInputLoader::loader(Gaudi::Details::PropertyBase& p ) {
ATH_MSG_DEBUG("setting prop ExtraOutputs to " << p.toString());
diff --git a/Control/SGComps/src/SGInputLoader.h b/Control/SGComps/src/SGInputLoader.h
index 7380b6993c8..a8a5e043566 100644
--- a/Control/SGComps/src/SGInputLoader.h
+++ b/Control/SGComps/src/SGInputLoader.h
@@ -39,7 +39,7 @@ class SGInputLoader
/// Default constructor:
SGInputLoader();
- void loader(Property&);
+ void loader(Gaudi::Details::PropertyBase&);
bool loadObjs(const DataObjIDColl& objs) const;
/// Properties
diff --git a/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx b/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx
index 54c1da1051f..a4bb5a99387 100644
--- a/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx
+++ b/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx
@@ -18,7 +18,7 @@
#include <utility>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
#include "GaudiKernel/IAlgContextSvc.h"
diff --git a/Control/StoreGate/StoreGate/StoreGateSvc.h b/Control/StoreGate/StoreGate/StoreGateSvc.h
index 8b120b425cc..f45e3392be3 100644
--- a/Control/StoreGate/StoreGate/StoreGateSvc.h
+++ b/Control/StoreGate/StoreGate/StoreGateSvc.h
@@ -25,7 +25,7 @@
#include <GaudiKernel/ClassID.h> // for CLID
#include <GaudiKernel/IInterface.h> // for InterfaceID
#include <GaudiKernel/IMessageSvc.h> // for Level
-#include "GaudiKernel/Property.h" /*StringArrayProperty*/
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObjID.h"
@@ -921,7 +921,7 @@ private:
void t2pRemove(const void* const pTrans);
/// callback for output level property
- void msg_update_handler(Property& outputLevel);
+ void msg_update_handler(Gaudi::Details::PropertyBase& outputLevel);
/// Add automatically-made symlinks for DP.
void addAutoSymLinks (const std::string& key, CLID clid, SG::DataProxy* dp,
diff --git a/Control/StoreGate/StoreGate/VarHandleKeyArrayProperty.h b/Control/StoreGate/StoreGate/VarHandleKeyArrayProperty.h
index cd26c7e1b45..ddf7b6093a3 100644
--- a/Control/StoreGate/StoreGate/VarHandleKeyArrayProperty.h
+++ b/Control/StoreGate/StoreGate/VarHandleKeyArrayProperty.h
@@ -15,7 +15,7 @@
#include "StoreGate/VarHandleKeyArray.h"
#include "StoreGate/ReadHandleKeyArray.h"
#include "StoreGate/WriteHandleKeyArray.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <iostream>
namespace Gaudi {
@@ -44,9 +44,9 @@ namespace SG {
VarHandleKeyArrayProperty* clone() const override;
- bool load( Property& destination ) const override;
+ bool load( Gaudi::Details::PropertyBase& destination ) const override;
- bool assign( const Property& source ) override;
+ bool assign( const Gaudi::Details::PropertyBase& source ) override;
std::string toString() const override;
diff --git a/Control/StoreGate/StoreGate/VarHandleKeyProperty.h b/Control/StoreGate/StoreGate/VarHandleKeyProperty.h
index e513c0d32e3..1f2cd81d32c 100644
--- a/Control/StoreGate/StoreGate/VarHandleKeyProperty.h
+++ b/Control/StoreGate/StoreGate/VarHandleKeyProperty.h
@@ -29,7 +29,7 @@
#include "StoreGate/UpdateHandleKey.h"
#include "StoreGate/ReadDecorHandleKey.h"
#include "StoreGate/WriteDecorHandleKey.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <iostream>
namespace Gaudi {
@@ -116,7 +116,7 @@ public:
* by converting to a string and back again. Returns true on success,
* false on failure.
*/
- virtual bool load( Property& destination ) const override;
+ virtual bool load( Gaudi::Details::PropertyBase& destination ) const override;
/**
@@ -127,7 +127,7 @@ public:
* by converting to a string and back again. Returns true on success,
* false on failure.
*/
- virtual bool assign( const Property& source ) override;
+ virtual bool assign( const Gaudi::Details::PropertyBase& source ) override;
/**
diff --git a/Control/StoreGate/StoreGate/tools/SGImplSvc.h b/Control/StoreGate/StoreGate/tools/SGImplSvc.h
index 1e144ed229b..0e6cb93210b 100644
--- a/Control/StoreGate/StoreGate/tools/SGImplSvc.h
+++ b/Control/StoreGate/StoreGate/tools/SGImplSvc.h
@@ -23,7 +23,7 @@
#include <GaudiKernel/IInterface.h> // for InterfaceID
#include <GaudiKernel/IMessageSvc.h> // for Level
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h" /*StringArrayProperty*/
+#include "Gaudi/Property.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObjID.h"
@@ -665,7 +665,7 @@ private:
void t2pRemove(const void* const pTrans);
/// callback for output level property
- void msg_update_handler(Property& outputLevel);
+ void msg_update_handler(Gaudi::Details::PropertyBase& outputLevel);
bool associateAux_impl (SG::AuxVectorBase* ptr,
const std::string& key,
diff --git a/Control/StoreGate/src/SGImplSvc.cxx b/Control/StoreGate/src/SGImplSvc.cxx
index d950f8257e0..ed2141f4c4c 100644
--- a/Control/StoreGate/src/SGImplSvc.cxx
+++ b/Control/StoreGate/src/SGImplSvc.cxx
@@ -1341,7 +1341,7 @@ SGImplSvc::t2pRemove(const void* const pTrans)
}
void
-SGImplSvc::msg_update_handler(Property& /*outputLevel*/)
+SGImplSvc::msg_update_handler(Gaudi::Details::PropertyBase& /*outputLevel*/)
{
setUpMessaging();
updateMsgStreamOutputLevel( outputLevel() );
diff --git a/Control/StoreGate/src/StoreGateSvc.cxx b/Control/StoreGate/src/StoreGateSvc.cxx
index 2ad8e4181e8..91507770bec 100644
--- a/Control/StoreGate/src/StoreGateSvc.cxx
+++ b/Control/StoreGate/src/StoreGateSvc.cxx
@@ -123,17 +123,17 @@ StatusCode StoreGateSvc::initialize() {
IProperty* appmgrprop = 0;
appmgr->queryInterface( IProperty::interfaceID(), (void**)&appmgrprop ).ignore();
//all of the above to get the jo svc type
- const Property& prop = appmgrprop->getProperty( "JobOptionsSvcType" );
+ const Gaudi::Details::PropertyBase& prop = appmgrprop->getProperty( "JobOptionsSvcType" );
IJobOptionsSvc* pJOSvc(0);
if ( serviceLocator()->service( prop.toString(), "JobOptionsSvc", pJOSvc ).isFailure() ) {
error() << "Failed to retrieve JobOptionsSvc" << endmsg;
}
//copy our properties to the prototype (default) SGImplSvc
std::string implStoreName = name() + "_Impl";
- const std::vector<const Property*>* props = pJOSvc->getProperties( name() );
+ const std::vector<const Gaudi::Details::PropertyBase*>* props = pJOSvc->getProperties( name() );
if ( props ) {
- std::vector<const Property*>::const_iterator prop(props->begin());
- std::vector<const Property*>::const_iterator pEnd(props->end());
+ std::vector<const Gaudi::Details::PropertyBase*>::const_iterator prop(props->begin());
+ std::vector<const Gaudi::Details::PropertyBase*>::const_iterator pEnd(props->end());
while (prop != pEnd) {
pJOSvc->addPropertyToCatalogue( implStoreName, **prop ).ignore();
++prop;
diff --git a/Control/StoreGate/src/VarHandleKeyArrayProperty.cxx b/Control/StoreGate/src/VarHandleKeyArrayProperty.cxx
index 8dd7cf32383..d116a9d6c0c 100644
--- a/Control/StoreGate/src/VarHandleKeyArrayProperty.cxx
+++ b/Control/StoreGate/src/VarHandleKeyArrayProperty.cxx
@@ -62,7 +62,7 @@ VarHandleKeyArrayProperty::clone() const
* false on failure.
*/
bool
-VarHandleKeyArrayProperty::load( Property& destination ) const
+VarHandleKeyArrayProperty::load( Gaudi::Details::PropertyBase& destination ) const
{
return destination.assign( *this );
}
@@ -77,7 +77,7 @@ VarHandleKeyArrayProperty::load( Property& destination ) const
* false on failure.
*/
bool
-VarHandleKeyArrayProperty::assign( const Property& source )
+VarHandleKeyArrayProperty::assign( const Gaudi::Details::PropertyBase& source )
{
return fromString( source.toString() ).isSuccess();
}
diff --git a/Control/StoreGate/src/VarHandleKeyProperty.cxx b/Control/StoreGate/src/VarHandleKeyProperty.cxx
index caaace59a50..97f29db2aa8 100644
--- a/Control/StoreGate/src/VarHandleKeyProperty.cxx
+++ b/Control/StoreGate/src/VarHandleKeyProperty.cxx
@@ -121,7 +121,7 @@ VarHandleKeyProperty::clone() const
* false on failure.
*/
bool
-VarHandleKeyProperty::load( Property& destination ) const
+VarHandleKeyProperty::load( Gaudi::Details::PropertyBase& destination ) const
{
return destination.assign( *this );
}
@@ -136,7 +136,7 @@ VarHandleKeyProperty::load( Property& destination ) const
* false on failure.
*/
bool
-VarHandleKeyProperty::assign( const Property& source )
+VarHandleKeyProperty::assign( const Gaudi::Details::PropertyBase& source )
{
return fromString( source.toString() ).isSuccess();
}
diff --git a/Control/StoreGate/test/VarHandleKeyProperty_test.cxx b/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
index dd41003f2fa..b00304549bb 100644
--- a/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
+++ b/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
@@ -193,13 +193,13 @@ public:
{ return mgr.setProperty(n, p); }
virtual StatusCode setPropertyRepr( const std::string& n, const std::string& r ) override
{ return mgr.setPropertyRepr(n,r); }
- virtual StatusCode getProperty( Property* p ) const override
+ virtual StatusCode getProperty( Gaudi::Details::PropertyBase* p ) const override
{ return mgr.getProperty (p); }
- virtual const Property& getProperty( const std::string& name) const override
+ virtual const Gaudi::Details::PropertyBase& getProperty( const std::string& name) const override
{ return mgr.getProperty (name); }
virtual StatusCode getProperty( const std::string& n, std::string& v ) const override
{ return mgr.getProperty (n, v); }
- virtual const std::vector<Property*>& getProperties( ) const override
+ virtual const std::vector<Gaudi::Details::PropertyBase*>& getProperties( ) const override
{ return mgr.getProperties(); }
virtual bool hasProperty(const std::string& name) const override
{ return mgr.hasProperty(name); }
diff --git a/Control/StoreGate/test/VarHandleProperty_test.cxx b/Control/StoreGate/test/VarHandleProperty_test.cxx
index 9736dda1293..a170450a652 100644
--- a/Control/StoreGate/test/VarHandleProperty_test.cxx
+++ b/Control/StoreGate/test/VarHandleProperty_test.cxx
@@ -56,13 +56,13 @@ public:
{ return mgr.setProperty(n, p); }
virtual StatusCode setPropertyRepr( const std::string& n, const std::string& r ) override
{ return mgr.setPropertyRepr(n,r); }
- virtual StatusCode getProperty( Property* p ) const override
+ virtual StatusCode getProperty( Gaudi::Details::PropertyBase* p ) const override
{ return mgr.getProperty (p); }
- virtual const Property& getProperty( const std::string& name) const override
+ virtual const Gaudi::Details::PropertyBase& getProperty( const std::string& name) const override
{ return mgr.getProperty (name); }
virtual StatusCode getProperty( const std::string& n, std::string& v ) const override
{ return mgr.getProperty (n, v); }
- virtual const std::vector<Property*>& getProperties( ) const override
+ virtual const std::vector<Gaudi::Details::PropertyBase*>& getProperties( ) const override
{ return mgr.getProperties(); }
virtual bool hasProperty(const std::string& name) const override
{ return mgr.hasProperty(name); }
diff --git a/Control/StoreGateTests/src/SgStressConsumer.cxx b/Control/StoreGateTests/src/SgStressConsumer.cxx
index 71d28426e52..ab58d5216b4 100755
--- a/Control/StoreGateTests/src/SgStressConsumer.cxx
+++ b/Control/StoreGateTests/src/SgStressConsumer.cxx
@@ -14,7 +14,7 @@
#include <sstream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// StoreGate
#include "StoreGate/StoreGateSvc.h"
diff --git a/Control/StoreGateTests/src/SgStressProducer.cxx b/Control/StoreGateTests/src/SgStressProducer.cxx
index 110b019fd29..d08eae45f07 100755
--- a/Control/StoreGateTests/src/SgStressProducer.cxx
+++ b/Control/StoreGateTests/src/SgStressProducer.cxx
@@ -14,7 +14,7 @@
#include <sstream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// StoreGate
#include "StoreGate/StoreGateSvc.h"
diff --git a/Control/Valkyrie/src/ValgrindSvc.cxx b/Control/Valkyrie/src/ValgrindSvc.cxx
index 43381e0606f..fc514c28548 100755
--- a/Control/Valkyrie/src/ValgrindSvc.cxx
+++ b/Control/Valkyrie/src/ValgrindSvc.cxx
@@ -16,7 +16,7 @@
#include "valgrind/callgrind.h"
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
#include "GaudiKernel/ServiceHandle.h"
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/RequireUniqueEvent.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/RequireUniqueEvent.cxx
index e12e8bdc051..bc0811d5a87 100755
--- a/Database/AthenaPOOL/AthenaPoolTools/src/RequireUniqueEvent.cxx
+++ b/Database/AthenaPOOL/AthenaPoolTools/src/RequireUniqueEvent.cxx
@@ -11,7 +11,7 @@
// the user data-class defintions
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include "EventInfo/EventInfo.h"
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.h b/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.h
index 2ff110ef64d..23be195fdf7 100755
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.h
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.h
@@ -11,7 +11,7 @@
**/
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" // no forward decl: typedef
+#include "Gaudi/Property.h" // no forward decl: typedef
#include "AthenaKernel/IAddressProvider.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/CondProxyProvider.h b/Database/AthenaPOOL/EventSelectorAthenaPool/src/CondProxyProvider.h
index cc18e4e985a..0f39299504f 100755
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/CondProxyProvider.h
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/CondProxyProvider.h
@@ -11,7 +11,7 @@
**/
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "AthenaKernel/IAddressProvider.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx
index dc606369053..40b72b28ef6 100644
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx
@@ -61,7 +61,7 @@ EventSelectorAthenaPool::EventSelectorAthenaPool(const std::string& name, ISvcLo
m_inputCollectionsProp.declareUpdateHandler(&EventSelectorAthenaPool::inputCollectionsHandler, this);
}
//________________________________________________________________________________
-void EventSelectorAthenaPool::inputCollectionsHandler(Property&) {
+void EventSelectorAthenaPool::inputCollectionsHandler(Gaudi::Details::PropertyBase&) {
if (this->FSMState() != Gaudi::StateMachine::OFFLINE) {
this->reinit().ignore();
}
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h
index df76dd5920e..2cfa32f009e 100644
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h
@@ -197,7 +197,7 @@ private: // properties
/// InputCollections, vector with names of the input collections.
Gaudi::Property<std::vector<std::string>> m_inputCollectionsProp{this, "InputCollections", {}, ""};
mutable std::vector<std::string>::const_iterator m_inputCollectionsIterator ATLAS_THREAD_SAFE;
- void inputCollectionsHandler(Property&);
+ void inputCollectionsHandler(Gaudi::Details::PropertyBase&);
/// Query, query string.
Gaudi::Property<std::string> m_query{this, "Query", "", ""};
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoAttListTool.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoAttListTool.cxx
index 0dac118fc55..072b70256d2 100755
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoAttListTool.cxx
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoAttListTool.cxx
@@ -14,7 +14,7 @@ Purpose : create a EventInfoAttList - The Tag information associated to the even
#include "EventInfoAttListTool.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODEventInfo/EventInfo.h"
#include "EventInfo/EventInfo.h"
diff --git a/Database/AthenaRoot/AthenaRootComps/src/IoSvc.cxx b/Database/AthenaRoot/AthenaRootComps/src/IoSvc.cxx
index a37815afeae..8a6c0164539 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/IoSvc.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/IoSvc.cxx
@@ -16,7 +16,7 @@
#include <limits>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
typedef IIoSvc::Fd Fd;
diff --git a/Database/AthenaRoot/AthenaRootComps/src/NtupleCnvSvc.cxx b/Database/AthenaRoot/AthenaRootComps/src/NtupleCnvSvc.cxx
index 34fb9a46607..65eee948234 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/NtupleCnvSvc.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/NtupleCnvSvc.cxx
@@ -19,7 +19,7 @@
// FrameWork includes
#include "GaudiKernel/GenericAddress.h"
#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// ROOT includes
#include "TFile.h"
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlg.cxx b/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlg.cxx
index a9670604dfb..cc75dc35330 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlg.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlg.cxx
@@ -25,7 +25,7 @@
#include <fcntl.h>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// SGTools
#include "SGTools/BuiltinsClids.h" // to put ints,... in evtstore
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlgHandle.cxx b/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlgHandle.cxx
index 4da79cd79f1..c507e5c84ee 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlgHandle.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlgHandle.cxx
@@ -25,7 +25,7 @@
#include <fcntl.h>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// SGTools
#include "SGTools/BuiltinsClids.h" // to put ints,... in evtstore
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx
index 2800ba8b68b..7d2a6a64e8c 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx
@@ -856,7 +856,7 @@ RootNtupleEventSelector::updateAddress(StoreID::type /*storeID*/, SG::TransientA
/// callback to synchronize the list of input files
void
-RootNtupleEventSelector::setupInputCollection( Property& /*inputCollectionsName*/ )
+RootNtupleEventSelector::setupInputCollection( Gaudi::Details::PropertyBase& /*inputCollectionsName*/ )
{
// nothing ?
return;
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.h b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.h
index 3b6e10db0dd..bd523aab906 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.h
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.h
@@ -20,7 +20,7 @@
#include "GaudiKernel/IIoComponent.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaKernel/IEvtSelectorSeek.h"
#include "AthenaKernel/IAddressProvider.h"
@@ -139,7 +139,7 @@ class RootNtupleEventSelector :
StatusCode endInputFile (RootNtupleEventContext* rctx) const;
/// callback to synchronize the list of input files
- void setupInputCollection( Property& inputCollectionsName );
+ void setupInputCollection( Gaudi::Details::PropertyBase& inputCollectionsName );
/// helper method to create proxies
StatusCode createRootBranchAddresses(StoreID::type storeID,
diff --git a/Database/AthenaRoot/AthenaRootComps/src/xAODCnvSvc.cxx b/Database/AthenaRoot/AthenaRootComps/src/xAODCnvSvc.cxx
index 86ad292d8f9..a08cefd347a 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/xAODCnvSvc.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/xAODCnvSvc.cxx
@@ -19,7 +19,7 @@
// FrameWork includes
#include "GaudiKernel/GenericAddress.h"
#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// ROOT includes
#include "TFile.h"
diff --git a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
index 1171e013c47..9785f6408b8 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
@@ -24,7 +24,7 @@
#include "TKey.h"
#include "TLeaf.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Framework includes
//#include "GaudiKernel/GenericAddress.h"
diff --git a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.h b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.h
index 32682624250..3b8ebe62926 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.h
+++ b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.h
@@ -17,7 +17,7 @@
#include "GaudiKernel/IIoComponent.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaKernel/IEvtSelectorSeek.h"
#include "AthenaKernel/IAddressProvider.h"
diff --git a/Database/IOVDbSvc/src/IOVDbSvc.cxx b/Database/IOVDbSvc/src/IOVDbSvc.cxx
index b52a16a49ed..859b92cf94c 100644
--- a/Database/IOVDbSvc/src/IOVDbSvc.cxx
+++ b/Database/IOVDbSvc/src/IOVDbSvc.cxx
@@ -35,7 +35,7 @@
namespace {
template<typename Prop_t>
bool
- fetchProp( const std::vector<const Property*>* properties, Prop_t& p ){
+ fetchProp( const std::vector<const Gaudi::Details::PropertyBase*>* properties, Prop_t& p ){
if (properties) {
for ( const auto & pThisProperty: *properties ) {
if ( pThisProperty->name()==p.name() ) {
@@ -776,7 +776,7 @@ StatusCode IOVDbSvc::checkEventSel() {
ATH_MSG_FATAL( "Could not retrieve [" << joSvc.typeAndName() << "]" );
return StatusCode::FAILURE;
}
- typedef std::vector<const Property*> Properties_t;
+ typedef std::vector<const Gaudi::Details::PropertyBase*> Properties_t;
const Properties_t* evtSelProps=joSvc->getProperties("EventSelector");
// do not return FAILURE if the EventSelector cannot be found, as this
// happens online when we have no EventSelector
diff --git a/Database/RDBAccessSvc/src/RDBAccessSvc.h b/Database/RDBAccessSvc/src/RDBAccessSvc.h
index 85103fa8fa7..1c326c0beef 100755
--- a/Database/RDBAccessSvc/src/RDBAccessSvc.h
+++ b/Database/RDBAccessSvc/src/RDBAccessSvc.h
@@ -18,7 +18,7 @@
#include "RDBAccessSvc/IRDBAccessSvc.h"
#include "RDBRecordset.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthService.h"
#include <string>
diff --git a/Database/RegistrationServices/src/RegistrationStream.cxx b/Database/RegistrationServices/src/RegistrationStream.cxx
index 827c43679ae..375e7b7a478 100755
--- a/Database/RegistrationServices/src/RegistrationStream.cxx
+++ b/Database/RegistrationServices/src/RegistrationStream.cxx
@@ -163,7 +163,7 @@ RegistrationStream::execute()
}
void
-RegistrationStream::itemListHandler( Property& /* theProp */ )
+RegistrationStream::itemListHandler( Gaudi::Details::PropertyBase& /* theProp */ )
{
//assuming concrete SG::Folder also has an itemList property
IProperty *pAsIProp(nullptr);
@@ -175,7 +175,7 @@ RegistrationStream::itemListHandler( Property& /* theProp */ )
}
void
-RegistrationStream::ProvIncludeHandler( Property& )
+RegistrationStream::ProvIncludeHandler( Gaudi::Details::PropertyBase& )
{
std::vector<std::string> list = m_provIncludeList.value();
std::vector<std::string>::const_iterator it = list.begin();
@@ -187,7 +187,7 @@ RegistrationStream::ProvIncludeHandler( Property& )
}
void
-RegistrationStream::ProvExcludeHandler( Property& )
+RegistrationStream::ProvExcludeHandler( Gaudi::Details::PropertyBase& )
{
std::vector<std::string> list = m_provExcludeList.value();
std::vector<std::string>::const_iterator it = list.begin();
diff --git a/Database/RegistrationServices/src/RegistrationStream.h b/Database/RegistrationServices/src/RegistrationStream.h
index 2dc3f23712f..d1ba005d423 100755
--- a/Database/RegistrationServices/src/RegistrationStream.h
+++ b/Database/RegistrationServices/src/RegistrationStream.h
@@ -19,7 +19,7 @@
#ifndef ATHENAPOOLTEST_REGISTRATIONSVC_H
#define ATHENAPOOLTEST_REGISTRATIONSVC_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/IIoComponent.h"
@@ -69,13 +69,13 @@ private:
/// PRIVATE METHODS
/// Handler for ItemNames Property
- void itemListHandler( Property& );
+ void itemListHandler( Gaudi::Details::PropertyBase& );
/// Handler for ProvNames Property
- void ProvIncludeHandler( Property& );
+ void ProvIncludeHandler( Gaudi::Details::PropertyBase& );
/// Handler for ItemNames Property
- void ProvExcludeHandler( Property& );
+ void ProvExcludeHandler( Gaudi::Details::PropertyBase& );
/// NOTE that the Tools assume this list will be ordered.
/// begin = newest; end = oldest
diff --git a/Database/RegistrationServices/src/RegistrationStreamLCGTool.h b/Database/RegistrationServices/src/RegistrationStreamLCGTool.h
index 644d26909bf..d042713195a 100755
--- a/Database/RegistrationServices/src/RegistrationStreamLCGTool.h
+++ b/Database/RegistrationServices/src/RegistrationStreamLCGTool.h
@@ -22,7 +22,7 @@
//<<<<<< INCLUDES >>>>>>
#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaKernel/IRegistrationStreamTool.h"
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h
index 027f82af668..d4cf73251cd 100755
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h
+++ b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h
@@ -12,7 +12,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthService.h"
#include "StoreGate/StoreGateSvc.h"
#include "EventInfoMgt/ITagInfoMgr.h"
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictCnvTest.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictCnvTest.cxx
index 9a0ccd62123..00d98c0ac6a 100755
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictCnvTest.cxx
+++ b/DetectorDescription/IdDictDetDescrCnv/src/IdDictCnvTest.cxx
@@ -21,7 +21,7 @@
// Athena-related includes
#include "StoreGate/DataHandle.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IChronoStatSvc.h"
diff --git a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
index 402982fc97c..0e29bb5d560 100644
--- a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
+++ b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
#include "TestTools/ParallelCallTest.h"
#include "RegSelTestAlg.h"
diff --git a/DetectorDescription/RegionSelector/src/RegSelSvc.cxx b/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
index 42a4efa18f7..0ad022d9fb1 100755
--- a/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
+++ b/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
@@ -2354,10 +2354,10 @@ bool RegSelSvc::GetEnabledROBsFromOKS()
}
// get the data flow config property
- const std::vector<const Property*>* dataFlowProps = p_jobOptionSvc->getProperties("DataFlowConfig");
+ const std::vector<const Gaudi::Details::PropertyBase*>* dataFlowProps = p_jobOptionSvc->getProperties("DataFlowConfig");
// go through looking for the enabled robs
- std::vector<const Property*>::const_iterator propp(dataFlowProps->begin());
+ std::vector<const Gaudi::Details::PropertyBase*>::const_iterator propp(dataFlowProps->begin());
for ( ; propp!=dataFlowProps->end() ; propp++) {
// the enabled ROB list is found
if ( (*propp)->name() == "DF_Enabled_ROB_IDs" ) {
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
index b3ac139d287..28deebbc9aa 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
@@ -11,7 +11,7 @@
#include "EventStorage/DataReader.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "PersistentDataModel/DataHeader.h"
#include "PersistentDataModel/Token.h"
diff --git a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
index 0d7be0857d5..413376e1875 100644
--- a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
+++ b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
@@ -52,7 +52,7 @@ EventSelectorByteStream::EventSelectorByteStream(
/******************************************************************************/
-void EventSelectorByteStream::inputCollectionsHandler(Property&) {
+void EventSelectorByteStream::inputCollectionsHandler(Gaudi::Details::PropertyBase&) {
if (this->FSMState() != Gaudi::StateMachine::OFFLINE) {
this->reinit().ignore();
}
diff --git a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.h b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.h
index 53c8158a596..c8e583015f1 100644
--- a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.h
+++ b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.h
@@ -163,7 +163,7 @@ private: // properties
ByteStreamInputSvc* m_eventSource{};
Gaudi::Property<std::vector<std::string>> m_inputCollectionsProp{this, "Input", {}, ""};
mutable std::vector<std::string>::const_iterator m_inputCollectionsIterator;
- void inputCollectionsHandler(Property&);
+ void inputCollectionsHandler(Gaudi::Details::PropertyBase&);
ServiceHandle<IIncidentSvc> m_incidentSvc{this, "IncidentSvc", "IncidentSvc", ""};
ServiceHandle<ActiveStoreSvc> m_activeStoreSvc;
diff --git a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx
index 778b4ca4a85..941fc0a8aeb 100644
--- a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx
+++ b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <algorithm>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TestTools/ParallelCallTest.h"
#include "TestTools/random.h"
#include "ROBDataProviderMTTest.h"
diff --git a/Event/DumpEventDataToJSON/src/DumpEventDataToJsonAlg.cxx b/Event/DumpEventDataToJSON/src/DumpEventDataToJsonAlg.cxx
index 457b20d8dbf..7fcc956e0f6 100644
--- a/Event/DumpEventDataToJSON/src/DumpEventDataToJsonAlg.cxx
+++ b/Event/DumpEventDataToJSON/src/DumpEventDataToJsonAlg.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Algorithm.h"
#include "DumpEventDataToJsonAlg.h"
diff --git a/Event/EventBookkeeperTools/src/SkimDecisionMultiFilter.cxx b/Event/EventBookkeeperTools/src/SkimDecisionMultiFilter.cxx
index eeccddad454..f5a9fe805ea 100644
--- a/Event/EventBookkeeperTools/src/SkimDecisionMultiFilter.cxx
+++ b/Event/EventBookkeeperTools/src/SkimDecisionMultiFilter.cxx
@@ -17,7 +17,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Handy definitions for error checking
#include "AthenaKernel/errorcheck.h"
diff --git a/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h b/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h
index e19986c430e..284e2798a90 100755
--- a/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h
+++ b/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h
@@ -68,7 +68,7 @@ class INav4MomDumper : public AthAlgorithm
/// Callback method to configure the output stream into which we'll
/// dump the informations from @c INavigable4MomentumCollection
- void setupOutputStream( Property& outputStreamName );
+ void setupOutputStream( Gaudi::Details::PropertyBase& outputStreamName );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/Event/EventCommonAlgs/src/I4MomDumper.cxx b/Event/EventCommonAlgs/src/I4MomDumper.cxx
index 9cff05b2071..0a27efd9c5f 100644
--- a/Event/EventCommonAlgs/src/I4MomDumper.cxx
+++ b/Event/EventCommonAlgs/src/I4MomDumper.cxx
@@ -21,7 +21,7 @@
#include <boost/array.hpp>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// NavFourMom includes
#include "NavFourMom/INavigable4MomentumCollection.h"
@@ -273,7 +273,7 @@ I4MomDumper::dump( const std::string& collName )
// Non-const methods:
///////////////////////////////////////////////////////////////////
-void I4MomDumper::setupDisplay( Property& /*displayName*/ )
+void I4MomDumper::setupDisplay( Gaudi::Details::PropertyBase& /*displayName*/ )
{
std::string& display = const_cast<std::string&>(m_displayName.value());
@@ -296,7 +296,7 @@ void I4MomDumper::setupDisplay( Property& /*displayName*/ )
return;
}
-void I4MomDumper::setupOutputStream( Property& /*outputStreamName*/ )
+void I4MomDumper::setupOutputStream( Gaudi::Details::PropertyBase& /*outputStreamName*/ )
{
// reset internal state
if ( m_outputStream &&
diff --git a/Event/EventCommonAlgs/src/I4MomDumper.h b/Event/EventCommonAlgs/src/I4MomDumper.h
index 8043507d0f4..72bb3d6df48 100644
--- a/Event/EventCommonAlgs/src/I4MomDumper.h
+++ b/Event/EventCommonAlgs/src/I4MomDumper.h
@@ -81,11 +81,11 @@ class I4MomDumper : public AthAlgorithm
/// Callback method to configure the display property which will tell how to
/// dump the informations from @c I4MomentumCollection
- void setupDisplay( Property& display );
+ void setupDisplay( Gaudi::Details::PropertyBase& display );
/// Callback method to configure the output stream into which we'll
/// dump the informations from @c I4MomentumCollection
- void setupOutputStream( Property& outputStreamName );
+ void setupOutputStream( Gaudi::Details::PropertyBase& outputStreamName );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/Event/EventCommonAlgs/src/INav4MomDumper.cxx b/Event/EventCommonAlgs/src/INav4MomDumper.cxx
index 32e38d82323..c849efaf83a 100755
--- a/Event/EventCommonAlgs/src/INav4MomDumper.cxx
+++ b/Event/EventCommonAlgs/src/INav4MomDumper.cxx
@@ -18,7 +18,7 @@
#include <set>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// NavFourMom includes
#include "NavFourMom/INavigable4MomentumCollection.h"
@@ -201,7 +201,7 @@ INav4MomDumper::dump( const std::string& collName )
// Non-const methods:
///////////////////////////////////////////////////////////////////
-void INav4MomDumper::setupOutputStream( Property& /*outputStreamName*/ )
+void INav4MomDumper::setupOutputStream( Gaudi::Details::PropertyBase& /*outputStreamName*/ )
{
// reset internal state
if ( m_outputStream &&
diff --git a/Event/xAOD/xAODCoreCnv/src/ROOTHeaderLoaderSvc.h b/Event/xAOD/xAODCoreCnv/src/ROOTHeaderLoaderSvc.h
index b1ef5899776..d613e7cbe15 100644
--- a/Event/xAOD/xAODCoreCnv/src/ROOTHeaderLoaderSvc.h
+++ b/Event/xAOD/xAODCoreCnv/src/ROOTHeaderLoaderSvc.h
@@ -10,7 +10,7 @@
// Framework include(s).
#include "AthenaBaseComps/AthService.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// System include(s).
#include <string>
diff --git a/Event/xAOD/xAODJetCnv/src/JetCnvAlg.cxx b/Event/xAOD/xAODJetCnv/src/JetCnvAlg.cxx
index a551aca8817..7996dc153c7 100644
--- a/Event/xAOD/xAODJetCnv/src/JetCnvAlg.cxx
+++ b/Event/xAOD/xAODJetCnv/src/JetCnvAlg.cxx
@@ -23,7 +23,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/errorcheck.h"
diff --git a/Event/xAOD/xAODTauCnv/src/TauJetCnvAlg.cxx b/Event/xAOD/xAODTauCnv/src/TauJetCnvAlg.cxx
index 39a21de377b..82804676bd2 100644
--- a/Event/xAOD/xAODTauCnv/src/TauJetCnvAlg.cxx
+++ b/Event/xAOD/xAODTauCnv/src/TauJetCnvAlg.cxx
@@ -23,7 +23,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/errorcheck.h"
diff --git a/Event/xAOD/xAODTauCnv/src/TauJetCnvTool.cxx b/Event/xAOD/xAODTauCnv/src/TauJetCnvTool.cxx
index 8d992554722..e5ce18c418e 100644
--- a/Event/xAOD/xAODTauCnv/src/TauJetCnvTool.cxx
+++ b/Event/xAOD/xAODTauCnv/src/TauJetCnvTool.cxx
@@ -16,7 +16,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/errorcheck.h"
diff --git a/ForwardDetectors/AFP/AFP_Digitization/AFP_Digitization/AFP_PileUpTool.h b/ForwardDetectors/AFP/AFP_Digitization/AFP_Digitization/AFP_PileUpTool.h
index 766d84bf269..f4e3584436b 100644
--- a/ForwardDetectors/AFP/AFP_Digitization/AFP_Digitization/AFP_PileUpTool.h
+++ b/ForwardDetectors/AFP/AFP_Digitization/AFP_Digitization/AFP_PileUpTool.h
@@ -10,7 +10,7 @@
#include "xAODEventInfo/EventAuxInfo.h" // NEW EDM
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx
index 299c8768d16..4782ef71ade 100644
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx
+++ b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx
@@ -23,7 +23,7 @@
// FrameWork includes
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/ALFA_Digitization/ALFA_PileUpTool.h b/ForwardDetectors/ALFA/ALFA_Digitization/ALFA_Digitization/ALFA_PileUpTool.h
index 197b3f6f513..4e39ff15e86 100644
--- a/ForwardDetectors/ALFA/ALFA_Digitization/ALFA_Digitization/ALFA_PileUpTool.h
+++ b/ForwardDetectors/ALFA/ALFA_Digitization/ALFA_Digitization/ALFA_PileUpTool.h
@@ -7,7 +7,7 @@
#include "PileUpTools/PileUpToolBase.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.h b/ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.h
index 57696b81e7e..ea82d17884e 100644
--- a/ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.h
+++ b/ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.h
@@ -17,7 +17,7 @@
#include "PileUpTools/PileUpMergeSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include <vector>
diff --git a/ForwardDetectors/ZDC/ZDC_SimuDigitization/ZDC_SimuDigitization/ZDC_PileUpTool.h b/ForwardDetectors/ZDC/ZDC_SimuDigitization/ZDC_SimuDigitization/ZDC_PileUpTool.h
index c36fc37aa67..4fd5d394caa 100644
--- a/ForwardDetectors/ZDC/ZDC_SimuDigitization/ZDC_SimuDigitization/ZDC_PileUpTool.h
+++ b/ForwardDetectors/ZDC/ZDC_SimuDigitization/ZDC_SimuDigitization/ZDC_PileUpTool.h
@@ -6,7 +6,7 @@
#define ZDC_DIGITIZATION_TOOL_H
#include "PileUpTools/PileUpToolBase.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
diff --git a/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx b/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx
index 58a6b8b7bb6..dd16e15f27b 100644
--- a/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx
+++ b/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx
@@ -14,7 +14,7 @@
//
/////////////////////////////////////////////////////////////
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "AthContainers/DataVector.h"
diff --git a/Generators/HepMCAnalysis_i/src/GetEvents.cxx b/Generators/HepMCAnalysis_i/src/GetEvents.cxx
index 693bc84995c..47c56f63169 100644
--- a/Generators/HepMCAnalysis_i/src/GetEvents.cxx
+++ b/Generators/HepMCAnalysis_i/src/GetEvents.cxx
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
diff --git a/Generators/HepMCAnalysis_i/src/HepMCAnalysis.cxx b/Generators/HepMCAnalysis_i/src/HepMCAnalysis.cxx
index 1b4b25141e9..d954a4898b2 100644
--- a/Generators/HepMCAnalysis_i/src/HepMCAnalysis.cxx
+++ b/Generators/HepMCAnalysis_i/src/HepMCAnalysis.cxx
@@ -11,7 +11,7 @@
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// ROOT
#include "TFile.h"
diff --git a/Generators/HforTool/src/HforTool.cxx b/Generators/HforTool/src/HforTool.cxx
index edf429a9a14..22e8bdb2330 100644
--- a/Generators/HforTool/src/HforTool.cxx
+++ b/Generators/HforTool/src/HforTool.cxx
@@ -13,7 +13,7 @@
#include <cmath>
#include <set>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GeneratorObjects/McEventCollection.h"
#include "TruthUtils/GeneratorName.h"
diff --git a/Generators/McAsciiEventSelector/src/McAsciiEventSelector.h b/Generators/McAsciiEventSelector/src/McAsciiEventSelector.h
index 897ed1464dd..23faf44f309 100644
--- a/Generators/McAsciiEventSelector/src/McAsciiEventSelector.h
+++ b/Generators/McAsciiEventSelector/src/McAsciiEventSelector.h
@@ -19,7 +19,7 @@
// Gaudi includes
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
// Forward declaration
diff --git a/Generators/McEventSelector/McEventSelector/McEventSelector.h b/Generators/McEventSelector/McEventSelector/McEventSelector.h
index 5609eeda5bc..3bd969807e3 100644
--- a/Generators/McEventSelector/McEventSelector/McEventSelector.h
+++ b/Generators/McEventSelector/McEventSelector/McEventSelector.h
@@ -25,7 +25,7 @@
// Include files
#include "GaudiKernel/IEvtSelector.h"
#include "AthenaBaseComps/AthService.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/MsgStream.h"
#include "AthenaKernel/IEvtSelectorSeek.h"
diff --git a/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.cxx b/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.cxx
index 554278d4728..b689a76c115 100644
--- a/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.cxx
+++ b/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.cxx
@@ -523,7 +523,7 @@ StatusCode ByteStreamEmonInputSvc::start()
return StatusCode::SUCCESS;
}
-void ByteStreamEmonInputSvc::updateHandler(Property& /* p */)
+void ByteStreamEmonInputSvc::updateHandler(Gaudi::Details::PropertyBase& /* p */)
{
if(! m_connect) {
m_connect = true;
diff --git a/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.h b/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.h
index 4fb124f5a16..b093dc084ed 100644
--- a/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.h
+++ b/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.h
@@ -54,7 +54,7 @@ private:
void check_publish();
void get_runparams();
- void updateHandler(Property& p);
+ void updateHandler(Gaudi::Details::PropertyBase& p);
int m_totalEventCounter{0}; //!< event Counter
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/L2muCalibTest.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/L2muCalibTest.cxx
index 1742ca3f8fb..2a724a9fcc2 100755
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/L2muCalibTest.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/L2muCalibTest.cxx
@@ -88,11 +88,11 @@ StatusCode L2muCalibTest::initialize(){
ATH_MSG_INFO("Dump of the property catalogue.... ");
std::vector<std::string> clients = m_jobOptionsSvc->getClients();
std::vector<std::string>::iterator cit;
- std::vector<const Property*>::const_iterator pit;
+ std::vector<const Gaudi::Details::PropertyBase*>::const_iterator pit;
for( cit = clients.begin(); cit != clients.end(); cit++ ) {
ATH_MSG_INFO(" Properties of " << *cit << ": ";
- const std::vector<const Property*>* properties = m_jobOptionsSvc->getProperties(*cit);
+ const std::vector<const Gaudi::Details::PropertyBase*>* properties = m_jobOptionsSvc->getProperties(*cit);
for( pit = properties->begin(); pit != properties->end(); pit++ ) {
log << (*pit)->name();
if( (pit+1) != properties->end()) log << ", ";
@@ -112,11 +112,11 @@ StatusCode L2muCalibTest::initialize(){
// Find the Data Flow application name
bool df_found = false;
- const std::vector<const Property*>* dataFlowProps = m_jobOptionsSvc->getProperties("DataFlowConfig");
+ const std::vector<const Gaudi::Details::PropertyBase*>* dataFlowProps = m_jobOptionsSvc->getProperties("DataFlowConfig");
if ( dataFlowProps ) {
ATH_MSG_INFO(" Properties available for 'DataFlowConfig': number = " << dataFlowProps->size());
ATH_MSG_INFO(" --------------------------------------------------- ");
- for ( std::vector<const Property*>::const_iterator cur = dataFlowProps->begin();
+ for ( std::vector<const Gaudi::Details::PropertyBase*>::const_iterator cur = dataFlowProps->begin();
cur != dataFlowProps->end(); cur++) {
ATH_MSG_INFO((*cur)->name() << " = " << (*cur)->toString());
// the application name is found
diff --git a/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx b/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
index a7239413683..d54b3ec225b 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
+++ b/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
@@ -33,7 +33,7 @@
#include "GaudiKernel/IAlgManager.h"
#include "GaudiKernel/IAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/System.h"
#include <sstream>
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
index 86286ece898..6f75db450c8 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
@@ -109,12 +109,12 @@ StatusCode HltROBDataProviderSvc::initialize()
if ((p_jobOptionsSvc.retrieve()).isFailure()) {
ATH_MSG_ERROR("Could not find JobOptionsSvc");
} else {
- const std::vector<const Property*>* dataFlowProps = p_jobOptionsSvc->getProperties("DataFlowConfig");
+ const std::vector<const Gaudi::Details::PropertyBase*>* dataFlowProps = p_jobOptionsSvc->getProperties("DataFlowConfig");
if(!dataFlowProps)
ATH_MSG_ERROR("Could not find DataFlowConfig properties");
else
{
- for ( const Property* cur : *dataFlowProps ) {
+ for ( const Gaudi::Details::PropertyBase* cur : *dataFlowProps ) {
// the enabled ROB list is found
if ( cur->name() == "DF_Enabled_ROB_IDs" ) {
if (m_enabledROBs.assign(*cur)) {
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.h b/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.h
index 7024f899569..eea8a1f06a7 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.h
@@ -23,7 +23,7 @@
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/IMessageSvc.h"
#include "GaudiKernel/Message.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/StatusCode.h"
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h
index 31a63fcae8c..577137b2e77 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h
@@ -24,7 +24,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <map>
#include <stdint.h>
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.h
index baa8ae82c44..72d5cf38853 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.h
@@ -24,7 +24,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelChargeCalibCondAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.h
index 4d762b8985f..fd251509c4b 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.h
@@ -24,7 +24,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelChargeLUTCalibCondAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
index ebb5a04ad27..507ddcd915a 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
@@ -21,7 +21,7 @@
#include "PixelConditionsData/PixelModuleData.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
class PixelConfigCondAlg : public AthReentrantAlgorithm {
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondHVAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondHVAlg.h
index b53d9c22bb0..46a0518006f 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondHVAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondHVAlg.h
@@ -23,7 +23,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelDCSCondHVAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.h
index 9299af32900..6555a6287ca 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.h
@@ -23,7 +23,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelDCSCondStateAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.h
index fe94f516b9c..c50e26c24fc 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.h
@@ -23,7 +23,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelDCSCondStatusAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondTempAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondTempAlg.h
index 6f392dc81c1..4b1d35a66eb 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondTempAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondTempAlg.h
@@ -23,7 +23,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelDCSCondTempAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.h
index cd76863789c..c4e2ff1b5a6 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.h
@@ -21,7 +21,7 @@
#include "PixelConditionsData/PixelDeadMapCondData.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelDeadMapCondAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDistortionAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDistortionAlg.h
index 17fa99956bd..3ed58ff2ecf 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDistortionAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDistortionAlg.h
@@ -24,7 +24,7 @@
#include "AthenaKernel/IAthRNGSvc.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelDistortionAlg : public AthAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h
index cdb463b0d8f..fa87f022cfe 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h
@@ -21,7 +21,7 @@
#include "PixelConditionsData/PixelHitDiscCnfgData.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelHitDiscCnfgAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelOfflineCalibCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelOfflineCalibCondAlg.h
index c2a600172ee..0f4fd31ce3a 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelOfflineCalibCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelOfflineCalibCondAlg.h
@@ -20,7 +20,7 @@
#include "PixelConditionsData/PixelOfflineCalibData.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelOfflineCalibCondAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelReadoutSpeedAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelReadoutSpeedAlg.h
index afc8034ec6f..8021f2d950d 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelReadoutSpeedAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelReadoutSpeedAlg.h
@@ -20,7 +20,7 @@
#include "PixelConditionsData/PixelReadoutSpeedData.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelReadoutSpeedAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.h
index 1285b56fae4..77e01c616b8 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.h
@@ -23,7 +23,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelTDAQCondAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixeldEdxAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixeldEdxAlg.h
index 8d3f29a6b61..2a1943c9e4c 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixeldEdxAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixeldEdxAlg.h
@@ -23,7 +23,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixeldEdxAlg : public AthAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.h
index 5c64fe2f621..5d806321532 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.h
@@ -16,7 +16,7 @@
#include "SCT_Cabling/ISCT_CablingTool.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class SCT_ConditionsParameterCondAlg : public AthReentrantAlgorithm
{
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.h
index fc6d40baafd..3c28e48000d 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.h
@@ -15,7 +15,7 @@
#include "StoreGate/WriteCondHandleKey.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class SCT_DCSConditionsHVCondAlg : public AthReentrantAlgorithm
{
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.h
index 7afb429279f..68f5459642f 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.h
@@ -16,7 +16,7 @@
#include "SCT_ConditionsData/SCT_DCSStatCondData.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class SCT_DCSConditionsStatCondAlg : public AthReentrantAlgorithm
{
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.h
index 31e9762ed7e..60344684e1e 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.h
@@ -15,7 +15,7 @@
#include "StoreGate/WriteCondHandleKey.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class SCT_DCSConditionsTempCondAlg : public AthReentrantAlgorithm
{
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.h
index a4485d7c95d..5bceda668f4 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.h
@@ -15,7 +15,7 @@
#include "StoreGate/WriteCondHandleKey.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class SCT_ModuleVetoCondAlg : public AthReentrantAlgorithm
{
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h
index ba692aa027f..c074d512ece 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h
@@ -12,7 +12,7 @@
// Include Gaudi classes
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Include Athena classes
#include "StoreGate/ReadCondHandleKey.h"
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h
index f6415cc34da..559def8a43e 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h
@@ -18,7 +18,7 @@
// Include Gaudi classes
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Forward declarations
class SCT_ID;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.h
index 9aa54516768..c3af5b1b530 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.h
@@ -18,7 +18,7 @@
#include "SCT_ConditionsData/SCT_AllGoodStripInfo.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <map>
#include <vector>
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.h
index 2cc101be468..1fb88df9394 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.h
@@ -26,7 +26,7 @@
#include "SCT_ConditionsData/SCT_DCSStatCondData.h"
// Gaudi
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/EventContext.h"
// STL
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTActiveCondAlg.h b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTActiveCondAlg.h
index c00834999bc..114f0d7c83b 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTActiveCondAlg.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTActiveCondAlg.h
@@ -12,7 +12,7 @@
#include "TRT_ConditionsData/ActiveFraction.h"
#include "TRT_ConditionsServices/ITRT_StrawStatusSummaryTool.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TRT_ReadoutGeometry/TRT_DetElementContainer.h"
class TRT_ID;
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHTCondAlg.h b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHTCondAlg.h
index da9e82d9cd9..a1953cdd1ea 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHTCondAlg.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHTCondAlg.h
@@ -10,7 +10,7 @@
#include "TRT_ConditionsData/HTcalculator.h"
#include "AthenaPoolUtilities/CondAttrListVec.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class TRTHTCondAlg : public AthAlgorithm
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHWMapCondAlg.h b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHWMapCondAlg.h
index 137af71810f..fa3b37a347b 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHWMapCondAlg.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHWMapCondAlg.h
@@ -12,7 +12,7 @@
#include "StoreGate/WriteCondHandleKey.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TRT_ConditionsData/HWMap.h"
class TRTHWMapCondAlg : public AthAlgorithm
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTPhaseCondAlg.h b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTPhaseCondAlg.h
index afec6df0873..47616fdf2c4 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTPhaseCondAlg.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTPhaseCondAlg.h
@@ -11,7 +11,7 @@
#include "TRT_ConditionsData/AverageT0.h"
#include "TRT_ConditionsServices/ITRT_CalDbTool.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class TRT_ID;
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawCondAlg.h b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawCondAlg.h
index 82de377a6f3..caeb927bbed 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawCondAlg.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawCondAlg.h
@@ -12,7 +12,7 @@
#include "TRT_ConditionsData/AliveStraws.h"
#include "TRT_ConditionsServices/ITRT_StrawStatusSummaryTool.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TRT_ReadoutGeometry/TRT_DetElementContainer.h"
class TRT_ID;
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTToTCondAlg.h b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTToTCondAlg.h
index 0d5bee1aa26..2ab12c34285 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTToTCondAlg.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTToTCondAlg.h
@@ -14,7 +14,7 @@
#include "AthenaPoolUtilities/CondAttrListVec.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TRT_ConditionsData/TRTDedxcorrection.h"
class TRTToTCondAlg : public AthAlgorithm
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/PixelGeoModel/IBLParameterSvc.h b/InnerDetector/InDetDetDescr/PixelGeoModel/PixelGeoModel/IBLParameterSvc.h
index c9fe48584d0..2903a58153b 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/PixelGeoModel/IBLParameterSvc.h
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/PixelGeoModel/IBLParameterSvc.h
@@ -15,7 +15,7 @@
#include "PixelGeoModel/IIBLParameterSvc.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/IInterface.h"
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/EnergyDepositionTool.h b/InnerDetector/InDetDigitization/PixelDigitization/src/EnergyDepositionTool.h
index c8c85adba0c..05c5f05704c 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/EnergyDepositionTool.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/EnergyDepositionTool.h
@@ -15,7 +15,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "CLHEP/Random/RandomEngine.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "HitManagement/TimedHitPtr.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/FrontEndSimTool.h b/InnerDetector/InDetDigitization/PixelDigitization/src/FrontEndSimTool.h
index e588da71f56..66dadbf42c9 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/FrontEndSimTool.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/FrontEndSimTool.h
@@ -6,7 +6,7 @@
#define PIXELDIGITIZATION_FrontEndSimTool_H
#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "CLHEP/Random/RandomEngine.h"
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/RadDamageUtil.h b/InnerDetector/InDetDigitization/PixelDigitization/src/RadDamageUtil.h
index cf9729d43f3..fba016124e8 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/RadDamageUtil.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/RadDamageUtil.h
@@ -14,7 +14,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
#include "SiDigitization/SiChargedDiodeCollection.h"
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.cxx b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.cxx
index 9291b800929..ea71b48bc6f 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.cxx
@@ -490,7 +490,7 @@ StatusCode SCT_DigitizationTool::processBunchXing(int bunchXing,
// =========================================================================
// property handlers
// =========================================================================
-void SCT_DigitizationTool::SetupRdoOutputType(Property &) {
+void SCT_DigitizationTool::SetupRdoOutputType(Gaudi::Details::PropertyBase &) {
}
// Does nothing, but required by Gaudi
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.h b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.h
index 8cbb364564d..2f49b7bfc93 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.h
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.h
@@ -116,7 +116,7 @@ private:
/**
@brief Called when m_WriteSCT1_RawData is altered. Does nothing, but required by Gaudi.
*/
- void SetupRdoOutputType(Property&);
+ void SetupRdoOutputType(Gaudi::Details::PropertyBase&);
FloatProperty m_tfix{this, "FixedTime", -999., "Fixed time for Cosmics run selection"};
BooleanProperty m_enableHits{this, "EnableHits", true, "Enable hits"};
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx
index c7b75cbfd7e..6b600dd9992 100755
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx
@@ -18,7 +18,7 @@ PURPOSE: Create a simple ntuple to perform EoverP studies with
// INCLUDE GAUDI HEADER FILES:
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include <algorithm>
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/TrackVertexAssoTestAlg.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/TrackVertexAssoTestAlg.cxx
index 9387be90b3f..e19c0bcc4c7 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/TrackVertexAssoTestAlg.cxx
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/TrackVertexAssoTestAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/Vertex.h"
diff --git a/LArCalorimeter/LArCalibUtils/src/LArPedestalInPhysicsMaker.cxx b/LArCalorimeter/LArCalibUtils/src/LArPedestalInPhysicsMaker.cxx
index 4a492c9aefc..bee6e56b742 100755
--- a/LArCalorimeter/LArCalibUtils/src/LArPedestalInPhysicsMaker.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArPedestalInPhysicsMaker.cxx
@@ -21,7 +21,7 @@
// Include files
#include "LArCalibUtils/LArPedestalInPhysicsMaker.h"
-//#include "GaudiKernel/Property.h"
+//#include "Gaudi/Property.h"
//#include "GaudiKernel/ListItem.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.h b/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.h
index 61fb2607958..31bcb7a0148 100644
--- a/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.h
+++ b/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.h
@@ -31,7 +31,7 @@
// Headerfile
#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandleKey.h"
#include "CaloInterface/ICaloCellMakerTool.h"
#include "Identifier/Identifier.h"
diff --git a/LArCalorimeter/LArCellRec/src/LArHVFraction.h b/LArCalorimeter/LArCellRec/src/LArHVFraction.h
index 22837d5dca8..c17189aecf0 100644
--- a/LArCalorimeter/LArCellRec/src/LArHVFraction.h
+++ b/LArCalorimeter/LArCellRec/src/LArHVFraction.h
@@ -9,7 +9,7 @@
#include "LArCabling/LArOnOffIdMapping.h"
#include "LArElecCalib/ILArHVScaleCorr.h"
#include "CaloEvent/CaloClusterCellLink.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CaloInterface/ILArHVFraction.h"
diff --git a/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx b/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx
index becac234003..5b469210fba 100644
--- a/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx
@@ -5,7 +5,7 @@
#include "LArTimeVetoAlg.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "LArRecEvent/LArEventBitInfo.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODEventInfo/EventInfo.h"
//Constructor
diff --git a/LArCalorimeter/LArClusterRec/LArClusterRec/LArClusterCollisionTimeAlg.h b/LArCalorimeter/LArClusterRec/LArClusterRec/LArClusterCollisionTimeAlg.h
index a9a86abdc01..7f6d4fd45ac 100644
--- a/LArCalorimeter/LArClusterRec/LArClusterRec/LArClusterCollisionTimeAlg.h
+++ b/LArCalorimeter/LArClusterRec/LArClusterRec/LArClusterCollisionTimeAlg.h
@@ -5,7 +5,7 @@
#ifndef LARCLUSTERCOLLISIONTIMEALG_H
#define LARCLUSTERCOLLISIONTIMEALG_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "xAODCaloEvent/CaloClusterContainer.h"
diff --git a/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx b/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx
index 05f9cce8c16..d09418a3424 100644
--- a/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx
+++ b/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx
@@ -3,7 +3,7 @@
*/
#include "LArHV2Ntuple.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/NTuple.h"
#include "LArHV/LArHVManager.h"
diff --git a/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx b/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
index b010ca6f99a..a84edad0c16 100755
--- a/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
+++ b/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
@@ -10,7 +10,7 @@
#include "LArDetDescr/LArRecoMaterialTool.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGate.h"
diff --git a/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx b/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx
index a66d51ff0ae..93337f14065 100755
--- a/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx
+++ b/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx
@@ -9,7 +9,7 @@
#include "LArDetDescr/LArRecoSimpleGeomTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IToolSvc.h"
#include <vector>
diff --git a/LArCalorimeter/LArDigitization/LArDigitization/LArHitFilter.h b/LArCalorimeter/LArDigitization/LArDigitization/LArHitFilter.h
index 307e0417868..f213bd1c5dd 100755
--- a/LArCalorimeter/LArDigitization/LArDigitization/LArHitFilter.h
+++ b/LArCalorimeter/LArDigitization/LArDigitization/LArHitFilter.h
@@ -7,7 +7,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
#include "LArSimEvent/LArHitContainer.h"
diff --git a/LArCalorimeter/LArDigitization/LArDigitization/LArHitMerger.h b/LArCalorimeter/LArDigitization/LArDigitization/LArHitMerger.h
index eef0fbba6a2..2ddad1c3125 100755
--- a/LArCalorimeter/LArDigitization/LArDigitization/LArHitMerger.h
+++ b/LArCalorimeter/LArDigitization/LArDigitization/LArHitMerger.h
@@ -7,7 +7,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <vector>
class StoreGateSvc;
diff --git a/LArCalorimeter/LArDigitization/LArDigitization/LArPileUpTool.h b/LArCalorimeter/LArDigitization/LArDigitization/LArPileUpTool.h
index 15a59254236..8b086ffe668 100755
--- a/LArCalorimeter/LArDigitization/LArDigitization/LArPileUpTool.h
+++ b/LArCalorimeter/LArDigitization/LArDigitization/LArPileUpTool.h
@@ -38,7 +38,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadCondHandle.h"
#include "StoreGate/WriteHandleKey.h"
#include "StoreGate/WriteHandle.h"
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloDDE.cxx b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloDDE.cxx
index 6bf43084e6b..ec51253979a 100755
--- a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloDDE.cxx
+++ b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloDDE.cxx
@@ -7,7 +7,7 @@
// Athena related
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <algorithm>
#include "StoreGate/StoreGateSvc.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloGeom.cxx b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloGeom.cxx
index d12b85eac37..8b723c03765 100755
--- a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloGeom.cxx
+++ b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloGeom.cxx
@@ -7,7 +7,7 @@
// Athena related
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IService.h"
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArMaterial.cxx b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArMaterial.cxx
index 3a602ec7a97..65184a94183 100755
--- a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArMaterial.cxx
+++ b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArMaterial.cxx
@@ -6,7 +6,7 @@
#include "TestLArDetDescr/TestLArMaterial.h"
// Athena related
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IService.h"
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArTT.cxx b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArTT.cxx
index b5fbc5f9a51..07eda3a9d18 100755
--- a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArTT.cxx
+++ b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArTT.cxx
@@ -7,7 +7,7 @@
// Athena related
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <algorithm>
#include "StoreGate/StoreGateSvc.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx
index 8a0e17f3737..36454b8526b 100644
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx
@@ -9,7 +9,7 @@
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IChronoStatSvc.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx
index 04cc746a215..121a934fe1e 100644
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx
@@ -10,7 +10,7 @@
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IChronoStatSvc.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx
index 5f7f83a3f19..82aa191d9fb 100644
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx
@@ -10,7 +10,7 @@
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IChronoStatSvc.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/testTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/testTTMap_Algo.cxx
index 429d33895df..c7f5e171baf 100755
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/testTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/testTTMap_Algo.cxx
@@ -9,7 +9,7 @@
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IChronoStatSvc.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/updateTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/updateTTMap_Algo.cxx
index 03e639bf7fc..5ccc92e103d 100644
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/updateTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/updateTTMap_Algo.cxx
@@ -9,7 +9,7 @@
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IChronoStatSvc.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.cc b/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.cc
index 2e9512a429d..c3231a9bc67 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.cc
@@ -31,7 +31,7 @@ namespace LArG4 {
declareProperty("GeometryCalculator",m_geometryCalculator);
}
- void CalibrationCalculator::WheelTypeHandler(Property&)
+ void CalibrationCalculator::WheelTypeHandler(Gaudi::Details::PropertyBase&)
{
switch(m_wcalc_tProp.value())
{
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.h b/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.h
index d66577ab547..eaa187f89bd 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.h
@@ -52,7 +52,7 @@ namespace LArG4 {
CalibrationCalculator(const std::string& name, ISvcLocator *pSvcLocator);
virtual ~CalibrationCalculator();
// Update handler
- void WheelTypeHandler(Property&);
+ void WheelTypeHandler(Gaudi::Details::PropertyBase&);
StatusCode initialize() override final;
// The Process method returns a boolean value. If it's true, the
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.cc b/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.cc
index df9e480f7c5..416f9b29703 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.cc
@@ -210,7 +210,7 @@ EnergyCalculator::EnergyCalculator(const std::string& name, ISvcLocator *pSvcLoc
declareProperty("zSide",m_zside);
}
-void EnergyCalculator::CorrectionTypeHandler(Property&)
+void EnergyCalculator::CorrectionTypeHandler(Gaudi::Details::PropertyBase&)
{
switch(m_corrProp.value())
{
@@ -235,7 +235,7 @@ void EnergyCalculator::CorrectionTypeHandler(Property&)
}
}
-void EnergyCalculator::SolidTypeHandler(Property&)
+void EnergyCalculator::SolidTypeHandler(Gaudi::Details::PropertyBase&)
{
switch(m_solidtypeProp.value())
{
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.h b/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.h
index 0e29d9ae0f5..c2cf362a11d 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.h
@@ -54,8 +54,8 @@ namespace LArG4 {
EnergyCalculator(const std::string& name, ISvcLocator *pSvcLocator);
// Update handlers
- void CorrectionTypeHandler(Property&);
- void SolidTypeHandler(Property&);
+ void CorrectionTypeHandler(Gaudi::Details::PropertyBase&);
+ void SolidTypeHandler(Gaudi::Details::PropertyBase&);
virtual StatusCode initialize() override final;
virtual StatusCode finalize() override final;
diff --git a/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h b/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h
index 4b38112f63f..e32f47170c1 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h
+++ b/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h
@@ -11,7 +11,7 @@
// Minimal service includes
#include "GaudiKernel/StatusCode.h"
//#include "GaudiKernel/Service.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "G4Electron.hh"
#include "G4Positron.hh"
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.cc b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.cc
index 8a3a014d790..d0e4b78b36d 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.cc
@@ -28,7 +28,7 @@ namespace LArG4 {
m_geometryTypeProp.declareUpdateHandler(&LArHECCalibrationWheelCalculator::GeometryTypeUpdateHandler, this);
}
- void LArHECCalibrationWheelCalculator::GeometryTypeUpdateHandler(Property&)
+ void LArHECCalibrationWheelCalculator::GeometryTypeUpdateHandler(Gaudi::Details::PropertyBase&)
{
switch(m_geometryTypeProp.value())
{
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.h b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.h
index a9e5562d453..dd1ad300a78 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.h
@@ -27,7 +27,7 @@ namespace LArG4 {
public:
LArHECCalibrationWheelCalculator(const std::string& name, ISvcLocator *pSvcLocator);
- void GeometryTypeUpdateHandler(Property&);
+ void GeometryTypeUpdateHandler(Gaudi::Details::PropertyBase&);
StatusCode initialize() override final;
virtual ~LArHECCalibrationWheelCalculator();
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.cc b/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.cc
index 914abae8272..c50b71729dd 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.cc
@@ -28,7 +28,7 @@ namespace LArG4 {
#endif
}
- void LocalCalibrationCalculator::GeometryTypeUpdateHandler(Property&)
+ void LocalCalibrationCalculator::GeometryTypeUpdateHandler(Gaudi::Details::PropertyBase&)
{
std::string geoTypeString = m_strgeometryType.value();
std::transform(geoTypeString.begin(), geoTypeString.end(),geoTypeString.begin(), ::toupper);
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.h b/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.h
index 1985b52903a..8899a81f6be 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.h
@@ -26,7 +26,7 @@ namespace LArG4 {
public:
LocalCalibrationCalculator(const std::string& name, ISvcLocator *pSvcLocatorconst);
- void GeometryTypeUpdateHandler(Property&);
+ void GeometryTypeUpdateHandler(Gaudi::Details::PropertyBase&);
StatusCode initialize() override final;
virtual ~LocalCalibrationCalculator();
diff --git a/LArCalorimeter/LArL1Sim/LArL1Sim/LArSCL1Maker.h b/LArCalorimeter/LArL1Sim/LArL1Sim/LArSCL1Maker.h
index f50d4925c21..ae48f24264a 100644
--- a/LArCalorimeter/LArL1Sim/LArL1Sim/LArSCL1Maker.h
+++ b/LArCalorimeter/LArL1Sim/LArL1Sim/LArSCL1Maker.h
@@ -16,7 +16,7 @@
//
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "LArDigitization/LArHitEMap.h"
diff --git a/LArCalorimeter/LArL1Sim/LArL1Sim/LArTTL1Maker.h b/LArCalorimeter/LArL1Sim/LArL1Sim/LArTTL1Maker.h
index 0d7e718c96c..167d00b1de2 100755
--- a/LArCalorimeter/LArL1Sim/LArL1Sim/LArTTL1Maker.h
+++ b/LArCalorimeter/LArL1Sim/LArL1Sim/LArTTL1Maker.h
@@ -16,7 +16,7 @@
//
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "LArDigitization/LArHitEMap.h"
diff --git a/LArCalorimeter/LArL1Sim/src/LArSCL1Maker.cxx b/LArCalorimeter/LArL1Sim/src/LArSCL1Maker.cxx
index 6635deb48a6..a1eab237b70 100755
--- a/LArCalorimeter/LArL1Sim/src/LArSCL1Maker.cxx
+++ b/LArCalorimeter/LArL1Sim/src/LArSCL1Maker.cxx
@@ -43,7 +43,7 @@
// ........ Gaudi needed includes
//
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IChronoStatSvc.h"
diff --git a/LArCalorimeter/LArL1Sim/src/LArTTL1Calib.cxx b/LArCalorimeter/LArL1Sim/src/LArTTL1Calib.cxx
index b98e3916705..c9a25c368de 100755
--- a/LArCalorimeter/LArL1Sim/src/LArTTL1Calib.cxx
+++ b/LArCalorimeter/LArL1Sim/src/LArTTL1Calib.cxx
@@ -23,7 +23,7 @@
//
// ........ Gaudi needed includes
//
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/INTupleSvc.h"
diff --git a/LArCalorimeter/LArSim/src/LArFakeHitProducer.cxx b/LArCalorimeter/LArSim/src/LArFakeHitProducer.cxx
index 7ec4b8eec73..b33f0e44bbc 100755
--- a/LArCalorimeter/LArSim/src/LArFakeHitProducer.cxx
+++ b/LArCalorimeter/LArSim/src/LArFakeHitProducer.cxx
@@ -5,7 +5,7 @@
#include "LArSim/LArFakeHitProducer.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IDataProviderSvc.h"
diff --git a/LArCalorimeter/LArSim/src/LArHitMaker.cxx b/LArCalorimeter/LArSim/src/LArHitMaker.cxx
index 5a49c6f4b34..df0b3e34539 100755
--- a/LArCalorimeter/LArSim/src/LArHitMaker.cxx
+++ b/LArCalorimeter/LArSim/src/LArHitMaker.cxx
@@ -6,7 +6,7 @@
#include "LArSim/LArHitProducer.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/LArCalorimeter/LArSim/src/LArHitProducer.cxx b/LArCalorimeter/LArSim/src/LArHitProducer.cxx
index ee93a8e7757..ed6ba8a7a0c 100755
--- a/LArCalorimeter/LArSim/src/LArHitProducer.cxx
+++ b/LArCalorimeter/LArSim/src/LArHitProducer.cxx
@@ -5,7 +5,7 @@
#include "LArSim/LArHitProducer.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IDataProviderSvc.h"
diff --git a/LArCalorimeter/LArSim/src/LArHitReader.cxx b/LArCalorimeter/LArSim/src/LArHitReader.cxx
index 2de954abf10..fa209e4c458 100755
--- a/LArCalorimeter/LArSim/src/LArHitReader.cxx
+++ b/LArCalorimeter/LArSim/src/LArHitReader.cxx
@@ -4,7 +4,7 @@
#include "LArSim/LArHitReader.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IDataProviderSvc.h"
#include "LArSimEvent/LArHit.h"
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
index 3997f9833bb..6e11e6c8c77 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
@@ -59,7 +59,7 @@
#include "LArCalibTest/FixLArElecCalib.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx
index 6923c5218d0..da0a8d00943 100755
--- a/LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx
@@ -180,7 +180,7 @@ quadrant:
#include "LArCalibTest/FixLArIdMap.h"
#include "GaudiKernel/Algorithm.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx
index 49765c0b1cf..875f2e61ee9 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx
@@ -11,7 +11,7 @@
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx
index e8730d22a06..f0e6941d80f 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx
@@ -25,7 +25,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArCondDataTest.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/LArCondDataTest.cxx
index bf0cfd468c3..c8bf5fd1725 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArCondDataTest.cxx
+++ b/LArCalorimeter/LArTest/LArConditionsTest/src/LArCondDataTest.cxx
@@ -20,7 +20,7 @@
#include "LArIdentifier/LArOnlineID.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "LArElecCalib/ILArShape.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTestAlg.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTestAlg.cxx
index 5e3a4349ba6..b25249b3952 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTestAlg.cxx
+++ b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTestAlg.cxx
@@ -25,7 +25,7 @@
//#include "AthenaKernel/IIOVSvc.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "LArRawConditions/LArRampMC.h"
diff --git a/LumiBlock/LumiBlockComps/src/BunchCrossingCondTest.h b/LumiBlock/LumiBlockComps/src/BunchCrossingCondTest.h
index cc780633703..4bd599f357f 100644
--- a/LumiBlock/LumiBlockComps/src/BunchCrossingCondTest.h
+++ b/LumiBlock/LumiBlockComps/src/BunchCrossingCondTest.h
@@ -9,7 +9,7 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "LumiBlockData/BunchCrossingCondData.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderTool.cxx b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderTool.cxx
index c66cbd719eb..202ef879ef8 100644
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderTool.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderTool.cxx
@@ -73,17 +73,17 @@ StatusCode Muon::RPC_RawDataProviderTool::initialize()
return StatusCode::FAILURE;
}
- const std::vector<const Property*>* dataFlowProps
+ const std::vector<const Gaudi::Details::PropertyBase*>* dataFlowProps
= (jobOptionsSvc)? jobOptionsSvc->getProperties("DataFlowConfig") : 0;
- const std::vector<const Property*>* eventSelProps
+ const std::vector<const Gaudi::Details::PropertyBase*>* eventSelProps
= (jobOptionsSvc)? jobOptionsSvc->getProperties("EventSelector") :
TrigConfSvc->getProperties("EventSelector");
if ( dataFlowProps != 0 ) has_bytestream = true;
else if( eventSelProps != 0 )
{
- for (std::vector<const Property*>::const_iterator
+ for (std::vector<const Gaudi::Details::PropertyBase*>::const_iterator
cur = eventSelProps->begin();
cur != eventSelProps->end(); cur++) {
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/MuonAlignmentErrorDbAlg.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/MuonAlignmentErrorDbAlg.h
index 517ece6d13e..e307dac06c6 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/MuonAlignmentErrorDbAlg.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/MuonAlignmentErrorDbAlg.h
@@ -13,7 +13,7 @@
#include "StoreGate/ReadCondHandleKey.h"
#include "StoreGate/WriteCondHandleKey.h"
#include "GaudiKernel/ICondSvc.h"
-//#include "GaudiKernel/Property.h"
+//#include "Gaudi/Property.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "MuonCondAlg/MuonAlignmentErrorData.h"
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CSC_DCSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CSC_DCSConditionsSvc.cxx
index 59b7bc7734c..778cf1496d3 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CSC_DCSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CSC_DCSConditionsSvc.cxx
@@ -14,7 +14,7 @@
#include <algorithm>
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsRun2Svc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsRun2Svc.cxx
index 6615d72bf3a..5ed93d6e85d 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsRun2Svc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsRun2Svc.cxx
@@ -10,7 +10,7 @@
#include <string>
#include <algorithm>
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsSvc.cxx
index 9499b46d43a..4efe9611c9f 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsSvc.cxx
@@ -10,7 +10,7 @@
#include <string>
#include <algorithm>
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DQConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DQConditionsSvc.cxx
index f96abeed3be..cf499a63d76 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DQConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DQConditionsSvc.cxx
@@ -9,7 +9,7 @@
//#include "PathResolver/PathResolver.h"
#include "StoreGate/StoreGateSvc.h"
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DeadTubeConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DeadTubeConditionsSvc.cxx
index b47e935f2f6..806b041f0e4 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DeadTubeConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DeadTubeConditionsSvc.cxx
@@ -9,7 +9,7 @@
//#include "PathResolver/PathResolver.h"
#include "StoreGate/StoreGateSvc.h"
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_DCSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_DCSConditionsSvc.cxx
index 5afa47ae75d..99596e06211 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_DCSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_DCSConditionsSvc.cxx
@@ -10,7 +10,7 @@
#include <string>
#include <algorithm>
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_STATUSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_STATUSConditionsSvc.cxx
index 62477569e01..2e921525e92 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_STATUSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_STATUSConditionsSvc.cxx
@@ -14,7 +14,7 @@
#include <algorithm>
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGC_STATUSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGC_STATUSConditionsSvc.cxx
index 3d554447966..1103167b2d3 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGC_STATUSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGC_STATUSConditionsSvc.cxx
@@ -16,7 +16,7 @@
#include <iostream>
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
TGC_STATUSConditionsSvc::TGC_STATUSConditionsSvc(const std::string& name, ISvcLocator* pSvcLocator) :
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx
index 70746b9da01..91fb74640c8 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx
@@ -4,7 +4,7 @@
// CscPeakThresholdClusterBuilderTool.cxx
#include "CscPeakThresholdClusterBuilderTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "MuonPrepRawData/CscPrepDataContainer.h"
#include "MuonPrepRawData/CscStripPrepDataContainer.h"
#include "MuonPrepRawData/CscStripPrepData.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilder.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilder.cxx
index 02380c606f9..aa4f6b890ff 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilder.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilder.cxx
@@ -4,7 +4,7 @@
// CscThresholdClusterBuilder.cxx
#include "CscThresholdClusterBuilder.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <sstream>
using std::string;
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.cxx
index 5e4ed65d17a..a7b870edb61 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.cxx
@@ -6,7 +6,7 @@
// CscThresholdClusterBuilderTool.cxx
#include "CscThresholdClusterBuilderTool.h"
#include <sstream>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "MuonPrepRawData/CscPrepDataContainer.h"
#include "MuonPrepRawData/CscStripPrepDataContainer.h"
#include "MuonPrepRawData/CscStripPrepData.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdEvtStore.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdEvtStore.cxx
index 77df975eb78..fc1eaf0006d 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdEvtStore.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdEvtStore.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/IDictLoaderSvc.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdNtuple.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdNtuple.cxx
index d009c3b2c7e..7f016b01dd7 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdNtuple.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdNtuple.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/IDictLoaderSvc.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.cxx
index b3edf57121b..ca654849c29 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.cxx
@@ -14,7 +14,7 @@
// FrameWork includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// McParticleKernel includes
#include "McParticleKernel/ITruthParticleCnvTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/ReadINav4MomAssocs.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/ReadINav4MomAssocs.cxx
index 3245dfa39f7..e6bf57d3203 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/ReadINav4MomAssocs.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/ReadINav4MomAssocs.cxx
@@ -12,7 +12,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// NavFourMom includes
#include "NavFourMom/INav4MomAssocs.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/WriteINav4MomAssocs.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/WriteINav4MomAssocs.cxx
index 1e22bf0d22f..93542497f11 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/WriteINav4MomAssocs.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/WriteINav4MomAssocs.cxx
@@ -12,7 +12,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// NavFourMom includes
#include "NavFourMom/INav4MomAssocs.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.cxx
index 4a410005e11..4ac57f25a55 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.h
index fbbfe12fc87..a0099b1ad5c 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.h
@@ -59,16 +59,16 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'AddVarTo' property
- void setupInputContainer( Property& /*prop*/ );
+ void setupInputContainer( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'VarName' property
- void setupVarName( Property& /*prop*/ );
+ void setupVarName( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'VarType' property
- void setupVarType( Property& /*prop*/ );
+ void setupVarType( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'Selection' property
- void setupSelection( Property& /*prop*/ );
+ void setupSelection( Gaudi::Details::PropertyBase& /*prop*/ );
@@ -127,25 +127,25 @@ private:
///////////////////////////////////////////////////////////////////
/// This internal method will realize if a user sets the 'AddVarTo' property
-inline void AddVarAlg::setupInputContainer( Property& /*prop*/ ) {
+inline void AddVarAlg::setupInputContainer( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'VarName' property
-inline void AddVarAlg::setupVarName( Property& /*prop*/ ) {
+inline void AddVarAlg::setupVarName( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setVarName = true;
return;
}
/// This internal method will realize if a user sets the 'VarType' property
-inline void AddVarAlg::setupVarType( Property& /*prop*/ ) {
+inline void AddVarAlg::setupVarType( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setVarType = true;
return;
}
/// This internal method will realize if a user sets the 'Selection' property
-inline void AddVarAlg::setupSelection( Property& /*prop*/ ) {
+inline void AddVarAlg::setupSelection( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setSelection = true;
return;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/CutAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/CutAlg.cxx
index 1b4211dd5cc..7642a29a3d2 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/CutAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/CutAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "ExpressionEvaluation/ExpressionParser.h"
#include "ExpressionEvaluation/SGxAODProxyLoader.h"
#include "ExpressionEvaluation/SGNTUPProxyLoader.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/EventDecisionAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/EventDecisionAlg.cxx
index de769b8900b..355ed8eed02 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/EventDecisionAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/EventDecisionAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/IDecisionSvc.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerAlg.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerAlg.h
index 4f458ab7edf..1b550bbbb19 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerAlg.h
@@ -71,22 +71,22 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'InputContainerList' property
- void setupInputContainerList( Property& /*prop*/ );
+ void setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'MissingETObject' property
- void setupMissingETObject( Property& /*prop*/ );
+ void setupMissingETObject( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'OutputContainer' property
- void setupOutputContainer( Property& /*prop*/ );
+ void setupOutputContainer( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'WriteSplitOutputContainer' property
- void setupWriteSplitOutputContainer( Property& /*prop*/ );
+ void setupWriteSplitOutputContainer( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'SetPdgId' property
- void setupSetPdgId( Property& /*prop*/ );
+ void setupSetPdgId( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'SortConstituents' property
- void setupSort( Property& /*prop*/ );
+ void setupSort( Gaudi::Details::PropertyBase& /*prop*/ );
@@ -151,37 +151,37 @@ private:
// Inline methods
/// This internal method will realize if a user sets the 'InputContainerList' property
-inline void ParticleCombinerAlg::setupInputContainerList( Property& /*prop*/ ) {
+inline void ParticleCombinerAlg::setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKeyList = true;
return;
}
/// This internal method will realize if a user sets the 'MissingETObject' property
-inline void ParticleCombinerAlg::setupMissingETObject( Property& /*prop*/ ) {
+inline void ParticleCombinerAlg::setupMissingETObject( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setMetName = true;
return;
}
/// This internal method will realize if a user sets the 'OutputContainer' property
-inline void ParticleCombinerAlg::setupOutputContainer( Property& /*prop*/ ) {
+inline void ParticleCombinerAlg::setupOutputContainer( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setOutCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'WriteSplitOutputContainer' property
-inline void ParticleCombinerAlg::setupWriteSplitOutputContainer( Property& /*prop*/ ) {
+inline void ParticleCombinerAlg::setupWriteSplitOutputContainer( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setWriteSplitAux = true;
return;
}
/// This internal method will realize if a user sets the 'SetPdgId' property
-inline void ParticleCombinerAlg::setupSetPdgId( Property& /*prop*/ ) {
+inline void ParticleCombinerAlg::setupSetPdgId( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setPdgId = true;
return;
}
/// This internal method will realize if a user sets the 'SortConstituents' property
-inline void ParticleCombinerAlg::setupSort( Property& /*prop*/ ) {
+inline void ParticleCombinerAlg::setupSort( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setSort = true;
return;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerTool.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerTool.h
index a521ae857da..7f57a6101af 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerTool.h
@@ -30,7 +30,7 @@
#include <vector>
// Athena includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
index e66c049af8e..fd4c83812d9 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
#include "ExpressionEvaluation/ExpressionParser.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
index f2a33b296cd..5c8aa14ebbc 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
index 060f8aeb792..a9ec50eccda 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
@@ -60,16 +60,16 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'InputContainer' property
- void setupInputContainer( Property& /*prop*/ );
+ void setupInputContainer( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'OutputContainer' property
- void setupOutputContainer( Property& /*prop*/ );
+ void setupOutputContainer( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'SortVariable' property
- void setupSortVar( Property& /*prop*/ );
+ void setupSortVar( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'SortDeceding' property
- void setupSortDescending( Property& /*prop*/ );
+ void setupSortDescending( Gaudi::Details::PropertyBase& /*prop*/ );
@@ -124,26 +124,26 @@ private:
///////////////////////////////////////////////////////////////////
/// This internal method will realize if a user sets the 'InputContainer' property
-inline void ParticleSortingAlg::setupInputContainer( Property& /*prop*/ ) {
+inline void ParticleSortingAlg::setupInputContainer( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'OutputContainer' property
-inline void ParticleSortingAlg::setupOutputContainer( Property& /*prop*/ ) {
+inline void ParticleSortingAlg::setupOutputContainer( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setOutCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'SortVariable' property
-inline void ParticleSortingAlg::setupSortVar( Property& /*prop*/ )
+inline void ParticleSortingAlg::setupSortVar( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_setSortVar = true;
return;
}
/// This internal method will realize if a user sets the 'SortDeceding' property
-inline void ParticleSortingAlg::setupSortDescending( Property& /*prop*/ )
+inline void ParticleSortingAlg::setupSortDescending( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_setSortDescending = true;
return;
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/PileupReweighting/PileupReweightingTool.h b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/PileupReweighting/PileupReweightingTool.h
index 93fb1f2ded7..bdd43a31fdb 100644
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/PileupReweighting/PileupReweightingTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/PileupReweighting/PileupReweightingTool.h
@@ -126,7 +126,7 @@ namespace CP {
CP::SystematicCode applySystematicVariation( const CP::SystematicSet& systConfig );
#ifndef XAOD_STANDALONE
- void updateHandler(Property& /*p*/);
+ void updateHandler(Gaudi::Details::PropertyBase& /*p*/);
#endif
protected:
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/Root/PileupReweightingTool.cxx b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/Root/PileupReweightingTool.cxx
index 10a957c649d..8c5ecf033fa 100644
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/Root/PileupReweightingTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/Root/PileupReweightingTool.cxx
@@ -73,7 +73,7 @@ PileupReweightingTool::PileupReweightingTool( const std::string& name ) :CP::TPi
#ifndef XAOD_STANDALONE
//attached update handler to the outputlevel property, so we can pass changes on to the underlying tool
auto props = getProperties();
- for( Property* prop : props ) {
+ for( Gaudi::Details::PropertyBase* prop : props ) {
if( prop->name() != "OutputLevel" ) {
continue;
}
@@ -86,7 +86,7 @@ PileupReweightingTool::PileupReweightingTool( const std::string& name ) :CP::TPi
#ifndef XAOD_STANDALONE
//rootcore can't do this yet!
-void PileupReweightingTool::updateHandler(Property& /*p*/) {
+void PileupReweightingTool::updateHandler(Gaudi::Details::PropertyBase& /*p*/) {
// commenting this out as it doesn't compile anymore
// leaving it to domain expert to decide whether to keep or remove it
// //call the original update handler
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.cxx
index 8b3ed14c2e5..6ee792ac79c 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IThinningTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.h b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.h
index 9a321f11679..4fbe2732428 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.h
@@ -61,10 +61,10 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'CaloCellsToThin' property
- void setupCaloCellsToThin( Property& /*prop*/ );
+ void setupCaloCellsToThin( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'InputContainerList' property
- void setupInputContainerList( Property& /*prop*/ );
+ void setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ );
///////////////////////////////////////////////////////////////////
@@ -107,13 +107,13 @@ private:
///////////////////////////////////////////////////////////////////
/// This internal method will realize if a user sets the 'CaloCellsToThin' property
-inline void ThinCaloCellsAlg::setupCaloCellsToThin( Property& /*prop*/ ) {
+inline void ThinCaloCellsAlg::setupCaloCellsToThin( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setCaloCellKey = true;
return;
}
/// This internal method will realize if a user sets the 'InputContainerList' property
-inline void ThinCaloCellsAlg::setupInputContainerList( Property& /*prop*/ ) {
+inline void ThinCaloCellsAlg::setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKey = true;
return;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.cxx
index 4aa5439c374..56028209af2 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IThinningTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.h b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.h
index dfc05e5f0cb..db6d844fd80 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.h
@@ -63,13 +63,13 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'CaloClustersToThin' property
- void setupCaloClustersToThin( Property& /*prop*/ );
+ void setupCaloClustersToThin( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'InputContainerList' property
- void setupInputContainerList( Property& /*prop*/ );
+ void setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'Selection' property
- void setupSelection( Property& /*prop*/ );
+ void setupSelection( Gaudi::Details::PropertyBase& /*prop*/ );
///////////////////////////////////////////////////////////////////
@@ -120,19 +120,19 @@ private:
///////////////////////////////////////////////////////////////////
/// This internal method will realize if a user sets the 'CaloClustersToThin' property
-inline void ThinCaloClustersAlg::setupCaloClustersToThin( Property& /*prop*/ ) {
+inline void ThinCaloClustersAlg::setupCaloClustersToThin( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setCaloClusKey = true;
return;
}
/// This internal method will realize if a user sets the 'InputContainerList' property
-inline void ThinCaloClustersAlg::setupInputContainerList( Property& /*prop*/ ) {
+inline void ThinCaloClustersAlg::setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'Selection' property
-inline void ThinCaloClustersAlg::setupSelection( Property& /*prop*/ ) {
+inline void ThinCaloClustersAlg::setupSelection( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setSelection = true;
return;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinGeantTruthAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinGeantTruthAlg.cxx
index 8fc3cf3ba1b..c535efd8548 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinGeantTruthAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinGeantTruthAlg.cxx
@@ -29,7 +29,7 @@
// FrameWork includes
#include "StoreGate/ThinningHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
//Standard includes
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.cxx
index 729f7f50a00..223e8d9b520 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IThinningTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.h b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.h
index f36fcc4a47a..794cae00b62 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.h
@@ -63,13 +63,13 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'IParticlesToThin' property
- void setupIParticlesToThin( Property& /*prop*/ );
+ void setupIParticlesToThin( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'InputContainerList' property
- void setupInputContainerList( Property& /*prop*/ );
+ void setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'Selection' property
- void setupSelection( Property& /*prop*/ );
+ void setupSelection( Gaudi::Details::PropertyBase& /*prop*/ );
///////////////////////////////////////////////////////////////////
@@ -121,19 +121,19 @@ private:
///////////////////////////////////////////////////////////////////
/// This internal method will realize if a user sets the 'IParticlesToThin' property
-inline void ThinIParticlesAlg::setupIParticlesToThin( Property& /*prop*/ ) {
+inline void ThinIParticlesAlg::setupIParticlesToThin( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setIPartKey = true;
return;
}
/// This internal method will realize if a user sets the 'InputContainerList' property
-inline void ThinIParticlesAlg::setupInputContainerList( Property& /*prop*/ ) {
+inline void ThinIParticlesAlg::setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'Selection' property
-inline void ThinIParticlesAlg::setupSelection( Property& /*prop*/ ) {
+inline void ThinIParticlesAlg::setupSelection( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setSelection = true;
return;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx
index 39b47b48474..c3bc8d9be45 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx
@@ -25,7 +25,7 @@
// FrameWork includes
#include "StoreGate/ThinningHandle.h"
#include "StoreGate/ReadHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/ThreadLocalContext.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx
index 8f6b28756ac..685e364ea91 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx
@@ -21,7 +21,7 @@
// FrameWork includes
#include "StoreGate/ThinningHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/ThreadLocalContext.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx
index 25af96e2035..a9d5cd41acc 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx
@@ -22,7 +22,7 @@
// FrameWork includes
#include "StoreGate/ThinningHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/ThreadLocalContext.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.cxx
index 89e394e89b8..1f06f106c17 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IThinningTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.h b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.h
index 11a8aad3342..1b0b65eecba 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.h
@@ -63,25 +63,25 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'TrackParticlesToThin' property
- void setupTrackPartsToThin( Property& /*prop*/ );
+ void setupTrackPartsToThin( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'InputContainerList' property
- void setupInputContainerList( Property& /*prop*/ );
+ void setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'Selection' property
- void setupSelection( Property& /*prop*/ );
+ void setupSelection( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'KeepTauConversions' property
- void setupTauConv( Property& /*prop*/ );
+ void setupTauConv( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'KeepTauWide' property
- void setupTauWide( Property& /*prop*/ );
+ void setupTauWide( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'KeepTauOther' property
- void setupTauOther( Property& /*prop*/ );
+ void setupTauOther( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'NMaxElectronTrackParticles' property
- void setupNEleTPMax( Property& /*prop*/ );
+ void setupNEleTPMax( Gaudi::Details::PropertyBase& /*prop*/ );
///////////////////////////////////////////////////////////////////
@@ -160,43 +160,43 @@ private:
///////////////////////////////////////////////////////////////////
/// This internal method will realize if a user sets the 'TrackParticlesToThin' property
-inline void ThinTrackParticlesAlg::setupTrackPartsToThin( Property& /*prop*/ ) {
+inline void ThinTrackParticlesAlg::setupTrackPartsToThin( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setTrackPartKey = true;
return;
}
/// This internal method will realize if a user sets the 'InputContainerList' property
-inline void ThinTrackParticlesAlg::setupInputContainerList( Property& /*prop*/ ) {
+inline void ThinTrackParticlesAlg::setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'Selection' property
-inline void ThinTrackParticlesAlg::setupSelection( Property& /*prop*/ ) {
+inline void ThinTrackParticlesAlg::setupSelection( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setSelection = true;
return;
}
/// This internal method will realize if a user sets the 'KeepTauConversions' property
-inline void ThinTrackParticlesAlg::setupTauConv( Property& /*prop*/ ) {
+inline void ThinTrackParticlesAlg::setupTauConv( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setTauConv = true;
return;
}
/// This internal method will realize if a user sets the 'KeepTauWide' property
-inline void ThinTrackParticlesAlg::setupTauWide( Property& /*prop*/ ) {
+inline void ThinTrackParticlesAlg::setupTauWide( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setTauWide = true;
return;
}
/// This internal method will realize if a user sets the 'KeepTauOther' property
-inline void ThinTrackParticlesAlg::setupTauOther( Property& /*prop*/ ) {
+inline void ThinTrackParticlesAlg::setupTauOther( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setTauOther = true;
return;
}
/// This internal method will realize if a user sets the 'NMaxElectronTrackParticles' property
-inline void ThinTrackParticlesAlg::setupNEleTPMax( Property& /*prop*/ ){
+inline void ThinTrackParticlesAlg::setupNEleTPMax( Gaudi::Details::PropertyBase& /*prop*/ ){
m_setNEleTPMax = true;
return;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapCheckingTool.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapCheckingTool.cxx
index c613002b4f0..4d79e4ad614 100644
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapCheckingTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapCheckingTool.cxx
@@ -11,7 +11,7 @@ Purpose : User Analysis Overlap Checking - see UserAnalysisOverlapCheckingTool.h
*****************************************************************************/
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Accessing data:
#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapRemovalTool.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapRemovalTool.cxx
index 5aeb8042427..b79c89d14f4 100644
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapRemovalTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapRemovalTool.cxx
@@ -11,7 +11,7 @@ Purpose : User Analysis Overlap Removal - see UserAnalysisOverlapRemovalTool.h f
*****************************************************************************/
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Accessing data:
#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisPreparationTool.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisPreparationTool.cxx
index 394b7e5ae91..99c6a91ab19 100644
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisPreparationTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisPreparationTool.cxx
@@ -11,7 +11,7 @@ Purpose : User Analysis Preparation - see UserAnalysisPreparationTool.h for deta
*****************************************************************************/
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Accessing data:
#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/PhysicsAnalysis/AraTool/AraTool/AraToolBase.h b/PhysicsAnalysis/AraTool/AraTool/AraToolBase.h
index ba6a5a207e5..d7ed9cf6d90 100644
--- a/PhysicsAnalysis/AraTool/AraTool/AraToolBase.h
+++ b/PhysicsAnalysis/AraTool/AraTool/AraToolBase.h
@@ -5,7 +5,7 @@
#ifndef ARATOOLBASE_H
#define ARATOOLBASE_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/PropertyHolder.h"
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/IDataHandleHolder.h"
@@ -35,7 +35,7 @@ public:
template<class TYPE>
- Property* declareProperty
+ Gaudi::Details::PropertyBase* declareProperty
( const std::string& name ,
TYPE& value,
const std::string& doc = "none" ) ;
@@ -47,7 +47,7 @@ public:
};
template<class TYPE>
-inline Property *
+inline Gaudi::Details::PropertyBase *
AraToolBase::declareProperty
( const std::string& name ,
TYPE& value,
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.cxx b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.cxx
index cd3727615a5..bdfbd38cae2 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.cxx
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// CLHEP includes
#include "AthenaKernel/Units.h"
@@ -259,19 +259,19 @@ StatusCode AssocBuilder::execute()
// Non-const methods:
///////////////////////////////////////////////////////////////////
-void AssocBuilder::setupInputContainers( Property& /*inputName*/ )
+void AssocBuilder::setupInputContainers( Gaudi::Details::PropertyBase& /*inputName*/ )
{
// nothing to do (yet ?)
return;
}
-void AssocBuilder::setupInputAssocContainers( Property& /*inputAssocName*/ )
+void AssocBuilder::setupInputAssocContainers( Gaudi::Details::PropertyBase& /*inputAssocName*/ )
{
// nothing to do (yet ?)
return;
}
-void AssocBuilder::setupAssocsOutput( Property& /*assocsOutputName*/ )
+void AssocBuilder::setupAssocsOutput( Gaudi::Details::PropertyBase& /*assocsOutputName*/ )
{
// nothing to do (yet ?)
return;
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h
index 1f0c67e8a4b..48541e80978 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h
@@ -61,15 +61,15 @@ class AssocBuilder : public AthAlgorithm
/** Callback method to setup the "ObjectContainers" property
*/
- void setupInputContainers( Property& inputNames );
+ void setupInputContainers( Gaudi::Details::PropertyBase& inputNames );
/** Callback method to setup the "AssocContainers" property
*/
- void setupInputAssocContainers( Property& inputAssocNames );
+ void setupInputAssocContainers( Gaudi::Details::PropertyBase& inputAssocNames );
/** Callback method to setup the "AssocsOutput" property
*/
- void setupAssocsOutput( Property& assocsOutputName );
+ void setupAssocsOutput( Gaudi::Details::PropertyBase& assocsOutputName );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.cxx b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.cxx
index b3a65688bbd..90ae1fce300 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.cxx
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.cxx
@@ -17,7 +17,7 @@
#include <ostream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// CLHEP includes
#include "AthenaKernel/Units.h"
@@ -256,13 +256,13 @@ StatusCode AssocDumper::dump( const INav4MomAssocs* assocs )
// Non-const methods:
///////////////////////////////////////////////////////////////////
-void AssocDumper::setupINav4MomAssocs( Property& /*inav4MomAssocsName*/ )
+void AssocDumper::setupINav4MomAssocs( Gaudi::Details::PropertyBase& /*inav4MomAssocsName*/ )
{
// nothing to do (yet?)
return;
}
-void AssocDumper::setupOutputStream( Property& /*outputStreamName*/ )
+void AssocDumper::setupOutputStream( Gaudi::Details::PropertyBase& /*outputStreamName*/ )
{
// reset internal state
if ( m_outputStream &&
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h
index 68f10742883..818768c0d51 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h
@@ -70,12 +70,12 @@ class AssocDumper : public AthAlgorithm
/** Callback method to configure the input location of the
* @c INav4MomAssocs we want to print out
*/
- void setupINav4MomAssocs( Property& inav4MomAssocsName );
+ void setupINav4MomAssocs( Gaudi::Details::PropertyBase& inav4MomAssocsName );
/** Callback method to configure the output stream into which we'll
* dump the informations from @c INav4MomAssocs.
*/
- void setupOutputStream( Property& outputStreamName );
+ void setupOutputStream( Gaudi::Details::PropertyBase& outputStreamName );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h
index 5c260ffb81b..447605ddbbd 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h
@@ -74,7 +74,7 @@ class DeltaROverlapTool : public OverlapBaseTool
/** Call-back method to configure the "XyzDeltaR" properties (min/max)
*/
- void setupDeltaR( Property& deltaR );
+ void setupDeltaR( Gaudi::Details::PropertyBase& deltaR );
///////////////////////////////////////////////////////////////////
// Protected data:
@@ -102,7 +102,7 @@ class DeltaROverlapTool : public OverlapBaseTool
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void DeltaROverlapTool::setupDeltaR( Property& /*maxDeltaR*/ )
+inline void DeltaROverlapTool::setupDeltaR( Gaudi::Details::PropertyBase& /*maxDeltaR*/ )
{
m_filter = AssociationComps::DeltaROverlapFilter( m_minDeltaR.value(), m_maxDeltaR.value() );
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDElectronSelector.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDElectronSelector.h
index 9deb6086748..b92a4123371 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDElectronSelector.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDElectronSelector.h
@@ -90,112 +90,112 @@ private:
//------------------------------------------------------
/// Call-back method to configure the cut properties (min/max): IsEM
- void setupIsEM( Property& prop );
+ void setupIsEM( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): passID
- void setupPassID( Property& prop );
+ void setupPassID( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): Author
- void setupAuthor( Property& prop );
+ void setupAuthor( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined et
- void setupUncombinedEt( Property& prop );
+ void setupUncombinedEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined e
- void setupUncombinedE( Property& prop );
+ void setupUncombinedE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined eta
- void setupUncombinedEta( Property& prop );
+ void setupUncombinedEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined |eta|
- void setupUncombinedAbsEta( Property& prop );
+ void setupUncombinedAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined phi
- void setupUncombinedPhi( Property& prop );
+ void setupUncombinedPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined mass
- void setupUncombinedMass( Property& prop );
+ void setupUncombinedMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster et
- void setupClusterEt( Property& prop );
+ void setupClusterEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster e
- void setupClusterE( Property& prop );
+ void setupClusterE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster eta
- void setupClusterEta( Property& prop );
+ void setupClusterEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster |eta|
- void setupClusterAbsEta( Property& prop );
+ void setupClusterAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster eta veto
- void setupClusterEtaVeto( Property& prop );
+ void setupClusterEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster phi
- void setupClusterPhi( Property& prop );
+ void setupClusterPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster phi veto
- void setupClusterPhiVeto( Property& prop );
+ void setupClusterPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster mass
- void setupClusterMass( Property& prop );
+ void setupClusterMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer e
- void setupClusterLayerE( Property& prop );
+ void setupClusterLayerE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer eta
- void setupClusterLayerEta( Property& prop );
+ void setupClusterLayerEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer |eta|
- void setupClusterLayerAbsEta( Property& prop );
+ void setupClusterLayerAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer eta veto
- void setupClusterLayerEtaVeto( Property& prop );
+ void setupClusterLayerEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer phi
- void setupClusterLayerPhi( Property& prop );
+ void setupClusterLayerPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer phi veto
- void setupClusterLayerPhiVeto( Property& prop );
+ void setupClusterLayerPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track pt
- void setupTrackPt( Property& prop );
+ void setupTrackPt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track p
- void setupTrackP( Property& prop );
+ void setupTrackP( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track eta
- void setupTrackEta( Property& prop );
+ void setupTrackEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track |eta|
- void setupTrackAbsEta( Property& prop );
+ void setupTrackAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track eta veto
- void setupTrackEtaVeto( Property& prop );
+ void setupTrackEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track phi
- void setupTrackPhi( Property& prop );
+ void setupTrackPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track phi veto
- void setupTrackPhiVeto( Property& prop );
+ void setupTrackPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track mass
- void setupTrackMass( Property& prop );
+ void setupTrackMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster-track et
- void setupClusterTrackEt( Property& prop );
+ void setupClusterTrackEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track pt iso
- void setupTrackPtIso( Property& prop );
+ void setupTrackPtIso( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): |track pt iso|
- void setupAbsTrackPtIso( Property& prop );
+ void setupAbsTrackPtIso( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): calo et iso
- void setupCaloEtIso( Property& prop );
+ void setupCaloEtIso( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): |calo et iso|
- void setupAbsCaloEtIso( Property& prop );
+ void setupAbsCaloEtIso( Gaudi::Details::PropertyBase& prop );
@@ -749,217 +749,217 @@ private:
///////////////////////////////////////////////////////////////////
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void D2PDElectronSelector::setupIsEM( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupIsEM( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doIsEM = true;
return;
}
-inline void D2PDElectronSelector::setupPassID( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupPassID( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doPassID = true;
return;
}
-inline void D2PDElectronSelector::setupAuthor( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupAuthor( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAuthor = true;
return;
}
-inline void D2PDElectronSelector::setupUncombinedEt( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupUncombinedEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedEt = true;
return;
}
-inline void D2PDElectronSelector::setupUncombinedE( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupUncombinedE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedE = true;
return;
}
-inline void D2PDElectronSelector::setupUncombinedEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupUncombinedEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedEta = true;
return;
}
-inline void D2PDElectronSelector::setupUncombinedAbsEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupUncombinedAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedAbsEta = true;
return;
}
-inline void D2PDElectronSelector::setupUncombinedPhi( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupUncombinedPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedPhi = true;
return;
}
-inline void D2PDElectronSelector::setupUncombinedMass( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupUncombinedMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedMass = true;
return;
}
-inline void D2PDElectronSelector::setupClusterEt( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterEt = true;
return;
}
-inline void D2PDElectronSelector::setupClusterE( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterE = true;
return;
}
-inline void D2PDElectronSelector::setupClusterEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterEta = true;
return;
}
-inline void D2PDElectronSelector::setupClusterAbsEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterAbsEta = true;
return;
}
-inline void D2PDElectronSelector::setupClusterEtaVeto( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterEtaVeto = true;
return;
}
-inline void D2PDElectronSelector::setupClusterPhi( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterPhi = true;
return;
}
-inline void D2PDElectronSelector::setupClusterPhiVeto( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterPhiVeto = true;
return;
}
-inline void D2PDElectronSelector::setupClusterMass( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterMass = true;
return;
}
-inline void D2PDElectronSelector::setupClusterLayerE( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterLayerE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerE = true;
return;
}
-inline void D2PDElectronSelector::setupClusterLayerEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterLayerEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerEta = true;
return;
}
-inline void D2PDElectronSelector::setupClusterLayerAbsEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterLayerAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerAbsEta = true;
return;
}
-inline void D2PDElectronSelector::setupClusterLayerEtaVeto( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterLayerEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerEtaVeto = true;
return;
}
-inline void D2PDElectronSelector::setupClusterLayerPhi( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterLayerPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerPhi = true;
return;
}
-inline void D2PDElectronSelector::setupClusterLayerPhiVeto( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterLayerPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerPhiVeto = true;
return;
}
-inline void D2PDElectronSelector::setupTrackPt( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackPt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPt = true;
return;
}
-inline void D2PDElectronSelector::setupTrackP( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackP( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackP = true;
return;
}
-inline void D2PDElectronSelector::setupTrackEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackEta = true;
return;
}
-inline void D2PDElectronSelector::setupTrackAbsEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackAbsEta = true;
return;
}
-inline void D2PDElectronSelector::setupTrackEtaVeto( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackEtaVeto = true;
return;
}
-inline void D2PDElectronSelector::setupTrackPhi( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPhi = true;
return;
}
-inline void D2PDElectronSelector::setupTrackPhiVeto( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPhiVeto = true;
return;
}
-inline void D2PDElectronSelector::setupTrackMass( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackMass = true;
return;
}
-inline void D2PDElectronSelector::setupClusterTrackEt( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterTrackEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterTrackEt = true;
return;
}
-inline void D2PDElectronSelector::setupTrackPtIso( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackPtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPtIso = true;
return;
}
-inline void D2PDElectronSelector::setupAbsTrackPtIso( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupAbsTrackPtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAbsTrackPtIso = true;
return;
}
-inline void D2PDElectronSelector::setupCaloEtIso( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupCaloEtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doCaloEtIso = true;
return;
}
-inline void D2PDElectronSelector::setupAbsCaloEtIso( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupAbsCaloEtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAbsCaloEtIso = true;
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDJetSelector.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDJetSelector.h
index dccaf112072..e7d64e7825d 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDJetSelector.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDJetSelector.h
@@ -90,70 +90,70 @@ private:
//------------------------------------------------------
/// Call-back method to configure the cut properties (min/max):
- void setupJetVertexFraction( Property& prop );
+ void setupJetVertexFraction( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupFlavorTag( Property& prop );
+ void setupFlavorTag( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupEMFrac( Property& prop );
+ void setupEMFrac( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupPSFrac( Property& prop );
+ void setupPSFrac( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupN90( Property& prop );
+ void setupN90( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSamplingMax( Property& prop );
+ void setupSamplingMax( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupFCor( Property& prop );
+ void setupFCor( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupScaledJESEt( Property& prop );
+ void setupScaledJESEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupScaledJESE( Property& prop );
+ void setupScaledJESE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupScaledJESPt( Property& prop );
+ void setupScaledJESPt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupScaledJESP( Property& prop );
+ void setupScaledJESP( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupScaledJESMass( Property& prop );
+ void setupScaledJESMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateEt( Property& prop );
+ void setupSignalStateEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateE( Property& prop );
+ void setupSignalStateE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStatePt( Property& prop );
+ void setupSignalStatePt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateP( Property& prop );
+ void setupSignalStateP( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateEta( Property& prop );
+ void setupSignalStateEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateAbsEta( Property& prop );
+ void setupSignalStateAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateEtaVeto( Property& prop );
+ void setupSignalStateEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStatePhi( Property& prop );
+ void setupSignalStatePhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStatePhiVeto( Property& prop );
+ void setupSignalStatePhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateMass( Property& prop );
+ void setupSignalStateMass( Gaudi::Details::PropertyBase& prop );
@@ -499,133 +499,133 @@ private:
///////////////////////////////////////////////////////////////////
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void D2PDJetSelector::setupJetVertexFraction( Property& /*prop*/ )
+inline void D2PDJetSelector::setupJetVertexFraction( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doJVF = true;
return;
}
-inline void D2PDJetSelector::setupFlavorTag( Property& /*prop*/ )
+inline void D2PDJetSelector::setupFlavorTag( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doFlavorTag = true;
return;
}
-inline void D2PDJetSelector::setupEMFrac( Property& /*prop*/ )
+inline void D2PDJetSelector::setupEMFrac( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doEMFrac = true;
return;
}
-inline void D2PDJetSelector::setupPSFrac( Property& /*prop*/ )
+inline void D2PDJetSelector::setupPSFrac( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doPSFrac = true;
return;
}
-inline void D2PDJetSelector::setupN90( Property& /*prop*/ )
+inline void D2PDJetSelector::setupN90( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doN90 = true;
return;
}
-inline void D2PDJetSelector::setupSamplingMax( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSamplingMax( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSamplingMax = true;
return;
}
-inline void D2PDJetSelector::setupFCor( Property& /*prop*/ )
+inline void D2PDJetSelector::setupFCor( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doFCor = true;
return;
}
-inline void D2PDJetSelector::setupScaledJESEt( Property& /*prop*/ )
+inline void D2PDJetSelector::setupScaledJESEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doScaledJESEt = true;
return;
}
-inline void D2PDJetSelector::setupScaledJESE( Property& /*prop*/ )
+inline void D2PDJetSelector::setupScaledJESE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doScaledJESE = true;
return;
}
-inline void D2PDJetSelector::setupScaledJESPt( Property& /*prop*/ )
+inline void D2PDJetSelector::setupScaledJESPt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doScaledJESPt = true;
return;
}
-inline void D2PDJetSelector::setupScaledJESP( Property& /*prop*/ )
+inline void D2PDJetSelector::setupScaledJESP( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doScaledJESP = true;
return;
}
-inline void D2PDJetSelector::setupScaledJESMass( Property& /*prop*/ )
+inline void D2PDJetSelector::setupScaledJESMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doScaledJESMass = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateEt( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateEt = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateE( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateE = true;
return;
}
-inline void D2PDJetSelector::setupSignalStatePt( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStatePt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStatePt = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateP( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateP( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateP = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateEta( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateEta = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateAbsEta( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateAbsEta = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateEtaVeto( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateEtaVeto = true;
return;
}
-inline void D2PDJetSelector::setupSignalStatePhi( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStatePhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStatePhi = true;
return;
}
-inline void D2PDJetSelector::setupSignalStatePhiVeto( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStatePhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStatePhiVeto = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateMass( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateMass = true;
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDMuonSelector.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDMuonSelector.h
index cb262192360..a19a61fadcf 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDMuonSelector.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDMuonSelector.h
@@ -80,7 +80,7 @@ private:
private:
/// Call-back method to configure the cut properties (min/max): mass
- void setupChi2( Property& prop );
+ void setupChi2( Gaudi::Details::PropertyBase& prop );
//------------------------------------------------------
@@ -260,7 +260,7 @@ private:
///////////////////////////////////////////////////////////////////
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void D2PDMuonSelector::setupChi2( Property& /*prop*/ )
+inline void D2PDMuonSelector::setupChi2( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doChi2 = true;
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDPhotonSelector.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDPhotonSelector.h
index e6516ecff99..403179bbb4f 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDPhotonSelector.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDPhotonSelector.h
@@ -91,109 +91,109 @@ private:
//------------------------------------------------------
/// Call-back method to configure the cut properties (min/max): IsEM
- void setupIsEM( Property& prop );
+ void setupIsEM( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): passID
- void setupPassID( Property& prop );
+ void setupPassID( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): Author
- void setupAuthor( Property& prop );
+ void setupAuthor( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined et
- void setupUncombinedEt( Property& prop );
+ void setupUncombinedEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined e
- void setupUncombinedE( Property& prop );
+ void setupUncombinedE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined eta
- void setupUncombinedEta( Property& prop );
+ void setupUncombinedEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined |eta|
- void setupUncombinedAbsEta( Property& prop );
+ void setupUncombinedAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined phi
- void setupUncombinedPhi( Property& prop );
+ void setupUncombinedPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined mass
- void setupUncombinedMass( Property& prop );
+ void setupUncombinedMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster et
- void setupClusterEt( Property& prop );
+ void setupClusterEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster e
- void setupClusterE( Property& prop );
+ void setupClusterE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster eta
- void setupClusterEta( Property& prop );
+ void setupClusterEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster |eta|
- void setupClusterAbsEta( Property& prop );
+ void setupClusterAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster eta veto
- void setupClusterEtaVeto( Property& prop );
+ void setupClusterEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster phi
- void setupClusterPhi( Property& prop );
+ void setupClusterPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster phi veto
- void setupClusterPhiVeto( Property& prop );
+ void setupClusterPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster mass
- void setupClusterMass( Property& prop );
+ void setupClusterMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer e
- void setupClusterLayerE( Property& prop );
+ void setupClusterLayerE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer eta
- void setupClusterLayerEta( Property& prop );
+ void setupClusterLayerEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer |eta|
- void setupClusterLayerAbsEta( Property& prop );
+ void setupClusterLayerAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer eta veto
- void setupClusterLayerEtaVeto( Property& prop );
+ void setupClusterLayerEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer phi
- void setupClusterLayerPhi( Property& prop );
+ void setupClusterLayerPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer phi veto
- void setupClusterLayerPhiVeto( Property& prop );
+ void setupClusterLayerPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track pt
- void setupTrackPt( Property& prop );
+ void setupTrackPt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track p
- void setupTrackP( Property& prop );
+ void setupTrackP( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track eta
- void setupTrackEta( Property& prop );
+ void setupTrackEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track |eta|
- void setupTrackAbsEta( Property& prop );
+ void setupTrackAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track eta veto
- void setupTrackEtaVeto( Property& prop );
+ void setupTrackEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track phi
- void setupTrackPhi( Property& prop );
+ void setupTrackPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track phi veto
- void setupTrackPhiVeto( Property& prop );
+ void setupTrackPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track mass
- void setupTrackMass( Property& prop );
+ void setupTrackMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track pt iso
- void setupTrackPtIso( Property& prop );
+ void setupTrackPtIso( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): |track pt iso|
- void setupAbsTrackPtIso( Property& prop );
+ void setupAbsTrackPtIso( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): calo et iso
- void setupCaloEtIso( Property& prop );
+ void setupCaloEtIso( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): |calo et iso|
- void setupAbsCaloEtIso( Property& prop );
+ void setupAbsCaloEtIso( Gaudi::Details::PropertyBase& prop );
@@ -732,211 +732,211 @@ private:
///////////////////////////////////////////////////////////////////
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void D2PDPhotonSelector::setupIsEM( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupIsEM( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doIsEM = true;
return;
}
-inline void D2PDPhotonSelector::setupPassID( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupPassID( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doPassID = true;
return;
}
-inline void D2PDPhotonSelector::setupAuthor( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupAuthor( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAuthor = true;
return;
}
-inline void D2PDPhotonSelector::setupUncombinedEt( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupUncombinedEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedEt = true;
return;
}
-inline void D2PDPhotonSelector::setupUncombinedE( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupUncombinedE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedE = true;
return;
}
-inline void D2PDPhotonSelector::setupUncombinedEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupUncombinedEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedEta = true;
return;
}
-inline void D2PDPhotonSelector::setupUncombinedAbsEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupUncombinedAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedAbsEta = true;
return;
}
-inline void D2PDPhotonSelector::setupUncombinedPhi( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupUncombinedPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedPhi = true;
return;
}
-inline void D2PDPhotonSelector::setupUncombinedMass( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupUncombinedMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedMass = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterEt( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterEt = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterE( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterE = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterEta = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterAbsEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterAbsEta = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterEtaVeto( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterEtaVeto = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterPhi( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterPhi = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterPhiVeto( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterPhiVeto = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterMass( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterMass = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterLayerE( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterLayerE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerE = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterLayerEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterLayerEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerEta = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterLayerAbsEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterLayerAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerAbsEta = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterLayerEtaVeto( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterLayerEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerEtaVeto = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterLayerPhi( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterLayerPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerPhi = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterLayerPhiVeto( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterLayerPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerPhiVeto = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackPt( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackPt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPt = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackP( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackP( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackP = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackEta = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackAbsEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackAbsEta = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackEtaVeto( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackEtaVeto = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackPhi( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPhi = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackPhiVeto( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPhiVeto = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackMass( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackMass = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackPtIso( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackPtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPtIso = true;
return;
}
-inline void D2PDPhotonSelector::setupAbsTrackPtIso( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupAbsTrackPtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAbsTrackPtIso = true;
return;
}
-inline void D2PDPhotonSelector::setupCaloEtIso( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupCaloEtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doCaloEtIso = true;
return;
}
-inline void D2PDPhotonSelector::setupAbsCaloEtIso( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupAbsCaloEtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAbsCaloEtIso = true;
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDSelectorBase.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDSelectorBase.h
index c7a7e9c94c1..fc426bb614b 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDSelectorBase.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDSelectorBase.h
@@ -201,34 +201,34 @@ private:
//------------------------------------------------------
/// Call-back method to configure the cut properties (min/max): pt
- void setupPt( Property& prop );
+ void setupPt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): p
- void setupP( Property& prop );
+ void setupP( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): et
- void setupEt( Property& prop );
+ void setupEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): e
- void setupE( Property& prop );
+ void setupE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): eta
- void setupEta( Property& prop );
+ void setupEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): |eta|
- void setupAbsEta( Property& prop );
+ void setupAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): eta veto ranges
- void setupEtaVeto( Property& prop );
+ void setupEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): phi
- void setupPhi( Property& prop );
+ void setupPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): phi veto ranges
- void setupPhiVeto( Property& prop );
+ void setupPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): mass
- void setupMass( Property& prop );
+ void setupMass( Gaudi::Details::PropertyBase& prop );
@@ -430,70 +430,70 @@ private:
// Inline methods:
///////////////////////////////////////////////////////////////////
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupPt( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupPt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doPt = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupP( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupP( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doP = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupEt( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doEt = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupE( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doE = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupEta( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doEta = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupAbsEta( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAbsEta = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupEtaVeto( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doEtaVeto = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupPhi( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doPhi = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupPhiVeto( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doPhiVeto = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupMass( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doMass = true;
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTauSelector.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTauSelector.h
index f2c17ea8106..e0a1d0ad3ce 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTauSelector.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTauSelector.h
@@ -86,19 +86,19 @@ private:
//------------------------------------------------------
/// Call-back method to configure the cut properties (min/max): IsTau
- void setupIsTau( Property& prop );
+ void setupIsTau( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): Author
- void setupAuthor( Property& prop );
+ void setupAuthor( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): Discriminant
- void setupDiscriminant( Property& prop );
+ void setupDiscriminant( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): Charge
- void setupCharge( Property& prop );
+ void setupCharge( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupNTracks( Property& prop );
+ void setupNTracks( Gaudi::Details::PropertyBase& prop );
@@ -287,31 +287,31 @@ private:
///////////////////////////////////////////////////////////////////
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void D2PDTauSelector::setupIsTau( Property& /*prop*/ )
+inline void D2PDTauSelector::setupIsTau( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doIsTau = true;
return;
}
-inline void D2PDTauSelector::setupAuthor( Property& /*prop*/ )
+inline void D2PDTauSelector::setupAuthor( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAuthor = true;
return;
}
-inline void D2PDTauSelector::setupDiscriminant( Property& /*prop*/ )
+inline void D2PDTauSelector::setupDiscriminant( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTauDiscriminant = true;
return;
}
-inline void D2PDTauSelector::setupCharge( Property& /*prop*/ )
+inline void D2PDTauSelector::setupCharge( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doCharge = true;
return;
}
-inline void D2PDTauSelector::setupNTracks( Property& /*prop*/ )
+inline void D2PDTauSelector::setupNTracks( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doNTracks = true;
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTrackParticleSelector.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTrackParticleSelector.h
index 9c3ca759312..7d893e56ea6 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTrackParticleSelector.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTrackParticleSelector.h
@@ -81,19 +81,19 @@ private:
//------------------------------------------------------
/// Call-back method to configure the cut properties (min/max): numberBLayerHits
- void setupNumberBLayerHits( Property& prop );
+ void setupNumberBLayerHits( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): numberPixelHits
- void setupNumberPixelHits( Property& prop );
+ void setupNumberPixelHits( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): numberSCTHits
- void setupNumberSCTHits( Property& prop );
+ void setupNumberSCTHits( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): numberSiliconHits
- void setupNumberSiliconHits( Property& prop );
+ void setupNumberSiliconHits( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): numberTRTHits
- void setupNumberTRTHits( Property& prop );
+ void setupNumberTRTHits( Gaudi::Details::PropertyBase& prop );
@@ -175,31 +175,31 @@ private:
///////////////////////////////////////////////////////////////////
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void D2PDTrackParticleSelector::setupNumberBLayerHits( Property& /*prop*/ )
+inline void D2PDTrackParticleSelector::setupNumberBLayerHits( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doNumberBLayerHits = true;
return;
}
-inline void D2PDTrackParticleSelector::setupNumberPixelHits( Property& /*prop*/ )
+inline void D2PDTrackParticleSelector::setupNumberPixelHits( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doNumberPixelHits = true;
return;
}
-inline void D2PDTrackParticleSelector::setupNumberSCTHits( Property& /*prop*/ )
+inline void D2PDTrackParticleSelector::setupNumberSCTHits( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doNumberSCTHits = true;
return;
}
-inline void D2PDTrackParticleSelector::setupNumberSiliconHits( Property& /*prop*/ )
+inline void D2PDTrackParticleSelector::setupNumberSiliconHits( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doNumberSiliconHits = true;
return;
}
-inline void D2PDTrackParticleSelector::setupNumberTRTHits( Property& /*prop*/ )
+inline void D2PDTrackParticleSelector::setupNumberTRTHits( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doNumberTRTHits = true;
return;
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.cxx
index 4e1f72429ef..da734606c6a 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.cxx
@@ -101,7 +101,7 @@ CollectionGetterRegistryTool::get (const std::string& label,
}
// Get the properties for the source tool.
- const std::vector<const Property*>* props =
+ const std::vector<const Gaudi::Details::PropertyBase*>* props =
m_jos->getProperties (i->second->name());
// Copy them to the destination tool (except for Label).
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/CompactHardTruth.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/CompactHardTruth.cxx
index 9590503b34f..32d008c5c72 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/CompactHardTruth.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/CompactHardTruth.cxx
@@ -16,7 +16,7 @@
#include <list>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/ServiceHandle.h"
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx
index 1e2f4e53631..59cdd4b84fd 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "DerivationFrameworkMuons/MuonTPJpsiVertexFittingAlg.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ITHistSvc.h"
#include "xAODEventInfo/EventInfo.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/EgammaTagTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/EgammaTagTool.cxx
index fec9448da38..371834720f6 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/EgammaTagTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/EgammaTagTool.cxx
@@ -12,7 +12,7 @@ Purpose : create a collection of EgammaTag
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/SystemOfUnits.h"
#include "ElectronPhotonTagTools/EgammaTagTool.h"
#include "TagEvent/EgammaAttributeNames.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/ElectronTagTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/ElectronTagTool.cxx
index dd52faf91dd..140cc4c7824 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/ElectronTagTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/ElectronTagTool.cxx
@@ -10,7 +10,7 @@ Purpose : create a collection of ElectronTag
*****************************************************************************/
#include "ElectronPhotonTagTools/ElectronTagTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/StoreGateSvc.h"
#include "xAODCore/ShallowCopy.h"
#include "xAODParticleEvent/IParticleLink.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/PhotonTagTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/PhotonTagTool.cxx
index cc82e2b228d..66baf090de2 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/PhotonTagTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/PhotonTagTool.cxx
@@ -11,7 +11,7 @@ Purpose : create a collection of PhotonTag
#include "ElectronPhotonTagTools/PhotonTagTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/StoreGateSvc.h"
#include "xAODCore/ShallowCopy.h"
#include "xAODParticleEvent/IParticleLink.h"
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/EventTagUtils/RegistrationStreamTrig.h b/PhysicsAnalysis/EventTag/EventTagUtils/EventTagUtils/RegistrationStreamTrig.h
index 78808cc220c..ca4beccb3c8 100755
--- a/PhysicsAnalysis/EventTag/EventTagUtils/EventTagUtils/RegistrationStreamTrig.h
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/EventTagUtils/RegistrationStreamTrig.h
@@ -14,7 +14,7 @@
//<<<<<< INCLUDES >>>>>>
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/EventInfoTagTool.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/EventInfoTagTool.cxx
index 012e94e184f..4f086373837 100755
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/EventInfoTagTool.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/src/EventInfoTagTool.cxx
@@ -13,7 +13,7 @@ Purpose : create a EventInfoTag - The Tag information associated to the event
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalEventTagTool.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalEventTagTool.cxx
index ab3b71c0287..65e828e8f83 100755
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalEventTagTool.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalEventTagTool.cxx
@@ -13,7 +13,7 @@ Purpose : create a GlobalEventTag - The Tag information associated to the event
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx
index fdc46ac4de7..1315e89af23 100755
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx
@@ -14,7 +14,7 @@ Purpose : create a GlobalTriggerTag - The Tag information associated to the even
#include "EventTagUtils/GlobalTriggerTagTool.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/RawInfoSummaryForTagTool.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/RawInfoSummaryForTagTool.cxx
index ed866fb5938..8cb73690389 100755
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/RawInfoSummaryForTagTool.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/src/RawInfoSummaryForTagTool.cxx
@@ -13,7 +13,7 @@ Purpose : create a DataQualityTag - The Detector Status Words and the Good
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/ExoticPhysTagTool.cxx b/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/ExoticPhysTagTool.cxx
index fb7cbe57da3..4d439949723 100755
--- a/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/ExoticPhysTagTool.cxx
+++ b/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/ExoticPhysTagTool.cxx
@@ -12,7 +12,7 @@ Purpose : create a ExoticPhysTag - a word to encode ExoticPhys specific informat
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "ExoticPhysTagTools/ExoticPhysTagTool.h"
diff --git a/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/HeavyIonPhysTagTool.cxx b/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/HeavyIonPhysTagTool.cxx
index e6f98b4671a..2ad0971a948 100755
--- a/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/HeavyIonPhysTagTool.cxx
+++ b/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/HeavyIonPhysTagTool.cxx
@@ -13,7 +13,7 @@ Purpose : create a HeavyIonPhysTag - a word to encode ExoticPhys specific inform
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "HeavyIonPhysTagTools/HeavyIonPhysTagTool.h"
diff --git a/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/HiggsPhysTagTool.cxx b/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/HiggsPhysTagTool.cxx
index b0f0fba1957..86c2b35aae0 100755
--- a/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/HiggsPhysTagTool.cxx
+++ b/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/HiggsPhysTagTool.cxx
@@ -12,7 +12,7 @@ Purpose : create a HiggsPhysTag - a word to encode HiggsPhys specific informatio
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "HiggsPhysTagTools/HiggsPhysTagTool.h"
diff --git a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/JetMissingEtIdentificationTagTool.cxx b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/JetMissingEtIdentificationTagTool.cxx
index 68c218c937f..965d9640474 100755
--- a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/JetMissingEtIdentificationTagTool.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/JetMissingEtIdentificationTagTool.cxx
@@ -10,7 +10,7 @@ Purpose : create a JetMissingEtIdentificationTag - word to encode Jet and
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "xAODJet/JetContainer.h"
diff --git a/PhysicsAnalysis/JetTagging/JetTagCalibration/JetTagCalibration/CalibrationBroker.h b/PhysicsAnalysis/JetTagging/JetTagCalibration/JetTagCalibration/CalibrationBroker.h
index f7117d662ee..6565eea27fd 100755
--- a/PhysicsAnalysis/JetTagging/JetTagCalibration/JetTagCalibration/CalibrationBroker.h
+++ b/PhysicsAnalysis/JetTagging/JetTagCalibration/JetTagCalibration/CalibrationBroker.h
@@ -8,7 +8,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "StoreGate/DataHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TFile.h"
#include <map>
#include <string>
diff --git a/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/JetTaggingTagTool.cxx b/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/JetTaggingTagTool.cxx
index 8d4fa1e309e..b06a2c17b81 100755
--- a/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/JetTaggingTagTool.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/JetTaggingTagTool.cxx
@@ -13,7 +13,7 @@ Purpose : create a Flavor Tagging Event Tag - a word to encode Flavor Tagging sp
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/MuonID/MuonTagTools/src/MuonTagTool.cxx b/PhysicsAnalysis/MuonID/MuonTagTools/src/MuonTagTool.cxx
index 59d27766db7..4f900025d5c 100644
--- a/PhysicsAnalysis/MuonID/MuonTagTools/src/MuonTagTool.cxx
+++ b/PhysicsAnalysis/MuonID/MuonTagTools/src/MuonTagTool.cxx
@@ -9,7 +9,7 @@ Purpose : create a collection of MuonTag
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODCore/ShallowCopy.h"
#include "xAODParticleEvent/IParticleLink.h"
#include "AthContainers/ConstDataVector.h"
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
index 2bf8891b101..5e16fddbb18 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
@@ -14,7 +14,7 @@
#include <string>
#include <vector>
#include "AthenaBaseComps/AthFilterAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIncidentListener.h"
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/muonTrkTrackThinTool.cxx b/PhysicsAnalysis/PrimaryDPDMaker/src/muonTrkTrackThinTool.cxx
index 2627f61cde1..c8d929a6d87 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/muonTrkTrackThinTool.cxx
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/muonTrkTrackThinTool.cxx
@@ -13,7 +13,7 @@
#include <iostream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// StoreGate
#include "StoreGate/DataHandle.h"
#include "StoreGate/ThinningHandle.h"
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/SUSYPhysTagTool.cxx b/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/SUSYPhysTagTool.cxx
index e1245b20979..0d81bda279a 100755
--- a/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/SUSYPhysTagTool.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/SUSYPhysTagTool.cxx
@@ -12,7 +12,7 @@ Purpose : create a SUSYPhysTag - a word to encode SUSYPhys specific information
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/ApplySUSYTools.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/ApplySUSYTools.cxx
index 8312602001e..3ecabbb3ea2 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/ApplySUSYTools.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/ApplySUSYTools.cxx
@@ -51,7 +51,7 @@
#include "PATInterfaces/SystematicVariation.h"
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/ServiceHandle.h"
diff --git a/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/StandardModelTagTool.cxx b/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/StandardModelTagTool.cxx
index 2a6eba2f176..33efb0d5cb5 100755
--- a/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/StandardModelTagTool.cxx
+++ b/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/StandardModelTagTool.cxx
@@ -12,7 +12,7 @@ Purpose : create a StandardModelPhysTag - a word to encode StandardModelPhys spe
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "GaudiKernel/GaudiException.h"
diff --git a/PhysicsAnalysis/TauID/TauTagTools/src/TauIdentificationTagTool.cxx b/PhysicsAnalysis/TauID/TauTagTools/src/TauIdentificationTagTool.cxx
index 6ce88597545..b2acfcfd0da 100755
--- a/PhysicsAnalysis/TauID/TauTagTools/src/TauIdentificationTagTool.cxx
+++ b/PhysicsAnalysis/TauID/TauTagTools/src/TauIdentificationTagTool.cxx
@@ -10,7 +10,7 @@ Created : January 2006
Purpose : create a TauIdentificationTag - word to encode tauJet specific informations
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "TauTagTools/TauIdentificationTagTool.h"
diff --git a/PhysicsAnalysis/TauID/TauTagTools/src/TauJetTagTool.cxx b/PhysicsAnalysis/TauID/TauTagTools/src/TauJetTagTool.cxx
index 0a85c9400e8..75d0d88bf57 100755
--- a/PhysicsAnalysis/TauID/TauTagTools/src/TauJetTagTool.cxx
+++ b/PhysicsAnalysis/TauID/TauTagTools/src/TauJetTagTool.cxx
@@ -9,7 +9,7 @@ Purpose : create a collection of TauJetTag
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodFilter.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodFilter.cxx
index f1514675dd6..cb525180bba 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodFilter.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodFilter.cxx
@@ -13,7 +13,7 @@
#include <algorithm>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// McParticleUtils includes
#include "McParticleUtils/McVtxFilter.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.cxx
index 91d395161e7..25325e9e5d4 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.cxx
@@ -14,7 +14,7 @@
#include <stdexcept>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// CLHEP includes
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.cxx
index 5cfcfc493a1..85153e8028a 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.cxx
@@ -12,7 +12,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// McParticleKernel includes
#include "McParticleKernel/ITruthParticleFilterTool.h"
@@ -148,7 +148,7 @@ StatusCode TruthParticleBuilder::execute()
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void TruthParticleBuilder::setupFilterTool( Property& /*doFiltering*/ )
+void TruthParticleBuilder::setupFilterTool( Gaudi::Details::PropertyBase& /*doFiltering*/ )
{
if ( m_doFiltering ) {
@@ -186,7 +186,7 @@ void TruthParticleBuilder::setupFilterTool( Property& /*doFiltering*/ )
return;
}
-void TruthParticleBuilder::setupCnvTool( Property& /*doTruthParticles*/ )
+void TruthParticleBuilder::setupCnvTool( Gaudi::Details::PropertyBase& /*doTruthParticles*/ )
{
if ( m_doTruthParticles ) {
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h
index fac5893c80d..b535fe3062a 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h
@@ -65,12 +65,12 @@ class TruthParticleBuilder : public AthAlgorithm
/** Call-back method to configure the filter tool if needed (this is defined
* by the state of the "DoFiltering" property)
*/
- void setupFilterTool( Property& doFiltering );
+ void setupFilterTool( Gaudi::Details::PropertyBase& doFiltering );
/** Call-back method to configure the converter tool if needed (this is
* defined by the state of the "DoTruthParticles" property)
*/
- void setupCnvTool( Property& doTruthParticles );
+ void setupCnvTool( Gaudi::Details::PropertyBase& doTruthParticles );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
index 77a2cbdb738..6fdb260a495 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
@@ -204,13 +204,13 @@ StatusCode RootTruthParticleCnvTool::setProperty( const std::string& ) {
abort(); }
StatusCode RootTruthParticleCnvTool::setProperty( const std::string&, const Gaudi::Details::PropertyBase& ) { abort(); }
StatusCode RootTruthParticleCnvTool::setPropertyRepr( const std::string&, const std::string& ){ abort(); }
-StatusCode RootTruthParticleCnvTool::getProperty( Property* ) const { abort(); }
-const Property&
+StatusCode RootTruthParticleCnvTool::getProperty( Gaudi::Details::PropertyBase* ) const { abort(); }
+const Gaudi::Details::PropertyBase&
RootTruthParticleCnvTool::getProperty( const std::string& ) const{ abort(); }
StatusCode RootTruthParticleCnvTool::getProperty( const std::string&,
std::string& ) const {
abort(); }
-const std::vector< Property* >&
+const std::vector< Gaudi::Details::PropertyBase* >&
RootTruthParticleCnvTool::getProperties() const { abort(); }
bool RootTruthParticleCnvTool::hasProperty( const std::string& ) const {
abort(); }
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h
index 3573cbd1e41..52f05145f10 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h
@@ -8,7 +8,7 @@
#define MCPARTICLEEVENTTPCNV_ROOTTRUTHPARTICLECNVTOOL_H
#include "McParticleKernel/ITruthParticleCnvTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class RootTruthParticleCnvTool
: public ITruthParticleCnvTool
@@ -56,10 +56,10 @@ public:
virtual StatusCode setProperty( const std::string& name, const Gaudi::Details::PropertyBase& p );
virtual StatusCode setPropertyRepr( const std::string& n, const std::string& r );
- virtual StatusCode getProperty( Property* p ) const;
- virtual const Property& getProperty( const std::string& name ) const;
+ virtual StatusCode getProperty( Gaudi::Details::PropertyBase* p ) const;
+ virtual const Gaudi::Details::PropertyBase& getProperty( const std::string& name ) const;
virtual StatusCode getProperty( const std::string& n, std::string& v ) const;
- virtual const std::vector<Property*>& getProperties( ) const;
+ virtual const std::vector<Gaudi::Details::PropertyBase*>& getProperties( ) const;
virtual bool hasProperty(const std::string& name) const;
/// @}
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna.cxx
index 63d9838dda2..94ed60b461a 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
namespace McAod {
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna_solution.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna_solution.cxx
index 77bfb2b4c66..6edfa849199 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna_solution.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna_solution.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/ServiceHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodSymLinkTests.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodSymLinkTests.cxx
index 1c7a946a76e..cd957679367 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodSymLinkTests.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodSymLinkTests.cxx
@@ -14,7 +14,7 @@
#include <limits>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// NavFourMom includes
#include "NavFourMom/INavigable4MomentumCollection.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
index 88688ca952d..6ece2481eea 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
@@ -449,13 +449,13 @@ StatusCode EtaPtFilterTool::initializeTool()
return StatusCode::SUCCESS;
}
-void EtaPtFilterTool::setupInnerEtaRegionCuts( Property& /*innerRegion*/ )
+void EtaPtFilterTool::setupInnerEtaRegionCuts( Gaudi::Details::PropertyBase& /*innerRegion*/ )
{
// nothing to do (yet?)
return;
}
-void EtaPtFilterTool::setupOuterEtaRegionCuts( Property& /*outerRegion*/ )
+void EtaPtFilterTool::setupOuterEtaRegionCuts( Gaudi::Details::PropertyBase& /*outerRegion*/ )
{
// nothing to do (yet?)
return;
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
index 772357495c2..be8b8014c56 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
@@ -137,11 +137,11 @@ class EtaPtFilterTool : public TruthParticleFilterBaseTool
/** Callback function to setup the "InnerEtaRegionCuts" property
*/
- void setupInnerEtaRegionCuts( Property& innerEtaRegionCuts );
+ void setupInnerEtaRegionCuts( Gaudi::Details::PropertyBase& innerEtaRegionCuts );
/** Callback function to setup the "OuterEtaRegionCuts" property
*/
- void setupOuterEtaRegionCuts( Property& outerEtaRegionCuts );
+ void setupOuterEtaRegionCuts( Gaudi::Details::PropertyBase& outerEtaRegionCuts );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx
index 363c7d5cf17..1a72387d8df 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx
@@ -13,7 +13,7 @@
#include <sstream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// StoreGate
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx
index 4aadf20744b..b60f1bc1cf3 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx
@@ -256,7 +256,7 @@ StatusCode HepMcFloatWriterTool::write( const HepMC::GenEvent* evt )
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void HepMcFloatWriterTool::setupBackend( Property& /*prop*/ )
+void HepMcFloatWriterTool::setupBackend( Gaudi::Details::PropertyBase& /*prop*/ )
{
// defaults
std::string protocol = "ascii";
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.h
index b0a8202e28b..81bff0a2447 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.h
@@ -74,7 +74,7 @@ class HepMcFloatWriterTool : virtual public IIOHepMcTool,
/** @brief Method to configure the back-end to write out the
* @c HepMC::GenEvent.
*/
- void setupBackend( Property& ioBackendURL );
+ void setupBackend( Gaudi::Details::PropertyBase& ioBackendURL );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.cxx
index af6d67a97cf..691f771c7b8 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.cxx
@@ -143,7 +143,7 @@ StatusCode HepMcReaderTool::read( HepMC::GenEvent* evt )
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void HepMcReaderTool::setupFrontend( Property& /*prop*/ )
+void HepMcReaderTool::setupFrontend( Gaudi::Details::PropertyBase& /*prop*/ )
{
// defaults
std::string protocol = "ascii";
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.h
index 2b0393adf66..dc1a82e20fc 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.h
@@ -73,7 +73,7 @@ class HepMcReaderTool : virtual public IIOHepMcTool,
/** @brief Method to configure the front-end to read out the
* @c HepMC::GenEvent.
*/
- void setupFrontend( Property& ioFrontendURL );
+ void setupFrontend( Gaudi::Details::PropertyBase& ioFrontendURL );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx
index fd07363a58c..3320a816c09 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx
@@ -14,7 +14,7 @@
// FrameWork includes
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/GaudiException.h"
// ROOT includes
@@ -176,7 +176,7 @@ StatusCode HepMcTupleWriterTool::write( const HepMC::GenEvent* evt )
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void HepMcTupleWriterTool::setupBackend( Property& /*m_outputFileName*/ )
+void HepMcTupleWriterTool::setupBackend( Gaudi::Details::PropertyBase& /*m_outputFileName*/ )
{
const bool createIf = false;
IProperty * tSvc = 0;
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.h
index 2284a4ec2f7..cb27cf1700e 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.h
@@ -77,7 +77,7 @@ class HepMcTupleWriterTool : virtual public IIOHepMcTool,
/** @brief Method to configure the back-end to write out the
* @c HepMC::GenEvent.
*/
- void setupBackend( Property& outputFileName );
+ void setupBackend( Gaudi::Details::PropertyBase& outputFileName );
/**
* @brief book the tuple
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.cxx
index 10e6ec02c9a..685b361fac6 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.cxx
@@ -151,7 +151,7 @@ StatusCode HepMcWriterTool::write( const HepMC::GenEvent* evt )
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void HepMcWriterTool::setupBackend( Property& /*prop*/ )
+void HepMcWriterTool::setupBackend( Gaudi::Details::PropertyBase& /*prop*/ )
{
// defaults
std::string protocol = "ascii";
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.h
index e10e7381070..1845fb6c6be 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.h
@@ -73,7 +73,7 @@ class HepMcWriterTool : virtual public IIOHepMcTool,
/** @brief Method to configure the back-end to write out the
* @c HepMC::GenEvent.
*/
- void setupBackend( Property& ioBackendURL );
+ void setupBackend( Gaudi::Details::PropertyBase& ioBackendURL );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.cxx
index 4460e67d1d8..2ce8ab169f4 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.cxx
@@ -14,7 +14,7 @@
// FrameWork includes
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/GaudiException.h"
// ROOT includes
@@ -176,7 +176,7 @@ StatusCode McAodTupleWriterTool::write( const TruthParticleContainer* mc )
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void McAodTupleWriterTool::setupBackend( Property& /*m_outputFileName*/ )
+void McAodTupleWriterTool::setupBackend( Gaudi::Details::PropertyBase& /*m_outputFileName*/ )
{
const bool createIf = false;
IProperty * tSvc = 0;
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.h
index 3cc305c9df3..bcbbe185f8f 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.h
@@ -77,7 +77,7 @@ class McAodTupleWriterTool : virtual public IIOMcAodTool,
/** @brief Method to configure the back-end to write out the
* @c HepMC::GenEvent.
*/
- void setupBackend( Property& outputFileName );
+ void setupBackend( Gaudi::Details::PropertyBase& outputFileName );
/**
* @brief book the tuple
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.cxx
index 8fd5bbe7b65..fabe82b6e36 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.cxx
@@ -172,7 +172,7 @@ StatusCode McAodWriterTool::write( const TruthParticleContainer* mcParts )
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void McAodWriterTool::setupBackend( Property& /*prop*/ )
+void McAodWriterTool::setupBackend( Gaudi::Details::PropertyBase& /*prop*/ )
{
// defaults
std::string protocol = "ascii";
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.h
index af9f9af46c0..90ca9dae90a 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.h
@@ -73,7 +73,7 @@ class McAodWriterTool : virtual public IIOMcAodTool,
/** @brief Method to configure the back-end to write out the
* @c TruthParticleContainer.
*/
- void setupBackend( Property& ioBackendURL );
+ void setupBackend( Gaudi::Details::PropertyBase& ioBackendURL );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx
index 73c8712743c..95aaa555893 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx
@@ -13,7 +13,7 @@
#include <algorithm>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// HepMC includes
#include "AtlasHepMC/GenEvent.h"
@@ -450,7 +450,7 @@ bool McVtxFilterTool::keepParticle( const VtxType::Flag vtxType,
// Non-const methods:
///////////////////////////////////////////////////////////////////
-void McVtxFilterTool::setupFilters( Property& /*decayPatterns*/ )
+void McVtxFilterTool::setupFilters( Gaudi::Details::PropertyBase& /*decayPatterns*/ )
{
m_filters.clear();
m_counter.clear();
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.h
index 62da5533367..723d0523320 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.h
@@ -51,7 +51,7 @@
// HepMC / CLHEP includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaBaseComps/AthAlgTool.h"
@@ -163,7 +163,7 @@ class McVtxFilterTool : virtual public IMcVtxFilterTool,
* We ensure the consistency between those 2 entities by defining a callback
* function (@setupFilters) to perform the job.
*/
- void setupFilters( Property& decayPatterns );
+ void setupFilters( Gaudi::Details::PropertyBase& decayPatterns );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx
index 3d68a1119fd..d08ec274bd0 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx
@@ -12,7 +12,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TruthHelper/IsGenStable.h"
#include "TruthHelper/IsGenInteracting.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.cxx
index 9d2a377c934..53a362fc881 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.cxx
@@ -309,13 +309,13 @@ TruthIsolationTool::computeIso( const GenParticles_t& particles,
}
void
-TruthIsolationTool::setupTruthEtIsolationsPrefix( Property& /*truthEtIsolationsPrefix*/ )
+TruthIsolationTool::setupTruthEtIsolationsPrefix( Gaudi::Details::PropertyBase& /*truthEtIsolationsPrefix*/ )
{
// no-op for now
}
void
-TruthIsolationTool::setupMcEventsOutput( Property& /*mcEventsOutputName*/ )
+TruthIsolationTool::setupMcEventsOutput( Gaudi::Details::PropertyBase& /*mcEventsOutputName*/ )
{
// no-op for now
}
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.h
index c8973ca0370..85286d003d8 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.h
@@ -101,12 +101,12 @@ class TruthIsolationTool : virtual public ITruthIsolationTool,
/** @brief Callback method to ensure consistency of the TruthEtIsolations
* prefix key.
*/
- void setupTruthEtIsolationsPrefix( Property& truthEtIsolationsPrefix );
+ void setupTruthEtIsolationsPrefix( Gaudi::Details::PropertyBase& truthEtIsolationsPrefix );
/** @brief Callback method to ensure consistency of output McEventCollection
* key.
*/
- void setupMcEventsOutput( Property& mcEventsOutputName );
+ void setupMcEventsOutput( Gaudi::Details::PropertyBase& mcEventsOutputName );
///////////////////////////////////////////////////////////////////
// Private data:
diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt
index f132bae02e5..283a2a39f42 100644
--- a/Projects/AthGeneration/externals.txt
+++ b/Projects/AthGeneration/externals.txt
@@ -9,4 +9,4 @@
AthGenerationExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use:
-GaudiVersion = v34r0.000
+GaudiVersion = v34r0.003
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 242f63bc478..6b710684420 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -9,4 +9,4 @@
AthSimulationExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use:
-GaudiVersion = v34r0.000
+GaudiVersion = v34r0.003
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index eb81e7685bd..e1b17153500 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -9,4 +9,4 @@
AthenaExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use:
-GaudiVersion = v34r0.000
+GaudiVersion = v34r0.003
diff --git a/Reconstruction/HeavyIonRec/HIGlobal/HIGlobal/HIEventShapeMaker.h b/Reconstruction/HeavyIonRec/HIGlobal/HIGlobal/HIEventShapeMaker.h
index 11e48900b44..6357c70b4d0 100644
--- a/Reconstruction/HeavyIonRec/HIGlobal/HIGlobal/HIEventShapeMaker.h
+++ b/Reconstruction/HeavyIonRec/HIGlobal/HIGlobal/HIEventShapeMaker.h
@@ -13,7 +13,7 @@
#include <string>
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "IHIEventShapeFiller.h"
#include "HIEventUtils/HIEventShapeSummaryTool.h"
diff --git a/Reconstruction/MissingETGoodness/src/JetGoodiesFiller.cxx b/Reconstruction/MissingETGoodness/src/JetGoodiesFiller.cxx
index a1015e1b1fa..4eaf7bee423 100644
--- a/Reconstruction/MissingETGoodness/src/JetGoodiesFiller.cxx
+++ b/Reconstruction/MissingETGoodness/src/JetGoodiesFiller.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "MissingETGoodness/JetGoodiesFiller.h"
#include "MissingETGoodness/MissingETUtils.h"
diff --git a/Reconstruction/MissingETGoodness/src/MuonGoodiesFiller.cxx b/Reconstruction/MissingETGoodness/src/MuonGoodiesFiller.cxx
index 69fe8b5d178..ac1fdcf45b2 100644
--- a/Reconstruction/MissingETGoodness/src/MuonGoodiesFiller.cxx
+++ b/Reconstruction/MissingETGoodness/src/MuonGoodiesFiller.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "muonEvent/MuonContainer.h"
#include "MissingETGoodness/MuonGoodiesFiller.h"
#include "MissingETGoodness/MuonSpShowerHelper.h"
diff --git a/Reconstruction/MissingETPerformance/src/BasicPlotsTool.cxx b/Reconstruction/MissingETPerformance/src/BasicPlotsTool.cxx
index 901a4b1ddcb..8465c8bac77 100755
--- a/Reconstruction/MissingETPerformance/src/BasicPlotsTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/BasicPlotsTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODEventInfo/EventInfo.h"
diff --git a/Reconstruction/MissingETPerformance/src/ContainerComparatorTool.cxx b/Reconstruction/MissingETPerformance/src/ContainerComparatorTool.cxx
index 6c18ac2cb4e..bf3fad81fe6 100755
--- a/Reconstruction/MissingETPerformance/src/ContainerComparatorTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/ContainerComparatorTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Reconstruction/MissingETPerformance/src/EtaRingsTool.cxx b/Reconstruction/MissingETPerformance/src/EtaRingsTool.cxx
index f2e746e8704..69a255d86c3 100755
--- a/Reconstruction/MissingETPerformance/src/EtaRingsTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/EtaRingsTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Reconstruction/MissingETPerformance/src/FakeMissingETTool.cxx b/Reconstruction/MissingETPerformance/src/FakeMissingETTool.cxx
index e5e67680f7a..1efeecece8f 100755
--- a/Reconstruction/MissingETPerformance/src/FakeMissingETTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/FakeMissingETTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//#include "CLHEP/Units/PhysicalConstants.h"
#include "TLorentzVector.h"
diff --git a/Reconstruction/MissingETPerformance/src/LinearityTool.cxx b/Reconstruction/MissingETPerformance/src/LinearityTool.cxx
index f76fecc13b3..448238c8f7d 100755
--- a/Reconstruction/MissingETPerformance/src/LinearityTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/LinearityTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Reconstruction/MissingETPerformance/src/MissingETCompositionTool.cxx b/Reconstruction/MissingETPerformance/src/MissingETCompositionTool.cxx
index 373a41192f2..c9a8276fdc9 100755
--- a/Reconstruction/MissingETPerformance/src/MissingETCompositionTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/MissingETCompositionTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODEventInfo/EventInfo.h"
diff --git a/Reconstruction/MissingETPerformance/src/MissingETScaleTool.cxx b/Reconstruction/MissingETPerformance/src/MissingETScaleTool.cxx
index 46e1c367622..d80947c5e5d 100755
--- a/Reconstruction/MissingETPerformance/src/MissingETScaleTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/MissingETScaleTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "egammaEvent/ElectronContainer.h"
diff --git a/Reconstruction/MissingETPerformance/src/MuonTool.cxx b/Reconstruction/MissingETPerformance/src/MuonTool.cxx
index 1865325d41f..6746f89c028 100644
--- a/Reconstruction/MissingETPerformance/src/MuonTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/MuonTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "MissingETPerformance/MuonTool.h"
diff --git a/Reconstruction/MissingETPerformance/src/ResolutionTool.cxx b/Reconstruction/MissingETPerformance/src/ResolutionTool.cxx
index 323bcd3e4ff..46256b23156 100755
--- a/Reconstruction/MissingETPerformance/src/ResolutionTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/ResolutionTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/PhysicalConstants.h"
#include "AthenaKernel/Units.h"
diff --git a/Reconstruction/MissingETPerformance/src/ZMuMuTool.cxx b/Reconstruction/MissingETPerformance/src/ZMuMuTool.cxx
index cc8b08e0352..98f62cf6c98 100755
--- a/Reconstruction/MissingETPerformance/src/ZMuMuTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/ZMuMuTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//#include "CLHEP/Units/PhysicalConstants.h"
#include <vector>
diff --git a/Reconstruction/MissingETPerformance/src/ZeeTool.cxx b/Reconstruction/MissingETPerformance/src/ZeeTool.cxx
index 3202e7f8aa3..e589b705b01 100755
--- a/Reconstruction/MissingETPerformance/src/ZeeTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/ZeeTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "egammaEvent/ElectronContainer.h"
diff --git a/Reconstruction/RecAlgs/src/JobOptsDumperAlg.h b/Reconstruction/RecAlgs/src/JobOptsDumperAlg.h
index 936e8d8bf3c..bd86ae90aa5 100755
--- a/Reconstruction/RecAlgs/src/JobOptsDumperAlg.h
+++ b/Reconstruction/RecAlgs/src/JobOptsDumperAlg.h
@@ -7,7 +7,7 @@
#ifndef RECO_ALGS_JOBOPTIONSDUMPERALG_H
#define RECO_ALGS_JOBOPTIONSDUMPERALG_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include <string>
diff --git a/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx b/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx
index d3b7c8b460f..d851ec7de07 100644
--- a/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx
+++ b/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CaloClusterMatching/TopoClusterMap.h"
diff --git a/Reconstruction/egamma/egammaCaloTools/src/egammaPreSamplerShape.cxx b/Reconstruction/egamma/egammaCaloTools/src/egammaPreSamplerShape.cxx
index 3c1ed3ad741..03f7d947f2d 100755
--- a/Reconstruction/egamma/egammaCaloTools/src/egammaPreSamplerShape.cxx
+++ b/Reconstruction/egamma/egammaCaloTools/src/egammaPreSamplerShape.cxx
@@ -14,7 +14,7 @@
#include "GaudiKernel/ObjectVector.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/Reconstruction/egamma/egammaTrackTools/src/egammaTrkRefitterTool.cxx b/Reconstruction/egamma/egammaTrackTools/src/egammaTrkRefitterTool.cxx
index 1abba788f42..d0b00200a8f 100644
--- a/Reconstruction/egamma/egammaTrackTools/src/egammaTrkRefitterTool.cxx
+++ b/Reconstruction/egamma/egammaTrackTools/src/egammaTrkRefitterTool.cxx
@@ -31,7 +31,7 @@
// INCLUDE GAUDI HEADER FILES:
#include "GaudiKernel/ObjectVector.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
egammaTrkRefitterTool::egammaTrkRefitterTool(const std::string& type,
diff --git a/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx b/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx
index 08b34931071..62c370e1e0d 100644
--- a/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx
+++ b/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx
@@ -7,7 +7,7 @@
#include "EfficiencyPlot.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h b/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h
index 2c46cc99f3b..c2d4c52b235 100644
--- a/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h
+++ b/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h
@@ -25,7 +25,7 @@
#include "xAODTruth/xAODTruthHelpers.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/Reconstruction/egamma/egammaValidation/src/ParticleHistograms.cxx b/Reconstruction/egamma/egammaValidation/src/ParticleHistograms.cxx
index fc4b83e2018..a4a584733bf 100644
--- a/Reconstruction/egamma/egammaValidation/src/ParticleHistograms.cxx
+++ b/Reconstruction/egamma/egammaValidation/src/ParticleHistograms.cxx
@@ -6,7 +6,7 @@
#include <typeinfo>
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Reconstruction/egamma/egammaValidation/src/WidthPlot.cxx b/Reconstruction/egamma/egammaValidation/src/WidthPlot.cxx
index 6360ce859dd..f8b214c78e7 100644
--- a/Reconstruction/egamma/egammaValidation/src/WidthPlot.cxx
+++ b/Reconstruction/egamma/egammaValidation/src/WidthPlot.cxx
@@ -5,7 +5,7 @@
#include "WidthPlot.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx b/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx
index e6763cc28db..3e0466a674d 100644
--- a/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx
+++ b/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx
@@ -27,11 +27,11 @@ std::string TauRecToolBase::find_file(const std::string& fname) const {
StatusCode TauRecToolBase::readConfig() {
// Sanity check to see if property ConfigPath is declared for a tool. Might be
// removed once all tools are updated to have a config path declared.
- // in athena getProperties returns std::vector<Property*>
+ // in athena getProperties returns std::vector<Gaudi::Details::PropertyBase*>
// in rc getProperties returns std::map<std::string,Property*>
#ifndef XAOD_STANDALONE
bool configPathDeclared = false;
- for (Property* property : getProperties())
+ for (Gaudi::Details::PropertyBase* property : getProperties())
{
if (property->name() == "ConfigPath")
{
diff --git a/Simulation/BeamEffects/src/CrabKissingVertexPositioner.cxx b/Simulation/BeamEffects/src/CrabKissingVertexPositioner.cxx
index 3ada121414e..330776676aa 100644
--- a/Simulation/BeamEffects/src/CrabKissingVertexPositioner.cxx
+++ b/Simulation/BeamEffects/src/CrabKissingVertexPositioner.cxx
@@ -60,7 +60,7 @@ namespace Simulation
{
}
- void CrabKissingVertexPositioner::BunchShapeHandler(Property&)
+ void CrabKissingVertexPositioner::BunchShapeHandler(Gaudi::Details::PropertyBase&)
{
if(m_bunchShapeProp.value() == "GAUSS") m_bunchShape = BunchShape::GAUSS;
else if(m_bunchShapeProp.value() == "FLAT") m_bunchShape = BunchShape::FLAT;
diff --git a/Simulation/BeamEffects/src/CrabKissingVertexPositioner.h b/Simulation/BeamEffects/src/CrabKissingVertexPositioner.h
index fba1fa23995..9348a52f1e5 100644
--- a/Simulation/BeamEffects/src/CrabKissingVertexPositioner.h
+++ b/Simulation/BeamEffects/src/CrabKissingVertexPositioner.h
@@ -72,7 +72,7 @@ namespace Simulation
std::string m_randomEngineName; //!< Name of the random number stream
StringProperty m_bunchShapeProp;
- void BunchShapeHandler(Property&);
+ void BunchShapeHandler(Gaudi::Details::PropertyBase&);
enum BunchShape{GAUSS,FLAT,NSHAPES};
BunchShape m_bunchShape; // GAUSS or FLAT
double m_bunchLength; //!< Parameter in the Z distribution of the beamspot
diff --git a/Simulation/FastShower/FastCaloSim/src/CaloCellContainerFCSFinalizerTool.cxx b/Simulation/FastShower/FastCaloSim/src/CaloCellContainerFCSFinalizerTool.cxx
index 2a9507522c5..49ccf8f71b4 100644
--- a/Simulation/FastShower/FastCaloSim/src/CaloCellContainerFCSFinalizerTool.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/CaloCellContainerFCSFinalizerTool.cxx
@@ -19,7 +19,7 @@ PURPOSE: Apply necessary finalising operation to CaloCellContainer
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/Simulation/G4Sim/G4HiveEx/src/G4InputLoader.cxx b/Simulation/G4Sim/G4HiveEx/src/G4InputLoader.cxx
index 8daa1f348c6..16be5ad8cd2 100644
--- a/Simulation/G4Sim/G4HiveEx/src/G4InputLoader.cxx
+++ b/Simulation/G4Sim/G4HiveEx/src/G4InputLoader.cxx
@@ -9,7 +9,7 @@
#include "G4InputLoader.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GeneratorObjects/McEventCollection.h"
#include "AthenaKernel/errorcheck.h"
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeGenericMuonSimHitCollTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeGenericMuonSimHitCollTool.h
index fa469a37abf..7b6167d4a0c 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeGenericMuonSimHitCollTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeGenericMuonSimHitCollTool.h
@@ -9,7 +9,7 @@
#include "MuonSimEvent/GenericMuonSimHitCollection.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include <string>
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.h
index e556c97518a..038b9aefa92 100755
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.h
@@ -7,7 +7,7 @@
#include "PileUpTools/PileUpToolBase.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/PhysicalConstants.h"
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeRecoTimingObjTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeRecoTimingObjTool.h
index 036f05839cd..8c934d33c2f 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeRecoTimingObjTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeRecoTimingObjTool.h
@@ -7,7 +7,7 @@
#include "PileUpTools/PileUpToolBase.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "PileUpTools/PileUpMergeSvc.h"
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTrackRecordCollTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTrackRecordCollTool.h
index f7f438309a4..204c3f02d54 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTrackRecordCollTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTrackRecordCollTool.h
@@ -8,7 +8,7 @@
#include "PileUpTools/PileUpToolBase.h"
#include "TrackRecord/TrackRecordCollection.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "PileUpTools/PileUpMergeSvc.h"
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTruthJetsTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTruthJetsTool.h
index 177c6dd0d88..623c8b260c1 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTruthJetsTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTruthJetsTool.h
@@ -9,7 +9,7 @@
#include "xAODJet/JetContainer.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "PileUpTools/PileUpMergeSvc.h"
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.h
index 07c14ad2440..aad1f661574 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.h
@@ -5,7 +5,7 @@
#ifndef MCTRUTHSIMALGS_NEWMERGEMCEVENTCOLLTOOL_H
#define MCTRUTHSIMALGS_NEWMERGEMCEVENTCOLLTOOL_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/WriteHandle.h"
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.h
index 15e3259f717..a378da019de 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.h
@@ -7,7 +7,7 @@
#include "PileUpTools/PileUpToolBase.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include <utility> /* pair */
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx b/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx
index 55e5cba78f0..02bcb6db259 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx
@@ -13,7 +13,7 @@
#include "ISF_Interfaces/IMonitoringTool.h"
#include "ISF_Interfaces/IEventFilterTool.h"
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Boost
#include <boost/lexical_cast.hpp>
// ATLAS cxx utils
diff --git a/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.cxx b/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.cxx
index 646d3b15d70..d83c4d23203 100644
--- a/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.cxx
+++ b/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.cxx
@@ -24,7 +24,7 @@ ISF::BaseSimulationSelector::BaseSimulationSelector(const std::string& type, con
m_simFlavorProp.declareUpdateHandler(&ISF::BaseSimulationSelector::SimulationFlavorHandler, this);
}
-void ISF::BaseSimulationSelector::SimulationFlavorHandler(Property&)
+void ISF::BaseSimulationSelector::SimulationFlavorHandler(Gaudi::Details::PropertyBase&)
{
// FIXME would probably be better to have this in SimulationFlavor.h
switch(m_simFlavorProp.value())
diff --git a/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.h b/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.h
index d0e9940463e..6b23eb1bc62 100644
--- a/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.h
+++ b/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.h
@@ -72,7 +72,7 @@ class BaseSimulationSelector : public extends<AthAlgTool, ISimulationSelector> {
bool m_isDynamic; //!< this selector is either dynamic or static
bool m_invertCuts; //!< invert the result given by passesCuts(..) method
Gaudi::CheckedProperty<unsigned short> m_simFlavorProp{0}; //!< the simulation flavour that this selector will select
- void SimulationFlavorHandler(Property&);
+ void SimulationFlavorHandler(Gaudi::Details::PropertyBase&);
ISF::SimulationFlavor m_simflavor{ISF::UndefinedSim}; //!< simulation flavor
};
diff --git a/Simulation/Tools/CaloSamplingFractionAnalysis/src/LarEMSamplingFraction.cxx b/Simulation/Tools/CaloSamplingFractionAnalysis/src/LarEMSamplingFraction.cxx
index 98cca5dec77..401e0e793dd 100644
--- a/Simulation/Tools/CaloSamplingFractionAnalysis/src/LarEMSamplingFraction.cxx
+++ b/Simulation/Tools/CaloSamplingFractionAnalysis/src/LarEMSamplingFraction.cxx
@@ -14,7 +14,7 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GeneratorObjects/McEventCollection.h"
diff --git a/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx b/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx
index 64f47ec3785..445fc27d1c9 100755
--- a/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx
+++ b/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx
@@ -11,7 +11,7 @@
#include "TBCaloGeometry/TBCaloCoordinate.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx b/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx
index 9f77816c806..fa1ab72fede 100644
--- a/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx
+++ b/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx
@@ -4,7 +4,7 @@
#include "TBCnv/TBByteStreamCnvTool.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "ByteStreamCnvSvc/ByteStreamCnvSvc.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
diff --git a/TileCalorimeter/TileConditions/src/TileEMScaleCondAlg.h b/TileCalorimeter/TileConditions/src/TileEMScaleCondAlg.h
index bad5ace0349..740c31dd0d2 100644
--- a/TileCalorimeter/TileConditions/src/TileEMScaleCondAlg.h
+++ b/TileCalorimeter/TileConditions/src/TileEMScaleCondAlg.h
@@ -17,7 +17,7 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
/**
* @brief Condition algorithm to produce TileEMScale and put it into condition store
diff --git a/TileCalorimeter/TileRecUtils/src/TileCellMaskingTool.cxx b/TileCalorimeter/TileRecUtils/src/TileCellMaskingTool.cxx
index 4a349f41b26..873bca789c3 100644
--- a/TileCalorimeter/TileRecUtils/src/TileCellMaskingTool.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileCellMaskingTool.cxx
@@ -4,7 +4,7 @@
// Gaudi includes
#include "GaudiKernel/Service.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Atlas includes
#include "AthenaKernel/errorcheck.h"
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilter.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilter.cxx
index 7a87b1650ba..d929947ccbe 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilter.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilter.cxx
@@ -19,7 +19,7 @@
#include "AthenaKernel/errorcheck.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// lang include
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilterCool.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilterCool.cxx
index cd39b530c4a..477d783b14c 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilterCool.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilterCool.cxx
@@ -5,7 +5,7 @@
#include "TileEvent/TileRawChannel.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IIncidentSvc.h"
// Atlas includes
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFlatFilter.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFlatFilter.cxx
index da200a02a37..ca39c80ada9 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFlatFilter.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFlatFilter.cxx
@@ -5,7 +5,7 @@
#include "TileEvent/TileRawChannel.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Atlas includes
#include "AthAllocators/DataPool.h"
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx
index f5a53f0eea6..b67c1087fb7 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx
@@ -18,7 +18,7 @@
#include "AthenaKernel/errorcheck.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// lang include
#include <algorithm>
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderManyAmps.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderManyAmps.cxx
index 21a8686b63a..234fb28ca51 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderManyAmps.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderManyAmps.cxx
@@ -15,7 +15,7 @@
#include "TileRecUtils/TileFilterTester.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//Atlas includes
#include "AthAllocators/DataPool.h"
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOpt2Filter.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOpt2Filter.cxx
index 2e0082e0d21..5ef745a88fa 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOpt2Filter.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOpt2Filter.cxx
@@ -32,7 +32,7 @@
#include "AthenaKernel/errorcheck.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Matrix/Matrix.h"
//using namespace std;
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderQIEFilter.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderQIEFilter.cxx
index 6f898b871ac..60d40ea8b5d 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderQIEFilter.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderQIEFilter.cxx
@@ -22,7 +22,7 @@
#include "TileCalibBlobObjs/TileCalibUtils.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Atlas includes
#include "AthAllocators/DataPool.h"
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderWienerFilter.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderWienerFilter.cxx
index 6ec1792a13a..2b3c7b9dba0 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderWienerFilter.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderWienerFilter.cxx
@@ -6,7 +6,7 @@
#include "TileCalibBlobObjs/TileCalibUtils.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GeoModelInterfaces/IGeoModelSvc.h"
// Atlas includes
diff --git a/TileCalorimeter/TileSimUtils/src/TileCalibHitCntNtup.cxx b/TileCalorimeter/TileSimUtils/src/TileCalibHitCntNtup.cxx
index 6053a20abf5..4b086efc0d2 100644
--- a/TileCalorimeter/TileSimUtils/src/TileCalibHitCntNtup.cxx
+++ b/TileCalorimeter/TileSimUtils/src/TileCalibHitCntNtup.cxx
@@ -6,7 +6,7 @@
// Atlas includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/errorcheck.h"
// ROOT includes
diff --git a/TileCalorimeter/TileSimUtils/src/TileCalibHitNtuple.cxx b/TileCalorimeter/TileSimUtils/src/TileCalibHitNtuple.cxx
index 10e10f12f88..70a433b9723 100644
--- a/TileCalorimeter/TileSimUtils/src/TileCalibHitNtuple.cxx
+++ b/TileCalorimeter/TileSimUtils/src/TileCalibHitNtuple.cxx
@@ -6,7 +6,7 @@
// Atlas includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/errorcheck.h"
// ROOT includes
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExCellWriterSvc.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExCellWriterSvc.h
index ec9bc4cd60d..a0f2ae278f6 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExCellWriterSvc.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExCellWriterSvc.h
@@ -7,7 +7,7 @@
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "ActsGeometry/IActsExCellWriterSvc.h"
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
index 9c6aa5d3058..89635fe82c7 100755
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
@@ -8,7 +8,7 @@
// ATHENA
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/ISvcLocator.h"
// ACTS
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
index 942549f6789..3b3588e846d 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/EventContext.h"
// Need to include this early; otherwise, we run into errors with
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialJsonWriterTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialJsonWriterTool.h
index c457d4ee3ef..6ae582a783f 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialJsonWriterTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialJsonWriterTool.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
// PACKAGE
#include "ActsGeometryInterfaces/IActsMaterialJsonWriterTool.h"
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialMapping.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialMapping.h
index 10a7105a245..4cad3f6f2e6 100755
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialMapping.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialMapping.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/ISvcLocator.h"
#include "StoreGate/ReadHandleKey.h"
#include "TrkGeometry/MaterialStepCollection.h"
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialTrackWriterSvc.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialTrackWriterSvc.h
index c8aeff8c547..7c4e5a32d90 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialTrackWriterSvc.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialTrackWriterSvc.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include <vector>
#include <deque>
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsObjWriterTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsObjWriterTool.h
index 23f101e8f85..5ad9eea85e6 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsObjWriterTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsObjWriterTool.h
@@ -11,7 +11,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/IInterface.h"
#include "ActsGeometry/ActsGeometryContext.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
namespace Acts {
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsPropStepRootWriterSvc.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsPropStepRootWriterSvc.h
index 7c63e67f3a7..ec67d1c3b00 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsPropStepRootWriterSvc.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsPropStepRootWriterSvc.h
@@ -7,7 +7,7 @@
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "ActsGeometry/IActsPropStepRootWriterSvc.h"
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsSurfaceMappingTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsSurfaceMappingTool.h
index 95e225b023c..d9211d1e9bb 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsSurfaceMappingTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsSurfaceMappingTool.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/EventContext.h"
// PACKAGE
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsVolumeMappingTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsVolumeMappingTool.h
index e22160eb09b..4b04bd4dd46 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsVolumeMappingTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsVolumeMappingTool.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/EventContext.h"
// PACKAGE
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometry.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometry.h
index 9d79fb9e7ed..c86281634a5 100755
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometry.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometry.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaKernel/IAthRNGSvc.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/ISvcLocator.h"
// PACKAGE
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometryTransforms.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometryTransforms.h
index 14d1da49533..32fcf333e67 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometryTransforms.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometryTransforms.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaKernel/IAthRNGSvc.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/ISvcLocator.h"
// PACKAGE
diff --git a/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h b/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
index 2093fe29d1f..9b742841e16 100644
--- a/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
+++ b/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/EventContext.h"
#include "BeamSpotConditionsData/BeamSpotData.h"
#include "TrkTrackLink/ITrackLink.h"
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/TrkDetDescrSvc/TrackingGeometrySvc.h b/Tracking/TrkDetDescr/TrkDetDescrSvc/TrkDetDescrSvc/TrackingGeometrySvc.h
index 843ae7714d5..22f57382df0 100755
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/TrkDetDescrSvc/TrackingGeometrySvc.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/TrkDetDescrSvc/TrackingGeometrySvc.h
@@ -14,7 +14,7 @@
#include "TrkGeometry/LayerMaterialMap.h"
#include "TrkDetDescrInterfaces/IGeometryBuilder.h"
#include "TrkDetDescrInterfaces/IGeometryProcessor.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaKernel/IOVSvcDefs.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/ExtrapolatorComparisonTest.h b/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/ExtrapolatorComparisonTest.h
index aa969d304ab..fa61505d349 100644
--- a/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/ExtrapolatorComparisonTest.h
+++ b/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/ExtrapolatorComparisonTest.h
@@ -15,7 +15,7 @@
// ATHENA
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/EventContext.h"
#include "GaudiKernel/RndmGenerators.h"
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/PropResultRootWriterSvc.h b/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/PropResultRootWriterSvc.h
index 420ca7a2f2f..af7335299ac 100644
--- a/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/PropResultRootWriterSvc.h
+++ b/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/PropResultRootWriterSvc.h
@@ -7,7 +7,7 @@
#define TRKEXALGS_PROPRESULTROOTWRITERSVC_H
#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingCondAlg.h b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingCondAlg.h
index 3900549600e..fd4c86c764d 100644
--- a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingCondAlg.h
+++ b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingCondAlg.h
@@ -13,7 +13,7 @@
#include "StoreGate/CondHandleKeyArray.h"
#include "TrkRIO_OnTrack/RIO_OnTrackErrorScaling.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <iostream>
class RIO_OnTrackErrorScalingKit;
diff --git a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingDbOverrideCondAlg.h b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingDbOverrideCondAlg.h
index 1bf64c0d7ff..f2d21b137ba 100644
--- a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingDbOverrideCondAlg.h
+++ b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingDbOverrideCondAlg.h
@@ -12,7 +12,7 @@
#include "StoreGate/WriteCondHandleKey.h"
#include "TrkRIO_OnTrack/RIO_OnTrackErrorScaling.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <iostream>
class RIO_OnTrackErrorScalingKit;
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.cxx
index e20760d1ce3..acde5ef4f23 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTracking/Vertex.h"
#include "TrkLinks/LinkToXAODTrackParticle.h"
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/ImagingSeedTuningAlg.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/ImagingSeedTuningAlg.cxx
index 475120b0317..c5582c8d102 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/ImagingSeedTuningAlg.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/ImagingSeedTuningAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "InDetTrackSelectionTool/IInDetTrackSelectionTool.h"
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloCell2ClusterMapper.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloCell2ClusterMapper.cxx
index 79eea27e7b9..193eeceb981 100755
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloCell2ClusterMapper.cxx
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloCell2ClusterMapper.cxx
@@ -42,7 +42,7 @@
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ListItem.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//###############################################################################
// CONSTRUCTOR:
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTopoTowerAlgorithm.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTopoTowerAlgorithm.cxx
index c9b031816b8..295ec528744 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTopoTowerAlgorithm.cxx
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTopoTowerAlgorithm.cxx
@@ -17,7 +17,7 @@
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ListItem.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//
#include "EventKernel/INavigable4Momentum.h"
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.h b/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.h
index debb6771b4c..b334a25abbc 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.h
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.h
@@ -15,7 +15,7 @@
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTrigMissingET/TrigMissingETContainer.h"
#include "GaudiKernel/SystemOfUnits.h"
#include "MonGroupBuilder.h"
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx b/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
index 9c4201c7399..d982a3d6f8e 100755
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
@@ -73,7 +73,7 @@ PURPOSE: Algorithm is an adaptation for the trigger of the egammaBuilder.cxx
// INCLUDE GAUDI HEADER FILES:
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include <algorithm>
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h
index e1102d79b41..65d426f3d39 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h
@@ -16,7 +16,7 @@
#include "TrigInterfaces/AllTEAlgo.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include <vector>
@@ -54,7 +54,7 @@ public:
/// Run once per event
HLT::ErrorCode hltExecute(std::vector<HLT::TEVec>&, unsigned int output);
- void updateHandler(Property& p);
+ void updateHandler(Gaudi::Details::PropertyBase& p);
// TrigL2MuonSA::RecMuonRoIUtils m_recMuonRoIUtils;
// ToolHandle<TrigL2MuonSA::MuFastDataPreparator> m_dataPreparator;
ToolHandle<TrigL2MuonSA::RpcDataPreparator>m_rpcDataPreparator;
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h
index bc7f108cce1..9f15867d33a 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h
@@ -16,7 +16,7 @@
#include "TrigInterfaces/AllTEAlgo.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include <vector>
@@ -67,7 +67,7 @@ public:
/// Run once per event
HLT::ErrorCode hltExecute(std::vector<HLT::TEVec>&, unsigned int output);
- void updateHandler(Property& p);
+ void updateHandler(Gaudi::Details::PropertyBase& p);
private:
std::vector<uint32_t> m_bitmasks;
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/DetectorTimingAlgo.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/DetectorTimingAlgo.cxx
index 573f83e8dfe..7936b31355e 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/DetectorTimingAlgo.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/DetectorTimingAlgo.cxx
@@ -12,7 +12,7 @@
#include "TrigGenericAlgs/DetectorTimingAlgo.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <math.h>
#include <sstream>
@@ -145,7 +145,7 @@ HLT::ErrorCode DetectorTimingAlgo::hltInitialize()
}
-void DetectorTimingAlgo::updateHandler(Property&)
+void DetectorTimingAlgo::updateHandler(Gaudi::Details::PropertyBase&)
{
// parseROBRequest();
}
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/L1CorrelationAlgo.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/L1CorrelationAlgo.cxx
index 6be24bcf5e1..3061287b5d9 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/L1CorrelationAlgo.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/L1CorrelationAlgo.cxx
@@ -12,7 +12,7 @@
#include "TrigGenericAlgs/L1CorrelationAlgo.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include <math.h>
@@ -285,7 +285,7 @@ HLT::ErrorCode L1CorrelationAlgo::hltInitialize()
}
-void L1CorrelationAlgo::updateHandler(Property&)
+void L1CorrelationAlgo::updateHandler(Gaudi::Details::PropertyBase&)
{
// parseROBRequest();
}
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.cxx
index 20a2562075c..b9360ee106f 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.cxx
@@ -12,7 +12,7 @@
#include "ROBRequestAlgo.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include <math.h>
@@ -43,7 +43,7 @@ HLT::ErrorCode ROBRequestAlgo::hltInitialize()
ServiceHandle<IJobOptionsSvc> jobOptSvc("JobOptionsSvc", name());
// get the list of enabled ROBs
- const Property* p = Gaudi::Utils::getProperty(jobOptSvc->getProperties("DataFlowConfig"),
+ const Gaudi::Details::PropertyBase* p = Gaudi::Utils::getProperty(jobOptSvc->getProperties("DataFlowConfig"),
"DF_Enabled_ROB_IDs");
if (p) m_enabledROBs.assign(*p);
else ATH_MSG_DEBUG("Could not find property DataFlowConfig.DF_Enabled_ROB_IDs");
@@ -70,7 +70,7 @@ HLT::ErrorCode ROBRequestAlgo::hltInitialize()
}
-void ROBRequestAlgo::updateHandler(Property&)
+void ROBRequestAlgo::updateHandler(Gaudi::Details::PropertyBase&)
{
parseROBRequest();
}
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h
index 0d3c4318a23..9361a82a211 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h
@@ -16,7 +16,7 @@
#include "TrigInterfaces/AllTEAlgo.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include <vector>
@@ -68,7 +68,7 @@ public:
/// Run once per event
HLT::ErrorCode hltExecute(std::vector<HLT::TEVec>&, unsigned int);
- void updateHandler(Property& p);
+ void updateHandler(Gaudi::Details::PropertyBase& p);
private:
void parseROBRequest();
diff --git a/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIClusterMaker.cxx b/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIClusterMaker.cxx
index e4298fa465f..434e8e1aad0 100644
--- a/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIClusterMaker.cxx
+++ b/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIClusterMaker.cxx
@@ -14,7 +14,7 @@
#include "CaloUtils/CaloCollectionHelper.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
//#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/StatusCode.h"
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h
index 3ee2812855c..715c4de3e65 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h
+++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h
@@ -12,7 +12,7 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#include "xAODTracking/TrackParticleContainer.h"
#include "AthenaMonitoringKernel/Monitored.h"
#include <map>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthViews/View.h"
// STL includes
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h
index 6fadfe9373b..4c0347dca06 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h
+++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h
@@ -4,7 +4,7 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#ifndef TRIGT2MINBIAS_TRACKCOUNTHYPOTOOL_H
#define TRIGT2MINBIAS_TRACKCOUNTHYPOTOOL_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx
index ea095c06df2..16f838d58e9 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx
@@ -7,7 +7,7 @@
#include "tbb/blocked_range.h"
#include "TestTools/expect.h"
#include "TestTools/ParallelCallTest.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigT2CaloCommon/LArCellCont.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
#include "CaloEvent/CaloConstCellContainer.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoAlgMT.h b/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoAlgMT.h
index d3a6f5e6e63..e59d4c8cd23 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoAlgMT.h
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoAlgMT.h
@@ -11,7 +11,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#include "DecisionHandling/TrigCompositeUtils.h"
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include <map>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthViews/View.h"
// STL includes
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoTool.h b/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoTool.h
index 49c852fc05d..73e86078467 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoTool.h
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoTool.h
@@ -4,7 +4,7 @@ Copyright! (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#ifndef TRIGT2MINBIAS_SPCOUNTHYPOTOOL_H
#define TRIGT2MINBIAS_SPCOUNTHYPOTOOL_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx
index 9dcb15f6f22..2fe0baa8aaa 100755
--- a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx
+++ b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx
@@ -17,7 +17,7 @@
//#include "GaudiKernel/IToolSvc.h"
//#include "GaudiKernel/ListItem.h"
//#include "GaudiKernel/StatusCode.h"
-//#include "GaudiKernel/Property.h"
+//#include "Gaudi/Property.h"
#include "TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionTool.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionTool.cxx
index fbf0c1d3571..d1b00685ed2 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionTool.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionTool.cxx
@@ -59,7 +59,7 @@ Trig::TrigDecisionTool::TrigDecisionTool(const std::string& name) :
#ifndef XAOD_STANDALONE
//just for Athena/AthAnalysisBase
auto props = getProperties();
- for( Property* prop : props ) {
+ for( Gaudi::Details::PropertyBase* prop : props ) {
if( prop->name() != "OutputLevel" ) {
continue;
}
@@ -72,7 +72,7 @@ Trig::TrigDecisionTool::TrigDecisionTool(const std::string& name) :
}
#ifndef XAOD_STANDALONE
-void Trig::TrigDecisionTool::outputlevelupdateHandler(Property& /*p*/) {
+void Trig::TrigDecisionTool::outputlevelupdateHandler(Gaudi::Details::PropertyBase& /*p*/) {
//call the original update handler
Logger::msg().setLevel(AthMessaging::msg().level());
}
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.h
index 7fd99520001..6316ea07216 100755
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.h
@@ -87,7 +87,7 @@ namespace Trig {
StatusCode finalize();
#ifndef XAOD_STANDALONE
- void outputlevelupdateHandler(Property& p); //propagates outputlevel changes to the Logger
+ void outputlevelupdateHandler(Gaudi::Details::PropertyBase& p); //propagates outputlevel changes to the Logger
#endif
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaAnalysisBaseTool.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaAnalysisBaseTool.cxx
index f7d0bb03f6c..2d84ad00cf5 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaAnalysisBaseTool.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaAnalysisBaseTool.cxx
@@ -95,7 +95,7 @@ TrigEgammaAnalysisBaseTool( const std::string& myname )
m_forceTrigEmulation=false;
}
-void TrigEgammaAnalysisBaseTool::updateDetail(Property& /*p*/){
+void TrigEgammaAnalysisBaseTool::updateDetail(Gaudi::Details::PropertyBase& /*p*/){
plot()->setDetail(m_detailedHists);
// Detail for tools needs to be reset for every call in Analysis
for( auto& tool : m_tools) {
@@ -103,18 +103,18 @@ void TrigEgammaAnalysisBaseTool::updateDetail(Property& /*p*/){
}
}
-void TrigEgammaAnalysisBaseTool::updateAltBinning(Property& /*p*/){
+void TrigEgammaAnalysisBaseTool::updateAltBinning(Gaudi::Details::PropertyBase& /*p*/){
plot()->setAltBinning(m_doJpsiee);
}
-void TrigEgammaAnalysisBaseTool::updateTP(Property& /*p*/){
+void TrigEgammaAnalysisBaseTool::updateTP(Gaudi::Details::PropertyBase& /*p*/){
plot()->setTP(m_tp);
for( auto& tool : m_tools) {
tool->setTP(m_tp);
}
}
-void TrigEgammaAnalysisBaseTool::updateEmulation(Property& /*p*/){
+void TrigEgammaAnalysisBaseTool::updateEmulation(Gaudi::Details::PropertyBase& /*p*/){
// This may not be set yet if we're in the middle of initialization.
if (!m_plot.typeAndName().empty()) {
plot()->setEmulation(m_doEmulation);
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaAnalysisBaseTool.h b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaAnalysisBaseTool.h
index 7b0ad509def..c7101507a40 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaAnalysisBaseTool.h
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaAnalysisBaseTool.h
@@ -93,11 +93,11 @@ ASG_TOOL_CLASS(TrigEgammaAnalysisBaseTool, ITrigEgammaAnalysisBaseTool)
private:
/*! Property update handlers */
- void updateDetail(Property& p);
- void updateAltBinning(Property& p);
- void updateTP(Property& p);
- void updateEmulation(Property& p);
- void updateOutputLevel(Property& p);
+ void updateDetail(Gaudi::Details::PropertyBase& p);
+ void updateAltBinning(Gaudi::Details::PropertyBase& p);
+ void updateTP(Gaudi::Details::PropertyBase& p);
+ void updateEmulation(Gaudi::Details::PropertyBase& p);
+ void updateOutputLevel(Gaudi::Details::PropertyBase& p);
std::string m_msg;
/*! creates map of trigger name and TrigInfo struct */
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaAnalysisAlg.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaAnalysisAlg.cxx
index 5bfd6fa6889..60316f519eb 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaAnalysisAlg.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaAnalysisAlg.cxx
@@ -5,7 +5,7 @@
// TrigEgammaAnalysisAlg.cxx
#include "TrigEgammaAnalysisAlg.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaAnalysisTools/ITrigEgammaAnalysisBaseTool.h"
#include "AsgTools/AsgTool.h"
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaTDToolTest.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaTDToolTest.cxx
index 238827bf56a..8408cf31a0e 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaTDToolTest.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaTDToolTest.cxx
@@ -5,7 +5,7 @@
// TrigEgammaTDToolTest.cxx
#include "TrigEgammaTDToolTest.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODEgamma/ElectronContainer.h"
#include "xAODEgamma/PhotonContainer.h"
using std::string;
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.cxx
index ae81fc078d2..7811bed2801 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.cxx
@@ -3,7 +3,7 @@
*/
#include "TrigEgammaEmulationToolAlg.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTrigger/EmTauRoI.h"
#include "xAODTrigCalo/TrigEMCluster.h"
#include "xAODTrigRinger/TrigRingerRings.h"
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
index 73f48b44219..f756e23e78c 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
@@ -5,7 +5,7 @@
// TrigEgammaMatchingToolTest.cxx
#include "TrigEgammaEmulationToolTest.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTrigger/EmTauRoI.h"
#include "xAODTrigCalo/TrigEMCluster.h"
#include "xAODTrigRinger/TrigRingerRings.h"
diff --git a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/TrigEgammaMatchingTool/TrigEgammaMatchingToolMT.h b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/TrigEgammaMatchingTool/TrigEgammaMatchingToolMT.h
index 0d08ee8f434..4a8400b3578 100644
--- a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/TrigEgammaMatchingTool/TrigEgammaMatchingToolMT.h
+++ b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/TrigEgammaMatchingTool/TrigEgammaMatchingToolMT.h
@@ -5,7 +5,7 @@
#ifndef TrigEgammaMatchingToolMT_H
#define TrigEgammaMatchingToolMT_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AsgTools/AsgTool.h"
#include "AsgTools/ToolHandle.h"
#include "TrigDecisionTool/TrigDecisionTool.h"
diff --git a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/src/TrigEgammaMatchingToolTest.cxx b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/src/TrigEgammaMatchingToolTest.cxx
index 139d2fcd2bc..d70be807b1e 100644
--- a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/src/TrigEgammaMatchingToolTest.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/src/TrigEgammaMatchingToolTest.cxx
@@ -5,7 +5,7 @@
// TrigEgammaMatchingToolTest.cxx
#include "TrigEgammaMatchingToolTest.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
using std::string;
//**********************************************************************
diff --git a/Trigger/TrigAnalysis/TrigRootAnalysis/src/TrigConfigSvcAthD3PD.cxx b/Trigger/TrigAnalysis/TrigRootAnalysis/src/TrigConfigSvcAthD3PD.cxx
index 85001ae1c18..a28b7e08aab 100644
--- a/Trigger/TrigAnalysis/TrigRootAnalysis/src/TrigConfigSvcAthD3PD.cxx
+++ b/Trigger/TrigAnalysis/TrigRootAnalysis/src/TrigConfigSvcAthD3PD.cxx
@@ -15,7 +15,7 @@
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/System.h"
#include "AthenaKernel/errorcheck.h"
@@ -79,15 +79,15 @@ namespace D3PD {
m_tupleName = "";
ServiceHandle< IJobOptionsSvc > jobOSvc( "JobOptionsSvc", name() );
CHECK( jobOSvc.retrieve() );
- const std::vector< const Property* >* evSelProp =
+ const std::vector< const Gaudi::Details::PropertyBase* >* evSelProp =
jobOSvc->getProperties( "EventSelector" );
if( ! evSelProp ) {
REPORT_MESSAGE( MSG::FATAL )
<< "Didn't find the input file list";
return StatusCode::FAILURE;
}
- std::vector< const Property* >::const_iterator itr = evSelProp->begin();
- std::vector< const Property* >::const_iterator end = evSelProp->end();
+ std::vector< const Gaudi::Details::PropertyBase* >::const_iterator itr = evSelProp->begin();
+ std::vector< const Gaudi::Details::PropertyBase* >::const_iterator end = evSelProp->end();
for( ; itr != end; ++itr ) {
// Look for the "InputCollections" property:
diff --git a/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MatchingTool.cxx b/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MatchingTool.cxx
index 5c9a35b01c0..3ebdf9ee50e 100644
--- a/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MatchingTool.cxx
+++ b/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MatchingTool.cxx
@@ -21,7 +21,7 @@ MatchingTool::MatchingTool(const std::string& name) :
}
#ifndef XAOD_STANDALONE
-void MatchingTool::updateThreshold(Property& /*p*/) {
+void MatchingTool::updateThreshold(Gaudi::Details::PropertyBase& /*p*/) {
ATH_MSG_DEBUG("Matching Threshold is updated to:" << m_matchingThreshold);
impl()->setThreshold( m_matchingThreshold );
}
diff --git a/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingTool.h b/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingTool.h
index 0f505b108e6..6092aed6dde 100644
--- a/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingTool.h
+++ b/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingTool.h
@@ -41,7 +41,7 @@ protected:
#ifndef XAOD_STANDALONE
- void updateThreshold(Property& p);
+ void updateThreshold(Gaudi::Details::PropertyBase& p);
#endif
private:
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/DSConfigSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/DSConfigSvc.cxx
index 621a1047ff1..62efca7e710 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/DSConfigSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/DSConfigSvc.cxx
@@ -109,7 +109,7 @@ TrigConf::DSConfigSvc::initialize() {
if( jobOptionsSvc.retrieve().isFailure() ) {
ATH_MSG_WARNING( "Cannot retrieve JobOptionsSvc" );
} else {
- const Property* p =
+ const Gaudi::Details::PropertyBase* p =
Gaudi::Utils::getProperty( jobOptionsSvc->getProperties( "IOVDbSvc" ), "Folders" );
if( p ) m_folders = p->toString();
ATH_MSG_DEBUG( "The string 'folders' is: " << m_folders );
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
index 6773a06ab98..6613ef76b2f 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
@@ -205,7 +205,7 @@ HLTConfigSvc::initialize() {
if (jobOptionsSvc.retrieve().isFailure()) {
ATH_MSG_WARNING("Cannot retrieve JobOptionsSvc");
} else {
- const Property* p=Gaudi::Utils::getProperty( jobOptionsSvc->getProperties("DataFlowConfig"), "DF_PartitionName");
+ const Gaudi::Details::PropertyBase* p=Gaudi::Utils::getProperty( jobOptionsSvc->getProperties("DataFlowConfig"), "DF_PartitionName");
if (p != 0) m_partition = p->toString();
}
}
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx
index 58cbebc361e..c8e05bdd091 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx
@@ -7,7 +7,7 @@
#include <nlohmann/json.hpp>
#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigConfIO/TrigDBJobOptionsLoader.h"
#include "TrigConfData/DataStructure.h"
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h
index 573b5af122f..475c424208c 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h
@@ -104,7 +104,7 @@ namespace TrigConf {
return m_josvc->getProperties(client);
}
- virtual const Property* getClientProperty(const std::string& client,
+ virtual const Gaudi::Details::PropertyBase* getClientProperty(const std::string& client,
const std::string& name) const override
{
return m_josvc->getClientProperty(client, name);
diff --git a/Trigger/TrigFake/src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx b/Trigger/TrigFake/src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx
index 2ecadae8225..bda6b320806 100644
--- a/Trigger/TrigFake/src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx
+++ b/Trigger/TrigFake/src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx
@@ -24,7 +24,7 @@ Modified :
#include <utility>
// INCLUDE GAUDI HEADER FILES:
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx b/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx
index 40d868dd86d..ec18ce92587 100644
--- a/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx
+++ b/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx
@@ -23,7 +23,7 @@ Modified :
#include <vector>
#include <utility>
// INCLUDE GAUDI HEADER FILES:
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ISvcLocator.h"
# include "CLHEP/Units/SystemOfUnits.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastCaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastCaloHypoAlgMT.cxx
index e8358950217..adfa2745c0d 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastCaloHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastCaloHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaFastCaloHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoAlgMT.cxx
index 44a064fd9ee..6572eac08f2 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <map>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaFastElectronHypoAlgMT.h"
#include "AthViews/ViewHelper.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoTool.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoTool.h
index d44c13333af..93b2a681a87 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoTool.h
@@ -4,7 +4,7 @@
#ifndef TRIGEGAMMAHYPO_TRIGEGAMMAFASTELECTRONHYPOTOOL_H
#define TRIGEGAMMAHYPO_TRIGEGAMMAFASTELECTRONHYPOTOOL_H 1
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "xAODTrigCalo/TrigEMCluster.h"
#include "xAODTrigEgamma/TrigElectronContainer.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoAlgMT.cxx
index a57e30b4927..b20937136fb 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaFastPhotonHypoAlgMT.h"
#include "AthViews/ViewHelper.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoTool.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoTool.h
index 1803c1e56cc..a2f3a7a3131 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoTool.h
@@ -4,7 +4,7 @@
#ifndef TRIGEGAMMAHYPO_TRIGEGAMMAFASTPHOTONHYPOTOOL_H
#define TRIGEGAMMAHYPO_TRIGEGAMMAFASTPHOTONHYPOTOOL_H 1
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "xAODTrigCalo/TrigEMCluster.h"
#include "xAODTrigEgamma/TrigPhotonContainer.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx
index 60b07defc37..55fc86417b1 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaPrecisionCaloHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoAlgMT.cxx
index 8c90e35cbd8..9dbb604bce4 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaPrecisionElectronHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoAlgMT.cxx
index de8a4a689b5..6d59b33f34d 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaPrecisionPhotonHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx
index a7bddb80d57..f7f95d76a10 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx
@@ -3,7 +3,7 @@
*/
#include <algorithm>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigJetHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserAlg.h b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserAlg.h
index 50d276dd285..c69dea03f8d 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserAlg.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserAlg.h
@@ -11,7 +11,7 @@
#include "TrigHLTJetHypoUnitTests/IHypoJetVectorGenerator.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class JetHypoExerciserAlg : public AthAlgorithm {
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserCompareAlg.h b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserCompareAlg.h
index 370a429bde5..1da74dbe109 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserCompareAlg.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserCompareAlg.h
@@ -11,7 +11,7 @@
#include "TrigHLTJetHypoUnitTests/IHypoJetVectorGenerator.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class JetHypoExerciserCompareAlg : public AthAlgorithm {
diff --git a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx
index 36e0b2cf741..e979887b4ab 100644
--- a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx
@@ -3,7 +3,7 @@
*/
#include "TrigMissingETHypoAlgMT.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.cxx
index 066a02dccff..a488662a22a 100644
--- a/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.cxx
@@ -3,7 +3,7 @@
*/
#include "TrigStreamerHypoAlgMT.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx
index c760b82a96e..864a7f045d0 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEFTauMVHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx
index 78428c69df0..edfff434ebf 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigTauCaloHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h
index fa7ae61a432..942c5dd33cf 100755
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h
@@ -24,7 +24,7 @@
//#include "TrigInterfaces/HypoAlgo.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTau/TauJet.h"
#include "xAODTau/TauJetContainer.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx
index 69a6f1419e2..93e4ed74e77 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigTrackPreSelHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h
index edceb95e280..a821cf101fa 100755
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h
@@ -5,7 +5,7 @@
#ifndef TrigTrackPreSelHypoTool_H
#define TrigTrackPreSelHypoTool_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTau/TauJet.h"
#include "xAODTau/TauJetContainer.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/BphysTrigDecoratorAlg.cxx b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/BphysTrigDecoratorAlg.cxx
index 3d0b7c212fd..6d7a3a365bb 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/BphysTrigDecoratorAlg.cxx
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/BphysTrigDecoratorAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthCheckMacros.h"
#include "xAODTracking/Vertex.h"
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigCorMoni.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigCorMoni.cxx
index e16ae118aa6..4390ac3cc89 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigCorMoni.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigCorMoni.cxx
@@ -12,7 +12,7 @@
#include "TH2I.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigConfInterfaces/ITrigConfigSvc.h"
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigRateMoni.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigRateMoni.cxx
index 4bbffb836d5..ca057d9b5d0 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigRateMoni.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigRateMoni.cxx
@@ -19,7 +19,7 @@
#include "GaudiKernel/AlgTool.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigInterfaces/AlgoConfig.h"
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.cxx
index 783b82b9df3..531bcad231d 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.cxx
@@ -3,7 +3,7 @@
*/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigSignatureMoni.h"
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
index affd288ed12..1c31a75dea4 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
@@ -7,7 +7,7 @@
#include<boost/algorithm/string.hpp>
#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaInterprocess/Incidents.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigSignatureMoniMT.h"
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/IViewCreatorROITool.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/IViewCreatorROITool.h
index af37a4e7832..c4d5876bc78 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/IViewCreatorROITool.h
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/IViewCreatorROITool.h
@@ -7,7 +7,7 @@
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
/**
diff --git a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx
index 1b647936eec..5909e49a88d 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx
@@ -7,7 +7,7 @@
#include "TrigCompositeUtils/HLTIdentifier.h"
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "DumpDecisions.h"
diff --git a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx
index ecb012901a2..aca57df6f9d 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx
@@ -5,7 +5,7 @@
// DecisionHandling includes
#include "RoRSeqFilter.h"
#include "AthenaMonitoringKernel/Monitored.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
using TrigCompositeUtils::DecisionContainer;
using TrigCompositeUtils::Decision;
diff --git a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx
index 176f7c02fa6..e99d2422025 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TriggerSummaryAlg.h"
#include "AthenaMonitoringKernel/Monitored.h"
diff --git a/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx b/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx
index 698c9223a95..273023e802d 100755
--- a/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx
@@ -130,7 +130,7 @@ void HLT::RandomScaler::setSeedFromDataflow()
// Check if application-specific random seed is provided via DataFlowConfig
ServiceHandle<IJobOptionsSvc> jobOptSvc("JobOptionsSvc", name());
if ( jobOptSvc.retrieve().isSuccess() ) {
- const Property* p = Gaudi::Utils::getProperty( jobOptSvc->getProperties("DataFlowConfig"), "DF_RandomSeed");
+ const Gaudi::Details::PropertyBase* p = Gaudi::Utils::getProperty( jobOptSvc->getProperties("DataFlowConfig"), "DF_RandomSeed");
if ( p!=0 ) { // Partition running
IntegerProperty seed;
if ( seed.assign(*p) ) {
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx
index f0572ac9b0e..c124dd08583 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx
@@ -12,7 +12,7 @@
#include "RoiB2TopoInputDataCnv.h"
#include "TrigT1CaloUtils/L1TopoDataMaker.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h b/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h
index 6f0e429d3e8..f9bce9a15cf 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h
@@ -10,7 +10,7 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigConfInterfaces/ITrigConfigSvc.h"
#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h
index a99b28ab70b..d6efae27b3b 100644
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h
@@ -9,7 +9,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/DataHandle.h"
#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.h
index 951b7bac211..32d94f98d5d 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.h
@@ -33,7 +33,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/DataObject.h"
#include "AthContainers/DataVector.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IToolSvc.h"
#include "CLHEP/Random/RandomEngine.h"
diff --git a/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h b/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h
index 33cfef43f5f..dad8506f69e 100644
--- a/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h
+++ b/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h
@@ -10,7 +10,7 @@
#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// monitoring from HLT
#include "TrigInterfaces/IMonitoredAlgo.h"
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMFPGAOfflineTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMFPGAOfflineTool.h
index 64b67218dd1..15d13f6b27b 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMFPGAOfflineTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMFPGAOfflineTool.h
@@ -10,7 +10,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//local includes
#include "TrigT1NSWSimTools/IMMFPGATool.h"
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMStripTdsOfflineTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMStripTdsOfflineTool.h
index 79d38701fad..edb468731a0 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMStripTdsOfflineTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMStripTdsOfflineTool.h
@@ -10,7 +10,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//local includes
#include "TrigT1NSWSimTools/IMMStripTdsTool.h"
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTdsOfflineTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTdsOfflineTool.h
index 9f9c20d7347..af4557fe104 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTdsOfflineTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTdsOfflineTool.h
@@ -8,7 +8,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "MuonSimData/MuonSimData.h" // cannot fw declare typedef MuonSimData::Deposit
#include "TrigT1NSWSimTools/IPadTdsTool.h"
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/ExampleL1TriggerByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/ExampleL1TriggerByteStreamTool.h
index 9bd03e98454..8d554179d03 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/ExampleL1TriggerByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/ExampleL1TriggerByteStreamTool.h
@@ -13,7 +13,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
/** @class ExampleL1TriggerByteStreamTool
* @brief Example implementation of a tool for L1 RoI conversion from BS to xAOD and from xAOD to BS
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h
index 078f9ede41a..3d6c2c24c50 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h
@@ -13,7 +13,7 @@
#include <map>
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Other stuff
#include "TrigT1Interfaces/SlinkWord.h"
diff --git a/Trigger/TriggerSimulation/TrigSimTransforms/src/MergingEventLoopMgr.h b/Trigger/TriggerSimulation/TrigSimTransforms/src/MergingEventLoopMgr.h
index 03a00337724..7fc85792445 100644
--- a/Trigger/TriggerSimulation/TrigSimTransforms/src/MergingEventLoopMgr.h
+++ b/Trigger/TriggerSimulation/TrigSimTransforms/src/MergingEventLoopMgr.h
@@ -10,7 +10,7 @@
#include "GaudiKernel/MinimalEventLoopMgr.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IEvtSelector.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/EventContext.h"
--
GitLab