From 9716aef05a83a0c6de84782ea729121c5b2ce9ad Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 27 Oct 2017 10:05:13 +0200
Subject: [PATCH] Remove obsolete factory entries for components in Tracking
- Delete all obsolete src/components/*_load.cxx files
- Remove obsolete DECLARE_FACTORY_ENTRIES within src/components/*_entries.cxx
The removed macros evaluate to NULL on the Gaudi side and have
been kept only for backwards compatibility.
---
.../components/TrkAmbiguitySolver_entries.cxx | 16 ----------
.../components/TrkAmbiguitySolver_load.cxx | 8 -----
.../TrkCollectionAliasAlg_entries.cxx | 4 ---
.../components/TrkCollectionAliasAlg_load.cxx | 5 ----
.../TrkTrackCollectionMerger_entries.cxx | 6 ----
.../TrkTrackCollectionMerger_load.cxx | 4 ---
.../components/TrkTrackSlimmer_entries.cxx | 4 ---
.../src/components/TrkTrackSlimmer_load.cxx | 5 ----
.../src/components/TrkTruthAlgs_entries.cxx | 7 -----
.../src/components/TrkTruthAlgs_load.cxx | 3 --
.../components/TrkAlignGenAlgs_entries.cxx | 8 -----
.../src/components/TrkAlignGenAlgs_load.cxx | 4 ---
.../components/TrkAlignGenTools_entries.cxx | 19 ------------
.../src/components/TrkAlignGenTools_load.cxx | 4 ---
.../TrkGlobalChi2AlignTools_entries.cxx | 5 ----
.../TrkGlobalChi2AlignTools_load.cxx | 3 --
.../components/TrkDetDescrAlgs_entries.cxx | 8 +----
.../src/components/TrkDetDescrAlgs_load.cxx | 4 ---
.../src/components/TrkDetDescrSvc_entries.cxx | 5 ----
.../src/components/TrkDetDescrSvc_load.cxx | 3 --
.../TrkDetDescrTestTools_entries.cxx | 15 ----------
.../components/TrkDetDescrTestTools_load.cxx | 4 ---
.../components/TrkDetDescrTools_entries.cxx | 18 +----------
.../src/components/TrkDetDescrTools_load.cxx | 4 ---
.../TrkDetDescrUnitTests_entries.cxx | 10 +------
.../components/TrkDetDescrUnitTests_load.cxx | 4 ---
.../components/TrkEventCnvTools_entries.cxx | 5 ----
.../src/components/TrkEventCnvTools_load.cxx | 4 ---
.../src/components/TrkJiveXML_entries.cxx | 6 ----
.../src/components/TrkJiveXML_load.cxx | 3 --
.../src/components/TrkExAlgs_entries.cxx | 9 ------
.../src/components/TrkExAlgs_load.cxx | 5 ----
.../src/components/TrkExEngine_entries.cxx | 11 -------
.../src/components/TrkExEngine_load.cxx | 4 ---
.../TrkExRungeKuttaIntersector_entries.cxx | 7 +----
.../TrkExRungeKuttaIntersector_load.cxx | 4 ---
.../TrkExRungeKuttaPropagator_entries.cxx | 5 ----
.../TrkExRungeKuttaPropagator_load.cxx | 3 --
.../TrkExSTEP_Propagator_entries.cxx | 5 ----
.../components/TrkExSTEP_Propagator_load.cxx | 3 --
.../TrkExSolenoidalIntersector_entries.cxx | 5 ----
.../TrkExSolenoidalIntersector_load.cxx | 4 ---
.../TrkExStraightLineIntersector_entries.cxx | 6 +---
.../TrkExStraightLineIntersector_load.cxx | 4 ---
.../src/components/TrkExTools_entries.cxx | 14 ---------
.../src/components/TrkExTools_load.cxx | 4 ---
.../src/components/TrkExUnitTests_entries.cxx | 6 +---
.../src/components/TrkExUnitTests_load.cxx | 4 ---
...rkDeterministicAnnealingFilter_entries.cxx | 12 --------
.../TrkDeterministicAnnealingFilter_load.cxx | 3 --
.../TrkDistributedKalmanFilter_entries.cxx | 6 ----
.../TrkDistributedKalmanFilter_load.cxx | 3 --
.../TrkDynamicNoiseAdjustor_entries.cxx | 8 -----
.../TrkDynamicNoiseAdjustor_load.cxx | 3 --
.../TrkGaussianSumFilter_entries.cxx | 28 -----------------
.../components/TrkGaussianSumFilter_load.cxx | 3 --
.../TrkGlobalChi2Fitter_entries.cxx | 7 -----
.../components/TrkGlobalChi2Fitter_load.cxx | 4 ---
.../components/TrkKalmanFitter_entries.cxx | 15 ----------
.../src/components/TrkKalmanFitter_load.cxx | 3 --
.../src/components/TrkRefitAlg_entries.cxx | 4 ---
.../src/components/TrkRefitAlg_load.cxx | 5 ----
.../src/components/TrkiPatFitter_entries.cxx | 7 -----
.../src/components/TrkiPatFitter_load.cxx | 4 ---
.../components/TrkG4UserActions_entries.cxx | 9 ------
.../src/components/TrkG4UserActions_load.cxx | 7 -----
.../TrkAmbiguityProcessor_entries.cxx | 12 --------
.../components/TrkAmbiguityProcessor_load.cxx | 14 ---------
.../TrkAssociationTools_entries.cxx | 9 ------
.../components/TrkAssociationTools_load.cxx | 14 ---------
.../CompetingRIOsOnTrackTool_entries.cxx | 5 ----
.../CompetingRIOsOnTrackTool_load.cxx | 4 ---
.../TrkMaterialProvider_entries.cxx | 7 -----
.../components/TrkMaterialProvider_load.cxx | 4 ---
.../TrkMeasurementUpdator_entries.cxx | 11 -------
.../components/TrkMeasurementUpdator_load.cxx | 3 --
.../TrkMeasurementUpdator_xk_entries.cxx | 10 +------
.../TrkMeasurementUpdator_xk_load.cxx | 3 --
.../components/TrkParticleCreator_entries.cxx | 6 +---
.../components/TrkParticleCreator_load.cxx | 3 --
.../TrkRIO_OnTrackCreator_entries.cxx | 8 -----
.../components/TrkRIO_OnTrackCreator_load.cxx | 3 --
.../TrkResidualPullCalculator_entries.cxx | 6 ----
.../TrkResidualPullCalculator_load.cxx | 5 ----
.../TrkSegmentConverter_entries.cxx | 6 ----
.../components/TrkSegmentConverter_load.cxx | 5 ----
.../TrkTrackFieldIntegralTools_entries.cxx | 6 ----
.../TrkTrackFieldIntegralTools_load.cxx | 5 ----
.../TrkTrackSlimmingTool_entries.cxx | 6 ----
.../components/TrkTrackSlimmingTool_load.cxx | 5 ----
.../TrkTrackSummaryTool_entries.cxx | 10 -------
.../components/TrkTrackSummaryTool_load.cxx | 5 ----
.../src/components/TrkTruthTools_entries.cxx | 9 ------
.../src/components/TrkTruthTools_load.cxx | 4 ---
.../components/TrkTruthToTrack_entries.cxx | 6 ----
.../src/components/TrkTruthToTrack_load.cxx | 3 --
.../components/TrkTruthTrackAlgs_entries.cxx | 7 +----
.../src/components/TrkTruthTrackAlgs_load.cxx | 3 --
.../components/TrkTruthTrackTools_entries.cxx | 8 +----
.../components/TrkTruthTrackTools_load.cxx | 3 --
.../TrkNeuralNetworkUtils_entries.cxx | 6 +---
.../components/TrkNeuralNetworkUtils_load.cxx | 5 ----
.../src/components/TrkValAlgs_entries.cxx | 12 --------
.../src/components/TrkValAlgs_load.cxx | 3 --
.../src/components/TrkValTools_entries.cxx | 30 -------------------
.../src/components/TrkValTools_load.cxx | 3 --
...TrkVertexFitterValidationTools_entries.cxx | 9 ------
.../TrkVertexFitterValidationTools_load.cxx | 3 --
...TrkVertexFitterValidationUtils_entries.cxx | 5 ----
.../TrkVertexFitterValidationUtils_load.cxx | 3 --
.../src/components/TrkJetVxFitter_entries.cxx | 12 --------
.../src/components/TrkJetVxFitter_load.cxx | 3 --
.../src/components/TrkV0Fitter_entries.cxx | 6 +---
.../src/components/TrkV0Fitter_load.cxx | 3 --
.../components/TrkVKalVrtFitter_entries.cxx | 17 +----------
.../src/components/TrkVKalVrtFitter_load.cxx | 8 -----
.../TrkVertexAnalysisUtils_entries.cxx | 5 ----
.../TrkVertexAnalysisUtils_load.cxx | 3 --
.../TrkVertexBilloirTools_entries.cxx | 7 +----
.../components/TrkVertexBilloirTools_load.cxx | 3 --
.../TrkVertexFitterUtils_entries.cxx | 15 ----------
.../components/TrkVertexFitterUtils_load.cxx | 3 --
.../components/TrkVertexFitters_entries.cxx | 9 ------
.../src/components/TrkVertexFitters_load.cxx | 3 --
.../TrkVertexSeedFinderTools_entries.cxx | 9 ------
.../TrkVertexSeedFinderTools_load.cxx | 3 --
.../TrkVertexSeedFinderUtils_entries.cxx | 15 ----------
.../TrkVertexSeedFinderUtils_load.cxx | 6 ----
.../src/components/TrkVertexTools_entries.cxx | 12 +-------
.../src/components/TrkVertexTools_load.cxx | 3 --
.../TrkVertexWeightCalculators_entries.cxx | 14 ---------
.../TrkVertexWeightCalculators_load.cxx | 3 --
.../src/components/TrkVxEdmCnv_entries.cxx | 5 ----
.../src/components/TrkVxEdmCnv_load.cxx | 3 --
134 files changed, 15 insertions(+), 884 deletions(-)
mode change 100755 => 100644 Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_entries.cxx
delete mode 100755 Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_load.cxx
mode change 100755 => 100644 Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_entries.cxx
delete mode 100755 Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_load.cxx
delete mode 100644 Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_load.cxx
mode change 100755 => 100644 Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_entries.cxx
delete mode 100755 Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_load.cxx
mode change 100755 => 100644 Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_entries.cxx
delete mode 100755 Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_load.cxx
delete mode 100644 Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_load.cxx
delete mode 100644 Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_load.cxx
delete mode 100644 Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_load.cxx
mode change 100755 => 100644 Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_entries.cxx
delete mode 100755 Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_load.cxx
mode change 100755 => 100644 Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_entries.cxx
delete mode 100755 Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_load.cxx
mode change 100755 => 100644 Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_entries.cxx
delete mode 100755 Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_load.cxx
mode change 100755 => 100644 Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_entries.cxx
delete mode 100755 Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_load.cxx
mode change 100755 => 100644 Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_entries.cxx
delete mode 100755 Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_load.cxx
mode change 100755 => 100644 Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_entries.cxx
delete mode 100755 Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_load.cxx
delete mode 100644 Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_load.cxx
mode change 100755 => 100644 Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_entries.cxx
delete mode 100755 Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_load.cxx
mode change 100755 => 100644 Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_entries.cxx
delete mode 100755 Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_load.cxx
mode change 100755 => 100644 Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_entries.cxx
delete mode 100755 Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_load.cxx
mode change 100755 => 100644 Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_entries.cxx
delete mode 100755 Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_load.cxx
mode change 100755 => 100644 Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_entries.cxx
delete mode 100755 Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_load.cxx
mode change 100755 => 100644 Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_entries.cxx
delete mode 100755 Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_load.cxx
mode change 100755 => 100644 Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_entries.cxx
delete mode 100755 Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_load.cxx
mode change 100755 => 100644 Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_entries.cxx
delete mode 100755 Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_load.cxx
mode change 100755 => 100644 Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_entries.cxx
delete mode 100755 Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_load.cxx
mode change 100755 => 100644 Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_entries.cxx
delete mode 100755 Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_load.cxx
mode change 100755 => 100644 Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_entries.cxx
delete mode 100755 Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_load.cxx
mode change 100755 => 100644 Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_entries.cxx
delete mode 100755 Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_load.cxx
mode change 100755 => 100644 Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_entries.cxx
delete mode 100755 Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_load.cxx
mode change 100755 => 100644 Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_entries.cxx
delete mode 100755 Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_load.cxx
mode change 100755 => 100644 Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_entries.cxx
delete mode 100755 Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_load.cxx
mode change 100755 => 100644 Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_entries.cxx
delete mode 100755 Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_load.cxx
mode change 100755 => 100644 Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_entries.cxx
delete mode 100755 Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_load.cxx
delete mode 100644 Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_load.cxx
delete mode 100644 Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_load.cxx
mode change 100755 => 100644 Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_entries.cxx
delete mode 100755 Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_load.cxx
mode change 100755 => 100644 Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_entries.cxx
delete mode 100755 Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_load.cxx
mode change 100755 => 100644 Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_entries.cxx
delete mode 100755 Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_load.cxx
mode change 100755 => 100644 Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_entries.cxx
delete mode 100755 Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_load.cxx
mode change 100755 => 100644 Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_entries.cxx
delete mode 100755 Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_load.cxx
mode change 100755 => 100644 Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_entries.cxx
delete mode 100755 Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_load.cxx
mode change 100755 => 100644 Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_entries.cxx
delete mode 100755 Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_load.cxx
delete mode 100644 Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_load.cxx
mode change 100755 => 100644 Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_entries.cxx
delete mode 100755 Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_load.cxx
mode change 100755 => 100644 Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_entries.cxx
delete mode 100755 Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_load.cxx
mode change 100755 => 100644 Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_entries.cxx
delete mode 100755 Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_load.cxx
mode change 100755 => 100644 Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_entries.cxx
delete mode 100755 Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_load.cxx
mode change 100755 => 100644 Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_entries.cxx
delete mode 100755 Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_load.cxx
mode change 100755 => 100644 Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_entries.cxx
delete mode 100755 Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_load.cxx
delete mode 100644 Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_load.cxx
delete mode 100644 Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_load.cxx
mode change 100755 => 100644 Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_entries.cxx
delete mode 100755 Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_load.cxx
delete mode 100644 Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_load.cxx
mode change 100755 => 100644 Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_entries.cxx
delete mode 100755 Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_load.cxx
mode change 100755 => 100644 Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_entries.cxx
delete mode 100755 Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_load.cxx
mode change 100755 => 100644 Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_entries.cxx
delete mode 100755 Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_load.cxx
mode change 100755 => 100644 Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_entries.cxx
delete mode 100755 Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_load.cxx
mode change 100755 => 100644 Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_entries.cxx
delete mode 100755 Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_load.cxx
mode change 100755 => 100644 Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_entries.cxx
delete mode 100755 Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_load.cxx
mode change 100755 => 100644 Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_entries.cxx
delete mode 100755 Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_load.cxx
mode change 100755 => 100644 Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_entries.cxx
delete mode 100755 Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_load.cxx
mode change 100755 => 100644 Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_entries.cxx
delete mode 100755 Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_load.cxx
mode change 100755 => 100644 Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_entries.cxx
delete mode 100755 Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_load.cxx
mode change 100755 => 100644 Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_entries.cxx
delete mode 100755 Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_load.cxx
delete mode 100644 Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_load.cxx
delete mode 100644 Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_load.cxx
delete mode 100644 Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_load.cxx
delete mode 100644 Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_load.cxx
diff --git a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_entries.cxx b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_entries.cxx
old mode 100755
new mode 100644
index e70f92f8ac9..270a508aeb1
--- a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_entries.cxx
+++ b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_entries.cxx
@@ -1,20 +1,4 @@
-/***************************************************************************
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: TrkAmbiguitySolver_entries.cxx,v 1.1.1.1 2007-02-21 13:36:44 msiebel Exp $
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkAmbiguitySolver/TrkAmbiguitySolver.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, TrkAmbiguitySolver )
-DECLARE_FACTORY_ENTRIES( TrkAmbiguitySolver )
-{
- DECLARE_NAMESPACE_ALGORITHM( Trk, TrkAmbiguitySolver );
-}
-
-
-
-
-
diff --git a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_load.cxx b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_load.cxx
deleted file mode 100755
index ccc9cda7f22..00000000000
--- a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/***************************************************************************
- ATLAS Collaboration
- ***************************************************************************/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkAmbiguitySolver )
-
diff --git a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_entries.cxx b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_entries.cxx
old mode 100755
new mode 100644
index 4fb9d7e919c..e40c706b40d
--- a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_entries.cxx
+++ b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkCollectionAliasAlg/TrkCollectionAliasAlg.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk , TrkCollectionAliasAlg )
-DECLARE_FACTORY_ENTRIES( TrkCollectionAliasAlg ) {
- DECLARE_NAMESPACE_ALGORITHM( Trk , TrkCollectionAliasAlg )
-}
diff --git a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_load.cxx b/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_load.cxx
deleted file mode 100755
index 3fc666cf1b7..00000000000
--- a/Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkCollectionAliasAlg )
-
diff --git a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_entries.cxx b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_entries.cxx
index 734e7a34398..6d8dfa7d95e 100644
--- a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_entries.cxx
+++ b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkTrackCollectionMerger/TrackCollectionMerger.h"
using namespace Trk;
DECLARE_ALGORITHM_FACTORY( TrackCollectionMerger )
-DECLARE_FACTORY_ENTRIES( TrkTrackCollectionMerger )
-{
- DECLARE_ALGORITHM( TrackCollectionMerger )
-}
-
diff --git a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_load.cxx b/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_load.cxx
deleted file mode 100644
index fe7827ecc26..00000000000
--- a/Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrackCollectionMerger)
-
diff --git a/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_entries.cxx b/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_entries.cxx
old mode 100755
new mode 100644
index 9e57d3f9155..536739159d4
--- a/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_entries.cxx
+++ b/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkTrackSlimmer/TrackSlimmer.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk , TrackSlimmer )
-DECLARE_FACTORY_ENTRIES( TrkTrackSlimmer ) {
- DECLARE_NAMESPACE_ALGORITHM( Trk , TrackSlimmer )
-}
diff --git a/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_load.cxx b/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_load.cxx
deleted file mode 100755
index cf3e4b53a39..00000000000
--- a/Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrackSlimmer )
-
diff --git a/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_entries.cxx b/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_entries.cxx
old mode 100755
new mode 100644
index 2559332a625..a67f15cfa40
--- a/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_entries.cxx
+++ b/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkTruthAlgs/TrackTruthSelector.h"
#include "TrkTruthAlgs/TrackTruthSimilaritySelector.h"
#include "../TrackParticleTruthAlg.h"
@@ -7,9 +6,3 @@ DECLARE_ALGORITHM_FACTORY( TrackTruthSelector )
DECLARE_ALGORITHM_FACTORY( TrackTruthSimilaritySelector )
DECLARE_ALGORITHM_FACTORY( TrackParticleTruthAlg )
-DECLARE_FACTORY_ENTRIES( TrkTruthAlgs )
-{
- DECLARE_ALGORITHM( TrackTruthSelector )
- DECLARE_ALGORITHM( TrackTruthSimilaritySelector )
- DECLARE_ALGORITHM( TrackParticleTruthAlg )
-}
diff --git a/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_load.cxx b/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_load.cxx
deleted file mode 100755
index e1543c66389..00000000000
--- a/Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTruthAlgs )
diff --git a/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_entries.cxx b/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_entries.cxx
index 79818fae7a1..faba4bd0d9f 100644
--- a/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_entries.cxx
+++ b/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkAlignGenAlgs/AlignAlg.h"
#include "TrkAlignGenAlgs/SelectEventNumber.h"
#include "TrkAlignGenAlgs/AlignSolve.h"
@@ -9,10 +8,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, SelectEventNumber )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, AlignSolve )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, AlignTrackCollSplitter )
-DECLARE_FACTORY_ENTRIES( TrkAlignGenAlgs )
-{
- DECLARE_NAMESPACE_ALGORITHM( Trk, AlignAlg )
- DECLARE_NAMESPACE_ALGORITHM( Trk, SelectEventNumber )
- DECLARE_NAMESPACE_ALGORITHM( Trk, AlignSolve )
- DECLARE_NAMESPACE_ALGORITHM( Trk, AlignTrackCollSplitter )
-}
diff --git a/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_load.cxx b/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_load.cxx
deleted file mode 100644
index 8afaffd28ce..00000000000
--- a/Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkAlignGenAlgs )
-
diff --git a/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_entries.cxx b/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_entries.cxx
index 3deaad01c54..11d1825234c 100644
--- a/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_entries.cxx
+++ b/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkAlignGenTools/MatrixTool.h"
#include "TrkAlignGenTools/IPCMatrixTool.h"
#include "TrkAlignGenTools/TrkAlignDBTool.h"
@@ -29,21 +28,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Trk, AlignResidualCalculator )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, BeamspotVertexPreProcessor )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, ConstrainedTrackProvider )
-
-DECLARE_FACTORY_ENTRIES( TrkAlignGenTools )
-{
- DECLARE_NAMESPACE_TOOL( Trk, MatrixTool )
- DECLARE_NAMESPACE_TOOL( Trk, IPCMatrixTool )
- DECLARE_NAMESPACE_TOOL( Trk, TrkAlignDBTool )
- DECLARE_NAMESPACE_TOOL( Trk, AnalyticalDerivCalcTool )
- DECLARE_NAMESPACE_TOOL( Trk, ShiftingDerivCalcTool )
- DECLARE_NAMESPACE_TOOL( Trk, TrackCollectionProvider )
- DECLARE_NAMESPACE_TOOL( Trk, MSConstraintTracksProvider )
- DECLARE_NAMESPACE_TOOL( Trk, AlignTrackPreProcessor )
- DECLARE_NAMESPACE_TOOL( Trk, AlignTrackCreator )
- DECLARE_NAMESPACE_TOOL( Trk, AlignTrackDresser )
- DECLARE_NAMESPACE_TOOL( Trk, AlignModuleTool )
- DECLARE_NAMESPACE_TOOL( Trk, AlignResidualCalculator )
- DECLARE_NAMESPACE_TOOL( Trk, BeamspotVertexPreProcessor )
- DECLARE_NAMESPACE_TOOL( Trk, ConstrainedTrackProvider )
-}
diff --git a/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_load.cxx b/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_load.cxx
deleted file mode 100644
index 9c288b58c92..00000000000
--- a/Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkAlignGenTools )
-
diff --git a/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_entries.cxx b/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_entries.cxx
index c6713d305a6..88c61ec80fc 100644
--- a/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_entries.cxx
+++ b/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkGlobalChi2AlignTools/GlobalChi2AlignTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, GlobalChi2AlignTool )
-DECLARE_FACTORY_ENTRIES( TrkGlobalChi2AlignTools )
-{
- DECLARE_NAMESPACE_ALGORITHM( Trk, GlobalChi2AlignTool );
-}
diff --git a/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_load.cxx b/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_load.cxx
deleted file mode 100644
index 37e8cb9767f..00000000000
--- a/Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkGlobalChi2AlignTools )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_entries.cxx b/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_entries.cxx
old mode 100755
new mode 100644
index db2d8e10a4f..cc450d5e99a
--- a/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_entries.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkDetDescrAlgs/MaterialMapping.h"
#include "TrkDetDescrAlgs/MaterialManipulation.h"
#include "TrkDetDescrAlgs/MaterialValidation.h"
@@ -11,9 +10,4 @@ DECLARE_ALGORITHM_FACTORY( MaterialValidation )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkDetDescrAlgs )
-{
- DECLARE_ALGORITHM( MaterialMapping )
- DECLARE_ALGORITHM( MaterialManipulation )
- DECLARE_ALGORITHM( MaterialValidation )
-}
+
diff --git a/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_load.cxx b/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_load.cxx
deleted file mode 100755
index f00ef9d9283..00000000000
--- a/Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkDetDescrAlgs )
-
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_entries.cxx b/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_entries.cxx
old mode 100755
new mode 100644
index 6de965088a1..57e75c58f82
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_entries.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_entries.cxx
@@ -1,13 +1,8 @@
#include "TrkDetDescrSvc/TrackingGeometrySvc.h"
#include "TrkDetDescrSvc/TrackingVolumesSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace Trk;
DECLARE_SERVICE_FACTORY( TrackingGeometrySvc )
DECLARE_SERVICE_FACTORY( TrackingVolumesSvc )
-DECLARE_FACTORY_ENTRIES(TrkDetDescrSvc) {
- DECLARE_SERVICE ( TrackingGeometrySvc )
- DECLARE_SERVICE ( TrackingVolumesSvc )
-}
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_load.cxx b/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_load.cxx
deleted file mode 100755
index 800e3089259..00000000000
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/src/components/TrkDetDescrSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkDetDescrSvc )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_entries.cxx b/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_entries.cxx
old mode 100755
new mode 100644
index 94b51dfece0..72e3de3b1e8
--- a/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_entries.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkDetDescrTestTools/GeometryAsciiDumper.h"
#include "TrkDetDescrTestTools/GeometryTTreeDumper.h"
#include "TrkDetDescrTestTools/MaterialMapper.h"
@@ -24,18 +23,4 @@ DECLARE_TOOL_FACTORY( TrackingVolumeDisplayer )
DECLARE_TOOL_FACTORY( GeometryJsonDumper )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkDetDescrTestTools )
-{
- DECLARE_TOOL( GeometryAsciiDumper )
- DECLARE_TOOL( GeometryTTreeDumper )
- DECLARE_TOOL( MaterialMapper )
- DECLARE_TOOL( VertexMapper )
- DECLARE_TOOL( LayerMaterialInspector )
- DECLARE_TOOL( LayerMaterialAnalyser )
- DECLARE_TOOL( RandomSurfaceBuilder )
- DECLARE_TOOL( RecursiveGeometryProcessor )
- DECLARE_TOOL( TrackingVolumeDisplayer )
- DECLARE_TOOL( GeometryJsonDumper )
-}
-
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_load.cxx b/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_load.cxx
deleted file mode 100755
index ad6eead03cb..00000000000
--- a/Tracking/TrkDetDescr/TrkDetDescrTestTools/src/components/TrkDetDescrTestTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkDetDescrTestTools )
-
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_entries.cxx b/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_entries.cxx
old mode 100755
new mode 100644
index 66f7e6fec9b..bd9d7fa7168
--- a/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_entries.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkDetDescrTools/CylinderVolumeCreator.h"
#include "TrkDetDescrTools/BinnedLayerMaterialCreator.h"
#include "TrkDetDescrTools/CompoundLayerMaterialCreator.h"
@@ -30,19 +29,4 @@ DECLARE_TOOL_FACTORY( TrackingVolumeArrayCreator )
DECLARE_TOOL_FACTORY( TrackingVolumeHelper )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkDetDescrTools )
-{
- DECLARE_TOOL( CylinderVolumeCreator )
- DECLARE_TOOL( BinnedLayerMaterialCreator )
- DECLARE_TOOL( CompoundLayerMaterialCreator )
- DECLARE_TOOL( CompressedLayerMaterialCreator )
- DECLARE_TOOL( GeometryBuilder )
- DECLARE_TOOL( GenericGeometryBuilder )
- DECLARE_TOOL( LayerArrayCreator )
- DECLARE_TOOL( LayerProvider )
- DECLARE_TOOL( LayerMaterialProvider )
- DECLARE_TOOL( LayerMaterialConverter )
- DECLARE_TOOL( InputLayerMaterialProvider )
- DECLARE_TOOL( TrackingVolumeArrayCreator )
- DECLARE_TOOL( TrackingVolumeHelper )
-}
+
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_load.cxx b/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_load.cxx
deleted file mode 100755
index 64eae4c303a..00000000000
--- a/Tracking/TrkDetDescr/TrkDetDescrTools/src/components/TrkDetDescrTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkDetDescrTools )
-
diff --git a/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_entries.cxx b/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_entries.cxx
old mode 100755
new mode 100644
index a2b19454a61..dc028d075a4
--- a/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_entries.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkDetDescrUnitTests/TrkDetDescrTPCnvTest.h"
#include "TrkDetDescrUnitTests/BinUtilityTest.h"
#include "TrkDetDescrUnitTests/TrackingGeometryTest.h"
@@ -15,12 +14,5 @@ DECLARE_ALGORITHM_FACTORY( MappingTest )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkDetDescrUnitTests )
-{
- DECLARE_ALGORITHM( BinUtilityTest )
- DECLARE_ALGORITHM( TrkDetDescrTPCnvTest )
- DECLARE_ALGORITHM( TrackingGeometryTest )
- DECLARE_ALGORITHM( SurfaceIntersectionTest )
- DECLARE_ALGORITHM( MappingTest )
-}
+
diff --git a/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_load.cxx b/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_load.cxx
deleted file mode 100755
index 3f9d5faa5b6..00000000000
--- a/Tracking/TrkDetDescr/TrkDetDescrUnitTests/src/components/TrkDetDescrUnitTests_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkDetDescrUnitTests )
-
diff --git a/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_entries.cxx b/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_entries.cxx
old mode 100755
new mode 100644
index 49bf81ad428..bdbf369ca4b
--- a/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_entries.cxx
+++ b/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_entries.cxx
@@ -1,10 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkEventCnvTools/EventCnvSuperTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, EventCnvSuperTool )
-DECLARE_FACTORY_ENTRIES(TrkEventCnvTools)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_TOOL(Trk, EventCnvSuperTool)
-}
diff --git a/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_load.cxx b/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_load.cxx
deleted file mode 100755
index 22c2177e1d9..00000000000
--- a/Tracking/TrkEventCnv/TrkEventCnvTools/src/components/TrkEventCnvTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkEventCnvTools)
diff --git a/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_entries.cxx b/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_entries.cxx
index 4e753f5c161..3690f9b700c 100644
--- a/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_entries.cxx
+++ b/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_entries.cxx
@@ -1,7 +1,6 @@
#include "TrkJiveXML/SegmentRetriever.h"
#include "TrkJiveXML/TrackRetriever.h"
#include "TrkJiveXML/VertexRetriever.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace JiveXML;
@@ -9,8 +8,3 @@ DECLARE_TOOL_FACTORY(SegmentRetriever)
DECLARE_TOOL_FACTORY(TrackRetriever)
DECLARE_TOOL_FACTORY(VertexRetriever)
-DECLARE_FACTORY_ENTRIES(TrkJiveXML) {
- DECLARE_ALGTOOL(SegmentRetriever)
- DECLARE_ALGTOOL(TrackRetriever)
- DECLARE_ALGTOOL(VertexRetriever)
-}
diff --git a/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_load.cxx b/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_load.cxx
deleted file mode 100644
index 630bbe2bcd4..00000000000
--- a/Tracking/TrkEventCnv/TrkJiveXML/src/components/TrkJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkJiveXML)
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_entries.cxx b/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_entries.cxx
old mode 100755
new mode 100644
index bd3e81d3e95..47831951cbe
--- a/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkExAlgs/ExtrapolatorTest.h"
#include "TrkExAlgs/CombinedExtrapolatorTest.h"
#include "TrkExAlgs/CETmaterial.h"
@@ -15,11 +14,3 @@ DECLARE_ALGORITHM_FACTORY( EnergyLossExtrapolationValidation )
DECLARE_ALGORITHM_FACTORY( CombinedExtrapolatorTest )
DECLARE_ALGORITHM_FACTORY( CETmaterial )
-DECLARE_FACTORY_ENTRIES( TrkExAlgs ) {
- DECLARE_ALGORITHM( RiddersAlgorithm )
- DECLARE_ALGORITHM( ExtrapolatorTest )
- DECLARE_ALGORITHM( ExtrapolationValidation )
- DECLARE_ALGORITHM( EnergyLossExtrapolationValidation )
- DECLARE_ALGORITHM( CombinedExtrapolatorTest )
- DECLARE_ALGORITHM( CETmaterial )
-}
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_load.cxx b/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_load.cxx
deleted file mode 100755
index 9543df073a5..00000000000
--- a/Tracking/TrkExtrapolation/TrkExAlgs/src/components/TrkExAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExAlgs )
-
diff --git a/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_entries.cxx b/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_entries.cxx
old mode 100755
new mode 100644
index e9f40a9439d..dcc3abf0758
--- a/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkExEngine/ExtrapolationEngine.h"
#include "TrkExEngine/StaticEngine.h"
#include "TrkExEngine/StaticNavigationEngine.h"
@@ -16,14 +15,4 @@ DECLARE_TOOL_FACTORY( PropagationEngine )
DECLARE_TOOL_FACTORY( StepEngine )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkExEngine )
-{
- DECLARE_TOOL( ExtrapolationEngine )
- DECLARE_TOOL( MaterialEffectsEngine )
- DECLARE_TOOL( StaticEngine )
- DECLARE_TOOL( StaticNavigationEngine )
- DECLARE_TOOL( PropagationEngine )
- DECLARE_TOOL( StepEngine )
-}
-
diff --git a/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_load.cxx b/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_load.cxx
deleted file mode 100755
index 563e2d8a554..00000000000
--- a/Tracking/TrkExtrapolation/TrkExEngine/src/components/TrkExEngine_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExEngine )
-
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_entries.cxx b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_entries.cxx
old mode 100755
new mode 100644
index 86db8ba0052..0a0264e6a8d
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkExRungeKuttaIntersector/IntersectorWrapper.h"
#include "TrkExRungeKuttaIntersector/RungeKuttaIntersector.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, IntersectorWrapper )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, RungeKuttaIntersector )
-DECLARE_FACTORY_ENTRIES( TrkExRungeKuttaIntersector )
-{
- DECLARE_NAMESPACE_TOOL( Trk, IntersectorWrapper )
- DECLARE_NAMESPACE_TOOL( Trk, RungeKuttaIntersector )
-}
+
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_load.cxx b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_load.cxx
deleted file mode 100755
index 9cee5bc4b05..00000000000
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/src/components/TrkExRungeKuttaIntersector_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExRungeKuttaIntersector )
-
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_entries.cxx b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_entries.cxx
old mode 100755
new mode 100644
index 3163d9b61f4..0e4fdfc0087
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkExRungeKuttaPropagator/RungeKuttaPropagator.h"
using namespace Trk;
@@ -6,8 +5,4 @@ using namespace Trk;
DECLARE_TOOL_FACTORY( RungeKuttaPropagator )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkExRungeKuttaPropagator )
-{
- DECLARE_TOOL( RungeKuttaPropagator )
-}
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_load.cxx b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_load.cxx
deleted file mode 100755
index 88ab7fe92bf..00000000000
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/components/TrkExRungeKuttaPropagator_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExRungeKuttaPropagator )
diff --git a/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_entries.cxx b/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_entries.cxx
old mode 100755
new mode 100644
index cde2f05937b..732e8c93083
--- a/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkExSTEP_Propagator/STEP_Propagator.h"
using namespace Trk;
@@ -6,8 +5,4 @@ using namespace Trk;
DECLARE_TOOL_FACTORY( STEP_Propagator )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkExSTEP_Propagator )
-{
- DECLARE_TOOL( STEP_Propagator )
-}
diff --git a/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_load.cxx b/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_load.cxx
deleted file mode 100755
index 8ca485a5803..00000000000
--- a/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/src/components/TrkExSTEP_Propagator_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExSTEP_Propagator )
diff --git a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_entries.cxx b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_entries.cxx
old mode 100755
new mode 100644
index 48593d54165..78a1ff6ca73
--- a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_entries.cxx
@@ -1,10 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkExSolenoidalIntersector/SolenoidalIntersector.h"
typedef Trk::SolenoidalIntersector TrkSolenoidalIntersector;
DECLARE_TOOL_FACTORY( TrkSolenoidalIntersector )
-DECLARE_FACTORY_ENTRIES( TrkExSolenoidalIntersector )
-{
- DECLARE_NAMESPACE_TOOL( Trk, SolenoidalIntersector )
-}
diff --git a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_load.cxx b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_load.cxx
deleted file mode 100755
index 97fdfcbf98d..00000000000
--- a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/components/TrkExSolenoidalIntersector_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExSolenoidalIntersector )
-
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_entries.cxx b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_entries.cxx
old mode 100755
new mode 100644
index 7b574b148f4..ca31a3aa4a3
--- a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkExStraightLineIntersector/StraightLineIntersector.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, StraightLineIntersector )
-DECLARE_FACTORY_ENTRIES( TrkExStraightLineIntersector )
-{
- DECLARE_NAMESPACE_TOOL( Trk, StraightLineIntersector )
-}
+
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_load.cxx b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_load.cxx
deleted file mode 100755
index 1d4387156d2..00000000000
--- a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/components/TrkExStraightLineIntersector_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExStraightLineIntersector )
-
diff --git a/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_entries.cxx b/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_entries.cxx
old mode 100755
new mode 100644
index c32868ea42a..3e5c1adecb7
--- a/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkExTools/Extrapolator.h"
#include "TrkExTools/Navigator.h"
#include "TrkExTools/MaterialEffectsUpdator.h"
@@ -21,16 +20,3 @@ DECLARE_TOOL_FACTORY( NIMatEffUpdator )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkExTools )
-{
- DECLARE_TOOL( Extrapolator )
- DECLARE_TOOL( TimedExtrapolator )
- DECLARE_TOOL( Navigator )
- DECLARE_TOOL( MaterialEffectsUpdator )
- DECLARE_TOOL( DummyMaterialEffectsUpdator )
- DECLARE_TOOL( EnergyLossUpdator )
- DECLARE_TOOL( MultipleScatteringUpdator )
- DECLARE_TOOL( NIMatEffUpdator )
-}
-
-
diff --git a/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_load.cxx b/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_load.cxx
deleted file mode 100755
index ae0178cefee..00000000000
--- a/Tracking/TrkExtrapolation/TrkExTools/src/components/TrkExTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExTools )
-
diff --git a/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_entries.cxx b/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_entries.cxx
old mode 100755
new mode 100644
index 2e6e50fbbcb..1fc7b35ca0f
--- a/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_entries.cxx
+++ b/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkExUnitTests/ExtrapolationEngineTest.h"
using namespace Trk;
@@ -6,7 +5,4 @@ using namespace Trk;
DECLARE_ALGORITHM_FACTORY( ExtrapolationEngineTest )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkExUnitTests )
-{
- DECLARE_ALGORITHM( ExtrapolationEngineTest )
-}
+
diff --git a/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_load.cxx b/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_load.cxx
deleted file mode 100755
index 515b6702dbe..00000000000
--- a/Tracking/TrkExtrapolation/TrkExUnitTests/src/components/TrkExUnitTests_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkExUnitTests )
-
diff --git a/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_entries.cxx b/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_entries.cxx
old mode 100755
new mode 100644
index a8d83c31249..9ce9a165777
--- a/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_entries.cxx
+++ b/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_entries.cxx
@@ -1,20 +1,8 @@
-
#include "TrkDeterministicAnnealingFilter/DeterministicAnnealingFilter.h"
#include "TrkDeterministicAnnealingFilter/DAF_WeightCalculator.h"
#include "TrkDeterministicAnnealingFilter/DAF_SimpleWeightCalculator.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// using namespace Trk;
-
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, DeterministicAnnealingFilter )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, DAF_WeightCalculator )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, DAF_SimpleWeightCalculator )
-DECLARE_FACTORY_ENTRIES(TrkDeterministicAnnealingFilter)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_TOOL(Trk, DeterministicAnnealingFilter)
- DECLARE_NAMESPACE_TOOL(Trk, DAF_WeightCalculator)
- DECLARE_NAMESPACE_TOOL(Trk, DAF_SimpleWeightCalculator)
-}
-
diff --git a/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_load.cxx b/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_load.cxx
deleted file mode 100755
index 73d2b9a416e..00000000000
--- a/Tracking/TrkFitter/TrkDeterministicAnnealingFilter/src/components/TrkDeterministicAnnealingFilter_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkDeterministicAnnealingFilter)
diff --git a/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_entries.cxx b/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_entries.cxx
old mode 100755
new mode 100644
index 4a45bcfa8e8..e848697e08f
--- a/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_entries.cxx
+++ b/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_entries.cxx
@@ -1,10 +1,4 @@
#include "TrkDistributedKalmanFilter/DistributedKalmanFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, DistributedKalmanFilter )
-DECLARE_FACTORY_ENTRIES(TrkDistributedKalmanFilter)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_TOOL(Trk, DistributedKalmanFilter)
-}
-
diff --git a/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_load.cxx b/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_load.cxx
deleted file mode 100755
index 8fbb22cecf2..00000000000
--- a/Tracking/TrkFitter/TrkDistributedKalmanFilter/src/components/TrkDistributedKalmanFilter_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkDistributedKalmanFilter)
diff --git a/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_entries.cxx b/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_entries.cxx
old mode 100755
new mode 100644
index 8d272ae1115..eecb8b97f27
--- a/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_entries.cxx
+++ b/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_entries.cxx
@@ -1,12 +1,4 @@
#include "TrkDynamicNoiseAdjustor/InDetDynamicNoiseAdjustment.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// using namespace Trk;
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, InDetDynamicNoiseAdjustment )
-DECLARE_FACTORY_ENTRIES(TrkDynamicNoiseAdjustor)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_TOOL(Trk, InDetDynamicNoiseAdjustment)
-}
-
diff --git a/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_load.cxx b/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_load.cxx
deleted file mode 100755
index 97ac9c9b8bd..00000000000
--- a/Tracking/TrkFitter/TrkDynamicNoiseAdjustor/src/components/TrkDynamicNoiseAdjustor_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkDynamicNoiseAdjustor)
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_entries.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_entries.cxx
old mode 100755
new mode 100644
index 167e7949702..cf3f661ad07
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_entries.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h"
#include "TrkGaussianSumFilter/MultiComponentStateModeCalculator.h"
#include "TrkGaussianSumFilter/MultiStateMaterialEffectsAdapter.h"
@@ -49,29 +47,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Trk, GsfExtrapolator )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, GsfSmoother )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, BremFind )
-DECLARE_FACTORY_ENTRIES( TrkGaussianSumFilter )
-{
- DECLARE_NAMESPACE_TOOL( Trk, QuickCloseComponentsMultiStateMerger )
- DECLARE_NAMESPACE_TOOL( Trk, MultiComponentStateModeCalculator )
- DECLARE_NAMESPACE_TOOL( Trk, MultiStateMaterialEffectsAdapter )
- DECLARE_NAMESPACE_TOOL( Trk, KullbackLeiblerComponentDistance )
- DECLARE_NAMESPACE_TOOL( Trk, CloseComponentsMultiStateMerger )
- DECLARE_NAMESPACE_TOOL( Trk, LargestWeightsMultiStateMerger )
- DECLARE_NAMESPACE_TOOL( Trk, GsfMaterialMixtureConvolution )
- DECLARE_NAMESPACE_TOOL( Trk, MahalanobisComponentDistance )
- DECLARE_NAMESPACE_TOOL( Trk, MultiComponentStateAssembler )
- DECLARE_NAMESPACE_TOOL( Trk, MultiComponentStateCombiner )
- DECLARE_NAMESPACE_TOOL( Trk, GsfCombinedMaterialEffects )
- DECLARE_NAMESPACE_TOOL( Trk, PosteriorWeightsCalculator )
- DECLARE_NAMESPACE_TOOL( Trk, GsfMaterialEffectsUpdator )
- DECLARE_NAMESPACE_TOOL( Trk, MultipleScatterUpdator )
- DECLARE_NAMESPACE_TOOL( Trk, GsfBetheHeitlerEffects )
- DECLARE_NAMESPACE_TOOL( Trk, GsfMeasurementUpdator )
- DECLARE_NAMESPACE_TOOL( Trk, GsfEnergyLossUpdator )
- DECLARE_NAMESPACE_TOOL( Trk, GaussianSumFitter )
- DECLARE_NAMESPACE_TOOL( Trk, ForwardGsfFitter )
- DECLARE_NAMESPACE_TOOL( Trk, GsfOutlierLogic )
- DECLARE_NAMESPACE_TOOL( Trk, GsfExtrapolator )
- DECLARE_NAMESPACE_TOOL( Trk, GsfSmoother )
- DECLARE_NAMESPACE_TOOL( Trk, BremFind )
-}
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_load.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_load.cxx
deleted file mode 100755
index 101cefe255a..00000000000
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkGaussianSumFilter )
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_entries.cxx b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_entries.cxx
old mode 100755
new mode 100644
index be8b4eab76c..304f2905745
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_entries.cxx
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_entries.cxx
@@ -1,12 +1,5 @@
#include "TrkGlobalChi2Fitter/GlobalChi2Fitter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Trk,GlobalChi2Fitter )
-DECLARE_FACTORY_ENTRIES(TrkGlobalChi2Fitter)
-{
-DECLARE_NAMESPACE_TOOL(Trk,GlobalChi2Fitter)
-
-
-}
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_load.cxx b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_load.cxx
deleted file mode 100755
index 3253723ff34..00000000000
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/components/TrkGlobalChi2Fitter_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkGlobalChi2Fitter)
-
diff --git a/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_entries.cxx b/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_entries.cxx
old mode 100755
new mode 100644
index 96c125e2bc8..2665d934301
--- a/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_entries.cxx
+++ b/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_entries.cxx
@@ -6,9 +6,6 @@
#include "TrkKalmanFitter/KalmanSmoother.h"
#include "TrkKalmanFitter/MeasRecalibSteeringTool.h"
#include "TrkKalmanFitter/KalmanPiecewiseAnnealingFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// using namespace Trk;
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, ForwardKalmanFitter )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, ForwardRefTrackKalmanFitter )
@@ -19,15 +16,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Trk, KalmanSmoother )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, MeasRecalibSteeringTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, KalmanPiecewiseAnnealingFilter )
-DECLARE_FACTORY_ENTRIES(TrkKalmanFitter)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_TOOL(Trk, ForwardKalmanFitter)
- DECLARE_NAMESPACE_TOOL(Trk, ForwardRefTrackKalmanFitter)
- DECLARE_NAMESPACE_TOOL(Trk, KalmanFitter)
- DECLARE_NAMESPACE_TOOL(Trk, KalmanOutlierLogic)
- DECLARE_NAMESPACE_TOOL(Trk, KalmanOutlierRecovery_InDet )
- DECLARE_NAMESPACE_TOOL(Trk, KalmanSmoother)
- DECLARE_NAMESPACE_TOOL(Trk, MeasRecalibSteeringTool )
- DECLARE_NAMESPACE_TOOL(Trk, KalmanPiecewiseAnnealingFilter )
-}
-
diff --git a/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_load.cxx b/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_load.cxx
deleted file mode 100755
index 44133426de9..00000000000
--- a/Tracking/TrkFitter/TrkKalmanFitter/src/components/TrkKalmanFitter_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkKalmanFitter)
diff --git a/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_entries.cxx b/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_entries.cxx
old mode 100755
new mode 100644
index 34f27c6ef0d..18d3e489bb0
--- a/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_entries.cxx
+++ b/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_entries.cxx
@@ -1,9 +1,5 @@
#include "TrkRefitAlg/ReFitTrack.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace Trk;
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, ReFitTrack )
-DECLARE_FACTORY_ENTRIES(TrkRefitAlg) {
- DECLARE_NAMESPACE_ALGORITHM( Trk, ReFitTrack)
-}
diff --git a/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_load.cxx b/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_load.cxx
deleted file mode 100755
index 6b7ff242a09..00000000000
--- a/Tracking/TrkFitter/TrkRefitAlg/src/components/TrkRefitAlg_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkRefitAlg)
-
-
diff --git a/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_entries.cxx b/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_entries.cxx
old mode 100755
new mode 100644
index cc06ed6e4b9..fb167b79995
--- a/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_entries.cxx
+++ b/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkiPatFitter/iPatGlobalFitter.h"
#include "TrkiPatFitter/MaterialAllocator.h"
@@ -6,9 +5,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Trk, iPatFitter )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, iPatGlobalFitter )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, MaterialAllocator )
-DECLARE_FACTORY_ENTRIES( TrkiPatFitter )
-{
- DECLARE_NAMESPACE_TOOL( Trk, iPatFitter )
- DECLARE_NAMESPACE_TOOL( Trk, iPatGlobalFitter )
- DECLARE_NAMESPACE_TOOL( Trk, MaterialAllocator )
-}
diff --git a/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_load.cxx b/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_load.cxx
deleted file mode 100755
index 233b41979d6..00000000000
--- a/Tracking/TrkFitter/TrkiPatFitter/src/components/TrkiPatFitter_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkiPatFitter )
-
diff --git a/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_entries.cxx b/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_entries.cxx
index bd0499f5f6f..539a677eb33 100644
--- a/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_entries.cxx
+++ b/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkG4UserActions/MaterialStepRecorderTool.h"
//#include "TrkG4UserActions/EnergyLossRecorderTool.h"
#include "TrkG4UserActions/GeantFollowerTool.h"
@@ -13,11 +12,3 @@ DECLARE_TOOL_FACTORY( G4UA::GeantFollowerTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk , GeantFollowerMSHelper )
DECLARE_TOOL_FACTORY( G4UA::GeantFollowerMSTool )
-DECLARE_FACTORY_ENTRIES( TrkG4UserActions ) {
- DECLARE_TOOL( G4UA::MaterialStepRecorderTool )
- // DECLARE_TOOL( G4UA::EnergyLossRecorderTool )
- DECLARE_TOOL( G4UA::GeantFollowerTool )
- DECLARE_NAMESPACE_TOOL( Trk , GeantFollowerHelper )
- DECLARE_TOOL( G4UA::GeantFollowerMSTool )
- DECLARE_NAMESPACE_TOOL( Trk , GeantFollowerMSHelper )
-}
diff --git a/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_load.cxx b/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_load.cxx
deleted file mode 100644
index 08acf4c16e3..00000000000
--- a/Tracking/TrkG4Components/TrkG4UserActions/src/components/TrkG4UserActions_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkG4UserActions )
-
-
-
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_entries.cxx b/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_entries.cxx
index 77898a886cb..dd0c514b2ba 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_entries.cxx
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../SimpleAmbiguityProcessorTool.h"
#include "../TrackSelectionProcessorTool.h"
#include "../TrackScoringTool.h"
@@ -12,14 +11,3 @@ DECLARE_TOOL_FACTORY(SimpleAmbiguityProcessorTool)
DECLARE_TOOL_FACTORY(TrackSelectionProcessorTool)
DECLARE_TOOL_FACTORY(TrackScoringTool)
-DECLARE_FACTORY_ENTRIES( TrkAmbiguityProcessor )
-{
- DECLARE_TOOL(DenseEnvironmentsAmbiguityProcessorTool)
- DECLARE_TOOL(SimpleAmbiguityProcessorTool)
- DECLARE_TOOL(TrackSelectionProcessorTool)
- DECLARE_TOOL(TrackScoringTool)
-}
-
-
-
-
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_load.cxx b/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_load.cxx
deleted file mode 100644
index 6cf3e063c81..00000000000
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/components/TrkAmbiguityProcessor_load.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-/***************************************************************************
- iPatRecAlgs
- -----------
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: TrkAmbiguityProcessor_load.cxx,v 1.1.1.1 2003-10-28 14:32:54 emoyse Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkAmbiguityProcessor )
-
-
-//LOAD_FACTORY_ENTRIES(AmbiTool )
diff --git a/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_entries.cxx b/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_entries.cxx
old mode 100755
new mode 100644
index 40ac54b3c57..83d53fce593
--- a/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_entries.cxx
+++ b/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_entries.cxx
@@ -1,13 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkAssociationTools/PRD_AssociationTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, PRD_AssociationTool )
-DECLARE_FACTORY_ENTRIES( TrkAssociationTools )
-{
- DECLARE_NAMESPACE_TOOL(Trk, PRD_AssociationTool)
-}
-
-
-
-
diff --git a/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_load.cxx b/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_load.cxx
deleted file mode 100755
index a804b08003c..00000000000
--- a/Tracking/TrkTools/TrkAssociationTools/src/components/TrkAssociationTools_load.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-/***************************************************************************
- iPatRecAlgs
- -----------
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: TrkAssociationTools_load.cxx,v 1.2 2005-06-22 13:41:58 emoyse Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkAssociationTools )
-
-
-//LOAD_FACTORY_ENTRIES(AmbiTool )
diff --git a/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_entries.cxx b/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_entries.cxx
old mode 100755
new mode 100644
index d3619273077..31ec20394e8
--- a/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_entries.cxx
+++ b/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_entries.cxx
@@ -1,10 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkCompetingRIOsOnTrackTool/CompetingRIOsOnTrackTool.h"
using namespace Trk;
DECLARE_TOOL_FACTORY(CompetingRIOsOnTrackTool)
-DECLARE_FACTORY_ENTRIES(TrkCompetingRIOsOnTrackTool) {
- DECLARE_TOOL(CompetingRIOsOnTrackTool)
-}
-
diff --git a/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_load.cxx b/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_load.cxx
deleted file mode 100755
index ffa1f2d74c4..00000000000
--- a/Tracking/TrkTools/TrkCompetingRIOsOnTrackTool/src/components/CompetingRIOsOnTrackTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkCompetingRIOsOnTrackTool)
diff --git a/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_entries.cxx b/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_entries.cxx
old mode 100755
new mode 100644
index 56846092ff4..c2805f211cb
--- a/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_entries.cxx
+++ b/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_entries.cxx
@@ -1,11 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkMaterialProvider/TrkMaterialProviderTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TrkMaterialProviderTool )
-DECLARE_FACTORY_ENTRIES( TrkMaterialProvider )
-{
- DECLARE_NAMESPACE_TOOL( Trk, TrkMaterialProviderTool )
-}
-
-
diff --git a/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_load.cxx b/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_load.cxx
deleted file mode 100755
index fb05d3fbd2b..00000000000
--- a/Tracking/TrkTools/TrkMaterialProvider/src/components/TrkMaterialProvider_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkMaterialProvider )
-
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_entries.cxx b/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_entries.cxx
old mode 100755
new mode 100644
index dfb5ac8d432..6fbabcbe743
--- a/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_entries.cxx
+++ b/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_entries.cxx
@@ -2,20 +2,9 @@
#include "TrkMeasurementUpdator/KalmanUpdatorSMatrix.h"
#include "TrkMeasurementUpdator/KalmanUpdatorAmg.h"
#include "TrkMeasurementUpdator/KalmanWeightUpdator.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// using namespace Trk;
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, KalmanUpdator )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, KalmanUpdatorSMatrix )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, KalmanUpdatorAmg )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, KalmanWeightUpdator )
-DECLARE_FACTORY_ENTRIES(TrkMeasurementUpdator)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_TOOL(Trk, KalmanUpdator)
- DECLARE_NAMESPACE_TOOL(Trk, KalmanUpdatorSMatrix)
- DECLARE_NAMESPACE_TOOL(Trk, KalmanUpdatorAmg)
- DECLARE_NAMESPACE_TOOL(Trk, KalmanWeightUpdator)
-}
-
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_load.cxx b/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_load.cxx
deleted file mode 100755
index 666c1bf4104..00000000000
--- a/Tracking/TrkTools/TrkMeasurementUpdator/src/components/TrkMeasurementUpdator_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkMeasurementUpdator)
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_entries.cxx b/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_entries.cxx
old mode 100755
new mode 100644
index bb7c2b6559b..444f33e468e
--- a/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_entries.cxx
+++ b/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_entries.cxx
@@ -1,12 +1,4 @@
#include "TrkMeasurementUpdator_xk/KalmanUpdator_xk.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-using namespace Trk;
-
-DECLARE_TOOL_FACTORY( KalmanUpdator_xk )
-
-DECLARE_FACTORY_ENTRIES( TrkMeasurementUpdator_xk )
-{
- DECLARE_TOOL( KalmanUpdator_xk )
-}
+DECLARE_TOOL_FACTORY( Trk::KalmanUpdator_xk )
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_load.cxx b/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_load.cxx
deleted file mode 100755
index 7aa07a96ca4..00000000000
--- a/Tracking/TrkTools/TrkMeasurementUpdator_xk/src/components/TrkMeasurementUpdator_xk_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkMeasurementUpdator_xk)
diff --git a/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_entries.cxx b/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_entries.cxx
old mode 100755
new mode 100644
index d1273081736..b5b4810e1d5
--- a/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_entries.cxx
+++ b/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkParticleCreator/TrackParticleCreatorTool.h"
using namespace Trk ;
@@ -6,7 +5,4 @@ using namespace Trk ;
DECLARE_TOOL_FACTORY( TrackParticleCreatorTool )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkParticleCreator )
-{
- DECLARE_TOOL( TrackParticleCreatorTool )
-}
+
diff --git a/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_load.cxx b/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_load.cxx
deleted file mode 100755
index 4d76054f934..00000000000
--- a/Tracking/TrkTools/TrkParticleCreator/src/components/TrkParticleCreator_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkParticleCreator )
diff --git a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_entries.cxx b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_entries.cxx
old mode 100755
new mode 100644
index 5174e7744ab..cf6abc6c7a0
--- a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_entries.cxx
+++ b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_entries.cxx
@@ -1,14 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkRIO_OnTrackCreator/RIO_OnTrackCreator.h"
#include "TrkRIO_OnTrackCreator/RIO_OnTrackErrorScalingTool.h"
-// using namespace Trk;
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, RIO_OnTrackCreator )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, RIO_OnTrackErrorScalingTool )
-DECLARE_FACTORY_ENTRIES(TrkRIO_OnTrackCreator)
-{ // in this package name the following methods are registered
- DECLARE_NAMESPACE_TOOL(Trk, RIO_OnTrackCreator)
- DECLARE_NAMESPACE_TOOL(Trk, RIO_OnTrackErrorScalingTool)
-}
-
diff --git a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_load.cxx b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_load.cxx
deleted file mode 100755
index 3f1ad1ea8ac..00000000000
--- a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/components/TrkRIO_OnTrackCreator_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkRIO_OnTrackCreator)
diff --git a/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_entries.cxx b/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_entries.cxx
index 315b94c3db3..7b9a2f1c667 100644
--- a/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_entries.cxx
+++ b/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../ResidualPullCalculator.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, ResidualPullCalculator )
-DECLARE_FACTORY_ENTRIES( TrkResidualPullCalculator )
-{
- DECLARE_NAMESPACE_TOOL( Trk, ResidualPullCalculator )
-}
-
diff --git a/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_load.cxx b/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_load.cxx
deleted file mode 100644
index 29f40227ec8..00000000000
--- a/Tracking/TrkTools/TrkResidualPullCalculator/src/components/TrkResidualPullCalculator_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkResidualPullCalculator )
-
diff --git a/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_entries.cxx b/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_entries.cxx
old mode 100755
new mode 100644
index ccaf93515fe..008baab5bfa
--- a/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_entries.cxx
+++ b/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_entries.cxx
@@ -1,11 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkSegmentConverter/TrkSegmentConverter.h"
using namespace Trk;
DECLARE_TOOL_FACTORY( TrkSegmentConverter )
-DECLARE_FACTORY_ENTRIES( TrkSegmentConverter )
-{
- DECLARE_TOOL( TrkSegmentConverter )
-}
-
diff --git a/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_load.cxx b/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_load.cxx
deleted file mode 100755
index cd30fa8dcc0..00000000000
--- a/Tracking/TrkTools/TrkSegmentConverter/src/components/TrkSegmentConverter_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkSegmentConverter )
-
diff --git a/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_entries.cxx b/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_entries.cxx
old mode 100755
new mode 100644
index 9ae284f2904..d0e2fafd9f9
--- a/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_entries.cxx
+++ b/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../FieldIntegralByTrackQueryTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, FieldIntegralByTrackQueryTool )
-DECLARE_FACTORY_ENTRIES( TrkTrackFieldIntegralTools )
-{
- DECLARE_NAMESPACE_TOOL( Trk, FieldIntegralByTrackQueryTool )
-}
-
diff --git a/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_load.cxx b/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_load.cxx
deleted file mode 100755
index 9f800b59e0a..00000000000
--- a/Tracking/TrkTools/TrkTrackFieldIntegralTools/src/components/TrkTrackFieldIntegralTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrackFieldIntegralTools )
-
diff --git a/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_entries.cxx b/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_entries.cxx
old mode 100755
new mode 100644
index 95b9b6dd326..fdde26c7319
--- a/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_entries.cxx
+++ b/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkTrackSlimmingTool/TrackSlimmingTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TrackSlimmingTool )
-DECLARE_FACTORY_ENTRIES( TrkTrackSlimmingTool )
-{
- DECLARE_NAMESPACE_TOOL( Trk, TrackSlimmingTool )
-}
-
diff --git a/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_load.cxx b/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_load.cxx
deleted file mode 100755
index 7da38cb32e5..00000000000
--- a/Tracking/TrkTools/TrkTrackSlimmingTool/src/components/TrkTrackSlimmingTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrackSlimmingTool )
-
diff --git a/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_entries.cxx b/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_entries.cxx
old mode 100755
new mode 100644
index 98e9b7093ea..deface7ef93
--- a/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_entries.cxx
+++ b/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_entries.cxx
@@ -1,16 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkTrackSummaryTool/TrackSummaryTool.h"
using namespace Trk;
DECLARE_TOOL_FACTORY( TrackSummaryTool )
-DECLARE_FACTORY_ENTRIES( TrkTrackSummaryTool )
-{
- DECLARE_TOOL( TrackSummaryTool )
-}
-
-
-
-
diff --git a/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_load.cxx b/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_load.cxx
deleted file mode 100755
index 794a9a546cc..00000000000
--- a/Tracking/TrkTools/TrkTrackSummaryTool/src/components/TrkTrackSummaryTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrackSummaryTool )
-
diff --git a/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_entries.cxx b/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_entries.cxx
old mode 100755
new mode 100644
index 38a0604633e..e5f7101900e
--- a/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_entries.cxx
+++ b/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkTruthCreatorTools/DetailedTrackTruthBuilder.h"
#include "TrkTruthCreatorTools/ElasticTruthTrajectoryBuilder.h"
#include "TrkTruthCreatorTools/DecayInFlyTruthTrajectoryBuilder.h"
@@ -11,11 +10,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Trk, DecayInFlyTruthTrajectoryBuilder )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TruthMatchRatio )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TruthMatchTanimoto )
-DECLARE_FACTORY_ENTRIES( TrkTruthCreatorTools )
-{
- DECLARE_NAMESPACE_TOOL( Trk, DetailedTrackTruthBuilder )
- DECLARE_NAMESPACE_TOOL( Trk, ElasticTruthTrajectoryBuilder )
- DECLARE_NAMESPACE_TOOL( Trk, DecayInFlyTruthTrajectoryBuilder )
- DECLARE_NAMESPACE_TOOL( Trk, TruthMatchRatio )
- DECLARE_NAMESPACE_TOOL( Trk, TruthMatchTanimoto )
-}
diff --git a/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_load.cxx b/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_load.cxx
deleted file mode 100755
index f75ddd648e0..00000000000
--- a/Tracking/TrkTools/TrkTruthCreatorTools/src/components/TrkTruthTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTruthCreatorTools )
-
diff --git a/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_entries.cxx b/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_entries.cxx
old mode 100755
new mode 100644
index d4e92baae23..b9f2eb31c54
--- a/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_entries.cxx
+++ b/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#define TRUTHTOTRACK_IMP
#include "TrkTruthToTrack/TruthToTrack.h"
#include "TrkTruthToTrack/TruthTrackRecordToTrack.h"
@@ -7,7 +5,3 @@
DECLARE_NAMESPACE_TOOL_FACTORY(Trk, TruthToTrack)
DECLARE_NAMESPACE_TOOL_FACTORY(Trk, TruthTrackRecordToTrack)
-DECLARE_FACTORY_ENTRIES(TrkTruthToTrack) {
- DECLARE_NAMESPACE_TOOL(Trk, TruthToTrack)
- DECLARE_NAMESPACE_TOOL(Trk, TruthTrackRecordToTrack)
-}
diff --git a/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_load.cxx b/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_load.cxx
deleted file mode 100755
index 109b8cbdcf7..00000000000
--- a/Tracking/TrkTools/TrkTruthToTrack/src/components/TrkTruthToTrack_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkTruthToTrack)
diff --git a/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_entries.cxx b/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_entries.cxx
index 91b0aa4ce73..2d218054ae7 100644
--- a/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_entries.cxx
+++ b/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../TruthTrackCreation.h"
using namespace Trk;
@@ -7,7 +5,4 @@ using namespace Trk;
DECLARE_ALGORITHM_FACTORY(TruthTrackCreation)
-DECLARE_FACTORY_ENTRIES(TrkTruthTrackAlgs)
-{
- DECLARE_ALGORITHM(TruthTrackCreation)
-}
+
diff --git a/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_load.cxx b/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_load.cxx
deleted file mode 100644
index 7b49af0aad2..00000000000
--- a/Tracking/TrkTruthTracks/TrkTruthTrackAlgs/src/components/TrkTruthTrackAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkTruthTrackAlgs)
diff --git a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_entries.cxx b/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_entries.cxx
index 5f8eb897f09..e335bd87cf7 100644
--- a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_entries.cxx
+++ b/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../TruthTrackBuilder.h"
#include "../PRD_TruthTrajectoryBuilder.h"
@@ -7,8 +5,4 @@
DECLARE_NAMESPACE_TOOL_FACTORY(Trk,TruthTrackBuilder)
DECLARE_NAMESPACE_TOOL_FACTORY(Trk,PRD_TruthTrajectoryBuilder)
-DECLARE_FACTORY_ENTRIES(TrkTruthTrackTools)
-{
- DECLARE_NAMESPACE_TOOL(Trk,TruthTrackBuilder)
- DECLARE_NAMESPACE_TOOL(Trk,PRD_TruthTrajectoryBuilder)
-}
+
diff --git a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_load.cxx b/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_load.cxx
deleted file mode 100644
index 025a7d5b6b6..00000000000
--- a/Tracking/TrkTruthTracks/TrkTruthTrackTools/src/components/TrkTruthTrackTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkTruthTrackTools)
diff --git a/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_entries.cxx b/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_entries.cxx
old mode 100755
new mode 100644
index 85fb5b6ad7f..535ed4dee16
--- a/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_entries.cxx
+++ b/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkNeuralNetworkUtils/NeuralNetworkToHistoTool.h"
using namespace Trk ;
@@ -6,7 +5,4 @@ using namespace Trk ;
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, NeuralNetworkToHistoTool )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkNeuralNetworkUtils )
-{
- DECLARE_NAMESPACE_TOOL( Trk, NeuralNetworkToHistoTool );
-}
+
diff --git a/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_load.cxx b/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_load.cxx
deleted file mode 100755
index a9cd18a521c..00000000000
--- a/Tracking/TrkUtilityPackages/TrkNeuralNetworkUtils/src/components/TrkNeuralNetworkUtils_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkNeuralNetworkUtils )
-
-
diff --git a/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_entries.cxx b/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_entries.cxx
index 633e0ad2f71..d7fc0a34fb6 100644
--- a/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_entries.cxx
+++ b/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_entries.cxx
@@ -1,6 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-
#include "TrkValAlgs/EventDataModelMonitor.h"
#include "TrkValAlgs/TrackValidationNtupleWriter.h"
//#include "TrkValAlgs/RecMomentumQualityValidation.h"
@@ -13,12 +10,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, SingleTrackDiffAlg )
//DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, MaterialOnTrackValidation )
//DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, RecMomentumQualityValidation )
-DECLARE_FACTORY_ENTRIES( TrkValAlgs )
-{
- // DECLARE_NAMESPACE_ALGORITHM( Trk, EventDataModelMonitor )
- DECLARE_NAMESPACE_ALGORITHM( Trk, TrackValidationNtupleWriter )
- DECLARE_NAMESPACE_ALGORITHM( Trk, SingleTrackDiffAlg )
- // DECLARE_NAMESPACE_ALGORITHM( Trk, MaterialOnTrackValidation )
- // DECLARE_NAMESPACE_ALGORITHM( Trk, RecMomentumQualityValidation )
-
-}
diff --git a/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_load.cxx b/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_load.cxx
deleted file mode 100644
index 9c7cc7b3f0f..00000000000
--- a/Tracking/TrkValidation/TrkValAlgs/src/components/TrkValAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkValAlgs )
diff --git a/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_entries.cxx b/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_entries.cxx
old mode 100755
new mode 100644
index 15293e83347..d6119e59880
--- a/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_entries.cxx
+++ b/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_entries.cxx
@@ -21,9 +21,6 @@
#include "TrkValTools/EventPropertyNtupleTool.h"
#include "TrkValTools/EventToTrackLinkNtupleTool.h"
#include "TrkValTools/TrkObserverTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// using namespace Trk;
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, BasicValTrkParticleNtupleTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TrackInformationNtupleTool )
@@ -49,30 +46,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Trk, EventPropertyNtupleTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, EventToTrackLinkNtupleTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TrkObserverTool )
-DECLARE_FACTORY_ENTRIES(TrkValTools)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_TOOL(Trk, BasicValTrkParticleNtupleTool)
- DECLARE_NAMESPACE_TOOL(Trk, TrackInformationNtupleTool)
- DECLARE_NAMESPACE_TOOL(Trk, PerigeeParametersNtupleTool)
- DECLARE_NAMESPACE_TOOL(Trk, MeasurementVectorNtupleTool)
- DECLARE_NAMESPACE_TOOL(Trk, TrackSummaryNtupleTool)
- DECLARE_NAMESPACE_TOOL(Trk, DirectTrackNtupleWriterTool)
- DECLARE_NAMESPACE_TOOL(Trk, ResidualValidationNtupleHelper)
- DECLARE_NAMESPACE_TOOL(Trk, HitPositionNtupleHelper)
- DECLARE_NAMESPACE_TOOL(Trk, TrackPositionNtupleHelper)
- DECLARE_NAMESPACE_TOOL(Trk, DAF_ValidationNtupleHelper)
- DECLARE_NAMESPACE_TOOL(Trk, EnergyLossMonitor)
- DECLARE_NAMESPACE_TOOL(Trk, PositionMomentumWriter)
- DECLARE_NAMESPACE_TOOL(Trk, TrackDiff)
- DECLARE_NAMESPACE_TOOL(Trk, PrimaryTruthClassifier )
- DECLARE_NAMESPACE_TOOL(Trk, InDetReconstructableSelector )
- DECLARE_NAMESPACE_TOOL(Trk, InDetHaloSelector )
- DECLARE_NAMESPACE_TOOL(Trk, InDetPrimaryConversionSelector )
- DECLARE_NAMESPACE_TOOL(Trk, TruthNtupleTool )
- DECLARE_NAMESPACE_TOOL(Trk, GenParticleJetFinder )
- DECLARE_NAMESPACE_TOOL(Trk, JetTruthNtupleTool )
- DECLARE_NAMESPACE_TOOL(Trk, EventPropertyNtupleTool )
- DECLARE_NAMESPACE_TOOL(Trk, EventToTrackLinkNtupleTool )
- DECLARE_NAMESPACE_TOOL(Trk, TrkObserverTool)
-}
-
diff --git a/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_load.cxx b/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_load.cxx
deleted file mode 100755
index fe5f1b25ee0..00000000000
--- a/Tracking/TrkValidation/TrkValTools/src/components/TrkValTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkValTools)
diff --git a/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_entries.cxx b/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_entries.cxx
old mode 100755
new mode 100644
index 121557da2af..12490cb0102
--- a/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_entries.cxx
+++ b/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_entries.cxx
@@ -1,17 +1,8 @@
#include "TrkVertexFitterValidationTools/BasicVtxValidationNtupleTool.h"
#include "TrkVertexFitterValidationTools/TrueTracksNtupleTool.h"
#include "TrkVertexFitterValidationTools/McEventNtupleTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// using namespace Trk;
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, BasicVtxValidationNtupleTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TrueTracksNtupleTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Trk, McEventNtupleTool )
-DECLARE_FACTORY_ENTRIES(TrkVertexFitterValidationTools)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_TOOL(Trk, BasicVtxValidationNtupleTool)
- DECLARE_NAMESPACE_TOOL(Trk, TrueTracksNtupleTool)
- DECLARE_NAMESPACE_TOOL(Trk, McEventNtupleTool)
-}
diff --git a/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_load.cxx b/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_load.cxx
deleted file mode 100755
index 8c5f36a1bd3..00000000000
--- a/Tracking/TrkValidation/TrkVertexFitterValidationTools/src/components/TrkVertexFitterValidationTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkVertexFitterValidationTools)
diff --git a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_entries.cxx b/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_entries.cxx
old mode 100755
new mode 100644
index 8e5abdc534d..ba71ec43d0a
--- a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_entries.cxx
+++ b/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkVertexFitterValidationUtils/TrkPriVxPurityTool.h"
#include "TrkVertexFitterValidationUtils/TrkPriVxPurity.h"
@@ -6,7 +5,3 @@ using namespace Trk;
DECLARE_TOOL_FACTORY( TrkPriVxPurityTool )
-DECLARE_FACTORY_ENTRIES( TrkVertexFitterValidationUtils )
-{
- DECLARE_TOOL( TrkPriVxPurityTool );
-}
diff --git a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_load.cxx b/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_load.cxx
deleted file mode 100755
index 48c0b4627b3..00000000000
--- a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/src/components/TrkVertexFitterValidationUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexFitterValidationUtils )
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_entries.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_entries.cxx
old mode 100755
new mode 100644
index 342deb46d7c..5854f176bff
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkJetVxFitter/JetFitterHelper.h"
#include "TrkJetVxFitter/JetFitterInitializationHelper.h"
#include "TrkJetVxFitter/JetFitterRoutines.h"
@@ -17,14 +16,3 @@ DECLARE_TOOL_FACTORY( KalmanVertexOnJetAxisUpdator )
DECLARE_TOOL_FACTORY( TrkDistanceFinderNeutralCharged )
DECLARE_TOOL_FACTORY( TrkDistanceFinderNeutralNeutral )
-
-DECLARE_FACTORY_ENTRIES( TrkJetVxFitter )
-{
- DECLARE_TOOL( JetFitterHelper )
- DECLARE_TOOL( JetFitterInitializationHelper )
- DECLARE_TOOL( JetFitterRoutines )
- DECLARE_TOOL( KalmanVertexOnJetAxisSmoother )
- DECLARE_TOOL( KalmanVertexOnJetAxisUpdator )
- DECLARE_TOOL( TrkDistanceFinderNeutralCharged )
- DECLARE_TOOL( TrkDistanceFinderNeutralNeutral )
-}
diff --git a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_load.cxx b/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_load.cxx
deleted file mode 100755
index 2ed7b08dd17..00000000000
--- a/Tracking/TrkVertexFitter/TrkJetVxFitter/src/components/TrkJetVxFitter_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkJetVxFitter )
diff --git a/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_entries.cxx b/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_entries.cxx
old mode 100755
new mode 100644
index dd71bf7d924..3ffbd7bffae
--- a/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkV0Fitter/TrkV0VertexFitter.h"
using namespace Trk ;
@@ -6,7 +5,4 @@ using namespace Trk ;
DECLARE_TOOL_FACTORY( TrkV0VertexFitter )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkV0Fitter )
-{
- DECLARE_TOOL( TrkV0VertexFitter )
-}
+
diff --git a/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_load.cxx b/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_load.cxx
deleted file mode 100755
index 1a8bacc9287..00000000000
--- a/Tracking/TrkVertexFitter/TrkV0Fitter/src/components/TrkV0Fitter_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkV0Fitter )
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_entries.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_entries.cxx
old mode 100755
new mode 100644
index ca68fa807d9..3d4e4abf9cb
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_entries.cxx
@@ -1,19 +1,4 @@
#include "TrkVKalVrtFitter/TrkVKalVrtFitter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-using namespace Trk;
+DECLARE_TOOL_FACTORY( Trk::TrkVKalVrtFitter )
-DECLARE_TOOL_FACTORY( TrkVKalVrtFitter )
-DECLARE_FACTORY_ENTRIES(TrkVKalVrtFitter) {
- DECLARE_TOOL( TrkVKalVrtFitter )
-}
-//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/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_load.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_load.cxx
deleted file mode 100755
index 3c02b88f975..00000000000
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/components/TrkVKalVrtFitter_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(TrkVKalVrtFitter)
- //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/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_entries.cxx
old mode 100755
new mode 100644
index 5ae5e3489e5..b9b3a2538cd
--- a/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkVertexAnalysisUtils/V0Tools.h"
using namespace Trk;
DECLARE_TOOL_FACTORY( V0Tools )
-DECLARE_FACTORY_ENTRIES( TrkVertexAnalysisUtils )
-{
- DECLARE_TOOL( V0Tools );
-}
diff --git a/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_load.cxx b/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_load.cxx
deleted file mode 100755
index 761c5b8620d..00000000000
--- a/Tracking/TrkVertexFitter/TrkVertexAnalysisUtils/src/components/TrkVertexAnalysisUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexAnalysisUtils )
diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_entries.cxx
old mode 100755
new mode 100644
index 116ccaf8e3a..c3d19a0b5de
--- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkVertexBilloirTools/FastVertexFitter.h"
#include "TrkVertexBilloirTools/FullVertexFitter.h"
@@ -8,8 +7,4 @@ DECLARE_TOOL_FACTORY( FastVertexFitter )
DECLARE_TOOL_FACTORY( FullVertexFitter )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkVertexBilloirTools )
-{
- DECLARE_TOOL( FastVertexFitter )
- DECLARE_TOOL( FullVertexFitter )
-}
+
diff --git a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_load.cxx b/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_load.cxx
deleted file mode 100755
index 09d49bce8a5..00000000000
--- a/Tracking/TrkVertexFitter/TrkVertexBilloirTools/src/components/TrkVertexBilloirTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexBilloirTools )
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_entries.cxx
old mode 100755
new mode 100644
index ed5884b03b3..06786b6a9ea
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkVertexFitterUtils/KalmanVertexUpdator.h"
#include "TrkVertexFitterUtils/KalmanVertexTrackUpdator.h"
#include "TrkVertexFitterUtils/FullLinearizedTrackFactory.h"
@@ -24,17 +23,3 @@ DECLARE_TOOL_FACTORY( NeutralParticleParameterCalculator)
DECLARE_TOOL_FACTORY( TrackToVertexIPEstimator )
DECLARE_TOOL_FACTORY( Z0PVTrackCompatibilityEstimator )
-DECLARE_FACTORY_ENTRIES( TrkVertexFitterUtils )
-{
- DECLARE_TOOL( KalmanVertexUpdator );
- DECLARE_TOOL( KalmanVertexTrackUpdator );
- DECLARE_TOOL( FullLinearizedTrackFactory );
- DECLARE_TOOL( DummyAnnealingMaker );
- DECLARE_TOOL( Chi2TrackCompatibilityEstimator );
- DECLARE_TOOL( DetAnnealingMaker );
- DECLARE_TOOL( ImpactPoint3dEstimator );
- DECLARE_TOOL( NeutralParticleParameterCalculator );
- DECLARE_TOOL( TrackToVertexIPEstimator );
- DECLARE_TOOL( Z0PVTrackCompatibilityEstimator );
-}
-
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_load.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_load.cxx
deleted file mode 100755
index 57e39d3db67..00000000000
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/components/TrkVertexFitterUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexFitterUtils )
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_entries.cxx
old mode 100755
new mode 100644
index bcbdbe09eeb..0b0362c8258
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkVertexFitters/SequentialVertexFitter.h"
#include "TrkVertexFitters/AdaptiveMultiVertexFitter.h"
#include "TrkVertexFitters/AdaptiveVertexFitter.h"
@@ -13,11 +12,3 @@ DECLARE_TOOL_FACTORY( SequentialVertexSmoother )
DECLARE_TOOL_FACTORY( AdaptiveVertexFitter )
DECLARE_TOOL_FACTORY( DummyVertexSmoother)
-DECLARE_FACTORY_ENTRIES( TrkVertexFitters )
-{
- DECLARE_TOOL( AdaptiveMultiVertexFitter );
- DECLARE_TOOL(SequentialVertexFitter);
- DECLARE_TOOL(SequentialVertexSmoother);
- DECLARE_TOOL( AdaptiveVertexFitter );
- DECLARE_TOOL(DummyVertexSmoother );
-}
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_load.cxx b/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_load.cxx
deleted file mode 100755
index e0f2e3b2adf..00000000000
--- a/Tracking/TrkVertexFitter/TrkVertexFitters/src/components/TrkVertexFitters_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexFitters )
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_entries.cxx
old mode 100755
new mode 100644
index 245940b2897..7e5ddee5d8f
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkVertexSeedFinderTools/MCTrueSeedFinder.h"
#include "TrkVertexSeedFinderTools/CrossDistancesSeedFinder.h"
#include "TrkVertexSeedFinderTools/DummySeedFinder.h"
@@ -13,11 +12,3 @@ DECLARE_TOOL_FACTORY ( DummySeedFinder )
DECLARE_TOOL_FACTORY ( ZScanSeedFinder )
DECLARE_TOOL_FACTORY ( ImagingSeedFinder )
-DECLARE_FACTORY_ENTRIES( TrkVertexSeedFinderTools )
-{
- DECLARE_TOOL( MCTrueSeedFinder );
- DECLARE_TOOL( CrossDistancesSeedFinder );
- DECLARE_TOOL( DummySeedFinder );
- DECLARE_TOOL( ZScanSeedFinder );
- DECLARE_TOOL( ImagingSeedFinder );
-}
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_load.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_load.cxx
deleted file mode 100755
index ca18e214a03..00000000000
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderTools/src/components/TrkVertexSeedFinderTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexSeedFinderTools )
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_entries.cxx
index ce00885a25e..940def81a84 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkVertexSeedFinderUtils/Trk2dDistanceSeeder.h"
#include "TrkVertexSeedFinderUtils/NewtonTrkDistanceFinder.h"
#include "TrkVertexSeedFinderUtils/FsmwMode1dFinder.h"
@@ -25,17 +24,3 @@ DECLARE_ALGORITHM_FACTORY( ImagingSeedTuningAlg )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkVertexSeedFinderUtils )
-{
- DECLARE_ALGORITHM( ImagingSeedTuningAlg );
-
- DECLARE_TOOL( Trk2dDistanceSeeder );
- DECLARE_TOOL( NewtonTrkDistanceFinder );
- DECLARE_TOOL( Mode3dTo1dFinder );
- DECLARE_TOOL( SeedNewtonTrkDistanceFinder );
- DECLARE_TOOL( FsmwMode1dFinder );
- DECLARE_TOOL( Trk2DDistanceFinderpwd );
- DECLARE_TOOL( SimpleVertexClusterFinder );
- DECLARE_TOOL( LocalMax1DClusterFinder );
- DECLARE_TOOL( VertexImageMaker );
-}
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_load.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_load.cxx
deleted file mode 100644
index 68db438fc61..00000000000
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/components/TrkVertexSeedFinderUtils_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVertexSeedFinderUtils )
-
-
-
diff --git a/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_entries.cxx
index bf4c522959c..6a2ebcdf86e 100644
--- a/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_entries.cxx
@@ -1,6 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TrkVertexTools/VertexCollectionSortingTool.h"
#include "TrkVertexTools/VertexMergingTool.h"
#include "TrkVertexTools/DummyVertexSelectionTool.h"
@@ -15,14 +12,7 @@ DECLARE_TOOL_FACTORY(DummyVertexSelectionTool)
DECLARE_TOOL_FACTORY(TruthVertexSelectionTool)
DECLARE_TOOL_FACTORY(VertexStoringTool)
-DECLARE_FACTORY_ENTRIES(TrkVertexTools)
-{
- DECLARE_TOOL(VertexCollectionSortingTool)
- DECLARE_TOOL(VertexMergingTool)
- DECLARE_TOOL(DummyVertexSelectionTool)
- DECLARE_TOOL(TruthVertexSelectionTool)
- DECLARE_TOOL(VertexStoringTool)
-}
+
diff --git a/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_load.cxx b/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_load.cxx
deleted file mode 100644
index 55b0bb61776..00000000000
--- a/Tracking/TrkVertexFitter/TrkVertexTools/src/components/TrkVertexTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
-
- LOAD_FACTORY_ENTRIES(TrkVertexTools)
diff --git a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_entries.cxx b/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_entries.cxx
index c928f11f643..54980403b10 100644
--- a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_entries.cxx
@@ -1,6 +1,3 @@
-
- #include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TrkVertexWeightCalculators/SumPtVertexWeightCalculator.h"
#include "TrkVertexWeightCalculators/VxProbVertexWeightCalculator.h"
#include "TrkVertexWeightCalculators/NNVertexWeightCalculator.h"
@@ -14,14 +11,3 @@
DECLARE_TOOL_FACTORY(NNVertexWeightCalculator )
DECLARE_TOOL_FACTORY(TrueVertexDistanceWeightCalculator)
- DECLARE_FACTORY_ENTRIES( TrkVertexWeightCalculators )
- {
- DECLARE_TOOL(SumPtVertexWeightCalculator)
- DECLARE_TOOL(VxProbVertexWeightCalculator)
- DECLARE_TOOL(NNVertexWeightCalculator)
- DECLARE_TOOL(TrueVertexDistanceWeightCalculator)
-
- }
-
-
-
diff --git a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_load.cxx b/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_load.cxx
deleted file mode 100644
index db83f06e01e..00000000000
--- a/Tracking/TrkVertexFitter/TrkVertexWeightCalculators/src/components/TrkVertexWeightCalculators_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
-
- LOAD_FACTORY_ENTRIES( TrkVertexWeightCalculators )
diff --git a/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_entries.cxx b/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_entries.cxx
index 9ae46297fc2..44954daaf54 100644
--- a/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_entries.cxx
+++ b/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkVxEdmCnv/VxCandidateXAODVertex.h"
using namespace Trk;
DECLARE_TOOL_FACTORY( VxCandidateXAODVertex )
-DECLARE_FACTORY_ENTRIES( TrkVxEdmCnv )
-{
- DECLARE_TOOL( VxCandidateXAODVertex )
-}
diff --git a/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_load.cxx b/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_load.cxx
deleted file mode 100644
index 8c92336f18f..00000000000
--- a/Tracking/TrkVertexFitter/TrkVxEdmCnv/src/components/TrkVxEdmCnv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkVxEdmCnv )
--
GitLab