Merge branch 'enable_athena_components' into 'master'

enable athena components

See merge request atlas/athena!37510

PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms/src/components/AsgAnalysisAlgorithms_entries.cxx

@@ -30,49 +30,25 @@
 #include <AsgAnalysisAlgorithms/TreeFillerAlg.h>
 #include <AsgAnalysisAlgorithms/TreeMakerAlg.h>
 
-DECLARE_NAMESPACE_TOOL_FACTORY (CP, AsgFlagSelectionTool)
-DECLARE_NAMESPACE_TOOL_FACTORY (CP, AsgPtEtaSelectionTool)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, AsgCutBookkeeperAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, AsgCutBookkeeperAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, AsgEventScaleFactorAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, AsgLeptonTrackSelectionAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, AsgOriginalObjectLinkAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, AsgSelectionAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, AsgViewFromSelectionAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, AsgxAODNTupleMakerAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, EventFlagSelectionAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, EventSelectionByObjectFlagAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, IsolationCloseByCorrectionAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, KinematicHistAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, ObjectCutFlowHistAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, OverlapRemovalAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, PileupReweightingAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, PMGTruthWeightAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, SysListDumperAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, SysListLoaderAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, TreeFillerAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, TreeMakerAlg)
-
-DECLARE_FACTORY_ENTRIES(AsgAnalysisAlgorithms) {
-  DECLARE_NAMESPACE_ALGTOOL (CP, AsgFlagSelectionTool)
-  DECLARE_NAMESPACE_ALGTOOL (CP, AsgPtEtaSelectionTool)
-  DECLARE_NAMESPACE_ALGORITHM (CP, AsgCutBookkeeperAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, AsgEventScaleFactorAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, AsgLeptonTrackSelectionAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, AsgOriginalObjectLinkAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, AsgSelectionAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, AsgViewFromSelectionAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, AsgxAODNTupleMakerAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, EventFlagSelectionAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, EventSelectionByObjectFlagAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, IsolationCloseByCorrectionAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, KinematicHistAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, ObjectCutFlowHistAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, OverlapRemovalAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, PileupReweightingAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, PMGTruthWeightAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, SysListDumperAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, SysListLoaderAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, TreeFillerAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, TreeMakerAlg)
-}
+DECLARE_COMPONENT (CP::AsgFlagSelectionTool)
+DECLARE_COMPONENT (CP::AsgPtEtaSelectionTool)
+DECLARE_COMPONENT (CP::AsgCutBookkeeperAlg)
+DECLARE_COMPONENT (CP::AsgCutBookkeeperAlg)
+DECLARE_COMPONENT (CP::AsgEventScaleFactorAlg)
+DECLARE_COMPONENT (CP::AsgLeptonTrackSelectionAlg)
+DECLARE_COMPONENT (CP::AsgOriginalObjectLinkAlg)
+DECLARE_COMPONENT (CP::AsgSelectionAlg)
+DECLARE_COMPONENT (CP::AsgViewFromSelectionAlg)
+DECLARE_COMPONENT (CP::AsgxAODNTupleMakerAlg)
+DECLARE_COMPONENT (CP::EventFlagSelectionAlg)
+DECLARE_COMPONENT (CP::EventSelectionByObjectFlagAlg)
+DECLARE_COMPONENT (CP::IsolationCloseByCorrectionAlg)
+DECLARE_COMPONENT (CP::KinematicHistAlg)
+DECLARE_COMPONENT (CP::ObjectCutFlowHistAlg)
+DECLARE_COMPONENT (CP::OverlapRemovalAlg)
+DECLARE_COMPONENT (CP::PileupReweightingAlg)
+DECLARE_COMPONENT (CP::PMGTruthWeightAlg)
+DECLARE_COMPONENT (CP::SysListDumperAlg)
+DECLARE_COMPONENT (CP::SysListLoaderAlg)
+DECLARE_COMPONENT (CP::TreeFillerAlg)
+DECLARE_COMPONENT (CP::TreeMakerAlg)

PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/src/components/EgammaAnalysisAlgorithms_entries.cxx

@@ -10,20 +10,11 @@
 #include <EgammaAnalysisAlgorithms/PhotonEfficiencyCorrectionAlg.h>
 #include <EgammaAnalysisAlgorithms/PhotonShowerShapeFudgeAlg.h>
 
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, EgammaCalibrationAndSmearingAlg)
-DECLARE_NAMESPACE_TOOL_FACTORY (CP, EgammaIsGoodOQSelectionTool)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, EgammaIsolationCorrectionAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, EgammaIsolationSelectionAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, ElectronEfficiencyCorrectionAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, PhotonEfficiencyCorrectionAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, PhotonShowerShapeFudgeAlg)
+DECLARE_COMPONENT (CP::EgammaCalibrationAndSmearingAlg)
+DECLARE_COMPONENT (CP::EgammaIsGoodOQSelectionTool)
+DECLARE_COMPONENT (CP::EgammaIsolationCorrectionAlg)
+DECLARE_COMPONENT (CP::EgammaIsolationSelectionAlg)
+DECLARE_COMPONENT (CP::ElectronEfficiencyCorrectionAlg)
+DECLARE_COMPONENT (CP::PhotonEfficiencyCorrectionAlg)
+DECLARE_COMPONENT (CP::PhotonShowerShapeFudgeAlg)
 
