Merge branch 'gaudi_declare_component_trigger' into 'master'

Migrate remaining Trigger packages to DECLARE_COMPONENT macros

See merge request atlas/athena!9926

Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
@@ -212,5 +212,5 @@ class muCombMT : public AthAlgorithm
    Gaudi::Property<std::vector<double>> m_IDSCANRes_endcap4 {this, "IDSCANEndcap4Res",{0.046, 0.0000002}, "ID parametrized rsolution for matching (ec4)"};
 
 };
-DECLARE_ALGORITHM_FACTORY( muCombMT )
-#endif // MUCOMB_H
+
+#endif // MUCOMBMT_H

Trigger/TrigAlgorithms/TrigmuComb/src/components/TrigmuComb_entries.cxx

 #include "TrigmuComb/muComb.h"
-
+#include "TrigmuComb/muCombMT.h"
 
 DECLARE_COMPONENT( muComb )
+DECLARE_COMPONENT( muCombMT )
 

Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoAlg.h

@@ -42,5 +42,4 @@ class TestTrigL2CaloHypoAlg : public ::AthReentrantAlgorithm {
 
 }; 
 
-DECLARE_ALGORITHM_FACTORY( TestTrigL2CaloHypoAlg )
 #endif //> !TRIGEGAMMAHYPO_TESTTRIGL2CALOHYPOALG_H

Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoToolInc.h

@@ -58,5 +58,5 @@ class TestTrigL2CaloHypoToolInc : public extends<AthAlgTool, ITrigL2CaloHypoTool
   
   int findCutIndex( float eta ) const;
 }; 
-DECLARE_TOOL_FACTORY( TestTrigL2CaloHypoToolInc )
+
 #endif //> !TRIGEGAMMAHYPO_TESTTRIGL2CALOHYPOTOOL_H

Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlg.h

@@ -42,5 +42,4 @@ class TrigL2CaloHypoAlg : public ::AthReentrantAlgorithm {
  
 }; 
 
-DECLARE_ALGORITHM_FACTORY( TrigL2CaloHypoAlg )
 #endif //> !TRIGEGAMMAHYPO_TRIGL2CALOHYPOALG_H

Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.h

@@ -55,5 +55,5 @@ class TrigL2CaloHypoToolInc : public extends<AthAlgTool, ITrigL2CaloHypoTool> {
   
   int findCutIndex( float eta ) const;
 }; 
-DECLARE_TOOL_FACTORY( TrigL2CaloHypoToolInc )
+
 #endif //> !TRIGEGAMMAHYPO_TRIGL2CALOHYPOTOOL_H

Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.h

@@ -43,5 +43,5 @@ class TrigL2CaloHypoToolMult : public extends<AthAlgTool, ITrigL2CaloHypoTool> {
   ToolHandleArray<ITrigL2CaloHypoTool> m_subTools { this, "SubTools", {}, "Sub tools performing cuts" };
   
 }; 
-DECLARE_TOOL_FACTORY( TrigL2CaloHypoToolMult )
+
 #endif //> !TRIGEGAMMAHYPO_TRIGL2CALOHYPOTOOLMULT_H

Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.h

@@ -131,5 +131,5 @@ class TrigL2ElectronFexMT : public AthAlgorithm  {
   ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" };
   
 };  
-DECLARE_ALGORITHM_FACTORY( TrigL2ElectronFexMT )
+
 #endif

Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlg.h

@@ -44,6 +44,5 @@ class TrigL2ElectronHypoAlg
   SG::ReadHandleKey< xAOD::TrigElectronContainer > m_electronsKey {this, "Electrons", "L2ElectronContainer", "Input"};
 
 }; 
-DECLARE_ALGORITHM_FACTORY( TrigL2ElectronHypoAlg )
 
 #endif //> !TRIGEGAMMAHYPO_TRIGL2ELECTRONHYPOALG_H

Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.h

@@ -87,5 +87,4 @@ class TrigL2ElectronHypoTool : virtual public ::AthAlgTool
   ToolHandle<GenericMonitoringTool> m_monTool{ this, "MonTool", "", "Monitoring tool" };
 }; 
 
-DECLARE_TOOL_FACTORY( TrigL2ElectronHypoTool )
 #endif //> !TRIGEGAMMAHYPO_TRIGL2CALOHYPOTOOL_H

Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx

@@ -11,9 +11,13 @@
 #include "TrigEgammaHypo/TrigEFElectronHypo.h"
 #include "TrigEgammaHypo/TrigEFPhotonHypo.h"
 #include "TrigEgammaHypo/TrigEFTrackHypo.h"
-#include "TrigEgammaHypo/TrigL2PhotonFex.h"
 #include "TrigEgammaHypo/TrigL2CaloLayersHypo.h"
-
+#include "../TestTrigL2CaloHypoAlg.h"
+#include "../TestTrigL2CaloHypoToolInc.h"
+#include "../TrigL2CaloHypoAlg.h"
+#include "../TrigL2CaloHypoToolInc.h"
+#include "../TrigL2CaloHypoToolMult.h"
+#include "../TrigL2ElectronFexMT.h"
 
 DECLARE_COMPONENT( TrigL2CaloHypo )
 DECLARE_COMPONENT( TrigL2ElectronFex )
