From 28d24c934eec89b7db58974bc4233b19674ed330 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 22 Mar 2018 14:56:52 +0100
Subject: [PATCH] Migrate remaining Trigger packages to DECLARE_COMPONENT
macros
Remove the obsolete DECLARE_FACTORY_ENTRIES macros and move the
component declaration to the _entries.cxx file.
---
.../TrigmuComb/TrigmuComb/muCombMT.h | 6 +++---
.../src/components/TrigmuComb_entries.cxx | 3 ++-
.../src/TestTrigL2CaloHypoAlg.h | 1 -
.../src/TestTrigL2CaloHypoToolInc.h | 2 +-
.../TrigEgammaHypo/src/TrigL2CaloHypoAlg.h | 1 -
.../src/TrigL2CaloHypoToolInc.h | 2 +-
.../src/TrigL2CaloHypoToolMult.h | 2 +-
.../TrigEgammaHypo/src/TrigL2ElectronFexMT.h | 2 +-
.../src/TrigL2ElectronHypoAlg.h | 1 -
.../src/TrigL2ElectronHypoTool.h | 1 -
.../src/components/TrigEgammaHypo_entries.cxx | 19 ++++++++++++-------
.../TrigMuonHypo/TrigMufastHypoAlg.h | 1 -
.../TrigMuonHypo/TrigMufastHypoTool.h | 1 -
.../TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h | 1 -
.../TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h | 1 -
.../TrigMuonHypo/TrigmuCombHypoAlg.h | 1 -
.../TrigMuonHypo/TrigmuCombHypoTool.h | 1 -
.../src/components/TrigMuonHypo_entries.cxx | 12 ++++++++++++
18 files changed, 33 insertions(+), 25 deletions(-)
mode change 100755 => 100644 Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.h
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoTool.h
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
diff --git a/Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h b/Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h
old mode 100755
new mode 100644
index f3443f0cebd..dfb85aa23f4
--- a/Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h
+++ b/Trigger/TrigAlgorithms/TrigmuComb/TrigmuComb/muCombMT.h
@@ -1,5 +1,5 @@
/*
- 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
diff --git a/Trigger/TrigAlgorithms/TrigmuComb/src/components/TrigmuComb_entries.cxx b/Trigger/TrigAlgorithms/TrigmuComb/src/components/TrigmuComb_entries.cxx
index 9bfa7d9f33f..20d2a61905e 100644
--- a/Trigger/TrigAlgorithms/TrigmuComb/src/components/TrigmuComb_entries.cxx
+++ b/Trigger/TrigAlgorithms/TrigmuComb/src/components/TrigmuComb_entries.cxx
@@ -1,5 +1,6 @@
#include "TrigmuComb/muComb.h"
-
+#include "TrigmuComb/muCombMT.h"
DECLARE_COMPONENT( muComb )
+DECLARE_COMPONENT( muCombMT )
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoAlg.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoAlg.h
index 4065cf10c1f..f45b818722c 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoAlg.h
@@ -42,5 +42,4 @@ class TestTrigL2CaloHypoAlg : public ::AthReentrantAlgorithm {
};
-DECLARE_ALGORITHM_FACTORY( TestTrigL2CaloHypoAlg )
#endif //> !TRIGEGAMMAHYPO_TESTTRIGL2CALOHYPOALG_H
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoToolInc.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoToolInc.h
index 6f5dbde141f..f54e207a3da 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TestTrigL2CaloHypoToolInc.h
+++ b/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
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlg.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlg.h
index ca2db5bba32..634de146acf 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoAlg.h
@@ -42,5 +42,4 @@ class TrigL2CaloHypoAlg : public ::AthReentrantAlgorithm {
};
-DECLARE_ALGORITHM_FACTORY( TrigL2CaloHypoAlg )
#endif //> !TRIGEGAMMAHYPO_TRIGL2CALOHYPOALG_H
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.h
index fb5e6ca3815..f1e966110da 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolInc.h
+++ b/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
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.h
index b282b2081d2..0dd3817a3a4 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypoToolMult.h
+++ b/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
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.h
old mode 100755
new mode 100644
index 81143c20b09..782dc0f7177
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFexMT.h
+++ b/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
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlg.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlg.h
index 98bf7f5e23d..daaa7f6e78e 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoAlg.h
+++ b/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
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.h
index 5169c3a3799..b3933e8f505 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronHypoTool.h
+++ b/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
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx
index 5e36b304f29..ff4b4ec3d73 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx
+++ b/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 )
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
old mode 100755
new mode 100644
index 40f01101f0f..90d0773ad7a
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoAlg.h
+++ b/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
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoTool.h
old mode 100755
new mode 100644
index 1aa64ca4cc9..e97824dae3b
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMufastHypoTool.h
+++ b/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
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
old mode 100755
new mode 100644
index b44551aeae5..aa9654aa723
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoAlg.h
+++ b/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
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h
index eea0d889edf..6401c602334 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFMSonlyHypoTool.h
+++ b/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
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h
index bbc027928bd..164342b77b3 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoAlg.h
+++ b/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
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoTool.h
index ddfadbbe1f6..948a727fe7b 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigmuCombHypoTool.h
+++ b/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
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/components/TrigMuonHypo_entries.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/components/TrigMuonHypo_entries.cxx
index c59937b9e28..dcf6c874297 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/components/TrigMuonHypo_entries.cxx
+++ b/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 )
--
GitLab