-DECLARE_FACTORY_ENTRIES(EgammaAnalysisAlgorithms) {
-  DECLARE_NAMESPACE_ALGORITHM (CP, EgammaCalibrationAndSmearingAlg)
-  DECLARE_NAMESPACE_TOOL (CP, EgammaIsGoodOQSelectionTool)
-  DECLARE_NAMESPACE_ALGORITHM (CP, EgammaIsolationCorrectionAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, EgammaIsolationSelectionAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, ElectronEfficiencyCorrectionAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, PhotonEfficiencyCorrectionAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, PhotonShowerShapeFudgeAlg)
-}

PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/src/components/FTagAnalysisAlgorithms_entries.cxx

 // AsgExampleTools_entries.cxx
 
-#include <GaudiKernel/DeclareFactoryEntries.h>
-
 #include <FTagAnalysisAlgorithms/BTaggingEfficiencyAlg.h>
 
-DECLARE_ALGORITHM_FACTORY (CP::BTaggingEfficiencyAlg)
-
-DECLARE_FACTORY_ENTRIES(FTagAnalysisAlgorithms) {
-  DECLARE_ALGORITHM (CP::BTaggingEfficiencyAlg)
-}
+DECLARE_COMPONENT (CP::BTaggingEfficiencyAlg)

PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms/src/components/MetAnalysisAlgorithms_entries.cxx

 // AsgExampleTools_entries.cxx
 
-#include <GaudiKernel/DeclareFactoryEntries.h>
-
 #include <MetAnalysisAlgorithms/MetBuilderAlg.h>
 #include <MetAnalysisAlgorithms/MetMakerAlg.h>
 #include <MetAnalysisAlgorithms/MetSignificanceAlg.h>
 #include <MetAnalysisAlgorithms/MetSystematicsAlg.h>
 
-DECLARE_ALGORITHM_FACTORY (CP::MetBuilderAlg)
-DECLARE_ALGORITHM_FACTORY (CP::MetMakerAlg)
-DECLARE_ALGORITHM_FACTORY (CP::MetSignificanceAlg)
-DECLARE_ALGORITHM_FACTORY (CP::MetSystematicsAlg)
+DECLARE_COMPONENT (CP::MetBuilderAlg)
+DECLARE_COMPONENT (CP::MetMakerAlg)
+DECLARE_COMPONENT (CP::MetSignificanceAlg)
+DECLARE_COMPONENT (CP::MetSystematicsAlg)
 
-DECLARE_FACTORY_ENTRIES(MetAnalysisAlgorithms) {
-  DECLARE_ALGORITHM (CP::MetBuilderAlg)
-  DECLARE_ALGORITHM (CP::MetMakerAlg)
-  DECLARE_ALGORITHM (CP::MetSignificanceAlg)
-  DECLARE_ALGORITHM (CP::MetSystematicsAlg)
-}

PhysicsAnalysis/Algorithms/TrackingAnalysisAlgorithms/src/components/TrackingAnalysisAlgorithms_entries.cxx

@@ -5,14 +5,7 @@
 // Local include(s):
 #include "TrackingAnalysisAlgorithms/VertexSelectionAlg.h"
 
-// Framework include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
 
 // Declare the component(s) of the package:
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, VertexSelectionAlg )
+DECLARE_COMPONENT( CP::VertexSelectionAlg )
 
-DECLARE_FACTORY_ENTRIES( TrackingAnalysisAlgorithms ) {
-
-   DECLARE_NAMESPACE_ALGORITHM( CP, VertexSelectionAlg )
-
-}

PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/src/components/TriggerAnalysisAlgorithms_entries.cxx

@@ -5,16 +5,12 @@
 /// @author Tadej Novak
 
 
-#include <GaudiKernel/DeclareFactoryEntries.h>
 
 #include <TriggerAnalysisAlgorithms/TrigEventSelectionAlg.h>
 #include <TriggerAnalysisAlgorithms/TrigPrescalesAlg.h>
 
 
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, TrigEventSelectionAlg)
-DECLARE_NAMESPACE_ALGORITHM_FACTORY (CP, TrigPrescalesAlg)
+DECLARE_COMPONENT (CP::TrigEventSelectionAlg)
+DECLARE_COMPONENT (CP::TrigPrescalesAlg)
+
 
-DECLARE_FACTORY_ENTRIES(TriggerAnalysisAlgorithms) {
-  DECLARE_NAMESPACE_ALGORITHM (CP, TrigEventSelectionAlg)
-  DECLARE_NAMESPACE_ALGORITHM (CP, TrigPrescalesAlg)
-}