@@ -29,8 +33,9 @@ DECLARE_COMPONENT( TrigEFElectronHypo )
 DECLARE_COMPONENT( TrigEFPhotonHypo )
 DECLARE_COMPONENT( TrigEFTrackHypo )
 DECLARE_COMPONENT( TrigL2CaloLayersHypo )
-
-
-
-
-
+DECLARE_COMPONENT( TestTrigL2CaloHypoAlg )
+DECLARE_COMPONENT( TestTrigL2CaloHypoToolInc )
+DECLARE_COMPONENT( TrigL2CaloHypoAlg )
+DECLARE_COMPONENT( TrigL2CaloHypoToolInc )
+DECLARE_COMPONENT( TrigL2CaloHypoToolMult )
+DECLARE_COMPONENT( TrigL2ElectronFexMT )

Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h

@@ -56,5 +56,4 @@ class TrigMufastHypoAlg
 	this, "L1Decisions", "", "Name of the input decisions object produced by MuFastSteering"};
 };
 
-DECLARE_ALGORITHM_FACTORY( TrigMufastHypoAlg )
 #endif

Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoTool.h

@@ -83,5 +83,4 @@ class TrigMufastHypoTool: public ::AthAlgTool {
     ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" };   
 };
 
-DECLARE_TOOL_FACTORY( TrigMufastHypoTool )
 #endif

Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h

@@ -56,5 +56,4 @@ class TrigMuonEFMSonlyHypoAlg
 	this, "L1Decisions", "MuonEFMSonly_Decisions", "Name of the input decisions object"};
 };
 
-DECLARE_ALGORITHM_FACTORY( TrigMuonEFMSonlyHypoAlg )
 #endif

Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h

@@ -57,5 +57,4 @@ class TrigMuonEFMSonlyHypoTool: public ::AthAlgTool {
   ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" };
 };
 
-DECLARE_TOOL_FACTORY(TrigMuonEFMSonlyHypoTool)
 #endif

Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h

@@ -54,5 +54,4 @@ class TrigmuCombHypoAlg
 	this, "MuonL2CBInfoFromMuCombAlg", "MuonL2CBInfo", "Name of the input data produced by muCombMT"};
 };
 
-DECLARE_ALGORITHM_FACTORY( TrigmuCombHypoAlg )
 #endif

Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoTool.h

@@ -78,5 +78,4 @@ class TrigmuCombHypoTool: public ::AthAlgTool {
     std::vector<float>::size_type m_bins;
 };
 
-DECLARE_TOOL_FACTORY( TrigmuCombHypoTool )
 #endif

Trigger/TrigHypothesis/TrigMuonHypo/src/components/TrigMuonHypo_entries.cxx

@@ -7,6 +7,10 @@
 #include "TrigMuonHypo/MucombHypo.h"
 #include "TrigMuonHypo/MucombStauHypo.h"
 #include "TrigMuonHypo/MuisoHypo.h"
+#include "TrigMuonHypo/TrigMufastHypoAlg.h"
+#include "TrigMuonHypo/TrigMufastHypoTool.h"
+#include "TrigMuonHypo/TrigmuCombHypoAlg.h"
+#include "TrigMuonHypo/TrigmuCombHypoTool.h"
 #include "TrigMuonHypo/TrigMooreHypo.h"
 #include "TrigMuonHypo/TrigMuonEFSegmentFinderHypo.h"
 #include "TrigMuonHypo/TrigMuonEFTrackBuilderHypo.h"
@@ -30,6 +34,8 @@
 #include "TrigMuonHypo/TrigMuonEFExtrapolatorNSWHypo.h"
 #include "TrigMuonHypo/TrigMuonEFCombinerDiMuonMassHypo.h"
 #include "TrigMuonHypo/TrigMuonEFCombinerDiMuonMassPtImpactsHypo.h"
+#include "TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h"
+#include "TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h"
 #include "TrigMuonHypo/TrigMuonCaloTagHypo.h"
 #include "TrigMuonHypo/TrigMuonIDTrackMultiHypo.h"
 
@@ -42,6 +48,10 @@ DECLARE_COMPONENT( MufastCALHypo )
 DECLARE_COMPONENT( MucombHypo )
 DECLARE_COMPONENT( MucombStauHypo )
 DECLARE_COMPONENT( MuisoHypo )
+DECLARE_COMPONENT( TrigMufastHypoAlg )
+DECLARE_COMPONENT( TrigMufastHypoTool )
+DECLARE_COMPONENT( TrigmuCombHypoAlg )
+DECLARE_COMPONENT( TrigmuCombHypoTool )
 DECLARE_COMPONENT( TrigMooreHypo )
 DECLARE_COMPONENT( TrigMuonEFSegmentFinderHypo )
 DECLARE_COMPONENT( TrigMuonEFTrackBuilderHypo )
@@ -65,6 +75,8 @@ DECLARE_COMPONENT( MufastNSWHypo )
 DECLARE_COMPONENT( TrigMuonEFExtrapolatorNSWHypo )
 DECLARE_COMPONENT( TrigMuonEFCombinerDiMuonMassHypo )
 DECLARE_COMPONENT( TrigMuonEFCombinerDiMuonMassPtImpactsHypo )
+DECLARE_COMPONENT( TrigMuonEFMSonlyHypoAlg )
+DECLARE_COMPONENT( TrigMuonEFMSonlyHypoTool )
 DECLARE_COMPONENT( TrigMuonCaloTagHypo )
 DECLARE_COMPONENT( TrigMuonIDTrackMultiHypo )