Skip to content
Snippets Groups Projects
Commit aad6fa70 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Migrate to DECLARE_COMPONENT macros

A few constructors had to be made public as required by the Gaudi Plugin
service.


Former-commit-id: b88be914d83755d32a130be4d36c218733be605b
parent 9da0ec12
No related branches found
No related tags found
No related merge requests found
Showing
with 87 additions and 91 deletions
#include "AthenaDBTestRec/TestCoolRecRead.h" #include "AthenaDBTestRec/TestCoolRecRead.h"
#include "AthenaDBTestRec/DetStoreDump.h" #include "AthenaDBTestRec/DetStoreDump.h"
DECLARE_ALGORITHM_FACTORY( TestCoolRecRead ) DECLARE_COMPONENT( TestCoolRecRead )
DECLARE_ALGORITHM_FACTORY( DetStoreDump ) DECLARE_COMPONENT( DetStoreDump )
...@@ -10,15 +10,15 @@ ...@@ -10,15 +10,15 @@
#include "../RunEventMetaWriter.h" #include "../RunEventMetaWriter.h"
#include "../DummyLumirangeTool.h" #include "../DummyLumirangeTool.h"
DECLARE_ALGORITHM_FACTORY(StoreDump) DECLARE_COMPONENT( StoreDump )
DECLARE_ALGORITHM_FACTORY(PassAllFilter) DECLARE_COMPONENT( PassAllFilter )
DECLARE_ALGORITHM_FACTORY(PassNoneFilter) DECLARE_COMPONENT( PassNoneFilter )
DECLARE_ALGORITHM_FACTORY(AddTrigMap) DECLARE_COMPONENT( AddTrigMap )
DECLARE_ALGORITHM_FACTORY(EventSplit) DECLARE_COMPONENT( EventSplit )
DECLARE_ALGORITHM_FACTORY(EventTagReader) DECLARE_COMPONENT( EventTagReader )
DECLARE_ALGORITHM_FACTORY(EventTagWriter) DECLARE_COMPONENT( EventTagWriter )
DECLARE_ALGORITHM_FACTORY(TagEventTagWriter) DECLARE_COMPONENT( TagEventTagWriter )
DECLARE_ALGORITHM_FACTORY(RunEventTagWriter) DECLARE_COMPONENT( RunEventTagWriter )
DECLARE_ALGORITHM_FACTORY(RunEventMetaWriter) DECLARE_COMPONENT( RunEventMetaWriter )
DECLARE_ALGORITHM_FACTORY(DummyLumirangeTool) DECLARE_COMPONENT( DummyLumirangeTool )
...@@ -15,20 +15,20 @@ ...@@ -15,20 +15,20 @@
#include "../PileUpEventInfoWriter.h" #include "../PileUpEventInfoWriter.h"
#include "../PileUpEventInfoReader.h" #include "../PileUpEventInfoReader.h"
DECLARE_ALGORITHM_FACTORY(AthenaPoolTestDataWriter) DECLARE_COMPONENT( AthenaPoolTestDataWriter )
DECLARE_ALGORITHM_FACTORY(AthenaPoolTestDataReader) DECLARE_COMPONENT( AthenaPoolTestDataReader )
DECLARE_ALGORITHM_FACTORY(AthenaPoolTestAttrWriter) DECLARE_COMPONENT( AthenaPoolTestAttrWriter )
DECLARE_ALGORITHM_FACTORY(AthenaPoolTestAttrReader) DECLARE_COMPONENT( AthenaPoolTestAttrReader )
// DECLARE_ALGORITHM_FACTORY(CaloClusterFakeWriter) // DECLARE_COMPONENT( CaloClusterFakeWriter )
// DECLARE_ALGORITHM_FACTORY(CaloClusterFakeReader) // DECLARE_COMPONENT( CaloClusterFakeReader )
DECLARE_ALGORITHM_FACTORY(InDetRawDataFakeWriter) DECLARE_COMPONENT( InDetRawDataFakeWriter )
DECLARE_ALGORITHM_FACTORY(InDetRawDataFakeReader) DECLARE_COMPONENT( InDetRawDataFakeReader )
DECLARE_ALGORITHM_FACTORY(TrkTrackFakeWriter) DECLARE_COMPONENT( TrkTrackFakeWriter )
DECLARE_ALGORITHM_FACTORY(TrkTrackFakeReader) DECLARE_COMPONENT( TrkTrackFakeReader )
DECLARE_ALGORITHM_FACTORY(LArCellContFakeWriter) DECLARE_COMPONENT( LArCellContFakeWriter )
DECLARE_ALGORITHM_FACTORY(LArCellContFakeReader) DECLARE_COMPONENT( LArCellContFakeReader )
DECLARE_ALGORITHM_FACTORY(EventInfoWriter) DECLARE_COMPONENT( EventInfoWriter )
DECLARE_ALGORITHM_FACTORY(EventInfoReader) DECLARE_COMPONENT( EventInfoReader )
DECLARE_ALGORITHM_FACTORY(PileUpEventInfoWriter) DECLARE_COMPONENT( PileUpEventInfoWriter )
DECLARE_ALGORITHM_FACTORY(PileUpEventInfoReader) DECLARE_COMPONENT( PileUpEventInfoReader )
#include "IOVDbTestAlg/IOVDbTestAlg.h" #include "IOVDbTestAlg/IOVDbTestAlg.h"
#include "IOVDbTestAlg/IOVDbTestCoolDCS.h" #include "IOVDbTestAlg/IOVDbTestCoolDCS.h"
DECLARE_ALGORITHM_FACTORY(IOVDbTestAlg) DECLARE_COMPONENT( IOVDbTestAlg )
DECLARE_ALGORITHM_FACTORY(IOVDbTestCoolDCS) DECLARE_COMPONENT( IOVDbTestCoolDCS )
#include "CommissionRec/ComTimeRec.h" #include "CommissionRec/ComTimeRec.h"
DECLARE_ALGORITHM_FACTORY( ComTimeRec ) DECLARE_COMPONENT( ComTimeRec )
#include "CommissionUtils/CosmicTriggerTimeTool.h" #include "CommissionUtils/CosmicTriggerTimeTool.h"
DECLARE_TOOL_FACTORY( CosmicTriggerTimeTool ) DECLARE_COMPONENT( CosmicTriggerTimeTool )
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
#include "DataQualityTools/DQTGlobalWZFinderTool.h" #include "DataQualityTools/DQTGlobalWZFinderTool.h"
#include "DataQualityTools/DQTLumiMonTool.h" #include "DataQualityTools/DQTLumiMonTool.h"
DECLARE_TOOL_FACTORY(DataQualityFatherMonTool) DECLARE_COMPONENT( DataQualityFatherMonTool )
//DECLARE_TOOL_FACTORY(DQTMuTrkEff) //DECLARE_COMPONENT( DQTMuTrkEff )
DECLARE_TOOL_FACTORY(DQTDetSynchMonTool) DECLARE_COMPONENT( DQTDetSynchMonTool )
DECLARE_TOOL_FACTORY(DQTMuonIDTrackTool) DECLARE_COMPONENT( DQTMuonIDTrackTool )
//DECLARE_TOOL_FACTORY(DQTElectronQualityTool) //DECLARE_COMPONENT( DQTElectronQualityTool )
//DECLARE_TOOL_FACTORY(DQTGlobalWFinderTool) //DECLARE_COMPONENT( DQTGlobalWFinderTool )
//DECLARE_TOOL_FACTORY(DQTNonCollBkg_ZDC) //DECLARE_COMPONENT( DQTNonCollBkg_ZDC )
DECLARE_TOOL_FACTORY(DQTBackgroundMon) DECLARE_COMPONENT( DQTBackgroundMon )
//DECLARE_TOOL_FACTORY(DQTRateMonTool) //DECLARE_COMPONENT( DQTRateMonTool )
//DECLARE_TOOL_FACTORY(DQTCaloClusterTool) //DECLARE_COMPONENT( DQTCaloClusterTool )
DECLARE_TOOL_FACTORY(DQTDataFlowMonTool) DECLARE_COMPONENT( DQTDataFlowMonTool )
//DECLARE_TOOL_FACTORY(DQTTopLeptonJetsFinderTool) //DECLARE_COMPONENT( DQTTopLeptonJetsFinderTool )
//DECLARE_TOOL_FACTORY(DQTGlobalTopDilFinderTool) //DECLARE_COMPONENT( DQTGlobalTopDilFinderTool )
DECLARE_TOOL_FACTORY(DQTGlobalWZFinderTool) DECLARE_COMPONENT( DQTGlobalWZFinderTool )
DECLARE_TOOL_FACTORY(DQTLumiMonTool) DECLARE_COMPONENT( DQTLumiMonTool )
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
#include "GoodRunsLists/TriggerRegistryTool.h" #include "GoodRunsLists/TriggerRegistryTool.h"
#include "GoodRunsLists/GoodRunsListSelectionTool.h" #include "GoodRunsLists/GoodRunsListSelectionTool.h"
DECLARE_TOOL_FACTORY( GoodRunsListSelectorTool ) DECLARE_COMPONENT( GoodRunsListSelectorTool )
DECLARE_TOOL_FACTORY( GoodRunsListSelectionTool ) DECLARE_COMPONENT( GoodRunsListSelectionTool )
DECLARE_TOOL_FACTORY( TriggerRegistryTool ) DECLARE_COMPONENT( TriggerRegistryTool )
#include "../GRLSelectorAlg.h" #include "../GRLSelectorAlg.h"
DECLARE_ALGORITHM_FACTORY( GRLSelectorAlg ) DECLARE_COMPONENT( GRLSelectorAlg )
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#include "GoodRunsListsUser/GoodRunsListSelectorAlg.h" #include "GoodRunsListsUser/GoodRunsListSelectorAlg.h"
#include "GoodRunsListsUser/GRLTriggerSelectorAlg.h" #include "GoodRunsListsUser/GRLTriggerSelectorAlg.h"
DECLARE_ALGORITHM_FACTORY( DummyDumperAlg ) DECLARE_COMPONENT( DummyDumperAlg )
DECLARE_ALGORITHM_FACTORY( TriggerSelectorAlg ) DECLARE_COMPONENT( TriggerSelectorAlg )
DECLARE_ALGORITHM_FACTORY( GoodRunsListSelectorAlg ) DECLARE_COMPONENT( GoodRunsListSelectorAlg )
DECLARE_ALGORITHM_FACTORY( GRLTriggerSelectorAlg ) DECLARE_COMPONENT( GRLTriggerSelectorAlg )
...@@ -157,7 +157,6 @@ public: ...@@ -157,7 +157,6 @@ public:
/// Implementation of IIncidentListener: Handle for EndEvent incidence /// Implementation of IIncidentListener: Handle for EndEvent incidence
void handle(const Incident& incident); void handle(const Incident& incident);
protected: // constructor and destructor
/// Standard Service Constructor /// Standard Service Constructor
AthenaPoolCnvSvc(const std::string& name, ISvcLocator* pSvcLocator); AthenaPoolCnvSvc(const std::string& name, ISvcLocator* pSvcLocator);
/// Destructor /// Destructor
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
#include "../CondAttrListCollCnv.h" #include "../CondAttrListCollCnv.h"
#include "../CondAttrListVecCnv.h" #include "../CondAttrListVecCnv.h"
DECLARE_SERVICE_FACTORY(AthenaPoolCnvSvc) DECLARE_COMPONENT( AthenaPoolCnvSvc )
DECLARE_SERVICE_FACTORY(AthenaRootSerializeSvc) DECLARE_COMPONENT( AthenaRootSerializeSvc )
DECLARE_CONVERTER_FACTORY(AthenaAttributeListCnv) DECLARE_CONVERTER_FACTORY( AthenaAttributeListCnv )
DECLARE_CONVERTER_FACTORY(CondAttrListCollCnv) DECLARE_CONVERTER_FACTORY( CondAttrListCollCnv )
DECLARE_CONVERTER_FACTORY(CondAttrListVecCnv) DECLARE_CONVERTER_FACTORY( CondAttrListVecCnv )
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
#include "../QueryTag.h" #include "../QueryTag.h"
#include "../PassNoneFilter.h" #include "../PassNoneFilter.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteData) DECLARE_COMPONENT( AthPoolEx::WriteData )
DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReWriteData) DECLARE_COMPONENT( AthPoolEx::ReWriteData )
DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReadData) DECLARE_COMPONENT( AthPoolEx::ReadData )
DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReadBs) DECLARE_COMPONENT( AthPoolEx::ReadBs )
DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteCond) DECLARE_COMPONENT( AthPoolEx::WriteCond )
DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReadCond) DECLARE_COMPONENT( AthPoolEx::ReadCond )
DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteTag) DECLARE_COMPONENT( AthPoolEx::WriteTag )
DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, PassNoneFilter) DECLARE_COMPONENT( AthPoolEx::PassNoneFilter )
DECLARE_NAMESPACE_TOOL_FACTORY(AthPoolEx, ReadMeta) DECLARE_COMPONENT( AthPoolEx::ReadMeta )
DECLARE_NAMESPACE_TOOL_FACTORY(AthPoolEx, QueryTag) DECLARE_COMPONENT( AthPoolEx::QueryTag )
#include "../AthenaRootStreamerSvc.h" #include "../AthenaRootStreamerSvc.h"
DECLARE_SERVICE_FACTORY(AthenaRootStreamerSvc) DECLARE_COMPONENT( AthenaRootStreamerSvc )
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "../MetadataTest.h" #include "../MetadataTest.h"
#include "../RequireUniqueEvent.h" #include "../RequireUniqueEvent.h"
DECLARE_ALGORITHM_FACTORY(EventCount) DECLARE_COMPONENT( EventCount )
DECLARE_ALGORITHM_FACTORY(MetadataTest) DECLARE_COMPONENT( MetadataTest )
DECLARE_ALGORITHM_FACTORY(RequireUniqueEvent) DECLARE_COMPONENT( RequireUniqueEvent )
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "../EventSelectorAthenaPool.h" #include "../EventSelectorAthenaPool.h"
#include "../CondProxyProvider.h" #include "../CondProxyProvider.h"
DECLARE_SERVICE_FACTORY(AthenaPoolAddressProviderSvc) DECLARE_COMPONENT( AthenaPoolAddressProviderSvc )
DECLARE_SERVICE_FACTORY(EventSelectorAthenaPool) DECLARE_COMPONENT( EventSelectorAthenaPool )
DECLARE_SERVICE_FACTORY(CondProxyProvider) DECLARE_COMPONENT( CondProxyProvider )
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
#include "../EventInfoAttListTool.h" #include "../EventInfoAttListTool.h"
#include "../EventInfoTagBuilder.h" #include "../EventInfoTagBuilder.h"
DECLARE_TOOL_FACTORY(AthenaPoolOutputStreamTool) DECLARE_COMPONENT( AthenaPoolOutputStreamTool )
DECLARE_TOOL_FACTORY(MakeEventStreamInfo) DECLARE_COMPONENT( MakeEventStreamInfo )
DECLARE_TOOL_FACTORY(CopyEventStreamInfo) DECLARE_COMPONENT( CopyEventStreamInfo )
DECLARE_TOOL_FACTORY(EventInfoAttListTool) DECLARE_COMPONENT( EventInfoAttListTool )
DECLARE_ALGORITHM_FACTORY(MakeInputDataHeader) DECLARE_COMPONENT( MakeInputDataHeader )
DECLARE_ALGORITHM_FACTORY(EventInfoTagBuilder) DECLARE_COMPONENT( EventInfoTagBuilder )
...@@ -173,7 +173,6 @@ public: // Non-static members ...@@ -173,7 +173,6 @@ public: // Non-static members
/// Setup Frontier cache for given logical or physical connection name /// Setup Frontier cache for given logical or physical connection name
StatusCode setFrontierCache(const std::string& conn) const; StatusCode setFrontierCache(const std::string& conn) const;
protected: // constructor and destructor
/// Standard Service Constructor /// Standard Service Constructor
PoolSvc(const std::string& name, ISvcLocator* pSvcLocator); PoolSvc(const std::string& name, ISvcLocator* pSvcLocator);
/// Destructor /// Destructor
......
#include "../PoolSvc.h" #include "../PoolSvc.h"
DECLARE_SERVICE_FACTORY(PoolSvc) DECLARE_COMPONENT( PoolSvc )
...@@ -120,8 +120,6 @@ class RDBAccessSvc final : public AthService, virtual public IRDBAccessSvc ...@@ -120,8 +120,6 @@ class RDBAccessSvc final : public AthService, virtual public IRDBAccessSvc
StatusCode finalize() override; StatusCode finalize() override;
StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ) override; StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ) override;
protected:
friend class SvcFactory<RDBAccessSvc>; friend class SvcFactory<RDBAccessSvc>;
/// Standard Service Constructor /// Standard Service Constructor
......
#include "../RDBAccessSvc.h" #include "../RDBAccessSvc.h"
#include "../SourceCompAlg.h" #include "../SourceCompAlg.h"
DECLARE_SERVICE_FACTORY(RDBAccessSvc) DECLARE_COMPONENT( RDBAccessSvc )
DECLARE_ALGORITHM_FACTORY(SourceCompAlg) DECLARE_COMPONENT( SourceCompAlg )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment