diff --git a/Reconstruction/DiTauRec/src/components/DiTauRec_entries.cxx b/Reconstruction/DiTauRec/src/components/DiTauRec_entries.cxx
index dea8c775b0458cee390e3fc6cce2ccf458712279..38e755e1fe72afeb47a49d4ddce6a3149927bcc3 100644
--- a/Reconstruction/DiTauRec/src/components/DiTauRec_entries.cxx
+++ b/Reconstruction/DiTauRec/src/components/DiTauRec_entries.cxx
@@ -1,6 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "DiTauRec/DiTauBuilder.h"
#include "DiTauRec/DiTauToolBase.h"
#include "DiTauRec/SeedJetBuilder.h"
@@ -20,14 +17,3 @@ DECLARE_TOOL_FACTORY( DiTauTrackFinder )
DECLARE_TOOL_FACTORY( CellFinder )
DECLARE_TOOL_FACTORY( IDVarCalculator )
-DECLARE_FACTORY_ENTRIES( DiTauRec )
-{
- DECLARE_ALGORITHM( DiTauBuilder );
- DECLARE_TOOL( SeedJetBuilder );
- DECLARE_TOOL( SubjetBuilder );
- DECLARE_TOOL( ElMuFinder );
- DECLARE_TOOL( VertexFinder );
- DECLARE_TOOL( DiTauTrackFinder );
- DECLARE_TOOL( CellFinder );
- DECLARE_TOOL( IDVarCalculator );
-}
diff --git a/Reconstruction/DiTauRec/src/components/DiTauRec_load.cxx b/Reconstruction/DiTauRec/src/components/DiTauRec_load.cxx
deleted file mode 100644
index f4bcb00c12f8ccf1aa4340964646b7374b4ec944..0000000000000000000000000000000000000000
--- a/Reconstruction/DiTauRec/src/components/DiTauRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(DiTauRec)
diff --git a/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_entries.cxx b/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_entries.cxx
old mode 100755
new mode 100644
index a1f5e3e2669422e52498f5436176f3bfb9f445aa..36ec2d26c17c84275343c8386fc259d4387be8e6
--- a/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_entries.cxx
+++ b/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_entries.cxx
@@ -1,15 +1,8 @@
#include "EventShapeTools/EventDensityTool.h"
#include "EventShapeTools/EventShapeCopier.h"
#include "../EventDensityAthAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( EventDensityTool )
DECLARE_TOOL_FACTORY( EventShapeCopier )
DECLARE_ALGORITHM_FACTORY( EventDensityAthAlg )
-DECLARE_FACTORY_ENTRIES( EventShapeTools ) {
- DECLARE_TOOL( EventDensityTool );
- DECLARE_TOOL( EventShapeCopier );
- DECLARE_ALGORITHM( EventDensityAthAlg );
-
-}
diff --git a/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_load.cxx b/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_load.cxx
deleted file mode 100755
index acc53fbd19751d7917410f9ac7c89f137cb313d6..0000000000000000000000000000000000000000
--- a/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(EventShapeTools)
diff --git a/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_entries.cxx b/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_entries.cxx
old mode 100755
new mode 100644
index 2f27565948ec4aaf0fb03c24276ee3f1e25f713e..ff8f9de90f0051ced4f2ffd57e71d48f38128f10
--- a/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_entries.cxx
+++ b/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_entries.cxx
@@ -1,12 +1,6 @@
#include "HIGlobal/HIEventShapeMaker.h"
#include "HIGlobal/HIEventShapeFillerTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( HIEventShapeMaker )
DECLARE_TOOL_FACTORY (HIEventShapeFillerTool)
-DECLARE_FACTORY_ENTRIES( HIGlobal ) {
- DECLARE_TOOL(HIEventShapeFillerTool);
- DECLARE_ALGORITHM( HIEventShapeMaker );
-}
-
diff --git a/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_load.cxx b/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_load.cxx
deleted file mode 100755
index 82b0ba27ee4de80025729e41e7667fc7a8f92270..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( HIGlobal )
-
-
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_entries.cxx b/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_entries.cxx
index 9dfc5d56a5a577b7477d6454668929ee7cf779d7..a78a2f772700804fcb9cf5acc28e7bade80b87a0 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_entries.cxx
+++ b/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_entries.cxx
@@ -1,6 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#ifndef XAOD_ANALYSIS
#include "../HIClusterMaker.h"
#include "../HIJetCellSubtractorTool.h"
@@ -36,19 +33,3 @@ DECLARE_TOOL_FACTORY(HIJetSignificanceTool)
DECLARE_TOOL_FACTORY(HIUEModulatorTool)
DECLARE_TOOL_FACTORY(HIClusterPseudoJetGetter)
-DECLARE_FACTORY_ENTRIES( HIJetRec ) {
-#ifndef XAOD_ANALYSIS
- DECLARE_ALGORITHM( HIClusterMaker )
- DECLARE_TOOL(HIJetCellSubtractorTool)
- DECLARE_TOOL( HIClusterSubtraction )
- DECLARE_TOOL(HISubtractedCellMakerTool)
-#endif
- DECLARE_TOOL( HIEventShapeJetIteration )
- DECLARE_TOOL(HIJetConstituentSubtractionTool)
- DECLARE_TOOL(HIJetClusterSubtractorTool)
- DECLARE_TOOL(HIJetDRAssociationTool)
- DECLARE_TOOL(HIJetMaxOverMeanTool)
- DECLARE_TOOL(HIJetDiscriminatorTool)
- DECLARE_TOOL(HIUEModulatorTool)
- DECLARE_TOOL(HIClusterPseudoJetGetter)
-}
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_load.cxx b/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_load.cxx
deleted file mode 100644
index 341628605e10464b4b1036ed19cfd873c9a927d7..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(HIJetRec)
-
diff --git a/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_entries.cxx b/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_entries.cxx
index b6e2bbb6435d9c265daa41cc6ff3d240c03760c6..bd7476c3fe16b3b016d3aa88cb3d82909ec8febe 100644
--- a/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_entries.cxx
+++ b/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_entries.cxx
@@ -3,19 +3,10 @@
#include "HIMonitoring/HIMonitoringZdcTool.h"
#include "HIMonitoring/HIMonitoringMuonsTool.h"
#include "HIMonitoring/HIMonitoringElectronsTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(HIMonitoringEventShapeTool)
DECLARE_TOOL_FACTORY(HIMonitoringPhotonsTool)
DECLARE_TOOL_FACTORY(HIMonitoringZdcTool)
DECLARE_TOOL_FACTORY(HIMonitoringMuonsTool)
DECLARE_TOOL_FACTORY(HIMonitoringElectronsTool)
-
-DECLARE_FACTORY_ENTRIES(HIMonitoring)
-{
- DECLARE_ALGTOOL(HIMonitoringEventShapeTool);
- DECLARE_ALGTOOL(HIMonitoringPhotonsTool);
- DECLARE_ALGTOOL(HIMonitoringZdcTool);
- DECLARE_ALGTOOL(HIMonitoringMuonsTool);
- DECLARE_ALGTOOL(HIMonitoringElectronsTool);
-}
+
diff --git a/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_load.cxx b/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_load.cxx
deleted file mode 100644
index 72fe5c813a40543b96351548f27501b912b37334..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(HIMonitoring)
\ No newline at end of file
diff --git a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_entries.cxx b/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_entries.cxx
index 895aa3b12cd26b3ae1160df538f55afab01c276f..bbefff7fae5ef3948143c3e8b276e4b14ea7c156 100644
--- a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_entries.cxx
+++ b/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "JetTileCorrection/JetTileCorrectionTool.h"
#include "../JetTileCorrectionAlg.h"
DECLARE_NAMESPACE_TOOL_FACTORY( CP, JetTileCorrectionTool )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, JetTileCorrectionAlg )
-DECLARE_FACTORY_ENTRIES( JetTileCorrection )
-{
- DECLARE_NAMESPACE_TOOL( CP, JetTileCorrectionTool );
- DECLARE_NAMESPACE_ALGORITHM( CP, JetTileCorrectionAlg );
-}
diff --git a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_load.cxx b/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_load.cxx
deleted file mode 100644
index ecb4b8cdbf87282d0dd80e29f544b1b20d313ebe..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(JetTileCorrection)
diff --git a/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_entries.cxx b/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_entries.cxx
index e6e3ba8bdf9ba256beb9d882f2a2c58197d7a250..7bff9474d08e5edf3a6fe67053cdff00d67c94f3 100644
--- a/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_entries.cxx
+++ b/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "JetCalibTools/JetCalibrationTool.h"
#include "JetCalibTools/CalibrationMethods/JetPileupCorrection.h"
@@ -13,11 +11,3 @@ DECLARE_TOOL_FACTORY( ResidualOffsetCorrection )
DECLARE_TOOL_FACTORY( EtaJESCorrection )
DECLARE_TOOL_FACTORY( InsituDataCorrection )
-DECLARE_FACTORY_ENTRIES( JetCalibTools )
-{
- DECLARE_TOOL( JetCalibrationTool );
- DECLARE_TOOL( JetPileupCorrection );
- DECLARE_TOOL( ResidualOffsetCorrection );
- DECLARE_TOOL( EtaJESCorrection );
- DECLARE_TOOL( InsituDataCorrection );
-}
diff --git a/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_load.cxx b/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_load.cxx
deleted file mode 100644
index f835c23a550c3657a7884006f883fceb378b80c2..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetCalibTools)
-
-
diff --git a/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_entries.cxx b/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_entries.cxx
index 7a6e9c2dcc0a033e3c7bda20bb7ebc4bd1b96132..eb75f29ff3d3e5bd93049598e277e288a4dab5b2 100644
--- a/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_entries.cxx
+++ b/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_entries.cxx
@@ -1,13 +1,4 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "JetJvtEfficiency/JetJvtEfficiency.h"
DECLARE_NAMESPACE_TOOL_FACTORY( CP, JetJvtEfficiency )
-DECLARE_FACTORY_ENTRIES( JetJvtEfficiency ) {
-
- DECLARE_NAMESPACE_TOOL( CP, JetJvtEfficiency )
-
-}
diff --git a/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_load.cxx b/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_load.cxx
deleted file mode 100644
index aedca1c6f7c105876e55bf1436f67a77b0b09ed2..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( JetJvtEfficiency)
diff --git a/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_entries.cxx b/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_entries.cxx
index 7ed9cd972346e15d393ad7e0128a08eb7e4e66b3..43bc525b70e6e4d8231bbf4c37bb81ad681502cb 100644
--- a/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_entries.cxx
+++ b/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_entries.cxx
@@ -1,6 +1,3 @@
-// JetRec_entries.cxx
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "PFlowUtils/IWeightPFOTool.h"
#include "JetMomentTools/JetCaloEnergies.h"
#include "JetMomentTools/JetCaloQualityTool.h"
@@ -48,28 +45,3 @@ DECLARE_TOOL_FACTORY(JetBadChanCorrTool)
DECLARE_TOOL_FACTORY(JetCaloCellQualityTool)
#endif
-DECLARE_FACTORY_ENTRIES(JetRec) {
- DECLARE_TOOL(JetCaloEnergies)
- DECLARE_TOOL(JetCaloQualityTool)
- DECLARE_TOOL(JetWidthTool)
- DECLARE_TOOL(JetMuonSegmentMomentsTool)
- DECLARE_TOOL(JetTrackMomentsTool)
- DECLARE_TOOL(JetTrackSumMomentsTool)
- DECLARE_TOOL(JetClusterMomentsTool)
- DECLARE_TOOL(JetVoronoiMomentsTool)
- DECLARE_TOOL(JetVertexFractionTool)
- DECLARE_TOOL(JetVertexTaggerTool)
- DECLARE_TOOL(JetForwardJvtTool)
- DECLARE_TOOL(JetPtAssociationTool)
- DECLARE_TOOL(JetIsolationTool)
- DECLARE_TOOL(JetLArHVTool)
- DECLARE_TOOL(JetOriginCorrectionTool)
- DECLARE_TOOL(JetECPSFractionTool)
- DECLARE_TOOL(JetConstitFourMomTool)
-
-#ifndef XAOD_ANALYSIS
- DECLARE_TOOL(JetBadChanCorrTool)
- DECLARE_TOOL(JetCaloCellQualityTool)
-#endif
-}
-
diff --git a/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_load.cxx b/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_load.cxx
deleted file mode 100644
index 0e6ec8f4140bb557f316dd8af9bb14528d190fc8..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// JetRec_load.cxx
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetMomentTools)
diff --git a/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_entries.cxx b/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_entries.cxx
old mode 100755
new mode 100644
index ab62828b7284b700869c08320e904a21c3f05f5d..3ea33e70bbba6414682e9a27d18140141baa048e
--- a/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_entries.cxx
+++ b/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_entries.cxx
@@ -1,4 +1,3 @@
-
#include "JetMonitoring/JetKinematicHistos.h"
#include "JetMonitoring/JetAttributeHisto.h"
#include "JetMonitoring/HistoDefinitionTool.h"
@@ -11,7 +10,6 @@
#include "JetMonitoring/HIJetUEMonitoring.h"
#include "../JetMonitoringTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( JetKinematicHistos )
DECLARE_TOOL_FACTORY( JetMonitoringTool )
@@ -27,23 +25,8 @@ DECLARE_TOOL_FACTORY( HIJetUEMonitoring )
DECLARE_TOOL_FACTORY( JetAttributeHisto )
-DECLARE_FACTORY_ENTRIES(JetMonitoring) {
- DECLARE_TOOL( JetKinematicHistos );
- DECLARE_TOOL( JetMonitoringTool );
- DECLARE_TOOL( JetAttributeHisto );
- DECLARE_TOOL( LeadingJetsRelations );
- DECLARE_TOOL( EfficiencyResponseHistos );
- DECLARE_TOOL( HIEfficiencyResponseHistos );
- DECLARE_TOOL( JetContainerHistoFiller );
- DECLARE_TOOL( JetSelectorAttribute );
- DECLARE_TOOL( HistoDefinitionTool );
- DECLARE_TOOL( HistosForJetSelection );
- DECLARE_TOOL( HIJetUEMonitoring );
-}
-
-
diff --git a/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_load.cxx b/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_load.cxx
deleted file mode 100755
index d1a1ecf37ec852e37f902f8c943212080879e2a8..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetMonitoring)
diff --git a/Reconstruction/Jet/JetRec/src/components/JetRec_entries.cxx b/Reconstruction/Jet/JetRec/src/components/JetRec_entries.cxx
index 336393184e339da768ff49e1c05a6e3c2088f539..2e1e44c5c75dcb316a94cbc7e9385887eac54b39 100644
--- a/Reconstruction/Jet/JetRec/src/components/JetRec_entries.cxx
+++ b/Reconstruction/Jet/JetRec/src/components/JetRec_entries.cxx
@@ -1,5 +1,3 @@
-// JetRec_entries.cxx
-
#include "../JetAlgorithm.h"
#include "JetRec/JetToolRunner.h"
#include "JetRec/JetRecTool.h"
@@ -14,7 +12,6 @@
#include "JetRec/JetPruner.h"
#include "JetRec/JetReclusterer.h"
#include "JetRec/FastJetInterfaceTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "JetRec/JetSorter.h"
#include "JetRec/JetPseudojetRetriever.h"
@@ -45,27 +42,3 @@ DECLARE_TOOL_FACTORY(JetConstitRemover)
DECLARE_ALGORITHM_FACTORY(JetAlgorithm)
-DECLARE_FACTORY_ENTRIES(JetRec) {
- DECLARE_TOOL(JetToolRunner)
- DECLARE_TOOL(JetRecTool)
- DECLARE_TOOL(JetDumper)
- DECLARE_TOOL(PseudoJetGetter)
- DECLARE_TOOL(MuonSegmentPseudoJetGetter)
- DECLARE_TOOL(JetFinder)
- DECLARE_TOOL(JetByVertexFinder)
- DECLARE_TOOL(JetFromPseudojet)
- DECLARE_TOOL(JetSorter)
- DECLARE_TOOL(JetFilterTool)
- DECLARE_TOOL(JetSplitter)
- DECLARE_TOOL(JetTrimmer)
- DECLARE_TOOL(JetPruner)
- DECLARE_TOOL(JetReclusterer)
- DECLARE_TOOL(FastJetInterfaceTool)
- DECLARE_TOOL(JetPseudojetRetriever)
- DECLARE_TOOL(JetConstituentsRetriever)
- DECLARE_TOOL(JetPseudojetCopier)
- DECLARE_TOOL(JetConstitRemover)
-
- DECLARE_ALGORITHM(JetAlgorithm)
-}
-
diff --git a/Reconstruction/Jet/JetRec/src/components/JetRec_load.cxx b/Reconstruction/Jet/JetRec/src/components/JetRec_load.cxx
deleted file mode 100644
index af1315591b0d4c9899f928aba1b70e5e486fd4d4..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetRec/src/components/JetRec_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// JetRec_load.cxx
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetRec)
diff --git a/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_entries.cxx b/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_entries.cxx
index d22df5af154cb397a9a62d57e1b4d9f448a88cd7..8c8a55edd3fd362d28b65471d42a8cfa6b36880d 100644
--- a/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_entries.cxx
+++ b/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_entries.cxx
@@ -1,10 +1,4 @@
-// JetRecCalo_entries.cxx
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "JetRecCalo/MissingCellListTool.h"
DECLARE_TOOL_FACTORY(MissingCellListTool)
-DECLARE_FACTORY_ENTRIES(JetRecCalo) {
- DECLARE_TOOL(MissingCellListTool)
-}
diff --git a/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_load.cxx b/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_load.cxx
deleted file mode 100644
index 25da647123d3ccbd8c6858445b9ef651825209a4..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetRecCalo)
diff --git a/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_entries.cxx b/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_entries.cxx
old mode 100755
new mode 100644
index 748d616947ff938887473b81626c10e407bfb6cc..f24217bf94d9d02ff6afa33b5c09fb978221964e
--- a/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_entries.cxx
+++ b/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_entries.cxx
@@ -1,6 +1,3 @@
-// JetRecTools_entries.cxx
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "JetRecTools/JetTrackSelectionTool.h"
#include "JetRecTools/SimpleJetTrackSelectionTool.h"
#include "JetRecTools/TrackVertexAssociationTool.h"
@@ -37,23 +34,3 @@ DECLARE_TOOL_FACTORY( CorrectPFOTool )
DECLARE_TOOL_FACTORY( ChargedHadronSubtractionTool )
DECLARE_TOOL_FACTORY( PuppiWeightTool )
-DECLARE_FACTORY_ENTRIES(JetRecTools) {
- DECLARE_TOOL(JetTrackSelectionTool)
- DECLARE_TOOL(SimpleJetTrackSelectionTool)
- DECLARE_TOOL(TrackVertexAssociationTool)
- DECLARE_TOOL(TrackPseudoJetGetter)
- DECLARE_TOOL(PFlowPseudoJetGetter)
- DECLARE_TOOL(JetConstituentModSequence)
- DECLARE_TOOL(JetConstituentModifierBase)
- DECLARE_TOOL(CaloClusterConstituentsOrigin)
- DECLARE_TOOL(SoftKillerWeightTool)
- DECLARE_TOOL( ConstituentSubtractorTool )
- DECLARE_TOOL( VoronoiWeightTool )
- DECLARE_TOOL( ClusterAtEMScaleTool )
- DECLARE_TOOL( ConstitTimeCutTool )
- DECLARE_TOOL( JetInputElRemovalTool )
- DECLARE_TOOL( CorrectPFOTool )
- DECLARE_TOOL( ChargedHadronSubtractionTool )
- DECLARE_TOOL( PuppiWeightTool )
-
-}
diff --git a/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_load.cxx b/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_load.cxx
deleted file mode 100755
index 7744bcf9d09fdbd97bbe84dbf95fcaf7f5e3b66a..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetRecTools)
diff --git a/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_entries.cxx b/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_entries.cxx
index b93cd2e822f720f468b50ce8d5214fc9b1fd49e5..e61f2f5cec81f0c221b2a983e4e6978f908b2a18 100644
--- a/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_entries.cxx
+++ b/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_entries.cxx
@@ -1,6 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "JetReclustering/JetReclusteringTool.h"
#include "JetReclustering/EffectiveRTool.h"
@@ -11,9 +8,3 @@ DECLARE_TOOL_FACTORY( EffectiveRTool )
#include "../AthJetReclusteringAlgo.h"
DECLARE_ALGORITHM_FACTORY( AthJetReclusteringAlgo )
-DECLARE_FACTORY_ENTRIES( JetReclustering )
-{
- DECLARE_ALGORITHM( AthJetReclusteringAlgo );
- DECLARE_TOOL( JetReclusteringTool );
- DECLARE_TOOL( EffectiveRTool );
-}
diff --git a/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_load.cxx b/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_load.cxx
deleted file mode 100644
index 910312475073c3f6abc96045fd3fdd1db8bf45c1..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(JetReclustering)
diff --git a/Reconstruction/Jet/JetResolution/src/components/JetResolution_entries.cxx b/Reconstruction/Jet/JetResolution/src/components/JetResolution_entries.cxx
index cf493cb70b478d76979c68f1186c4a4102d5b51b..5721367ed204855754740267862ab1097222fe4f 100644
--- a/Reconstruction/Jet/JetResolution/src/components/JetResolution_entries.cxx
+++ b/Reconstruction/Jet/JetResolution/src/components/JetResolution_entries.cxx
@@ -1,7 +1,3 @@
-// Gaudi/Athena includes
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local includes
#include "JetResolution/JERTool.h"
#include "JetResolution/JERSmearingTool.h"
#include "../JERTestAlg.h"
@@ -10,10 +6,3 @@ DECLARE_TOOL_FACTORY( JERTool )
DECLARE_TOOL_FACTORY( JERSmearingTool )
DECLARE_ALGORITHM_FACTORY( JERTestAlg )
-DECLARE_FACTORY_ENTRIES( JetResolution ) {
-
- DECLARE_TOOL( JERTool )
- DECLARE_TOOL( JERSmearingTool )
- DECLARE_ALGORITHM( JERTestAlg )
-
-}
diff --git a/Reconstruction/Jet/JetResolution/src/components/JetResolution_load.cxx b/Reconstruction/Jet/JetResolution/src/components/JetResolution_load.cxx
deleted file mode 100644
index eb2bae660a90a8504c0fd00e878de912bb022b7f..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/src/components/JetResolution_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena includes
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure
-LOAD_FACTORY_ENTRIES( JetResolution )
diff --git a/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_entries.cxx b/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_entries.cxx
old mode 100755
new mode 100644
index 9e787f57afc7545277e5f0d1fa0b85ddc71049d1..6e9da7d757fd1a320c4501d2cfc7227f7a97d862
--- a/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_entries.cxx
+++ b/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_entries.cxx
@@ -1,17 +1,8 @@
#include "JetSimTools/JetTruthParticleSelectorTool.h"
#include "JetSimTools/TruthPseudoJetGetter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( JetTruthParticleSelectorTool )
DECLARE_TOOL_FACTORY( TruthPseudoJetGetter )
-DECLARE_FACTORY_ENTRIES(JetSimTools) {
- DECLARE_TOOL( JetTruthParticleSelectorTool );
- DECLARE_TOOL( TruthPseudoJetGetter );
-
-}
-
-
-
diff --git a/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_load.cxx b/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_load.cxx
deleted file mode 100755
index 25ff83d6cea4083a5cabf46f26b3bac643df2df2..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetSimTools)
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_entries.cxx b/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_entries.cxx
index 8a0bd689bb6d288bccb6fb38270fce7a243b757a..2dc2795fa54112966ae31ef58a9f53592ff2e89a 100644
--- a/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_entries.cxx
+++ b/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_entries.cxx
@@ -22,7 +22,6 @@
#include "JetSubStructureMomentTools/Validator.h"
#include "JetSubStructureMomentTools/QwTool.h"
#include "JetSubStructureMomentTools/BoostedXbbTagTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(KtDeltaRTool)
@@ -48,28 +47,3 @@ DECLARE_TOOL_FACTORY(Validator)
DECLARE_TOOL_FACTORY(QwTool)
DECLARE_TOOL_FACTORY(BoostedXbbTagTool)
-DECLARE_FACTORY_ENTRIES(JetSubStructureMomentTools) {
- DECLARE_TOOL(KtDeltaRTool)
- DECLARE_TOOL(NSubjettinessTool)
- DECLARE_TOOL(NSubjettinessRatiosTool)
- DECLARE_TOOL(KTSplittingScaleTool)
- DECLARE_TOOL(DipolarityTool)
- DECLARE_TOOL(AngularityTool)
- DECLARE_TOOL(KtMassDropTool)
- DECLARE_TOOL(PlanarFlowTool)
- DECLARE_TOOL(CenterOfMassShapesTool)
- DECLARE_TOOL(EnergyCorrelatorTool)
- DECLARE_TOOL(EnergyCorrelatorRatiosTool)
- DECLARE_TOOL(JetPullTool)
- DECLARE_TOOL(JetChargeTool)
- DECLARE_TOOL(VolatilityTool)
- DECLARE_TOOL(ShowerDeconstructionTool)
- DECLARE_TOOL(SubjetMakerTool)
- DECLARE_TOOL(SubjetFinderTool)
- DECLARE_TOOL(SubjetRecorderTool)
- DECLARE_TOOL(BosonTagTool)
- DECLARE_TOOL(Validator)
- DECLARE_TOOL(QwTool)
- DECLARE_TOOL(BoostedXbbTagTool)
-}
-
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_load.cxx b/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_load.cxx
deleted file mode 100644
index 9aff038f171e63e77e5636552b4fee370210111a..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// JetSubStructureMomentTools_load.cxx
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetSubStructureMomentTools)
diff --git a/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_entries.cxx b/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_entries.cxx
index 62b209dc9167eb92dc32c150386db12f9f8fb067..c6ace4c1e68278053568b8c60d8c176d2d588f63 100644
--- a/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_entries.cxx
+++ b/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_entries.cxx
@@ -1,14 +1,4 @@
-
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Package include(s):
#include "JetUncertainties/JetUncertaintiesTool.h"
DECLARE_TOOL_FACTORY(JetUncertaintiesTool)
-DECLARE_FACTORY_ENTRIES(JetUncertaintiesTool)
-{
- DECLARE_TOOL(JetUncertaintiesTool)
-}
diff --git a/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_load.cxx b/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_load.cxx
deleted file mode 100644
index ec42422977bc229dc83a5f868ed1393988b69eb8..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES(JetUncertainties)
diff --git a/Reconstruction/Jet/JetValidation/src/components/JetValidation_entries.cxx b/Reconstruction/Jet/JetValidation/src/components/JetValidation_entries.cxx
index 632ceee30909c2c8c557a85161682722f20522d1..33295d37dbf1ebf843b0dd41a0fe70c0bca75821 100644
--- a/Reconstruction/Jet/JetValidation/src/components/JetValidation_entries.cxx
+++ b/Reconstruction/Jet/JetValidation/src/components/JetValidation_entries.cxx
@@ -1,7 +1,6 @@
//#include "JetValidation/JetTests.h"
//#include "JetValidation/JetCalibratorAthenaExample.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
//DECLARE_ALGORITHM_FACTORY( JetTests )
//DECLARE_ALGORITHM_FACTORY( JetSkeletonAlg )
@@ -9,10 +8,6 @@
//DECLARE_TOOL_FACTORY( JetCalibratorAthenaExample )
//DECLARE_TOOL_FACTORY( JetCollectionTester )
-DECLARE_FACTORY_ENTRIES( JetValidation ) {
- //DECLARE_ALGORITHM( JetSkeletonAlg ) ;
- //DECLARE_TOOL( JetCalibratorAthenaExample ) ;
- //DECLARE_TOOL( JetCollectionTester ) ;
-}
+
diff --git a/Reconstruction/Jet/JetValidation/src/components/JetValidation_load.cxx b/Reconstruction/Jet/JetValidation/src/components/JetValidation_load.cxx
deleted file mode 100644
index 038179a47045f79e73fb4d4fc9f4ff7ab9f83b1b..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetValidation/src/components/JetValidation_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(JetValidation)
diff --git a/Reconstruction/MET/METReconstruction/src/components/METReconstruction_entries.cxx b/Reconstruction/MET/METReconstruction/src/components/METReconstruction_entries.cxx
index 77163a0cdfa62207d16cba2138687d17aa9950f0..4c985684fb80a19ec25da966c1fbd986187b15da 100644
--- a/Reconstruction/MET/METReconstruction/src/components/METReconstruction_entries.cxx
+++ b/Reconstruction/MET/METReconstruction/src/components/METReconstruction_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
// Top level tool
#include "METReconstruction/METRecoTool.h"
#include "METReconstruction/METAssociationTool.h"
@@ -61,32 +59,3 @@ DECLARE_ALGORITHM_FACTORY(METRecoAlg)
DECLARE_ALGORITHM_FACTORY(METReaderAlg)
DECLARE_ALGORITHM_FACTORY(METAssocTestAlg)
-DECLARE_FACTORY_ENTRIES(METReconstruction) {
- DECLARE_TOOL(METRecoTool)
- DECLARE_TOOL(METElectronTool)
- DECLARE_TOOL(METPhotonTool)
- DECLARE_TOOL(METJetTool)
- DECLARE_TOOL(METTauTool)
- DECLARE_TOOL(METMuonTool)
- DECLARE_TOOL(METSoftTermsTool)
- DECLARE_TOOL(METAssociationTool)
- DECLARE_TOOL(METElectronAssociator)
- DECLARE_TOOL(METPhotonAssociator)
- DECLARE_TOOL(METJetAssocTool)
- DECLARE_TOOL(METTauAssociator)
- DECLARE_TOOL(METMuonAssociator)
- DECLARE_TOOL(METSoftAssociator)
- //
- DECLARE_TOOL(METTruthTool)
- DECLARE_TOOL(METTruthAssociator)
- DECLARE_TOOL(METCaloRegionsTool)
- //
- DECLARE_TOOL(METJetFilterTool)
- DECLARE_TOOL(METTrackFilterTool)
- DECLARE_TOOL(METMuonElossTool)
- DECLARE_TOOL(METRegionsTool)
- //
- DECLARE_ALGORITHM(METRecoAlg)
- DECLARE_ALGORITHM(METReaderAlg)
- DECLARE_ALGORITHM(METAssocTestAlg)
-}
diff --git a/Reconstruction/MET/METReconstruction/src/components/METReconstruction_load.cxx b/Reconstruction/MET/METReconstruction/src/components/METReconstruction_load.cxx
deleted file mode 100644
index ec06f87ad6e4f80a47ee5c322dd63973cd1de0d4..0000000000000000000000000000000000000000
--- a/Reconstruction/MET/METReconstruction/src/components/METReconstruction_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(METReconstruction)
diff --git a/Reconstruction/MET/METUtilities/src/components/METUtilities_entries.cxx b/Reconstruction/MET/METUtilities/src/components/METUtilities_entries.cxx
index 25db23508c41f96c824402523ac8851b0bc0470d..a50541533fa14a8117d257a92bc957a148a9199c 100644
--- a/Reconstruction/MET/METUtilities/src/components/METUtilities_entries.cxx
+++ b/Reconstruction/MET/METUtilities/src/components/METUtilities_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
// Top level tool
#include "METUtilities/METMaker.h"
#include "METUtilities/METRebuilder.h"
@@ -15,16 +13,7 @@ DECLARE_TOOL_FACTORY(METMaker)
DECLARE_TOOL_FACTORY(METRebuilder)
DECLARE_TOOL_FACTORY(METSystematicsTool)
DECLARE_TOOL_FACTORY(METSignificance)
-//
+
DECLARE_ALGORITHM_FACTORY(METUtilAlg)
DECLARE_ALGORITHM_FACTORY(METMakerAlg)
-DECLARE_FACTORY_ENTRIES(METReconstruction) {
- DECLARE_TOOL(METMaker)
- DECLARE_TOOL(METRebuilder)
- DECLARE_TOOL(METSystematicsTool)
- DECLARE_TOOL(METSignificance)
- //
- DECLARE_ALGORITHM(METUtilAlg)
- DECLARE_ALGORITHM(METMakerAlg)
-}
diff --git a/Reconstruction/MET/METUtilities/src/components/METUtilities_load.cxx b/Reconstruction/MET/METUtilities/src/components/METUtilities_load.cxx
deleted file mode 100644
index b0c3390521cf946492b86c99116854360db2a2e8..0000000000000000000000000000000000000000
--- a/Reconstruction/MET/METUtilities/src/components/METUtilities_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(METUtilities)
diff --git a/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_entries.cxx b/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_entries.cxx
index 2f4eae6bd732c0f3810f9cb591f321906c5c6198..f894fa88e67029eca9a427c24fc071da1b962b9b 100644
--- a/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_entries.cxx
+++ b/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_entries.cxx
@@ -1,7 +1,6 @@
#include "MissingETGoodness/EtmissGoodnessSelectorAlg.h"
#include "MissingETGoodness/EtmissGoodnessManagerAlg.h"
#include "MissingETGoodness/EtmissGoodnessManagerTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MissingETGoodness/JetGoodiesFiller.h"
#include "MissingETGoodness/MetGoodiesFiller.h"
#include "MissingETGoodness/JetVarTool.h"
@@ -19,15 +18,3 @@ DECLARE_ALGORITHM_FACTORY( MuonGoodiesFiller )
DECLARE_TOOL_FACTORY( EtmissGoodnessManagerTool )
DECLARE_TOOL_FACTORY( JetVarTool )
-DECLARE_FACTORY_ENTRIES( MissingETGoodness ) {
- DECLARE_TOOL( EtmissGoodnessManagerTool )
- DECLARE_TOOL( JetVarTool )
- DECLARE_ALGORITHM( EtmissGoodnessManagerAlg )
- DECLARE_ALGORITHM( EtmissGoodnessSelectorAlg )
- DECLARE_ALGORITHM( JetGoodiesFiller )
- DECLARE_ALGORITHM( MetGoodiesFiller )
- DECLARE_ALGORITHM( METCollisionFilter )
- DECLARE_ALGORITHM( SkimDecisionFilter )
- DECLARE_ALGORITHM( MuonGoodiesFiller )
-}
-
diff --git a/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_load.cxx b/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_load.cxx
deleted file mode 100644
index a4c4033e431bd88be323334040dae08575f03008..0000000000000000000000000000000000000000
--- a/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MissingETGoodness)
-
diff --git a/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_entries.cxx b/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_entries.cxx
old mode 100755
new mode 100644
index f4588a54af38c231b961b5538a3c5bf7ccb6a0f4..f752689c985583f8085c5f9dd277379659783fdf
--- a/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_entries.cxx
+++ b/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_entries.cxx
@@ -1,10 +1,5 @@
#include "MissingETMonitoring/METMonTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( METMonTool )
-DECLARE_FACTORY_ENTRIES(MissingETMonitoring)
-{
- DECLARE_TOOL( METMonTool )
-}
diff --git a/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_load.cxx b/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_load.cxx
deleted file mode 100755
index 967aa3f132fd1917b1ee7a3d0fd38f693c56f2c2..0000000000000000000000000000000000000000
--- a/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MissingETMonitoring)
diff --git a/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_entries.cxx b/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_entries.cxx
old mode 100755
new mode 100644
index c4dd52599983d1504e2e1779263b8634b387ee0e..71edb2c6a4c0c0160258b356d003b668d7b9b91f
--- a/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_entries.cxx
+++ b/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_entries.cxx
@@ -21,7 +21,6 @@
#include "MissingETPerformance/PileUpTool.h"
#include "MissingETPerformance/MissingETScaleTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( MissingETPerformance )
DECLARE_ALGORITHM_FACTORY( ZeeSequencer )
@@ -47,27 +46,3 @@ DECLARE_TOOL_FACTORY( ContainerComparatorTool )
DECLARE_TOOL_FACTORY( PileUpTool )
DECLARE_TOOL_FACTORY( MissingETScaleTool )
-DECLARE_FACTORY_ENTRIES( MissingETPerformance )
-{
- DECLARE_TOOL( MissingETData )
- DECLARE_TOOL( MissingETMuonData )
- DECLARE_TOOL( MissingETEventSelector )
- DECLARE_TOOL( ResolutionTool )
- DECLARE_TOOL( BasicPlotsTool )
- DECLARE_TOOL( MissingETCompositionTool )
- DECLARE_TOOL( LinearityTool )
- DECLARE_TOOL( EtaRingsTool )
- DECLARE_TOOL( JetVariablesTool )
- DECLARE_TOOL( TopoClusterVariablesTool )
- DECLARE_TOOL( TrigMissingETTool )
- DECLARE_TOOL( TrigVsOfflineMissingETTool )
- DECLARE_TOOL( FakeMissingETTool )
- DECLARE_TOOL( ZMuMuTool )
- DECLARE_TOOL( ZeeTool )
- DECLARE_TOOL( MuonTool )
- DECLARE_TOOL( ContainerComparatorTool )
- DECLARE_TOOL( PileUpTool )
- DECLARE_TOOL( MissingETScaleTool )
-
- DECLARE_ALGORITHM( MissingETPerformance )
-}
diff --git a/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_load.cxx b/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_load.cxx
deleted file mode 100755
index b7ae4d41940c4193dd4ccec9147bf6ae36b62503..0000000000000000000000000000000000000000
--- a/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( MissingETPerformance )
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_entries.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_entries.cxx
old mode 100755
new mode 100644
index 031be08aa4bae9e00e10094f40a392e71ebd4ad7..3476d912affccc850a74f3b397fe07bcdc65b487
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_entries.cxx
@@ -1,6 +1,3 @@
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CaloTrkMuIdTools/CaloMuonTag.h"
#include "CaloTrkMuIdTools/TrackEnergyInCaloTool.h"
#include "CaloTrkMuIdTools/TrackDepositInCaloTool.h"
@@ -11,11 +8,3 @@ DECLARE_TOOL_FACTORY( TrackEnergyInCaloTool )
DECLARE_TOOL_FACTORY( TrackDepositInCaloTool )
DECLARE_TOOL_FACTORY( CaloMuonLikelihoodTool )
-DECLARE_FACTORY_ENTRIES ( CaloTrkMuIdTools ) {
- DECLARE_TOOL( CaloMuonTag );
- DECLARE_TOOL( TrackEnergyInCaloTool );
- DECLARE_TOOL( TrackDepositInCaloTool );
- DECLARE_TOOL( CaloMuonLikelihoodTool );
-}
-
-
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_load.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_load.cxx
deleted file mode 100755
index aef4db52da85c07095296126e586b6f17fd118c4..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CaloTrkMuIdTools )
diff --git a/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_entries.cxx b/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_entries.cxx
index a0364edbfa54b29e49156a9b7965ef06a2323d30..78038394b79735aa7906345931f3a6563dc7f052 100644
--- a/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_entries.cxx
+++ b/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_entries.cxx
@@ -1,11 +1,6 @@
#include "../ExtrapolateMuonToIP.h"
#include "../ExtrapolateMuonToIPTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( ExtrapolateMuonToIP )
DECLARE_TOOL_FACTORY( ExtrapolateMuonToIPTool )
-DECLARE_FACTORY_ENTRIES(CombinedMuonRefit) {
- DECLARE_ALGORITHM( ExtrapolateMuonToIP )
- DECLARE_TOOL( ExtrapolateMuonToIPTool )
-}
diff --git a/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_load.cxx b/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_load.cxx
deleted file mode 100644
index 6b7ff242a098205cf60c845176b44454f21f77fe..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkRefitAlg)
-
-
diff --git a/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_entries.cxx b/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_entries.cxx
index 102b9302233428dd0184e3496df45ffd9ee64123..2f6d5cee7a64fa37937c76e22172261e9493738c 100644
--- a/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuGirlRecoTool.h"
using namespace MuGirlNS;
DECLARE_TOOL_FACTORY( MuGirlRecoTool )
-DECLARE_FACTORY_ENTRIES( MuGirl )
-{
- DECLARE_TOOL( MuGirlRecoTool )
-}
-
diff --git a/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_load.cxx b/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_load.cxx
deleted file mode 100644
index 7f0f898cf90bb998548053c65c125d6b70a19a86..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuGirl)
diff --git a/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_entries.cxx b/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_entries.cxx
index 041a8032dceec11c43049170664894ef023690e7..ba6d10d9f48dcc282c9b1cf604757b1e92f7c42c 100644
--- a/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_entries.cxx
@@ -1,13 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuGirlCandidate/CandidateTool.h"
using namespace MuGirlNS;
DECLARE_TOOL_FACTORY( CandidateTool )
-DECLARE_FACTORY_ENTRIES( MuGirlCandidate )
-{
- DECLARE_TOOL( CandidateTool )
-}
-
diff --git a/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_load.cxx b/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_load.cxx
deleted file mode 100644
index ba491661b5effb686b004001390fccf80402b2df..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlCandidate )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_entries.cxx b/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_entries.cxx
index d6ff8bb621b0a4fe1a5faf2a4f99193a7e7f9c83..22bf5d0e3d55dbc92ab5cf3b86200abcd210129c 100644
--- a/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuGirlGlobalFit/GlobalFitTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( MuGirlNS, GlobalFitTool )
-DECLARE_FACTORY_ENTRIES( GlobalFitTool )
-{
- DECLARE_NAMESPACE_TOOL( MuGirlNS, GlobalFitTool )
-}
-
diff --git a/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_load.cxx b/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_load.cxx
deleted file mode 100644
index 7d2c46196ba98a68542ea8683c06c4616d5b66e0..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlGlobalFit )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_entries.cxx b/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_entries.cxx
index 726e5d68f0fbaaa9a3a9a574611985e73e6bacd7..0693a47285471b8624cdb409008f341319e02c54 100644
--- a/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuGirlParticleCreatorTool/MuGirlParticleCreatorTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( MuGirlNS, MuGirlParticleCreatorTool )
-DECLARE_FACTORY_ENTRIES( MuGirlParticleCreatorTool )
-{
- DECLARE_NAMESPACE_TOOL( MuGirlNS, MuGirlParticleCreatorTool )
-}
-
diff --git a/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_load.cxx b/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_load.cxx
deleted file mode 100644
index 89cfbf50c04e1840441eef4adc7c743fb7e9db2e..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlParticleCreatorTool )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_entries.cxx b/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_entries.cxx
index 5c5f99287b61130be6e5db23022652009116ca12..766e6604d9e8f4a6a9894969203475f7b94ceea5 100644
--- a/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuGirlPerformanceTools/PerformanceTruthTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( MuGirlNS, PerformanceTruthTool )
-DECLARE_FACTORY_ENTRIES( PerformanceTruthTool )
-{
- DECLARE_NAMESPACE_TOOL( MuGirlNS, PerformanceTruthTool )
-}
-
diff --git a/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_load.cxx b/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_load.cxx
deleted file mode 100644
index 6d56e1d2ecb2c272beb1001b3ca5bb48197d3119..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlPerformanceTools )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_entries.cxx b/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_entries.cxx
index eebb886da7aaa948a11a8d0807741f56427659ad..2020328e67ae3afdc7d1a3f129ceb71c5c759bbd 100644
--- a/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuGirlSelection/ANNSelectionTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( MuGirlNS, ANNSelectionTool )
-DECLARE_FACTORY_ENTRIES( MuGirlSelection )
-{
- DECLARE_NAMESPACE_TOOL( MuGirlNS, ANNSelectionTool )
-}
-
diff --git a/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_load.cxx b/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_load.cxx
deleted file mode 100644
index 1db364e34c15e44b342dc27906406c1ef0ef984a..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlSelection )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_entries.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_entries.cxx
index ec77b255a9f827c6b797919f63266c0772eb12f3..41b159b4ff6adebc96bfd0d008281b2d6c7183f9 100644
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuGirlStau/StauTool.h"
#include "MuGirlStau/StauBetaTofTool.h"
@@ -7,9 +6,3 @@ using namespace MuGirlNS;
DECLARE_TOOL_FACTORY (StauTool)
DECLARE_TOOL_FACTORY (StauBetaTofTool)
-DECLARE_FACTORY_ENTRIES( MuGirlStau )
-{
- DECLARE_TOOL( StauTool )
- DECLARE_TOOL( StauBetaTofTool )
-}
-
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_load.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_load.cxx
deleted file mode 100644
index 7668371b9ab7ddf3f5aaae7ca7eb543739f3ac3c..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlStau )
-
diff --git a/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_entries.cxx b/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_entries.cxx
old mode 100755
new mode 100644
index f7aeb67ebf399a4dbfc42f86a9b37e48ebcbaef3..8cbc1c5302ce298de8502467b601b4cd0ed5cce2
--- a/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuidCaloEnergyTools/MuidCaloEnergyTool.h"
#include "MuidCaloEnergyTools/MuidCaloEnergyMeas.h"
#include "MuidCaloEnergyTools/MuidCaloEnergyParam.h"
@@ -7,10 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidCaloEnergyTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidCaloEnergyMeas )
DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidCaloEnergyParam )
-DECLARE_FACTORY_ENTRIES( MuidCaloEnergyTools )
-{
- DECLARE_NAMESPACE_TOOL( Rec, MuidCaloEnergyTool )
- DECLARE_NAMESPACE_TOOL( Rec, MuidCaloEnergyMeas )
- DECLARE_NAMESPACE_TOOL( Rec, MuidCaloEnergyParam )
-}
-
diff --git a/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_load.cxx b/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_load.cxx
deleted file mode 100755
index d8ef51577bfec2fa76ed498d81f65ce68e9e6d42..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_load.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuidCaloEnergyTools)
-
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
-
-
diff --git a/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_entries.cxx b/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_entries.cxx
old mode 100755
new mode 100644
index 85a9954723e08d41d79684cbb6d4535f7e0b67b7..34a632e8093de8dd55cfa19d555d4129e58c1e8e
--- a/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuidCaloIsolationTools/MuidTrackIsolation.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidTrackIsolation )
-DECLARE_FACTORY_ENTRIES( MuidCaloIsolationTools )
-{
- DECLARE_NAMESPACE_TOOL( Rec, MuidTrackIsolation )
-}
diff --git a/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_load.cxx b/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_load.cxx
deleted file mode 100755
index efb3842c5f7174b7068093be68401a84122fdb96..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuidCaloIsolationTools )
diff --git a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_entries.cxx b/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_entries.cxx
old mode 100755
new mode 100644
index f85fed3044a8092ae66da5e8a3f414627e829db7..b21dba9a805fdfabc79baa08b1d53eaef4e54a8c
--- a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuidCaloScatteringTools/MuidCaloMaterialParam.h"
#include "MuidCaloScatteringTools/MuidCaloTrackStateOnSurface.h"
#include "MuidCaloScatteringTools/MuidMaterialEffectsOnTrackProvider.h"
@@ -7,11 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidCaloMaterialParam )
DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidCaloTrackStateOnSurface )
DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidMaterialEffectsOnTrackProvider)
-DECLARE_FACTORY_ENTRIES( MuidCaloScatteringTools )
-{
- DECLARE_NAMESPACE_TOOL( Rec, MuidCaloMaterialParam )
- DECLARE_NAMESPACE_TOOL( Rec, MuidCaloTrackStateOnSurface )
- DECLARE_NAMESPACE_TOOL( Rec, MuidMaterialEffectsOnTrackProvider)
-}
-
-
diff --git a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_load.cxx b/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_load.cxx
deleted file mode 100755
index effee9176f4e1d3d882ce2381979080a8c693320..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuidCaloScatteringTools )
-
diff --git a/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_entries.cxx b/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_entries.cxx
index 26162e554fa235298f77c523c27061a07cdb5fcd..d20873b3d1d33eada714047a15a3c80d366ea69e 100644
--- a/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuidCombinedTools/MuidBackTracker.h"
#include "MuidCombinedTools/MuidVertexCombiner.h"
#include "MuidCombinedTools/MuidMatchMaker.h"
@@ -7,11 +6,5 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidBackTracker )
DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidMatchMaker )
DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuidVertexCombiner )
-DECLARE_FACTORY_ENTRIES( MuidCombinedTools )
-{
- DECLARE_NAMESPACE_TOOL( Rec, MuidBackTracker )
- DECLARE_NAMESPACE_TOOL( Rec, MuidVertexCombiner )
- DECLARE_NAMESPACE_TOOL( Rec, MuidMatchMaker )
-}
diff --git a/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_load.cxx b/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_load.cxx
deleted file mode 100644
index 2b9bb67dc0a45b06c4756e9df6103214755b4320..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuidMuidCombinedTools )
diff --git a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_entries.cxx b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_entries.cxx
old mode 100755
new mode 100644
index a4be792135487410c481ab5db3f82e2cb90b5b2e..1e55981ff4692516b39eeb60938cbc549ec02cd2
--- a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuidTrackBuilder/CombinedMuonTrackBuilder.h"
#include "MuidTrackBuilder/MuidMuonRecovery.h"
#include "MuidTrackBuilder/MuonMatchQuality.h"
@@ -11,11 +10,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuonMatchQuality )
DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuonTrackQuery )
DECLARE_NAMESPACE_TOOL_FACTORY( Rec, OutwardsCombinedMuonTrackBuilder )
-DECLARE_FACTORY_ENTRIES( MuidTrackBuilder )
-{
- DECLARE_NAMESPACE_TOOL( Rec, CombinedMuonTrackBuilder )
- DECLARE_NAMESPACE_TOOL( Rec, MuidMuonRecovery )
- DECLARE_NAMESPACE_TOOL( Rec, MuonMatchQuality )
- DECLARE_NAMESPACE_TOOL( Rec, MuonTrackQuery )
- DECLARE_NAMESPACE_TOOL( Rec, OutwardsCombinedMuonTrackBuilder )
-}
diff --git a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_load.cxx b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_load.cxx
deleted file mode 100755
index 115d97a692254db53a2492dc6057e10d37fef81e..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuidTrackBuilder)
-
diff --git a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_entries.cxx b/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_entries.cxx
index 82c4fdd0fc17e634850c98034671da93df9880fb..505c80c3e47c1f527759ea9444f6b081f805cc34 100644
--- a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../FinalizeMuonContainers.h"
#include "../InitializeMuonClusters.h"
#include "../FinalizeMuonClusters.h"
@@ -17,14 +16,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY ( Rec, MergeMuonCaloClusterContainers )
DECLARE_ALGORITHM_FACTORY ( MuonToTrackConverterAlg )
DECLARE_NAMESPACE_ALGORITHM_FACTORY ( Rec, MuonTrackSlimmer )
-DECLARE_FACTORY_ENTRIES( MuonCombinedEventStoreAlgs )
-{
- DECLARE_NAMESPACE_ALGORITHM( Rec, FinalizeMuonContainers )
- DECLARE_NAMESPACE_ALGORITHM ( Rec, InitializeMuonClusters )
- DECLARE_NAMESPACE_ALGORITHM ( Rec, FinalizeMuonClusters )
- DECLARE_NAMESPACE_ALGORITHM ( Rec, InitializeMuonCaloEnergy )
- DECLARE_NAMESPACE_ALGORITHM ( Rec, MergeMuonCaloEnergyContainers )
- DECLARE_NAMESPACE_ALGORITHM ( Rec, MergeMuonCaloClusterContainers )
- DECLARE_ALGORITHM (MuonToTrackConverterAlg )
- DECLARE_NAMESPACE_ALGORITHM ( Rec, MuonTrackSlimmer )
-}
diff --git a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_load.cxx b/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_load.cxx
deleted file mode 100644
index 3aab1722bd46fa06d6fa4037d8ecf4f68d6485c5..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedEventStoreAlgs )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_entries.cxx b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_entries.cxx
index 6f09d8b728106fd7da7bcd8f0eb2f1854ebdd351..321a9106783409c289df7ba281f3f0e6d310d005 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonCombinedInDetCandidateAlg.h"
#include "../MuonCombinedMuonCandidateAlg.h"
#include "../MuonCombinedAlg.h"
@@ -13,13 +12,3 @@ DECLARE_ALGORITHM_FACTORY( MuonCreatorAlg )
DECLARE_ALGORITHM_FACTORY( MuonCombinedInDetExtensionAlg )
DECLARE_ALGORITHM_FACTORY( MuonSegmentTagAlg )
-DECLARE_FACTORY_ENTRIES( MuonCombinedAlgs )
-{
- DECLARE_ALGORITHM( MuonCombinedInDetCandidateAlg )
- DECLARE_ALGORITHM( MuonCombinedMuonCandidateAlg )
- DECLARE_ALGORITHM( MuonCombinedAlg )
- DECLARE_ALGORITHM( MuonCreatorAlg )
- DECLARE_ALGORITHM( MuonCombinedInDetExtensionAlg )
- DECLARE_ALGORITHM( MuonSegmentTagAlg )
-}
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_load.cxx
deleted file mode 100644
index 9e8e1737663402808e21883163be5bf8d68a90dd..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedAlgs )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_entries.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_entries.cxx
index c8a2c6e537f2ec60d20834d1e0c81bfabcaac2fc..27ebeb448253af684719ecebb686682b1a673757 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonCandidateTool.h"
#include "../InDetCandidateTool.h"
#include "../MuonCombinedTool.h"
@@ -27,19 +26,3 @@ DECLARE_TOOL_FACTORY( MuGirlTagTool )
DECLARE_TOOL_FACTORY( MuonCaloTagTool )
DECLARE_TOOL_FACTORY( TrackSegmentAssociationTool )
-DECLARE_FACTORY_ENTRIES( MuonCombinedBaseTools )
-{
- DECLARE_TOOL( InDetCandidateTool )
- DECLARE_TOOL( MuonCandidateTool )
- DECLARE_TOOL( MuonCombinedTool )
- DECLARE_TOOL( MuonCombinedDebuggerTool )
- DECLARE_TOOL( MuonCreatorTool )
- DECLARE_TOOL( MuonDressingTool )
- DECLARE_TOOL( MuonCombinedStacoTagTool )
- DECLARE_TOOL( MuonCombinedFitTagTool )
- DECLARE_TOOL( MuonSegmentTagTool )
- DECLARE_TOOL( MuGirlTagTool )
- DECLARE_TOOL( MuonCaloTagTool )
- DECLARE_TOOL( TrackSegmentAssociationTool )
-}
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_load.cxx
deleted file mode 100644
index 9e8e1737663402808e21883163be5bf8d68a90dd..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedAlgs )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_entries.cxx b/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_entries.cxx
index 3a53eedcc306d92f832acd88342eaade7b7f1e72..4c5cb7d7abebc636483d2e82ed3d6c4c4ce43a30 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonPrintingTool.h"
#include "../MuonScatteringAngleSignificanceTool.h"
#include "../MuonMomentumBalanceSignificanceTool.h"
@@ -11,10 +10,3 @@ DECLARE_TOOL_FACTORY( MuonScatteringAngleSignificanceTool )
DECLARE_TOOL_FACTORY( MuonMomentumBalanceSignificanceTool )
DECLARE_TOOL_FACTORY( MuonMeanMDTdADCFillerTool )
-DECLARE_FACTORY_ENTRIES( MuonCombinedEvaluationTools )
-{
- DECLARE_TOOL( MuonPrintingTool )
- DECLARE_TOOL( MuonScatteringAngleSignificanceTool )
- DECLARE_TOOL( MuonMomentumBalanceSignificanceTool )
- DECLARE_TOOL( uonMeanMDTdADCFillerTool )
-}
diff --git a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_load.cxx
deleted file mode 100644
index 7da912d5682e6a4704ed3368bd4b1d128c363db5..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedEvaluationTools )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_entries.cxx b/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_entries.cxx
index 37e52938298fb459c6c2f2b641cd3c866ae1308f..a19669aff3a26f4afff4b7eb9bfb0f2a332ea2bc 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_entries.cxx
@@ -1,10 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonTrackTagTestTool.h"
//using namespace MuonCombined;
DECLARE_NAMESPACE_TOOL_FACTORY( MuonCombined, MuonTrackTagTestTool )
-DECLARE_FACTORY_ENTRIES( MuonCombinedTestTools ) {
- DECLARE_NAMESPACE_TOOL( MuonCombined, MuonTrackTagTestTool )
-}
+
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_load.cxx
deleted file mode 100644
index 9cf28e1fc58b682c0dce14e636ca17c37a9d793b..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedTestTools )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_entries.cxx b/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_entries.cxx
index 340f858a01d707e11e36470ce6a0cf81222d1441..c93e03bb6dd91e9a6f974e1ee6f53f04506df6b0 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonCombinedTimingTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Rec, MuonCombinedTimingTool )
-DECLARE_FACTORY_ENTRIES( MuonCombinedTimingTools )
-{
- DECLARE_NAMESPACE_TOOL( Rec, MuonCombinedTimingTool );
-}
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_load.cxx
deleted file mode 100644
index 894b821dc1bfb4dd2fb6d9b3c9e57d84d45fa1f3..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedTimingTools )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_entries.cxx b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_entries.cxx
old mode 100755
new mode 100644
index e9e03e1ad336facd0d5c6df7da4e0b851e00b886..d3ba135e0cbba2951e593716c80d6eb1976ff2de
--- a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonInsideOutRecoTool.h"
#include "../MuonStauRecoTool.h"
#include "../MuonLayerSegmentMatchingTool.h"
@@ -14,12 +13,3 @@ DECLARE_TOOL_FACTORY( MuonLayerSegmentMatchingTool )
DECLARE_TOOL_FACTORY( MuonLayerAmbiguitySolverTool )
DECLARE_TOOL_FACTORY( MuonCandidateTrackBuilderTool )
-DECLARE_FACTORY_ENTRIES( MuonCombinedTrackFindingTools )
-{
-
- DECLARE_TOOL( MuonInsideOutRecoTool )
- DECLARE_TOOL( MuonStauRecoTool )
- DECLARE_TOOL( MuonLayerSegmentMatchingTool )
- DECLARE_TOOL( MuonLayerAmbiguitySolverTool )
- DECLARE_TOOL( MuonCandidateTrackBuilderTool )
-}
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_load.cxx
deleted file mode 100755
index fcd623b1d26bb491f57549947845627dc5013fad..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedTrackFindingTools )
diff --git a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_entries.cxx b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_entries.cxx
index 97e9ad2e698227725c391b07c436f3868a89f9f2..5cf1f1dcb24eb779712046965584c50c95b1a2bc 100644
--- a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../MuTagMatchingTool.h"
#include "../MuTagAmbiguitySolverTool.h"
@@ -7,8 +5,3 @@
DECLARE_TOOL_FACTORY ( MuTagMatchingTool)
DECLARE_TOOL_FACTORY ( MuTagAmbiguitySolverTool)
-DECLARE_FACTORY_ENTRIES( MuonSegmentTaggerTools ){
- DECLARE_TOOL ( MuTagMatchingTool );
- DECLARE_TOOL ( MuTagAmbiguitySolverTool );
-}
-
diff --git a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_load.cxx b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_load.cxx
deleted file mode 100644
index f83ebc4f784cba1aee1e73c0b02d6b9465dfee0d..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonSegmentTaggerTools)
diff --git a/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_entries.cxx b/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_entries.cxx
index 3060d5e5e59f6ed24379186f73315bfe3316e09d..bcf7b31d22e45708611c3e500bcfd5d9d87decfc 100644
--- a/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_entries.cxx
+++ b/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_entries.cxx
@@ -1,9 +1,5 @@
#include "MuonSpShowerBuilderAlgs/MuonSpShowerBuilder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( MuonSpShowerBuilder )
-DECLARE_FACTORY_ENTRIES( MuonSpShowerBuilderAlgs ) {
- DECLARE_ALGORITHM( MuonSpShowerBuilder )
-}
diff --git a/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_load.cxx b/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_load.cxx
deleted file mode 100644
index c23283887dabb7f0ab04d3c199b1da1acc4d94db..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( MuonSpShowerBuilderAlgs )
diff --git a/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_entries.cxx b/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_entries.cxx
index edf056f2e1f4b6e6c2418ce6c635e22c3626a5ce..3b062a1e6f0a065b5f8f3f092864d517d1c68a0b 100644
--- a/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_entries.cxx
+++ b/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "PFlowUtils/RetrievePFOTool.h"
#include "PFlowUtils/WeightPFOTool.h"
#include "../ParticleFlowEventFilter_r207.h"
@@ -7,8 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( CP, RetrievePFOTool)
DECLARE_NAMESPACE_TOOL_FACTORY( CP, WeightPFOTool)
DECLARE_ALGORITHM_FACTORY(ParticleFlowEventFilter_r207)
-DECLARE_FACTORY_ENTRIES(PFlowUtils){
- DECLARE_NAMESPACE_TOOL (CP, RetrievePFOTool)
- DECLARE_NAMESPACE_TOOL (CP, WeightPFOTool)
- DECLARE_ALGORITHM(ParticleFlowEventFilter_r207)
-}
diff --git a/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_load.cxx b/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_load.cxx
deleted file mode 100644
index eba0afe240ab0c84704902a0011abffd6a410520..0000000000000000000000000000000000000000
--- a/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(PFlowUtils)
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_entries.cxx b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_entries.cxx
index 3c97bed06d1facd8e2ac08897c85a9df06e29377..5e091d85bca8ab54954f9d0f83d0678e3478affa 100644
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_entries.cxx
+++ b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "../PhysValPFO.h"
#include "../PhysValCluster.h"
DECLARE_TOOL_FACTORY( PhysValPFO )
DECLARE_TOOL_FACTORY( PhysValCluster )
-
-DECLARE_FACTORY_ENTRIES( PFODQA ) {
- DECLARE_ALGTOOL( PhysValPFO )
- DECLARE_ALGTOOL( PhysValCluster )
-}
+
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_load.cxx b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_load.cxx
deleted file mode 100644
index f9017ac5d815e974990d9b2d088edd53a122c694..0000000000000000000000000000000000000000
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( PFODQA)
diff --git a/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_entries.cxx b/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_entries.cxx
index af5630fa4e36c1b5e659a4b009c122efef185df1..3385ba0b64a080a4ae0d23fbdb8a6f69f15cd6e1 100644
--- a/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_entries.cxx
+++ b/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "PanTauAlgs/Tool_InformationStore.h"
#include "PanTauAlgs/Tool_InputConverter.h"
#include "PanTauAlgs/Tool_TauConstituentGetter.h"
@@ -23,19 +21,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( PanTau, Tool_DetailsArranger )
DECLARE_NAMESPACE_TOOL_FACTORY( PanTau, PanTauProcessor )
//DECLARE_NAMESPACE_ALGORITHM_FACTORY( PanTau, PanTauProcessor )
-
-
-DECLARE_FACTORY_ENTRIES( PanTauAlgs ) {
-
-DECLARE_NAMESPACE_TOOL( PanTau, Tool_InformationStore )
-DECLARE_NAMESPACE_TOOL( PanTau, Tool_InputConverter )
-DECLARE_NAMESPACE_TOOL( PanTau, Tool_TauConstituentGetter )
-DECLARE_NAMESPACE_TOOL( PanTau, Tool_TauConstituentSelector )
-DECLARE_NAMESPACE_TOOL( PanTau, Tool_FeatureExtractor )
-DECLARE_NAMESPACE_TOOL( PanTau, Tool_ModeDiscriminator )
-DECLARE_NAMESPACE_TOOL( PanTau, Tool_DecayModeDeterminator )
-DECLARE_NAMESPACE_TOOL( PanTau, Tool_DetailsArranger )
-//DECLARE_NAMESPACE_ALGORITHM( PanTau , PanTauProcessor )
-DECLARE_NAMESPACE_TOOL( PanTau, PanTauProcessor )
-
-}
diff --git a/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_load.cxx b/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_load.cxx
deleted file mode 100644
index 5316f811bd9e551ec77f021714845293a35bbb6a..0000000000000000000000000000000000000000
--- a/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PanTauAlgs )
-
diff --git a/Reconstruction/RecAlgs/src/components/RecAlgs_entries.cxx b/Reconstruction/RecAlgs/src/components/RecAlgs_entries.cxx
old mode 100755
new mode 100644
index e536dd39344f54804dba0c8f6a6ea4a1abdfaf43..5dedf77301ba8b40e7e8df60a66560e8832ada5a
--- a/Reconstruction/RecAlgs/src/components/RecAlgs_entries.cxx
+++ b/Reconstruction/RecAlgs/src/components/RecAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../TimingAlg.h"
#include "../MemoryAlg.h"
#include "../JobInfo.h"
@@ -9,9 +8,3 @@ DECLARE_ALGORITHM_FACTORY( MemoryAlg )
DECLARE_ALGORITHM_FACTORY( JobInfo )
DECLARE_ALGORITHM_FACTORY( EventInfoUnlocker )
-DECLARE_FACTORY_ENTRIES( RecAlgs ) {
- DECLARE_ALGORITHM( TimingAlg );
- DECLARE_ALGORITHM( MemoryAlg );
- DECLARE_ALGORITHM( JobInfo );
- DECLARE_ALGORITHM( EventInfoUnlocker );
-}
diff --git a/Reconstruction/RecAlgs/src/components/RecAlgs_load.cxx b/Reconstruction/RecAlgs/src/components/RecAlgs_load.cxx
deleted file mode 100755
index 36c0d478e781c6e5d9d226172d90f8bfa52dc094..0000000000000000000000000000000000000000
--- a/Reconstruction/RecAlgs/src/components/RecAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( RecAlgs )
-
diff --git a/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_entries.cxx b/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_entries.cxx
old mode 100755
new mode 100644
index c5c59b81f4cda72a78b303270575650f64c9254c..999a7e45fc46ba273b52047644a6ef49b3c0860a
--- a/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_entries.cxx
+++ b/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "RecBackgroundAlgs/BackgroundWordFiller.h"
#include "RecBackgroundAlgs/BackgroundWordTest.h"
#include "RecBackgroundAlgs/BeamBackgroundFiller.h"
@@ -8,8 +6,3 @@ DECLARE_ALGORITHM_FACTORY( BackgroundWordFiller )
DECLARE_ALGORITHM_FACTORY( BackgroundWordTest )
DECLARE_ALGORITHM_FACTORY( BeamBackgroundFiller )
-DECLARE_FACTORY_ENTRIES( RecBackgroundAlgs ) {
- DECLARE_ALGORITHM( BackgroundWordFiller )
- DECLARE_ALGORITHM( BackgroundWordTest )
- DECLARE_ALGORITHM( BeamBackgroundFiller )
-}
diff --git a/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_load.cxx b/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_load.cxx
deleted file mode 100755
index 187039bef228ad28621947942b35967c098953d8..0000000000000000000000000000000000000000
--- a/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RecBackgroundAlgs)
diff --git a/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_entries.cxx b/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_entries.cxx
old mode 100755
new mode 100644
index 35b058eb690c510f0b994dd282ddde2e424e883b..9498dbc0f855ea93648a414d9b8233176d8d3168
--- a/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_entries.cxx
+++ b/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "RecExAlgs/SimpleRawObjMaker.h"
#include "RecExAlgs/SimpleCookedObjMaker.h"
@@ -6,7 +5,3 @@
DECLARE_ALGORITHM_FACTORY( SimpleRawObjMaker )
DECLARE_ALGORITHM_FACTORY( SimpleCookedObjMaker )
-DECLARE_FACTORY_ENTRIES( RecExAlgs ) {
- DECLARE_ALGORITHM( SimpleRawObjMaker );
- DECLARE_ALGORITHM( SimpleCookedObjMaker );
-}
diff --git a/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_load.cxx b/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_load.cxx
deleted file mode 100755
index 71e306fea4a7177b16fd5e5ba461a651c5e8cc67..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( RecExAlgs )
-
diff --git a/Reconstruction/RecJiveXML/src/components/RecJiveXML_entries.cxx b/Reconstruction/RecJiveXML/src/components/RecJiveXML_entries.cxx
old mode 100755
new mode 100644
index 356fb0f152dd556422bca5bc071b7b5fb6e2be81..534079e31b23788d1d973105ae1b511fe479d51f
--- a/Reconstruction/RecJiveXML/src/components/RecJiveXML_entries.cxx
+++ b/Reconstruction/RecJiveXML/src/components/RecJiveXML_entries.cxx
@@ -1,13 +1,8 @@
#include "RecJiveXML/JetRecJetRetriever.h"
#include "RecJiveXML/MissingETRetriever.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace JiveXML;
DECLARE_TOOL_FACTORY(JetRecJetRetriever)
DECLARE_TOOL_FACTORY(MissingETRetriever)
-DECLARE_FACTORY_ENTRIES(RecJiveXML) {
- DECLARE_ALGTOOL(JetRecJetRetriever)
- DECLARE_ALGTOOL(MissingETRetriever)
-}
diff --git a/Reconstruction/RecJiveXML/src/components/RecJiveXML_load.cxx b/Reconstruction/RecJiveXML/src/components/RecJiveXML_load.cxx
deleted file mode 100755
index df21b4bcc6713b94161aae59f4f0a17a5c635998..0000000000000000000000000000000000000000
--- a/Reconstruction/RecJiveXML/src/components/RecJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RecJiveXML)
diff --git a/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_entries.cxx b/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_entries.cxx
index cb1692615a1d889345935b00032a51e4e4176a7f..4880b0b4e390fe428298be5e8013662ac7512271 100644
--- a/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_entries.cxx
+++ b/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../CaloRingerAlgorithm.h"
#include "../xAODRingSetConfWriter.h"
@@ -8,8 +6,3 @@ using namespace Ringer;
DECLARE_ALGORITHM_FACTORY( CaloRingerAlgorithm )
DECLARE_ALGORITHM_FACTORY( xAODRingSetConfWriter )
-DECLARE_FACTORY_ENTRIES( CaloRingerAlgs ) {
- DECLARE_ALGORITHM( CaloRingerAlgorithm )
- DECLARE_ALGORITHM( xAODRingSetConfWriter )
- }
-
diff --git a/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_load.cxx b/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_load.cxx
deleted file mode 100644
index d03c7eed3c079f38e16bfb285bad233eb628ff4c..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CaloRingerAlgs )
-
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_entries.cxx b/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_entries.cxx
index 6e5b5704df9c998b02a94252aa3d00fd752a6807..aa1ad9f408d4b8ed0fb7f5f851980294d73c60e6 100644
--- a/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_entries.cxx
+++ b/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../IsolationBuilder.h"
DECLARE_ALGORITHM_FACTORY( IsolationBuilder )
-DECLARE_FACTORY_ENTRIES(IsolationAlgs) {
- DECLARE_ALGORITHM( IsolationBuilder )
-}
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_load.cxx b/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_load.cxx
deleted file mode 100644
index 89d79ccd5065bf5c93e26672a4e94968093c5c95..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(IsolationAlgs)
diff --git a/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_entries.cxx b/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_entries.cxx
index f05cca5a0bbf53361634c159e57161e371fbef2b..2208c907e7fec4e152ceee55e2be2aa7d88a33be 100644
--- a/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_entries.cxx
+++ b/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../TrackParticleCellAssociationAlg.h"
#include "../TrackParticleClusterAssociationAlg.h"
DECLARE_ALGORITHM_FACTORY( TrackParticleCellAssociationAlg )
DECLARE_ALGORITHM_FACTORY( TrackParticleClusterAssociationAlg )
-DECLARE_FACTORY_ENTRIES( TrackParticleAssociationAlgs )
-{
- DECLARE_ALGORITHM( TrackParticleCellAssociationAlg )
- DECLARE_ALGORITHM( TrackParticleClusterAssociationAlg )
-}
diff --git a/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_load.cxx b/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_load.cxx
deleted file mode 100644
index a4b13428ba2daa92d1195130d92e8a025e4c8487..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrackParticleAssociationAlgs )
-
diff --git a/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_entries.cxx b/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_entries.cxx
index dc142af7593779534a926901043506a41478be4c..1754f6ee613f693989c8b0051858b71e1b1cb5f8 100644
--- a/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_entries.cxx
+++ b/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../CaloClusterMatchingTool.h"
#include "../CaloClusterMatchLinkAlg.h"
@@ -9,8 +7,3 @@ DECLARE_TOOL_FACTORY(CaloClusterMatchingTool)
DECLARE_ALGORITHM_FACTORY(CaloClusterMatchLinkAlg)
-DECLARE_FACTORY_ENTRIES(CaloClusterMatching) {
- DECLARE_TOOL(CaloClusterMatchingTool)
-
- DECLARE_ALGORITHM(CaloClusterMatchLinkAlg)
-}
diff --git a/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_load.cxx b/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_load.cxx
deleted file mode 100644
index 0cc31f085346b1bae89a5b30fd7d234db1bd04bd..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloCusterMatching)
diff --git a/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_entries.cxx b/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_entries.cxx
index 0d05e4cba0879bc3e05465595dc30e88f47b0659..bce0199d6dec55cc49c3df86ba32ae09d5c8e39a 100644
--- a/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_entries.cxx
+++ b/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../CaloRingsBuilder.h"
#include "../CaloAsymRingsBuilder.h"
#include "../CaloRingerInputReader.h"
@@ -13,12 +12,3 @@ DECLARE_TOOL_FACTORY( CaloRingerInputReader )
DECLARE_TOOL_FACTORY( CaloRingerElectronsReader )
DECLARE_TOOL_FACTORY( CaloRingerPhotonsReader )
-DECLARE_FACTORY_ENTRIES( CaloRingerTools )
-{
- DECLARE_TOOL( CaloRingsBuilder )
- DECLARE_TOOL( CaloAsymRingsBuilder )
- DECLARE_TOOL( CaloRingerInputReader )
- DECLARE_TOOL( CaloRingerElectronsReader )
- DECLARE_TOOL( CaloRingerPhotonsReader )
-}
-
diff --git a/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_load.cxx b/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_load.cxx
deleted file mode 100644
index 6d6b06cbb70d61f73f2f6621822bdbb654233d01..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CaloRingerTools )
-
diff --git a/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_entries.cxx b/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_entries.cxx
index fbd807cec216b08fe8caaa03bfa945e154fea6e5..60b73387a7e0b9980abce2741457ac451256e104 100644
--- a/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_entries.cxx
+++ b/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_entries.cxx
@@ -1,9 +1,3 @@
-// $Id: IsolationTool_entries.cxx 770003 2016-08-25 08:54:14Z krasznaa $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "IsolationTool/TrackIsolationTool.h"
#include "IsolationTool/CaloIsolationTool.h"
#include "IsolationTool/IsolationHelper.h"
@@ -15,11 +9,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( CP, IsolationHelper )
DECLARE_ALGORITHM_FACTORY( IsolationTool_AthTest )
-DECLARE_FACTORY_ENTRIES( IsolationTool ) {
-
- DECLARE_NAMESPACE_TOOL( xAOD, TrackIsolationTool )
- DECLARE_NAMESPACE_TOOL( xAOD, CaloIsolationTool )
- DECLARE_NAMESPACE_TOOL( CP, IsolationHelper )
-
- DECLARE_ALGORITHM( IsolationTool_AthTest )
-}
diff --git a/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_load.cxx b/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_load.cxx
deleted file mode 100644
index e61116c8e26cdc677107270297ddc486bf524a74..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id: IsolationTool_load.cxx 770003 2016-08-25 08:54:14Z krasznaa $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( IsolationTool )
diff --git a/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_entries.cxx b/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_entries.cxx
index 2f4cb25eda7db0b00aee51a69e8d30a0e148174e..4662477bb3f135347e2eb8905fd23d9e1f9232e2 100644
--- a/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_entries.cxx
+++ b/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../TrackParticlesInConeTool.h"
#include "../TruthParticlesInConeTool.h"
#include "../CaloClustersInConeTool.h"
@@ -11,11 +10,3 @@ DECLARE_TOOL_FACTORY( TruthParticlesInConeTool )
DECLARE_TOOL_FACTORY( CaloClustersInConeTool )
DECLARE_TOOL_FACTORY( PFlowObjectsInConeTool )
-DECLARE_FACTORY_ENTRIES( ParticlesInConeTools )
-{
- DECLARE_TOOL( TrackParticlesInConeTool )
- DECLARE_TOOL( TruthParticlesInConeTool )
- DECLARE_TOOL( CaloClustersInConeTool )
- DECLARE_TOOL( PFlowObjectsInConeTool )
-}
-
diff --git a/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_load.cxx b/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_load.cxx
deleted file mode 100644
index f34bf991a4f18fbf2b1ef14b1700d4fd0fdef658..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ParticlesInConeTools )
-
diff --git a/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_entries.cxx b/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_entries.cxx
old mode 100755
new mode 100644
index 602b2a965dfb7d88d790a5b6a15ec1d023bd0229..918c528c68bc9cb290285495e221448442155e3b
--- a/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_entries.cxx
+++ b/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_entries.cxx
@@ -1,6 +1,3 @@
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../ParticleCaloExtensionTool.h"
#include "../ParticleCaloCellAssociationTool.h"
#include "../ParticleCaloClusterAssociationTool.h"
@@ -15,12 +12,3 @@ DECLARE_TOOL_FACTORY( ParticleCaloClusterAssociationTool )
DECLARE_TOOL_FACTORY( MuonCaloEnergyTool )
DECLARE_ALGORITHM_FACTORY( TrackParticleCaloExtensionAlg )
-DECLARE_FACTORY_ENTRIES ( TrackToCalo ) {
- DECLARE_TOOL( ParticleCaloExtensionTool );
- DECLARE_TOOL( ParticleCaloCellAssociationTool );
- DECLARE_TOOL( ParticleCaloClusterAssociationTool );
- DECLARE_TOOL( MuonCaloEnergyTool );
- DECLARE_ALGORITHM( TrackParticleCaloExtensionAlg );
-}
-
-
diff --git a/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_load.cxx b/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_load.cxx
deleted file mode 100755
index 1bc4de99b78379302ebb515112ae5735f11d0532..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrackToCalo )
diff --git a/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_entries.cxx b/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_entries.cxx
old mode 100755
new mode 100644
index 7f52cca0c35bcd8b6d9a0694b1287c28d6962db3..6da30f6afdf9b4eafe632f22e656d1b1b21b8912
--- a/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_entries.cxx
+++ b/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrackToVertex/TrackToVertex.h"
#include "TrackToVertex/TrackToVertexAssociator.h"
@@ -7,11 +6,3 @@ using namespace Reco;
DECLARE_TOOL_FACTORY( TrackToVertex )
DECLARE_TOOL_FACTORY( TrackToVertexAssociator )
-/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrackToVertex )
-{
- DECLARE_TOOL( TrackToVertex )
- DECLARE_TOOL( TrackToVertexAssociator )
-}
-
-
diff --git a/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_load.cxx b/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_load.cxx
deleted file mode 100755
index 0656f41487f743e07294810729423dbf2dafa89b..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrackToVertex )
-
diff --git a/Reconstruction/TRT_Rec/src/components/TRT_Rec_entries.cxx b/Reconstruction/TRT_Rec/src/components/TRT_Rec_entries.cxx
old mode 100755
new mode 100644
index 6945c5d9059de8b77230cfdef42ef4be37ddf6a8..90d1cb106aa8b76ac60bfcfc92d756b8cb3bcb96
--- a/Reconstruction/TRT_Rec/src/components/TRT_Rec_entries.cxx
+++ b/Reconstruction/TRT_Rec/src/components/TRT_Rec_entries.cxx
@@ -1,11 +1,3 @@
-/***************************************************************************
- TRT_Rec
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: TRT_Rec_entries.cxx,v 1.5 2006-10-11 10:45:02 pop Exp $
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_Rec/TRT_DataSelector.h"
#include "TRT_Rec/TRT_Histogrammer.h"
#include "TRT_Rec/TRT_Predictor.h"
@@ -16,11 +8,3 @@ DECLARE_TOOL_FACTORY( TRT_Histogrammer )
DECLARE_TOOL_FACTORY( TRT_Predictor )
DECLARE_TOOL_FACTORY( TRT_Recon )
-DECLARE_FACTORY_ENTRIES( TRT_Rec )
-{
- DECLARE_TOOL( TRT_DataSelector )
- DECLARE_TOOL( TRT_Histogrammer )
- DECLARE_TOOL( TRT_Predictor )
- DECLARE_TOOL( TRT_Recon )
-}
-
diff --git a/Reconstruction/TRT_Rec/src/components/TRT_Rec_load.cxx b/Reconstruction/TRT_Rec/src/components/TRT_Rec_load.cxx
deleted file mode 100755
index ca273b50eb9e5e462bbf1928e81ce9d930e8bc2e..0000000000000000000000000000000000000000
--- a/Reconstruction/TRT_Rec/src/components/TRT_Rec_load.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-/***************************************************************************
- TRT_Rec
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: TRT_Rec_load.cxx,v 1.1 2004-02-13 17:00:14 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_Rec )
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_entries.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_entries.cxx
index 310d103f3f5ccd2f96c6cf5b6d66cead009b68f5..71e72f4970f2311a257de8ee809bcc8613c74cea 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_entries.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TrackCaloClusterRecAlgs/TrackCaloClusterRecAlg.h"
DECLARE_ALGORITHM_FACTORY(TrackCaloClusterRecAlg)
-DECLARE_FACTORY_ENTRIES(TrackCaloClusterRecAlgs)
-{
- DECLARE_ALGORITHM(TrackCaloClusterRecAlg)
-}
\ No newline at end of file
+
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_load.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_load.cxx
deleted file mode 100644
index 41254fc6c5c639f870bd5f1e506236f3ab1f1eb0..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrackCaloClusterRecAlgs)
\ No newline at end of file
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_entries.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_entries.cxx
index 6cc84eea2d7f1979705a5fc6fecf90324e6311f1..d1381461f254d0923835bf9ae4af58f6e351e8fb 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_entries.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TrackCaloClusterRecTools/ParticleToCaloExtrapolationTool.h"
#include "TrackCaloClusterRecTools/TrackCaloClusterWeightsTool.h"
#include "TrackCaloClusterRecTools/TrackCaloClusterCreatorTool.h"
@@ -9,11 +7,4 @@ DECLARE_TOOL_FACTORY(ParticleToCaloExtrapolationTool)
DECLARE_TOOL_FACTORY(TrackCaloClusterWeightsTool)
DECLARE_TOOL_FACTORY(TrackCaloClusterCreatorTool)
DECLARE_TOOL_FACTORY(ClusterFilterTool)
-
-DECLARE_FACTORY_ENTRIES(TrackCaloClusterRecTools)
-{
- DECLARE_TOOL(ParticleToCaloExtrapolationTool)
- DECLARE_TOOL(TrackCaloClusterWeightsTool)
- DECLARE_TOOL(TrackCaloClusterCreatorTool)
- DECLARE_TOOL(ClusterFilterTool)
-}
\ No newline at end of file
+
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_load.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_load.cxx
deleted file mode 100644
index 6d0003695c1e4ee375a9526f02e6d7063adaf5f5..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrackCaloClusterRecTools)
\ No newline at end of file
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_entries.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_entries.cxx
index a23fee784303f860f25fe78c1270f3b4fd05b343..fac62f203e1fe79a10ecee007b031f330b112f5b 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_entries.cxx
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrackCaloClusterRecValidation/TrackCaloClusterRecValidationTool.h"
#include "TrackCaloClusterRecValidation/CalibrationNtupleMakerTool.h"
DECLARE_TOOL_FACTORY(TrackCaloClusterRecValidationTool)
DECLARE_ALGORITHM_FACTORY(CalibrationNtupleMakerTool)
-DECLARE_FACTORY_ENTRIES(TrackCaloClusterRecValidation){
- DECLARE_TOOL(TrackCaloClusterRecValidationTool)
- DECLARE_ALGORITHM(CalibrationNtupleMakerTool)
-}
\ No newline at end of file
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_load.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_load.cxx
deleted file mode 100644
index 269de5f44d1fcc0922606af8cc6800052b753b99..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrackCaloClusterRecValidation)
\ No newline at end of file
diff --git a/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_entries.cxx b/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_entries.cxx
old mode 100755
new mode 100644
index 89774663fe886e0b2874d1f3a3af99827fa9393c..10fa82576cd72d5b896560ed3fe08c19c108db18
--- a/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_entries.cxx
+++ b/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_entries.cxx
@@ -1,16 +1,3 @@
#include "VrtSecInclusive/VrtSecInclusive.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( VKalVrtAthena, VrtSecInclusive )
-DECLARE_FACTORY_ENTRIES(VrtSecInclusive) {
- DECLARE_NAMESPACE_ALGORITHM( VKalVrtAthena, VrtSecInclusive )
-}
-//Notes:
-//
-//1. The argument to the DECLARE_FACTORY_ENTRIES(XXX) is the name of the
-// component library (libXXX.so).
-//2. Each Algorithm that is contained in the library should be declared
-// by the DECLARE_ALGORITHM() statement.
-//3. Each Service that is contained in the library should be declared
-// by the DECLARE_SERVICE() statement.
-//
-// See Athena User Guide for more information
+
diff --git a/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_load.cxx b/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_load.cxx
deleted file mode 100755
index be3fd6ca6ed46cdb398d25ecae67ca4233047f7e..0000000000000000000000000000000000000000
--- a/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(VrtSecInclusive)
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
diff --git a/Reconstruction/eflowRec/src/components/eflowRec_entries.cxx b/Reconstruction/eflowRec/src/components/eflowRec_entries.cxx
index 80b6931d5fec22dac3d0c7560c6b98b06c7e7155..32ff4bc636410c25e694a860fd4179775446b5e3 100644
--- a/Reconstruction/eflowRec/src/components/eflowRec_entries.cxx
+++ b/Reconstruction/eflowRec/src/components/eflowRec_entries.cxx
@@ -26,7 +26,6 @@
#include "eflowRec/PFLCCalibTool.h"
#include "eflowRec/PFOChargedCreatorAlgorithm.h"
#include "eflowRec/PFONeutralCreatorAlgorithm.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( eflowBuilder )
DECLARE_ALGORITHM_FACTORY( eflowPreparation )
@@ -57,33 +56,3 @@ DECLARE_TOOL_FACTORY( eflowCellEOverPTool_mc12_JetETMiss)
DECLARE_TOOL_FACTORY( eflowCellEOverPTool_mc12_LC)
DECLARE_TOOL_FACTORY( eflowObjectCreatorTool )
-DECLARE_FACTORY_ENTRIES(eflowRec) {
- DECLARE_ALGORITHM( eflowBuilder )
- DECLARE_ALGORITHM( eflowPreparation )
- DECLARE_ALGORITHM( eflowCaloObjectBuilder )
- DECLARE_ALGORITHM( eflowObjectBuilder )
- DECLARE_ALGORITHM (eflowOverlapRemoval )
- DECLARE_ALGORITHM ( eflowVertexInformationSetter )
- DECLARE_ALGORITHM( PFLeptonSelector )
- DECLARE_ALGORITHM( PFClusterSelector )
- DECLARE_ALGORITHM( PFTrackSelector )
- DECLARE_ALGORITHM( PFAlgorithm )
- DECLARE_ALGORITHM( PFOChargedCreatorAlgorithm )
- DECLARE_ALGORITHM( PFONeutralCreatorAlgorithm )
- DECLARE_TOOL( PFCellLevelSubtractionTool )
- DECLARE_TOOL( PFRecoverSplitShowersTool )
- DECLARE_TOOL( PFMomentCalculatorTool )
- DECLARE_TOOL( PFClusterCollectionTool )
- DECLARE_TOOL( PFLCCalibTool )
- DECLARE_TOOL ( eflowRecoverSplitShowersTool )
- DECLARE_TOOL ( eflowCellLevelSubtractionTool )
- DECLARE_TOOL ( eflowMomentCalculatorTool )
- DECLARE_TOOL ( eflowClusterCollectionTool )
- DECLARE_TOOL ( eflowLCCalibTool )
- DECLARE_TOOL ( eflowTrackCaloExtensionTool )
- DECLARE_TOOL ( eflowTrackCaloDummyExtensionTool )
- DECLARE_TOOL ( PFTrackClusterMatchingTool )
- DECLARE_TOOL (eflowCellEOverPTool_mc12_JetETMiss)
- DECLARE_TOOL ( eflowCellEOverPTool_mc12_LC)
- DECLARE_TOOL (eflowObjectCreatorTool )
-}
diff --git a/Reconstruction/eflowRec/src/components/eflowRec_load.cxx b/Reconstruction/eflowRec/src/components/eflowRec_load.cxx
deleted file mode 100644
index f6e676c5d9cf6ee60b0ace1f54c6b735612de5f3..0000000000000000000000000000000000000000
--- a/Reconstruction/eflowRec/src/components/eflowRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(eflowRec)
diff --git a/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_entries.cxx b/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_entries.cxx
index cd58c0336302830bb618fecc6f79cbb7e8644ffa..f328f4af5ed2f6b665c6520cedb6eea17bf26d10 100644
--- a/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_entries.cxx
+++ b/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_entries.cxx
@@ -1,13 +1,4 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "../EgammaPhysValMonitoringTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( EgammaPhysValMonitoring, EgammaPhysValMonitoringTool )
-DECLARE_FACTORY_ENTRIES( EgammaPhysValMonitoring ) {
-
- DECLARE_NAMESPACE_TOOL( EgammaPhysValMonitoring, EgammaPhysValMonitoringTool )
-
-}
diff --git a/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_load.cxx b/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_load.cxx
deleted file mode 100644
index 70a2c4d5306ea9cff8fa4604e3b980bcd784e3d8..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( EgammaMonitoring )
diff --git a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx b/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx
old mode 100755
new mode 100644
index b8c53ecdcbed82d49759c94ccaedefa08d6a72d1..4384d06c67576e2f2411566e7a64ec7b880f5fe3
--- a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../egammaBuilder.h"
#include "../egammaRecBuilder.h"
#include "../topoEgammaBuilder.h"
@@ -24,17 +23,3 @@ DECLARE_ALGORITHM_FACTORY( egammaTopoClusterCopier )
DECLARE_ALGORITHM_FACTORY( electronSuperClusterBuilder )
DECLARE_ALGORITHM_FACTORY( photonSuperClusterBuilder )
-DECLARE_FACTORY_ENTRIES(egammaAlgs) {
- DECLARE_ALGORITHM( egammaBuilder )
- DECLARE_ALGORITHM( egammaRecBuilder )
- DECLARE_ALGORITHM( topoEgammaBuilder )
- DECLARE_ALGORITHM( egammaForwardBuilder )
- DECLARE_ALGORITHM( egammaTruthAssociationAlg )
- DECLARE_ALGORITHM( egammaTrackSlimmer )
- DECLARE_ALGORITHM( EMBremCollectionBuilder )
- DECLARE_ALGORITHM( EMVertexBuilder )
- DECLARE_ALGORITHM( egammaTopoClusterCopier )
- DECLARE_ALGORITHM( electronSuperClusterBuilder )
- DECLARE_ALGORITHM( photonSuperClusterBuilder )
-
-}
diff --git a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_load.cxx b/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_load.cxx
deleted file mode 100755
index fcd37bbd6080ff485e4d37346e26370f19d60153..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaAlgs)
-
diff --git a/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_entries.cxx b/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_entries.cxx
old mode 100755
new mode 100644
index 3c7c65fbfb99a39700096cfddbb19c90195fda05..7b43e6f7d33b9fcb868a7d45fb40a6047ff7e0b7
--- a/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_entries.cxx
+++ b/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_entries.cxx
@@ -8,7 +8,6 @@
#include "../egammaqweta1c.h"
#include "../egammaqweta2c.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY ( egammaShowerShape )
DECLARE_TOOL_FACTORY ( egammaEnergyPositionAllSamples )
@@ -20,17 +19,3 @@ DECLARE_TOOL_FACTORY ( egammaIso )
DECLARE_TOOL_FACTORY ( egammaqweta1c )
DECLARE_TOOL_FACTORY ( egammaqweta2c )
-
-DECLARE_FACTORY_ENTRIES(egammaCaloTools) {
- DECLARE_TOOL ( egammaIso )
- DECLARE_TOOL ( egammaShowerShape )
- DECLARE_TOOL ( egammaEnergyPositionAllSamples )
- DECLARE_TOOL ( egammaPreSamplerShape )
- DECLARE_TOOL ( egammaStripsShape )
- DECLARE_TOOL ( egammaMiddleShape )
- DECLARE_TOOL ( egammaBackShape )
- DECLARE_TOOL ( egammaqweta1c )
- DECLARE_TOOL ( egammaqweta2c )
-
-}
-
diff --git a/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_load.cxx b/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_load.cxx
deleted file mode 100755
index 554dc55e852200df5db0ecce5e99d20323aa5088..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaCaloTools)
diff --git a/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_entries.cxx b/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_entries.cxx
index 61089c30a057365c922235f1a426936dfd3f4dc2..b39dd0c377454cd860fdb56c651fecf9238ae057 100644
--- a/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_entries.cxx
+++ b/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_entries.cxx
@@ -1,8 +1,4 @@
#include "egammaMVACalib/egammaMVATool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( egammaMVATool )
-DECLARE_FACTORY_ENTRIES( egammaMVACalib ){
- DECLARE_TOOL( egammaMVATool );
-}
diff --git a/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_load.cxx b/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_load.cxx
deleted file mode 100644
index 6eea1c496f381480267296a874155e6fc32c1b39..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( egammaMVACalib )
-
diff --git a/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_entries.cxx b/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_entries.cxx
old mode 100755
new mode 100644
index 35e351bb723dfdff41251d104443aa8586ffc036..e415f56e722658800f125b8b4a8cfbfa3dde8ab5
--- a/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_entries.cxx
+++ b/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_entries.cxx
@@ -2,15 +2,9 @@
#include "egammaPerformance/electronMonTool.h"
#include "egammaPerformance/forwardElectronMonTool.h"
#include "egammaPerformance/ZeeTaPMonTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY ( photonMonTool )
DECLARE_TOOL_FACTORY ( electronMonTool )
DECLARE_TOOL_FACTORY ( forwardElectronMonTool )
DECLARE_TOOL_FACTORY ( ZeeTaPMonTool )
-DECLARE_FACTORY_ENTRIES(egammaPerformance) {
- DECLARE_TOOL ( photonMonTool )
- DECLARE_TOOL ( electronMonTool )
- DECLARE_TOOL ( forwardElectronMonTool )
- DECLARE_TOOL ( ZeeTaPMonTool )
-}
+
diff --git a/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_load.cxx b/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_load.cxx
deleted file mode 100755
index d9cd5e3ac9713f318d65deb80813564c08a9f125..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaPerformance)
-
diff --git a/Reconstruction/egamma/egammaTools/src/components/egammaTools_entries.cxx b/Reconstruction/egamma/egammaTools/src/components/egammaTools_entries.cxx
old mode 100755
new mode 100644
index 2a78f8ba3f2b7dff9a566485cd515a1c3d823290..9e7e0e5d921b17a583e57ff255f350bbc64b51c5
--- a/Reconstruction/egamma/egammaTools/src/components/egammaTools_entries.cxx
+++ b/Reconstruction/egamma/egammaTools/src/components/egammaTools_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../EMClusterTool.h"
#include "../EMConversionBuilder.h"
#include "../EMFourMomBuilder.h"
@@ -22,16 +20,3 @@ DECLARE_TOOL_FACTORY ( egammaOQFlagsBuilder )
DECLARE_TOOL_FACTORY ( EMPIDBuilder )
DECLARE_TOOL_FACTORY ( egammaSwTool )
-DECLARE_FACTORY_ENTRIES(egammaTools) {
- DECLARE_TOOL ( EMClusterTool )
- DECLARE_TOOL ( EMConversionBuilder )
- DECLARE_TOOL ( EMFourMomBuilder )
- DECLARE_TOOL ( EMShowerBuilder )
- DECLARE_TOOL ( EMTrackMatchBuilder )
- DECLARE_TOOL ( FourMomCombiner )
- DECLARE_TOOL ( egammaCheckEnergyDepositTool )
- DECLARE_TOOL ( egammaOQFlagsBuilder )
- DECLARE_TOOL ( EMPIDBuilder )
- DECLARE_TOOL ( egammaSwTool )
-}
-
diff --git a/Reconstruction/egamma/egammaTools/src/components/egammaTools_load.cxx b/Reconstruction/egamma/egammaTools/src/components/egammaTools_load.cxx
deleted file mode 100755
index 17c91b8ae805d5f7bf48c43b9e894c00739e399c..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaTools/src/components/egammaTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaTools)
-
diff --git a/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_entries.cxx b/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_entries.cxx
old mode 100755
new mode 100644
index ca9eb492f6a6f547efc09d10839e3d04ef22b9e6..554822c15277e3c062b1ad9578849eaffc842f98
--- a/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_entries.cxx
+++ b/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_entries.cxx
@@ -2,14 +2,8 @@
#include "../EMExtrapolationTools.h"
#include "../CaloCluster_OnTrackBuilder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY ( egammaTrkRefitterTool )
DECLARE_TOOL_FACTORY ( EMExtrapolationTools )
DECLARE_TOOL_FACTORY (CaloCluster_OnTrackBuilder)
-DECLARE_FACTORY_ENTRIES(egammaTrackTools) {
- DECLARE_TOOL ( egammaTrkRefitterTool )
- DECLARE_TOOL ( EMExtrapolationTools )
- DECLARE_TOOL ( CaloCluster_OnTrackBuilder)
-}
diff --git a/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_load.cxx b/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_load.cxx
deleted file mode 100755
index 17c91b8ae805d5f7bf48c43b9e894c00739e399c..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaTools)
-
diff --git a/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_entries.cxx b/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_entries.cxx
old mode 100755
new mode 100644
index 6c4f632607538464599dbc27b984603aa63fbe04..3105ff3f35226e4db765c05805f715bd7bc54db9
--- a/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_entries.cxx
+++ b/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_entries.cxx
@@ -1,9 +1,3 @@
-/***************************************************************************
- iPatGeometryTools
- ATLAS Collaboration
- ***************************************************************************/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "iPatGeometryTools/DetectorSelection.h"
#include "iPatGeometryTools/LayerAllocator.h"
#include "iPatGeometryTools/LayerNumberAllocator.h"
@@ -14,11 +8,3 @@ DECLARE_TOOL_FACTORY( LayerAllocator )
DECLARE_TOOL_FACTORY( LayerNumberAllocator )
DECLARE_TOOL_FACTORY( SiDetectorLocator )
-DECLARE_FACTORY_ENTRIES( iPatGeometryTools )
-{
- DECLARE_TOOL( DetectorSelection )
- DECLARE_TOOL( LayerAllocator )
- DECLARE_TOOL( LayerNumberAllocator )
- DECLARE_TOOL( SiDetectorLocator )
-}
-
diff --git a/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_load.cxx b/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_load.cxx
deleted file mode 100755
index 731caa2266d39b1130c0680c0c62821231c93543..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/***************************************************************************
- iPatGeometryTools
- ATLAS Collaboration
- ***************************************************************************/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatGeometryTools )
diff --git a/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_entries.cxx b/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_entries.cxx
old mode 100755
new mode 100644
index 9ef250788b4b615216a8877d743be8a0c3bbe16b..c07a229231197ca822d3a995f1bc4ea8fadd309b
--- a/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_entries.cxx
+++ b/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_entries.cxx
@@ -1,11 +1,4 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "iPatQuality/TrackQuality.h"
DECLARE_TOOL_FACTORY( TrackQuality )
-DECLARE_FACTORY_ENTRIES( iPatQuality )
-{
- DECLARE_TOOL( TrackQuality )
-}
-
diff --git a/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_load.cxx b/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_load.cxx
deleted file mode 100755
index 0cb5e5227da4800bd8e444adc8758bb78ce3f79a..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatQuality )
diff --git a/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_entries.cxx b/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_entries.cxx
old mode 100755
new mode 100644
index e669945845ffc1a4a4c3408c356b09e6a4f141be..06f095c8895bc7a7af2c56ac51922960eda8201d
--- a/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_entries.cxx
+++ b/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_entries.cxx
@@ -1,12 +1,3 @@
-/***************************************************************************
- iPatRecAlgs
- -----------
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatRecAlgs_entries.cxx,v 1.12 2008-12-16 15:52:48 pop Exp $
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "iPatRecAlgs/iPatRec.h"
#include "iPatRecAlgs/iPatShortTracks.h"
#include "iPatRecAlgs/iPatStatistics.h"
@@ -19,12 +10,3 @@ DECLARE_ALGORITHM_FACTORY( iPatStatistics )
DECLARE_ALGORITHM_FACTORY( iPatTrackTruthAssociator )
DECLARE_ALGORITHM_FACTORY( IntersectorTest )
-DECLARE_FACTORY_ENTRIES( iPatRecAlgs )
-{
- DECLARE_ALGORITHM( iPatRec )
- DECLARE_ALGORITHM( iPatShortTracks )
- DECLARE_ALGORITHM( iPatStatistics )
- DECLARE_ALGORITHM( iPatTrackTruthAssociator )
- DECLARE_ALGORITHM( IntersectorTest )
-}
-
diff --git a/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_load.cxx b/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_load.cxx
deleted file mode 100755
index 47ab7fedd222a3819e2bb24cfd95a78f1d74305c..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_load.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-/***************************************************************************
- iPatRecAlgs
- -----------
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatRecAlgs_load.cxx,v 1.1.1.1 2002-09-10 14:09:45 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatRecAlgs )
diff --git a/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_entries.cxx b/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_entries.cxx
old mode 100755
new mode 100644
index 4436a1309533bcad86dfecf894d419853e7db7d8..2b08339f7551888d789162865a4b3fd3609fdbe4
--- a/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_entries.cxx
+++ b/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_entries.cxx
@@ -1,11 +1,3 @@
-/***************************************************************************
- iPatTrackFinder
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatTrackFinder_entries.cxx,v 1.6 2007-02-12 18:09:40 pop Exp $
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "iPatTrackFinder/AssignedHits.h"
#include "iPatTrackFinder/CandidateBuilder.h"
#include "iPatTrackFinder/CombinationMaker.h"
@@ -22,14 +14,3 @@ DECLARE_TOOL_FACTORY( PointManager )
DECLARE_TOOL_FACTORY( TrackFinder )
DECLARE_TOOL_FACTORY( TrackManager )
-DECLARE_FACTORY_ENTRIES( iPatTrackFinder )
-{
- DECLARE_TOOL( AssignedHits )
- DECLARE_TOOL( CandidateBuilder )
- DECLARE_TOOL( CombinationMaker )
- DECLARE_TOOL( FinderTolerances )
- DECLARE_TOOL( PointManager )
- DECLARE_TOOL( TrackFinder )
- DECLARE_TOOL( TrackManager )
-}
-
diff --git a/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_load.cxx b/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_load.cxx
deleted file mode 100755
index 6a0c360794fc7d4a7ea6a6d65e55bacee4644ff8..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_load.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-/***************************************************************************
- iPatTrackFinder
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatTrackFinder_load.cxx,v 1.1 2004-07-27 12:22:57 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatTrackFinder )
diff --git a/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_entries.cxx b/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_entries.cxx
old mode 100755
new mode 100644
index dc2a8402f6a5be6d6aa8dd8c6a56fe43f61513c4..19d6373c813165ac3b49778ad043811b1ea7bb06
--- a/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_entries.cxx
+++ b/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "iPatTrackFitter/TrackFitter.h"
DECLARE_TOOL_FACTORY( TrackFitter )
-DECLARE_FACTORY_ENTRIES( iPatTrackFitter )
-{
- DECLARE_TOOL( TrackFitter )
-}
+
diff --git a/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_load.cxx b/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_load.cxx
deleted file mode 100755
index 98b8f17fbe136656769d2fbf0b905ee11b4cd118..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatTrackFitter )
-
diff --git a/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_entries.cxx b/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_entries.cxx
old mode 100755
new mode 100644
index cf87f16a0fba1ae8d8218ab7513f889a496a4eee..d3c4cecdb5ad323913be24c8388550459175c954
--- a/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_entries.cxx
+++ b/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_entries.cxx
@@ -1,11 +1,3 @@
-/***************************************************************************
- iPatTrackFollower
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatTrackFollower_entries.cxx,v 1.4 2006-10-04 09:37:42 pop Exp $
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "iPatTrackFollower/SiClusterProperties.h"
#include "iPatTrackFollower/SiliconLayerAssociator.h"
#include "iPatTrackFollower/TrackBuilder.h"
@@ -16,11 +8,3 @@ DECLARE_TOOL_FACTORY( SiliconLayerAssociator )
DECLARE_TOOL_FACTORY( TrackBuilder )
DECLARE_TOOL_FACTORY( TrackFollower )
-DECLARE_FACTORY_ENTRIES( iPatTrackFollower )
-{
- DECLARE_TOOL( SiClusterProperties )
- DECLARE_TOOL( SiliconLayerAssociator )
- DECLARE_TOOL( TrackBuilder )
- DECLARE_TOOL( TrackFollower )
-}
-
diff --git a/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_load.cxx b/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_load.cxx
deleted file mode 100755
index c6876ccefa7d176379a4002037a0d49ef41d7c35..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_load.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-/***************************************************************************
- iPatTrackFollower
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatTrackFollower_load.cxx,v 1.1 2004-07-05 16:57:57 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatTrackFollower )
diff --git a/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_entries.cxx b/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_entries.cxx
old mode 100755
new mode 100644
index 0b5364fd49ee4bcb9f7d4ec0f2fb4b4b44c6ef41..fe761fae69d5b047965d593c08c8e6867c3ca40f
--- a/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_entries.cxx
+++ b/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_entries.cxx
@@ -1,17 +1,4 @@
-/***************************************************************************
- iPatTruthTrajectory
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatTruthTrajectory_entries.cxx,v 1.4 2005-09-06 10:34:32 pop Exp $
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "iPatTruthTrajectory/TruthParameters.h"
DECLARE_TOOL_FACTORY( TruthParameters )
-DECLARE_FACTORY_ENTRIES( iPatTruthTrajectory )
-{
- DECLARE_TOOL( TruthParameters )
-}
-
diff --git a/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_load.cxx b/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_load.cxx
deleted file mode 100755
index f946c511bb57684de236c73ea3fedf7039a57202..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_load.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-/***************************************************************************
- iPatTruthTrajectory
-
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatTruthTrajectory_load.cxx,v 1.1 2003-10-07 15:56:49 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatTruthTrajectory )
diff --git a/Reconstruction/tauMonitoring/src/components/tauMonitoring_entries.cxx b/Reconstruction/tauMonitoring/src/components/tauMonitoring_entries.cxx
index 5020b0a4f39a61902759fe5b511e25b6a7791f06..e0431672d36e7cc45b26b8a751b70bf6228a351a 100644
--- a/Reconstruction/tauMonitoring/src/components/tauMonitoring_entries.cxx
+++ b/Reconstruction/tauMonitoring/src/components/tauMonitoring_entries.cxx
@@ -1,9 +1,4 @@
#include "tauMonitoring/tauMonTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
DECLARE_TOOL_FACTORY( tauMonTool )
-DECLARE_FACTORY_ENTRIES(tauMonitoring)
-{
- DECLARE_TOOL( tauMonTool )
-}
+
diff --git a/Reconstruction/tauMonitoring/src/components/tauMonitoring_load.cxx b/Reconstruction/tauMonitoring/src/components/tauMonitoring_load.cxx
deleted file mode 100644
index 4a0c370aafb7bf70662e69818e7a714bafc2377f..0000000000000000000000000000000000000000
--- a/Reconstruction/tauMonitoring/src/components/tauMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(tauMonitoring)
diff --git a/Reconstruction/tauRec/src/components/tauRec_entries.cxx b/Reconstruction/tauRec/src/components/tauRec_entries.cxx
old mode 100755
new mode 100644
index 2d529556edaec2ba6d4de28b9a65bc8b97438108..cb95fbfe00e0e9c9e183f9ea7005549377880613
--- a/Reconstruction/tauRec/src/components/tauRec_entries.cxx
+++ b/Reconstruction/tauRec/src/components/tauRec_entries.cxx
@@ -3,9 +3,9 @@
#include "tauRec/TauProcessorAlg.h"
#include "tauRec/TauTrackSlimmer.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
// DECLARE_ALGORITHM_FACTORY( TauBuilder )
// DECLARE_ALGORITHM_FACTORY( TauProcessor )
DECLARE_ALGORITHM_FACTORY( TauProcessorAlg )
DECLARE_ALGORITHM_FACTORY( TauTrackSlimmer )
+
diff --git a/Reconstruction/tauRec/src/components/tauRec_load.cxx b/Reconstruction/tauRec/src/components/tauRec_load.cxx
deleted file mode 100755
index 84f141f229697d96091655254891da3c42d3baed..0000000000000000000000000000000000000000
--- a/Reconstruction/tauRec/src/components/tauRec_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(tauRec)
-
-
-
diff --git a/Reconstruction/tauRecTools/src/components/tauRecTools_entries.cxx b/Reconstruction/tauRecTools/src/components/tauRecTools_entries.cxx
index 331be2dc3eae518080294ef83ffaa04592332be5..76ba69a8545438bca28443f2e1e56b04ce21e94d 100644
--- a/Reconstruction/tauRecTools/src/components/tauRecTools_entries.cxx
+++ b/Reconstruction/tauRecTools/src/components/tauRecTools_entries.cxx
@@ -40,7 +40,6 @@
#include "tauRecTools/TauEleOLRDecorator.h"
#include "tauRecTools/TauIDVarCalculator.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#ifndef XAOD_ANALYSIS
DECLARE_TOOL_FACTORY( JetSeedBuilder )
@@ -85,3 +84,4 @@ DECLARE_NAMESPACE_TOOL_FACTORY( tauRecTools, DiTauIDVarCalculator )
DECLARE_TOOL_FACTORY( TauJetBDTEvaluator )
DECLARE_TOOL_FACTORY( TauEleOLRDecorator )
DECLARE_TOOL_FACTORY( TauIDVarCalculator )
+
diff --git a/Reconstruction/tauRecTools/src/components/tauRecTools_load.cxx b/Reconstruction/tauRecTools/src/components/tauRecTools_load.cxx
deleted file mode 100644
index 6b1c2188830c28bd0ce8c55d51143773b065ebdd..0000000000000000000000000000000000000000
--- a/Reconstruction/tauRecTools/src/components/tauRecTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(tauRecTools)
-