From b9b838eeb7ab24a0c1e6294141330e7e1a3697a8 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 27 Oct 2017 13:14:48 +0200
Subject: [PATCH] Remove obsolete factory entries for components in
MuonSpectrometer
- 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.
---
.../AmdcsimrecAthenaSvc_entries.cxx | 5 ----
.../components/AmdcsimrecAthenaSvc_load.cxx | 4 ---
.../AmdcDb/src/components/AmdcDb_entries.cxx | 5 ----
.../AmdcDb/src/components/AmdcDb_load.cxx | 4 ---
.../src/components/AmdcMGM_entries.cxx | 5 ----
.../AmdcMGM/src/components/AmdcMGM_load.cxx | 4 ---
.../src/components/AmdcOracle_entries.cxx | 5 ----
.../src/components/AmdcOracle_load.cxx | 4 ---
.../src/components/MSVertexReco_entries.cxx | 6 -----
.../src/components/MSVertexReco_load.cxx | 3 ---
.../src/components/MSVertexTools_entries.cxx | 11 --------
.../src/components/MSVertexTools_load.cxx | 5 ----
.../components/MuonAlignErrorTool_entries.cxx | 5 ----
.../components/MuonAlignErrorTool_load.cxx | 3 ---
.../components/MuonAlignGenTools_entries.cxx | 20 ---------------
.../src/components/MuonAlignGenTools_load.cxx | 3 ---
.../src/components/CSCcabling_entries.cxx | 4 ---
.../src/components/CSCcabling_load.cxx | 4 ---
.../components/MuonCablingServers_entries.cxx | 6 -----
.../components/MuonCablingServers_load.cxx | 5 ----
.../components/MuonMDT_Cabling_entries.cxx | 8 ------
.../src/components/MuonMDT_Cabling_load.cxx | 4 ---
.../components/MuonRPC_Cabling_entries.cxx | 7 ------
.../src/components/MuonRPC_Cabling_load.cxx | 7 ------
.../components/MuonTGC_Cabling_entries.cxx | 4 ---
.../src/components/MuonTGC_Cabling_load.cxx | 4 ---
.../RPCcablingInterface_entries.cxx | 1 -
.../components/RPCcablingInterface_load.cxx | 3 ---
.../src/components/TGCcabling_entries.cxx | 4 ---
.../src/components/TGCcabling_load.cxx | 5 ----
.../TGCcablingInterface_entries.cxx | 2 +-
.../components/TGCcablingInterface_load.cxx | 3 ---
.../src/components/CscCalibAlgs_entries.cxx | 8 +-----
.../src/components/CscCalibAlgs_load.cxx | 3 ---
.../src/components/CscCalib_entries.cxx | 5 ----
.../src/components/CscCalib_load.cxx | 6 -----
.../MdtCalibDbAsciiTool_entries.cxx | 4 ---
.../components/MdtCalibDbAsciiTool_load.cxx | 3 ---
.../MdtCalibDbCoolStrTool_entries.cxx | 4 ---
.../components/MdtCalibDbCoolStrTool_load.cxx | 3 ---
.../src/components/MdtCalibSvc_entries.cxx | 7 ------
.../src/components/MdtCalibSvc_load.cxx | 3 ---
.../src/components/MdtCalibTools_entries.cxx | 11 --------
.../src/components/MdtCalibTools_load.cxx | 3 ---
.../components/MdtValidationAlg_entries.cxx | 5 +---
.../src/components/MdtValidationAlg_load.cxx | 3 ---
.../src/components/MuonCalibAlgs_entries.cxx | 4 ---
.../src/components/MuonCalibAlgs_load.cxx | 3 ---
.../MuonCalibDbOperations_entries.cxx | 9 -------
.../components/MuonCalibDbOperations_load.cxx | 3 ---
.../MuonCalibExtraTreeAlg_entries.cxx | 8 ------
.../components/MuonCalibExtraTreeAlg_load.cxx | 3 ---
.../components/MuonCalibPatRec_entries.cxx | 5 ----
.../src/components/MuonCalibPatRec_load.cxx | 3 ---
.../CalibNtupleAnalysisAlg_entries.cxx | 25 -------------------
.../CalibNtupleAnalysisAlg_load.cxx | 3 ---
.../src/components/MdtCalibIOSvc_entries.cxx | 8 ------
.../src/components/MdtCalibIOSvc_load.cxx | 3 ---
.../MuonCalibStandAloneBase_entries.cxx | 7 ------
.../MuonCalibStandAloneBase_load.cxx | 3 ---
.../MuonCalibStandAloneExtraTools_entries.cxx | 11 --------
.../MuonCalibStandAloneExtraTools_load.cxx | 3 ---
.../MuonCalibStandAloneTools_entries.cxx | 21 ----------------
.../MuonCalibStandAloneTools_load.cxx | 3 ---
.../src/components/MuonCalibTools_entries.cxx | 7 ------
.../src/components/MuonCalibTools_load.cxx | 3 ---
.../src/components/RpcCalibTools_entries.cxx | 7 ------
.../src/components/RpcCalibTools_load.cxx | 2 --
.../src/components/MuonByteStream_entries.cxx | 11 --------
.../src/components/MuonByteStream_load.cxx | 4 ---
.../MuonByteStreamCnvTest_entries.cxx | 19 --------------
.../components/MuonByteStreamCnvTest_load.cxx | 4 ---
.../components/MuonCSC_CnvTools_entries.cxx | 11 --------
.../src/components/MuonCSC_CnvTools_load.cxx | 5 ----
.../components/MuonEventCnvTools_entries.cxx | 10 --------
.../src/components/MuonEventCnvTools_load.cxx | 5 ----
.../MuonIdCnv/src/MuonIdCnv_entries.cxx | 19 --------------
.../MuonCnv/MuonIdCnv/src/MuonIdCnv_load.cxx | 9 -------
.../src/components/MuonJiveXML_entries.cxx | 13 ----------
.../src/components/MuonJiveXML_load.cxx | 3 ---
.../components/MuonMDT_CnvTools_entries.cxx | 10 --------
.../src/components/MuonMDT_CnvTools_load.cxx | 5 ----
.../components/MuonPrdSelector_entries.cxx | 7 ------
.../src/components/MuonPrdSelector_load.cxx | 3 ---
.../MuonPrepRawDataProviderTools_entries.cxx | 7 ------
.../MuonPrepRawDataProviderTools_load.cxx | 3 ---
.../MuonPrepRawDataToxAOD_entries.cxx | 9 -------
.../components/MuonPrepRawDataToxAOD_load.cxx | 4 ---
.../components/MuonRPC_CnvTools_entries.cxx | 10 --------
.../src/components/MuonRPC_CnvTools_load.cxx | 5 ----
.../components/MuonRdoToPrepData_entries.cxx | 9 -------
.../src/components/MuonRdoToPrepData_load.cxx | 4 ---
.../components/MuonTGC_CnvTools_entries.cxx | 14 -----------
.../src/components/MuonTGC_CnvTools_load.cxx | 3 ---
.../components/MDT_CondCabling_entries.cxx | 7 ------
.../src/components/MDT_CondCabling_load.cxx | 3 ---
.../components/RPC_CondCabling_entries.cxx | 7 ------
.../src/components/RPC_CondCabling_load.cxx | 3 ---
.../components/TGC_CondCabling_entries.cxx | 6 -----
.../src/components/TGC_CondCabling_load.cxx | 3 ---
.../src/components/MuonCondCool_entries.cxx | 10 --------
.../src/components/MuonCondCool_load.cxx | 3 ---
.../src/components/MuonCondSvc_entries.cxx | 24 ------------------
.../src/components/MuonCondSvc_load.cxx | 3 ---
.../MuonCondTest/src/MuonCondTest_entries.cxx | 16 ------------
.../MuonCondTest/src/MuonCondTest_load.cxx | 8 ------
.../src/components/MuonCondTool_entries.cxx | 16 ------------
.../src/components/MuonCondTool_load.cxx | 3 ---
.../src/components/MuonAGDD_entries.cxx | 7 ------
.../MuonAGDD/src/components/MuonAGDD_load.cxx | 4 ---
.../components/MuonRegionSelector_entries.cxx | 8 ------
.../components/MuonRegionSelector_load.cxx | 4 ---
.../MuonTrackingGeometry_entries.cxx | 10 --------
.../components/MuonTrackingGeometry_load.cxx | 4 ---
.../components/CSC_Digitization_entries.cxx | 6 -----
.../src/components/CSC_Digitization_load.cxx | 4 ---
.../components/MDT_Digitization_entries.cxx | 10 --------
.../src/components/MDT_Digitization_load.cxx | 3 ---
.../components/MM_Digitization_entries.cxx | 6 -----
.../src/components/MM_Digitization_load.cxx | 3 ---
.../MuonFastDigitization_entries.cxx | 5 ----
.../components/MuonFastDigitization_load.cxx | 3 ---
.../components/RPC_Digitization_entries.cxx | 7 ------
.../src/components/RPC_Digitization_load.cxx | 3 ---
.../components/TGC_Digitization_entries.cxx | 8 ------
.../src/components/TGC_Digitization_load.cxx | 3 ---
.../components/sTGC_Digitization_entries.cxx | 5 ----
.../src/components/sTGC_Digitization_load.cxx | 3 ---
.../src/components/MuonG4SD_entries.cxx | 15 -----------
.../MuonG4SD/src/components/MuonG4SD_load.cxx | 2 --
.../src/components/MuonGeoModel_entries.cxx | 1 +
.../components/MuonGeoModelTest_entries.cxx | 7 ------
.../src/components/MuonGeoModelTest_load.cxx | 3 ---
.../src/components/MuonIdHelpers_entries.cxx | 5 ----
.../src/components/MuonIdHelpers_load.cxx | 3 ---
.../components/TestMuonIdHelpers_entries.cxx | 6 -----
.../src/components/TestMuonIdHelpers_load.cxx | 5 ----
.../src/components/CscOverlay_entries.cxx | 5 ----
.../src/components/CscOverlay_load.cxx | 4 ---
.../src/components/MdtOverlay_entries.cxx | 5 ----
.../src/components/MdtOverlay_load.cxx | 4 ---
.../src/components/RpcOverlay_entries.cxx | 4 ---
.../src/components/RpcOverlay_load.cxx | 4 ---
.../src/components/TgcOverlay_entries.cxx | 5 ----
.../src/components/TgcOverlay_load.cxx | 5 ----
.../components/CscClusterization_entries.cxx | 16 +-----------
.../src/components/CscClusterization_load.cxx | 4 ---
.../components/MuonClusterization_entries.cxx | 9 +------
.../components/MuonClusterization_load.cxx | 3 ---
.../components/MuonTGMeasAssocAlg_entries.cxx | 8 ------
.../components/MuonTGMeasAssocAlg_load.cxx | 5 ----
.../components/RpcClusterBuilder_entries.cxx | 5 ----
.../src/components/RpcClusterBuilder_load.cxx | 4 ---
.../MuonCombinePatternTool_entries.cxx | 5 ----
.../MuonCombinePatternTool_load.cxx | 3 ---
.../MuonHoughPatternTool_entries.cxx | 8 ------
.../components/MuonHoughPatternTool_load.cxx | 3 ---
.../MdtDriftCircleOnTrackCreator_entries.cxx | 6 -----
.../MdtDriftCircleOnTrackCreator_load.cxx | 3 ---
.../MuonClusterOnTrackCreator_entries.cxx | 6 -----
.../MuonClusterOnTrackCreator_load.cxx | 4 ---
...ompetingClustersOnTrackCreator_entries.cxx | 7 ------
...onCompetingClustersOnTrackCreator_load.cxx | 3 ---
.../components/MuonTrigCoinData_entries.cxx | 4 ---
.../src/components/MuonTrigCoinData_load.cxx | 3 ---
.../MuonAmbiTrackSelectionTool_entries.cxx | 6 -----
.../MuonAmbiTrackSelectionTool_load.cxx | 5 ----
.../MuonAssociationTools_entries.cxx | 7 ------
.../components/MuonAssociationTools_load.cxx | 5 ----
.../MuonErrorScalingTools_entries.cxx | 6 -----
.../components/MuonErrorScalingTools_load.cxx | 3 ---
.../components/MuonRecHelperTools_entries.cxx | 7 ------
.../components/MuonRecHelperTools_load.cxx | 3 ---
.../MuonResidualPullCalculators_entries.cxx | 7 ------
.../MuonResidualPullCalculators_load.cxx | 5 ----
.../src/components/MuonTGRecTools_entries.cxx | 11 --------
.../src/components/MuonTGRecTools_load.cxx | 5 ----
.../components/MuonTimingTools_entries.cxx | 5 ----
.../src/components/MuonTimingTools_load.cxx | 3 ---
.../MuonTrackSummaryHelperTool_entries.cxx | 11 --------
.../MuonTrackSummaryHelperTool_load.cxx | 5 ----
.../src/components/MuonTruthTools_entries.cxx | 7 ------
.../src/components/MuonTruthTools_load.cxx | 5 ----
.../MuonStationIntersectSvc_entries.cxx | 5 ----
.../MuonStationIntersectSvc_load.cxx | 3 ---
.../components/MooSegmentFinder_entries.cxx | 9 -------
.../src/components/MooSegmentFinder_load.cxx | 5 ----
.../MuonCurvedSegmentCombiner_entries.cxx | 6 -----
.../MuonCurvedSegmentCombiner_load.cxx | 6 -----
.../components/CscSegmentMakers_entries.cxx | 7 ------
.../src/components/CscSegmentMakers_load.cxx | 3 ---
.../components/DCMathSegmentMaker_entries.cxx | 13 ----------
.../components/DCMathSegmentMaker_load.cxx | 5 ----
.../components/MdtSegmentT0Fitter_entries.cxx | 5 ----
.../components/MdtSegmentT0Fitter_load.cxx | 3 ---
.../MuonClusterSegmentMakerTools_entries.cxx | 7 ------
.../MuonClusterSegmentMakerTools_load.cxx | 3 ---
.../MuonLayerSegmentMakerTools_entries.cxx | 5 ----
.../MuonLayerSegmentMakerTools_load.cxx | 3 ---
.../MuonPatternSegmentMaker_entries.cxx | 11 --------
.../MuonPatternSegmentMaker_load.cxx | 5 ----
.../components/MuonSegmentCleaner_entries.cxx | 6 -----
.../components/MuonSegmentCleaner_load.cxx | 3 ---
.../MuonSegmentMatchingTool_entries.cxx | 7 ------
.../MuonSegmentMatchingTool_load.cxx | 3 ---
.../MuonSegmentMomentum_entries.cxx | 6 -----
.../components/MuonSegmentMomentum_load.cxx | 3 ---
...MuonSegmentOverlapRemovalTools_entries.cxx | 7 ------
.../MuonSegmentOverlapRemovalTools_load.cxx | 3 ---
.../MuonSegmentSelectionTools_entries.cxx | 6 -----
.../MuonSegmentSelectionTools_load.cxx | 3 ---
.../RPC_LinearSegmentMakerTool_entries.cxx | 5 ----
.../RPC_LinearSegmentMakerTool_load.cxx | 3 ---
.../TGC_LinearSegmentMakerTool_entries.cxx | 6 -----
.../TGC_LinearSegmentMakerTool_load.cxx | 3 ---
.../MuonSegmentTrackMaker_entries.cxx | 6 -----
.../components/MuonSegmentTrackMaker_load.cxx | 3 ---
.../MuonTrackFinderTools_entries.cxx | 14 -----------
.../components/MuonTrackFinderTools_load.cxx | 3 ---
.../MuonTrackSteeringTools_entries.cxx | 10 --------
.../MuonTrackSteeringTools_load.cxx | 3 ---
.../src/components/MuonTruthAlgs_entries.cxx | 16 ------------
.../src/components/MuonTruthAlgs_load.cxx | 4 ---
.../MuonAlignMonitoring_entries.cxx | 8 ------
.../components/MuonAlignMonitoring_load.cxx | 3 ---
.../MuonCalibMonitoring_entries.cxx | 9 -------
.../components/MuonCalibMonitoring_load.cxx | 2 --
.../components/MuonDQAMonitoring_entries.cxx | 12 ++-------
.../src/components/MuonDQAMonitoring_load.cxx | 2 --
.../src/components/MuonDQAUtils_entries.cxx | 9 +------
.../src/components/MuonDQAUtils_load.cxx | 3 ---
.../src/components/MuonPhysValMon_entries.cxx | 9 -------
.../src/components/MuonPhysValMon_load.cxx | 5 ----
.../CscRawDataMonitoring_entries.cxx | 20 ++++-----------
.../components/CscRawDataMonitoring_load.cxx | 2 --
.../MdtRawDataMonitoring_entries.cxx | 10 --------
.../components/MdtRawDataMonitoring_load.cxx | 2 --
.../MdtVsRpcRawDataMonitoring_entries.cxx | 7 ------
.../MdtVsRpcRawDataMonitoring_load.cxx | 2 --
.../MdtVsTgcRawDataMonitoring_entries.cxx | 9 +------
.../MdtVsTgcRawDataMonitoring_load.cxx | 2 --
.../RpcRawDataMonitoring_entries.cxx | 12 ---------
.../components/RpcRawDataMonitoring_load.cxx | 2 --
.../TgcRawDataMonitoring_entries.cxx | 10 +-------
.../components/TgcRawDataMonitoring_load.cxx | 2 --
.../components/MuonSegmMonitoring_entries.cxx | 7 ------
.../components/MuonSegmMonitoring_load.cxx | 2 --
.../MuonTrackMonitoring_entries.cxx | 6 -----
.../components/MuonTrackMonitoring_load.cxx | 2 --
.../components/MuonGMCheckCorners_entries.cxx | 6 +----
.../components/MuonGMCheckCorners_load.cxx | 3 ---
.../src/components/MuonPRDTest_entries.cxx | 8 ------
.../src/components/MuonPRDTest_load.cxx | 2 --
.../MuonTrackPerformance_entries.cxx | 10 --------
.../components/MuonTrackPerformance_load.cxx | 3 ---
.../MuonSimHitToPrdTest_entries.cxx | 6 -----
.../components/MuonSimHitToPrdTest_load.cxx | 3 ---
.../MuonTrackValidation_entries.cxx | 6 -----
.../components/MuonTrackValidation_load.cxx | 5 ----
259 files changed, 17 insertions(+), 1518 deletions(-)
mode change 100755 => 100644 MuonSpectrometer/Amdcsimrec/AmdcAth/src/components/AmdcsimrecAthenaSvc_entries.cxx
delete mode 100755 MuonSpectrometer/Amdcsimrec/AmdcAth/src/components/AmdcsimrecAthenaSvc_load.cxx
mode change 100755 => 100644 MuonSpectrometer/Amdcsimrec/AmdcDb/src/components/AmdcDb_entries.cxx
delete mode 100755 MuonSpectrometer/Amdcsimrec/AmdcDb/src/components/AmdcDb_load.cxx
delete mode 100644 MuonSpectrometer/Amdcsimrec/AmdcMGM/src/components/AmdcMGM_load.cxx
mode change 100755 => 100644 MuonSpectrometer/Amdcsimrec/AmdcOracle/src/components/AmdcOracle_entries.cxx
delete mode 100755 MuonSpectrometer/Amdcsimrec/AmdcOracle/src/components/AmdcOracle_load.cxx
delete mode 100644 MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/components/MSVertexReco_load.cxx
delete mode 100644 MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/components/MSVertexTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/components/MuonAlignErrorTool_load.cxx
delete mode 100644 MuonSpectrometer/MuonAlignment/MuonAlignGenTools/src/components/MuonAlignGenTools_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonCablings/CSCcabling/src/components/CSCcabling_entries.cxx
delete mode 100755 MuonSpectrometer/MuonCablings/CSCcabling/src/components/CSCcabling_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonCablings/MuonCablingServers/src/components/MuonCablingServers_entries.cxx
delete mode 100755 MuonSpectrometer/MuonCablings/MuonCablingServers/src/components/MuonCablingServers_load.cxx
delete mode 100644 MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/components/MuonMDT_Cabling_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonCablings/MuonRPC_Cabling/src/components/MuonRPC_Cabling_entries.cxx
delete mode 100755 MuonSpectrometer/MuonCablings/MuonRPC_Cabling/src/components/MuonRPC_Cabling_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/components/MuonTGC_Cabling_entries.cxx
delete mode 100755 MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/components/MuonTGC_Cabling_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonCablings/RPCcablingInterface/src/components/RPCcablingInterface_entries.cxx
delete mode 100755 MuonSpectrometer/MuonCablings/RPCcablingInterface/src/components/RPCcablingInterface_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonCablings/TGCcabling/src/components/TGCcabling_entries.cxx
delete mode 100755 MuonSpectrometer/MuonCablings/TGCcabling/src/components/TGCcabling_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonCablings/TGCcablingInterface/src/components/TGCcablingInterface_entries.cxx
delete mode 100755 MuonSpectrometer/MuonCablings/TGCcablingInterface/src/components/TGCcablingInterface_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/src/components/CscCalibAlgs_entries.cxx
delete mode 100755 MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/src/components/CscCalibAlgs_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/components/CscCalib_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/src/components/MdtCalibDbAsciiTool_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/src/components/MdtCalibDbCoolStrTool_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/components/MdtCalibSvc_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/src/components/MdtCalibTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibValidation/src/components/MdtValidationAlg_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MuonCalibAlgs/src/components/MuonCalibAlgs_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MuonCalibDbOperations/src/components/MuonCalibDbOperations_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/components/MuonCalibExtraTreeAlg_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MuonCalibPatRec/src/components/MuonCalibPatRec_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/src/components/CalibNtupleAnalysisAlg_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/src/components/MdtCalibIOSvc_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/components/MuonCalibStandAloneBase_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/components/MuonCalibStandAloneExtraTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneTools/src/components/MuonCalibStandAloneTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/MuonCalibTools/src/components/MuonCalibTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/components/RpcCalibTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_load.cxx
delete mode 100644 MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/components/MuonByteStreamCnvTest_load.cxx
delete mode 100644 MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/components/MuonCSC_CnvTools_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonCnv/MuonEventCnvTools/src/components/MuonEventCnvTools_entries.cxx
delete mode 100755 MuonSpectrometer/MuonCnv/MuonEventCnvTools/src/components/MuonEventCnvTools_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx
delete mode 100755 MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_load.cxx
delete mode 100644 MuonSpectrometer/MuonCnv/MuonJiveXML/src/components/MuonJiveXML_load.cxx
delete mode 100644 MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/components/MuonMDT_CnvTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonCnv/MuonPrdSelector/src/components/MuonPrdSelector_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonCnv/MuonPrepRawDataProviderTools/src/components/MuonPrepRawDataProviderTools_entries.cxx
delete mode 100755 MuonSpectrometer/MuonCnv/MuonPrepRawDataProviderTools/src/components/MuonPrepRawDataProviderTools_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonCnv/MuonPrepRawDataToxAOD/src/components/MuonPrepRawDataToxAOD_entries.cxx
delete mode 100755 MuonSpectrometer/MuonCnv/MuonPrepRawDataToxAOD/src/components/MuonPrepRawDataToxAOD_load.cxx
delete mode 100644 MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/components/MuonRPC_CnvTools_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/components/MuonRdoToPrepData_entries.cxx
delete mode 100755 MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/components/MuonRdoToPrepData_load.cxx
delete mode 100644 MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/components/MuonTGC_CnvTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonConditions/MuonCondCabling/MDT_CondCabling/src/components/MDT_CondCabling_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling/src/components/RPC_CondCabling_entries.cxx
delete mode 100755 MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling/src/components/RPC_CondCabling_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/src/components/TGC_CondCabling_entries.cxx
delete mode 100755 MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/src/components/TGC_CondCabling_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/components/MuonCondCool_entries.cxx
delete mode 100755 MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/components/MuonCondCool_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/components/MuonCondSvc_entries.cxx
delete mode 100755 MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/components/MuonCondSvc_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_entries.cxx
delete mode 100755 MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_load.cxx
delete mode 100644 MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/components/MuonCondTool_load.cxx
delete mode 100644 MuonSpectrometer/MuonDetDescr/MuonAGDD/src/components/MuonAGDD_load.cxx
delete mode 100644 MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/components/MuonRegionSelector_load.cxx
delete mode 100644 MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/components/MuonTrackingGeometry_load.cxx
delete mode 100644 MuonSpectrometer/MuonDigitization/CSC_Digitization/src/components/CSC_Digitization_load.cxx
delete mode 100644 MuonSpectrometer/MuonDigitization/MDT_Digitization/src/components/MDT_Digitization_load.cxx
delete mode 100644 MuonSpectrometer/MuonDigitization/MM_Digitization/src/components/MM_Digitization_load.cxx
delete mode 100644 MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/components/MuonFastDigitization_load.cxx
delete mode 100644 MuonSpectrometer/MuonDigitization/RPC_Digitization/src/components/RPC_Digitization_load.cxx
delete mode 100644 MuonSpectrometer/MuonDigitization/TGC_Digitization/src/components/TGC_Digitization_load.cxx
delete mode 100644 MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/components/sTGC_Digitization_load.cxx
delete mode 100644 MuonSpectrometer/MuonG4/MuonG4SD/src/components/MuonG4SD_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonGeoModel/src/components/MuonGeoModel_entries.cxx
delete mode 100644 MuonSpectrometer/MuonGeoModelTest/src/components/MuonGeoModelTest_load.cxx
delete mode 100644 MuonSpectrometer/MuonIdHelpers/src/components/MuonIdHelpers_load.cxx
delete mode 100644 MuonSpectrometer/MuonIdHelpersAlgs/src/components/TestMuonIdHelpers_load.cxx
delete mode 100644 MuonSpectrometer/MuonOverlay/CscOverlay/src/components/CscOverlay_load.cxx
delete mode 100644 MuonSpectrometer/MuonOverlay/MdtOverlay/src/components/MdtOverlay_load.cxx
delete mode 100644 MuonSpectrometer/MuonOverlay/RpcOverlay/src/components/RpcOverlay_load.cxx
delete mode 100644 MuonSpectrometer/MuonOverlay/TgcOverlay/src/components/TgcOverlay_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/components/CscClusterization_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/components/CscClusterization_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonClusterization/src/components/MuonClusterization_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonClusterization/src/components/MuonClusterization_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonTGMeasAssocAlg/src/components/MuonTGMeasAssocAlg_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/src/components/RpcClusterBuilder_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/src/components/RpcClusterBuilder_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/components/MuonCombinePatternTool_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/components/MuonHoughPatternTool_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/components/MuonHoughPatternTool_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/components/MdtDriftCircleOnTrackCreator_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/src/components/MuonClusterOnTrackCreator_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/src/components/MuonClusterOnTrackCreator_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/src/components/MuonCompetingClustersOnTrackCreator_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonTrigCoinData/src/components/MuonTrigCoinData_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/components/MuonAmbiTrackSelectionTool_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/src/components/MuonAssociationTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/src/components/MuonErrorScalingTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/components/MuonRecHelperTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/src/components/MuonResidualPullCalculators_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/components/MuonTGRecTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTimingTools/src/components/MuonTimingTools_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/src/components/MuonTrackSummaryHelperTool_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/src/components/MuonTrackSummaryHelperTool_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTruthTools/src/components/MuonTruthTools_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/src/components/MuonStationIntersectSvc_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/src/components/MuonStationIntersectSvc_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/components/MooSegmentFinder_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/src/components/MuonCurvedSegmentCombiner_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/components/CscSegmentMakers_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/components/DCMathSegmentMaker_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/components/MdtSegmentT0Fitter_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/components/MdtSegmentT0Fitter_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonClusterSegmentMakerTools/src/components/MuonClusterSegmentMakerTools_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonClusterSegmentMakerTools/src/components/MuonClusterSegmentMakerTools_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonLayerSegmentMakerTools/src/components/MuonLayerSegmentMakerTools_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonLayerSegmentMakerTools/src/components/MuonLayerSegmentMakerTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/components/MuonPatternSegmentMaker_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/src/components/MuonSegmentCleaner_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMatchingTools/src/components/MuonSegmentMatchingTool_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMatchingTools/src/components/MuonSegmentMatchingTool_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/src/components/MuonSegmentMomentum_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentOverlapRemovalTools/src/components/MuonSegmentOverlapRemovalTools_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentOverlapRemovalTools/src/components/MuonSegmentOverlapRemovalTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentSelectionTools/src/components/MuonSegmentSelectionTools_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/RPC_LinearSegmentMakerTool/src/components/RPC_LinearSegmentMakerTool_load.cxx
delete mode 100644 MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/TGC_LinearSegmentMakerTool/src/components/TGC_LinearSegmentMakerTool_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/components/MuonSegmentTrackMaker_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/components/MuonSegmentTrackMaker_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/components/MuonTrackFinderTools_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/components/MuonTrackFinderTools_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/components/MuonTrackSteeringTools_entries.cxx
delete mode 100755 MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/components/MuonTrackSteeringTools_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonTruthAlgs/src/components/MuonTruthAlgs_entries.cxx
delete mode 100755 MuonSpectrometer/MuonTruthAlgs/src/components/MuonTruthAlgs_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/components/MuonAlignMonitoring_entries.cxx
delete mode 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/components/MuonAlignMonitoring_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/components/MuonCalibMonitoring_entries.cxx
delete mode 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/components/MuonCalibMonitoring_load.cxx
delete mode 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/src/components/MuonDQAMonitoring_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/components/MuonDQAUtils_entries.cxx
delete mode 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/components/MuonDQAUtils_load.cxx
delete mode 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/components/MuonPhysValMon_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/components/CscRawDataMonitoring_entries.cxx
delete mode 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/components/CscRawDataMonitoring_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/components/MdtRawDataMonitoring_entries.cxx
delete mode 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/components/MdtRawDataMonitoring_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/src/components/MdtVsRpcRawDataMonitoring_entries.cxx
delete mode 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/src/components/MdtVsRpcRawDataMonitoring_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/components/MdtVsTgcRawDataMonitoring_entries.cxx
delete mode 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/components/MdtVsTgcRawDataMonitoring_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/components/RpcRawDataMonitoring_entries.cxx
delete mode 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/components/RpcRawDataMonitoring_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/components/TgcRawDataMonitoring_entries.cxx
delete mode 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/components/TgcRawDataMonitoring_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonSegmMonitoring/src/components/MuonSegmMonitoring_entries.cxx
delete mode 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonSegmMonitoring/src/components/MuonSegmMonitoring_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/components/MuonTrackMonitoring_entries.cxx
delete mode 100755 MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/components/MuonTrackMonitoring_load.cxx
delete mode 100644 MuonSpectrometer/MuonValidation/MuonGeomTest/src/components/MuonGMCheckCorners_load.cxx
delete mode 100644 MuonSpectrometer/MuonValidation/MuonPRDTest/src/components/MuonPRDTest_load.cxx
mode change 100755 => 100644 MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/components/MuonTrackPerformance_entries.cxx
delete mode 100755 MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/components/MuonTrackPerformance_load.cxx
delete mode 100644 MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/src/components/MuonSimHitToPrdTest_load.cxx
delete mode 100644 MuonSpectrometer/MuonValidation/MuonTrackValidation/src/components/MuonTrackValidation_load.cxx
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcAth/src/components/AmdcsimrecAthenaSvc_entries.cxx b/MuonSpectrometer/Amdcsimrec/AmdcAth/src/components/AmdcsimrecAthenaSvc_entries.cxx
old mode 100755
new mode 100644
index 6a1a184bd28a..d9f5d4f8e685
--- a/MuonSpectrometer/Amdcsimrec/AmdcAth/src/components/AmdcsimrecAthenaSvc_entries.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcAth/src/components/AmdcsimrecAthenaSvc_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AmdcAth/AmdcsimrecAthenaSvc.h"
DECLARE_SERVICE_FACTORY( AmdcsimrecAthenaSvc )
-DECLARE_FACTORY_ENTRIES(AmdcAth) {
- DECLARE_SERVICE( AmdcsimrecAthenaSvc );
-}
-
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcAth/src/components/AmdcsimrecAthenaSvc_load.cxx b/MuonSpectrometer/Amdcsimrec/AmdcAth/src/components/AmdcsimrecAthenaSvc_load.cxx
deleted file mode 100755
index 7cfac4b51097..000000000000
--- a/MuonSpectrometer/Amdcsimrec/AmdcAth/src/components/AmdcsimrecAthenaSvc_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AmdcAth)
-
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/components/AmdcDb_entries.cxx b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/components/AmdcDb_entries.cxx
old mode 100755
new mode 100644
index 15305d39fb5f..e0132e014b2f
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/components/AmdcDb_entries.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/components/AmdcDb_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AmdcDb/AmdcDb.h"
DECLARE_SERVICE_FACTORY( AmdcDb )
-DECLARE_FACTORY_ENTRIES(AmdcDb) {
- DECLARE_SERVICE( AmdcDb );
-}
-
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/components/AmdcDb_load.cxx b/MuonSpectrometer/Amdcsimrec/AmdcDb/src/components/AmdcDb_load.cxx
deleted file mode 100755
index d4bf51a36e0f..000000000000
--- a/MuonSpectrometer/Amdcsimrec/AmdcDb/src/components/AmdcDb_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AmdcDb)
-
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/components/AmdcMGM_entries.cxx b/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/components/AmdcMGM_entries.cxx
index 4bf405a681cf..b22a53ed6f7f 100644
--- a/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/components/AmdcMGM_entries.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/components/AmdcMGM_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AmdcMGM/AmdcDumpGeoModel.h"
DECLARE_ALGORITHM_FACTORY( AmdcDumpGeoModel )
-DECLARE_FACTORY_ENTRIES( AmdcMGM ) {
- DECLARE_ALGORITHM( AmdcDumpGeoModel );
-}
-
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/components/AmdcMGM_load.cxx b/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/components/AmdcMGM_load.cxx
deleted file mode 100644
index e157eebf9124..000000000000
--- a/MuonSpectrometer/Amdcsimrec/AmdcMGM/src/components/AmdcMGM_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AmdcMGM )
-
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/components/AmdcOracle_entries.cxx b/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/components/AmdcOracle_entries.cxx
old mode 100755
new mode 100644
index c7bdb031e6e9..43a3274cdf40
--- a/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/components/AmdcOracle_entries.cxx
+++ b/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/components/AmdcOracle_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AmdcOracle/AmdcDumpOracle.h"
DECLARE_ALGORITHM_FACTORY( AmdcDumpOracle )
-DECLARE_FACTORY_ENTRIES( AmdcOracle ) {
- DECLARE_ALGORITHM( AmdcDumpOracle );
-}
-
diff --git a/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/components/AmdcOracle_load.cxx b/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/components/AmdcOracle_load.cxx
deleted file mode 100755
index e8dd2c6e931c..000000000000
--- a/MuonSpectrometer/Amdcsimrec/AmdcOracle/src/components/AmdcOracle_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AmdcOracle )
-
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/components/MSVertexReco_entries.cxx b/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/components/MSVertexReco_entries.cxx
index 0c942532cade..70303aa11398 100644
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/components/MSVertexReco_entries.cxx
+++ b/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/components/MSVertexReco_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MSVertexRecoAlg/MSVertexRecoAlg.h"
DECLARE_ALGORITHM_FACTORY( MSVertexRecoAlg )
-DECLARE_FACTORY_ENTRIES( MSVertexRecoAlg ) {
-
- DECLARE_ALGORITHM( MSVertexRecoAlg )
-
-}
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/components/MSVertexReco_load.cxx b/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/components/MSVertexReco_load.cxx
deleted file mode 100644
index 40593544bdc7..000000000000
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexRecoAlg/src/components/MSVertexReco_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MSVertexRecoAlg )
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/components/MSVertexTools_entries.cxx b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/components/MSVertexTools_entries.cxx
index 534bae88dc44..daf6abfab697 100644
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/components/MSVertexTools_entries.cxx
+++ b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/components/MSVertexTools_entries.cxx
@@ -1,5 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MSVertexTrackletTool.h"
#include "../MSVertexRecoTool.h"
@@ -8,12 +6,3 @@ using namespace Muon;
DECLARE_TOOL_FACTORY( MSVertexTrackletTool )
DECLARE_TOOL_FACTORY( MSVertexRecoTool )
-DECLARE_FACTORY_ENTRIES( MSVertexTools )
-{
- DECLARE_TOOL( MSVertexTrackletTool )
- DECLARE_TOOL( MSVertexRecoTool )
-}
-
-
-
-
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/components/MSVertexTools_load.cxx b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/components/MSVertexTools_load.cxx
deleted file mode 100644
index 2d776463a2c5..000000000000
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/components/MSVertexTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MSVertexTools )
-
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/components/MuonAlignErrorTool_entries.cxx b/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/components/MuonAlignErrorTool_entries.cxx
index dbadb718f309..76ff16a47c2a 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/components/MuonAlignErrorTool_entries.cxx
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/components/MuonAlignErrorTool_entries.cxx
@@ -1,11 +1,6 @@
#include "MuonAlignErrorTool/MuonAlignErrorExampleAlg.h"
#include "MuonAlignErrorTool/AlignmentErrorTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( MuonAlign, MuonAlignErrorExampleAlg )
DECLARE_NAMESPACE_TOOL_FACTORY( MuonAlign, AlignmentErrorTool )
-DECLARE_FACTORY_ENTRIES(MuonAlignErrorTool) {
- DECLARE_NAMESPACE_ALGORITHM( MuonAlign, MuonAlignErrorExampleAlg )
- DECLARE_NAMESPACE_TOOL( MuonAlign, AlignmentErrorTool )
-}
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/components/MuonAlignErrorTool_load.cxx b/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/components/MuonAlignErrorTool_load.cxx
deleted file mode 100644
index 9a2faf7b2bc6..000000000000
--- a/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/src/components/MuonAlignErrorTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(MuonAlignErrorTool)
-
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignGenTools/src/components/MuonAlignGenTools_entries.cxx b/MuonSpectrometer/MuonAlignment/MuonAlignGenTools/src/components/MuonAlignGenTools_entries.cxx
index 03daae6a45cc..c1684d74833c 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignGenTools/src/components/MuonAlignGenTools_entries.cxx
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignGenTools/src/components/MuonAlignGenTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonAlignGenTools/CommonGeometryManagerTool.h"
#include "MuonAlignGenTools/MuonGeometryManagerTool.h"
#include "MuonAlignGenTools/MdtGeometryManagerTool.h"
@@ -30,22 +29,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonTrackCollectionProvider )
//DECLARE_NAMESPACE_TOOL_FACTORY( Muon, UnbiasedResidualTool )
//DECLARE_NAMESPACE_ALGORITHM_FACTORY( Muon, UnbiasedMuonResiduals )
-DECLARE_FACTORY_ENTRIES( MuonAlignGenTools )
-{
- DECLARE_NAMESPACE_TOOL( Muon, MuonAlignModuleTool )
- DECLARE_NAMESPACE_TOOL( Muon, CommonGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( Muon, MuonGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( Muon, MdtGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( Muon, CscGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( Muon, TgcGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( Muon, MuonFillNtupleTool )
- DECLARE_NAMESPACE_TOOL( Muon, MuonAlignDBTool )
- DECLARE_NAMESPACE_TOOL( Muon, MdtAlignDBTool )
- DECLARE_NAMESPACE_TOOL( Muon, CscAlignDBTool )
- DECLARE_NAMESPACE_TOOL( Muon, MuonAlignHelperTool )
- DECLARE_NAMESPACE_TOOL( Muon, MuonAlignRefitTool )
- DECLARE_NAMESPACE_TOOL( Muon, MuonTrackPreProcessor )
- DECLARE_NAMESPACE_TOOL( Muon, MuonTrackCollectionProvider )
- //DECLARE_NAMESPACE_TOOL( Muon, UnbiasedResidualTool )
- //DECLARE_NAMESPACE_ALGORITHM( Muon, UnbiasedMuonResiduals )
-}
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignGenTools/src/components/MuonAlignGenTools_load.cxx b/MuonSpectrometer/MuonAlignment/MuonAlignGenTools/src/components/MuonAlignGenTools_load.cxx
deleted file mode 100644
index 55a503c83d19..000000000000
--- a/MuonSpectrometer/MuonAlignment/MuonAlignGenTools/src/components/MuonAlignGenTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonAlignGenTools )
diff --git a/MuonSpectrometer/MuonCablings/CSCcabling/src/components/CSCcabling_entries.cxx b/MuonSpectrometer/MuonCablings/CSCcabling/src/components/CSCcabling_entries.cxx
old mode 100755
new mode 100644
index 2869a342663f..85dd27ddd29e
--- a/MuonSpectrometer/MuonCablings/CSCcabling/src/components/CSCcabling_entries.cxx
+++ b/MuonSpectrometer/MuonCablings/CSCcabling/src/components/CSCcabling_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CSCcabling/CSCcablingSvc.h"
DECLARE_SERVICE_FACTORY(CSCcablingSvc)
-DECLARE_FACTORY_ENTRIES(CSCcabling) {
- DECLARE_SERVICE( CSCcablingSvc )
-}
diff --git a/MuonSpectrometer/MuonCablings/CSCcabling/src/components/CSCcabling_load.cxx b/MuonSpectrometer/MuonCablings/CSCcabling/src/components/CSCcabling_load.cxx
deleted file mode 100755
index 61131ceaf71a..000000000000
--- a/MuonSpectrometer/MuonCablings/CSCcabling/src/components/CSCcabling_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CSCcabling)
-
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/components/MuonCablingServers_entries.cxx b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/components/MuonCablingServers_entries.cxx
old mode 100755
new mode 100644
index 52837a2c46a8..2b00b48cb683
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/components/MuonCablingServers_entries.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/components/MuonCablingServers_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonCablingServers/RPCcablingServerSvc.h"
#include "MuonCablingServers/TGCcablingServerSvc.h"
DECLARE_SERVICE_FACTORY( RPCcablingServerSvc )
DECLARE_SERVICE_FACTORY( TGCcablingServerSvc )
-DECLARE_FACTORY_ENTRIES(MuonCablingServers) {
- DECLARE_SERVICE( RPCcablingServerSvc );
- DECLARE_SERVICE( TGCcablingServerSvc );
-}
-
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/components/MuonCablingServers_load.cxx b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/components/MuonCablingServers_load.cxx
deleted file mode 100755
index 1df0d908d7cb..000000000000
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/components/MuonCablingServers_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonCablingServers)
-
-
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/components/MuonMDT_Cabling_entries.cxx b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/components/MuonMDT_Cabling_entries.cxx
index cbe40a4af712..4e2ceb992d94 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/components/MuonMDT_Cabling_entries.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/components/MuonMDT_Cabling_entries.cxx
@@ -1,14 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "MuonMDT_Cabling/MuonMDT_CablingSvc.h"
#include "MuonMDT_Cabling/MdtTestCabling.h"
DECLARE_SERVICE_FACTORY(MuonMDT_CablingSvc)
DECLARE_ALGORITHM_FACTORY(MdtTestCabling)
-DECLARE_FACTORY_ENTRIES(MuonMDT_Cabling) {
-
- DECLARE_SERVICE(MuonMDT_CablingSvc)
- DECLARE_ALGORITHM(MdtTestCabling)
-
-}
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/components/MuonMDT_Cabling_load.cxx b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/components/MuonMDT_Cabling_load.cxx
deleted file mode 100644
index 470465fdc097..000000000000
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/src/components/MuonMDT_Cabling_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonMDT_Cabling)
-
diff --git a/MuonSpectrometer/MuonCablings/MuonRPC_Cabling/src/components/MuonRPC_Cabling_entries.cxx b/MuonSpectrometer/MuonCablings/MuonRPC_Cabling/src/components/MuonRPC_Cabling_entries.cxx
old mode 100755
new mode 100644
index 285f2e1c9464..3bf2921997ef
--- a/MuonSpectrometer/MuonCablings/MuonRPC_Cabling/src/components/MuonRPC_Cabling_entries.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonRPC_Cabling/src/components/MuonRPC_Cabling_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "MuonRPC_Cabling/MuonRPC_CablingSvc.h"
#include "MuonRPC_Cabling/MuonRpcCablingTest.h"
DECLARE_SERVICE_FACTORY(MuonRPC_CablingSvc)
DECLARE_ALGORITHM_FACTORY( MuonRpcCablingTest )
-DECLARE_FACTORY_ENTRIES(MuonRPC_Cabling) {
- DECLARE_SERVICE(MuonRPC_CablingSvc)
- DECLARE_ALGORITHM(MuonRpcCablingTest)
-}
-
diff --git a/MuonSpectrometer/MuonCablings/MuonRPC_Cabling/src/components/MuonRPC_Cabling_load.cxx b/MuonSpectrometer/MuonCablings/MuonRPC_Cabling/src/components/MuonRPC_Cabling_load.cxx
deleted file mode 100755
index 58b252c06c55..000000000000
--- a/MuonSpectrometer/MuonCablings/MuonRPC_Cabling/src/components/MuonRPC_Cabling_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonRPC_Cabling)
-
-
-
-
diff --git a/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/components/MuonTGC_Cabling_entries.cxx b/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/components/MuonTGC_Cabling_entries.cxx
old mode 100755
new mode 100644
index e08ea02349f1..e6b5b28d4c3f
--- a/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/components/MuonTGC_Cabling_entries.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/components/MuonTGC_Cabling_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonTGC_Cabling/MuonTGC_CablingSvc.h"
DECLARE_SERVICE_FACTORY( MuonTGC_CablingSvc )
-DECLARE_FACTORY_ENTRIES(MuonTGC_Cabling) {
- DECLARE_SERVICE( MuonTGC_CablingSvc );
-}
diff --git a/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/components/MuonTGC_Cabling_load.cxx b/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/components/MuonTGC_Cabling_load.cxx
deleted file mode 100755
index 462594676607..000000000000
--- a/MuonSpectrometer/MuonCablings/MuonTGC_Cabling/src/components/MuonTGC_Cabling_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonTGC_Cabling)
-
diff --git a/MuonSpectrometer/MuonCablings/RPCcablingInterface/src/components/RPCcablingInterface_entries.cxx b/MuonSpectrometer/MuonCablings/RPCcablingInterface/src/components/RPCcablingInterface_entries.cxx
old mode 100755
new mode 100644
index 8b6536c9c824..8b137891791f
--- a/MuonSpectrometer/MuonCablings/RPCcablingInterface/src/components/RPCcablingInterface_entries.cxx
+++ b/MuonSpectrometer/MuonCablings/RPCcablingInterface/src/components/RPCcablingInterface_entries.cxx
@@ -1,2 +1 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
diff --git a/MuonSpectrometer/MuonCablings/RPCcablingInterface/src/components/RPCcablingInterface_load.cxx b/MuonSpectrometer/MuonCablings/RPCcablingInterface/src/components/RPCcablingInterface_load.cxx
deleted file mode 100755
index ec3ef741d6f9..000000000000
--- a/MuonSpectrometer/MuonCablings/RPCcablingInterface/src/components/RPCcablingInterface_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RPCcablingInterface)
diff --git a/MuonSpectrometer/MuonCablings/TGCcabling/src/components/TGCcabling_entries.cxx b/MuonSpectrometer/MuonCablings/TGCcabling/src/components/TGCcabling_entries.cxx
old mode 100755
new mode 100644
index d945c575e946..c6bea56620d4
--- a/MuonSpectrometer/MuonCablings/TGCcabling/src/components/TGCcabling_entries.cxx
+++ b/MuonSpectrometer/MuonCablings/TGCcabling/src/components/TGCcabling_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TGCcabling/TGCcablingSvc.h"
DECLARE_SERVICE_FACTORY( TGCcablingSvc )
-DECLARE_FACTORY_ENTRIES(TGCcabling) {
- DECLARE_SERVICE( TGCcablingSvc )
-}
diff --git a/MuonSpectrometer/MuonCablings/TGCcabling/src/components/TGCcabling_load.cxx b/MuonSpectrometer/MuonCablings/TGCcabling/src/components/TGCcabling_load.cxx
deleted file mode 100755
index 091af0e32c0c..000000000000
--- a/MuonSpectrometer/MuonCablings/TGCcabling/src/components/TGCcabling_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TGCcabling)
-
-
diff --git a/MuonSpectrometer/MuonCablings/TGCcablingInterface/src/components/TGCcablingInterface_entries.cxx b/MuonSpectrometer/MuonCablings/TGCcablingInterface/src/components/TGCcablingInterface_entries.cxx
old mode 100755
new mode 100644
index 46799f3371cc..8b137891791f
--- a/MuonSpectrometer/MuonCablings/TGCcablingInterface/src/components/TGCcablingInterface_entries.cxx
+++ b/MuonSpectrometer/MuonCablings/TGCcablingInterface/src/components/TGCcablingInterface_entries.cxx
@@ -1 +1 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
+
diff --git a/MuonSpectrometer/MuonCablings/TGCcablingInterface/src/components/TGCcablingInterface_load.cxx b/MuonSpectrometer/MuonCablings/TGCcablingInterface/src/components/TGCcablingInterface_load.cxx
deleted file mode 100755
index bd4fbcd1f7a8..000000000000
--- a/MuonSpectrometer/MuonCablings/TGCcablingInterface/src/components/TGCcablingInterface_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TGCcablingInterface)
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/src/components/CscCalibAlgs_entries.cxx b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/src/components/CscCalibAlgs_entries.cxx
old mode 100755
new mode 100644
index 3a782a0c6cd1..f21c2d23ff97
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/src/components/CscCalibAlgs_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/src/components/CscCalibAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../CscCalcPed.h"
#include "../CscCalcSlope.h"
@@ -6,9 +5,4 @@ using namespace MuonCalib;
DECLARE_ALGORITHM_FACTORY( CscCalcPed )
DECLARE_ALGORITHM_FACTORY( CscCalcSlope )
-
-DECLARE_FACTORY_ENTRIES( CscCalibAlgs )
-{
- DECLARE_ALGORITHM( CscCalcPed )
- DECLARE_ALGORITHM( CscCalcSlope )
-}
+
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/src/components/CscCalibAlgs_load.cxx b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/src/components/CscCalibAlgs_load.cxx
deleted file mode 100755
index 0cbdda671ffc..000000000000
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/src/components/CscCalibAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CscCalibAlgs )
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/components/CscCalib_entries.cxx b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/components/CscCalib_entries.cxx
index d7804ece4f76..f25d90b84d53 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/components/CscCalib_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/components/CscCalib_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../CscCalibTool.h"
DECLARE_TOOL_FACTORY( CscCalibTool )
-DECLARE_FACTORY_ENTRIES( CscCalibTools ){
- DECLARE_TOOL( CscCalibTool )
-}
-
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/components/CscCalib_load.cxx b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/components/CscCalib_load.cxx
deleted file mode 100644
index c49acba55a09..000000000000
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/components/CscCalib_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CscCalibTools )
-
-
-
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/src/components/MdtCalibDbAsciiTool_entries.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/src/components/MdtCalibDbAsciiTool_entries.cxx
index 30f2de13fa0d..40d4cb5b91b5 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/src/components/MdtCalibDbAsciiTool_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/src/components/MdtCalibDbAsciiTool_entries.cxx
@@ -1,10 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MdtCalibDbAsciiTool/MdtCalibDbAsciiTool.h"
using namespace MuonCalib;
DECLARE_TOOL_FACTORY( MdtCalibDbAsciiTool )
-DECLARE_FACTORY_ENTRIES( MdtCalibDbAsciiTool ){
- DECLARE_TOOL( MdtCalibDbAsciiTool )
-}
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/src/components/MdtCalibDbAsciiTool_load.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/src/components/MdtCalibDbAsciiTool_load.cxx
deleted file mode 100644
index 27da20293ef9..000000000000
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbAsciiTool/src/components/MdtCalibDbAsciiTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MdtCalibDbAsciiTool )
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/src/components/MdtCalibDbCoolStrTool_entries.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/src/components/MdtCalibDbCoolStrTool_entries.cxx
index 5ebb53225db1..8021973dbc9b 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/src/components/MdtCalibDbCoolStrTool_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/src/components/MdtCalibDbCoolStrTool_entries.cxx
@@ -1,10 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MdtCalibDbCoolStrTool/MdtCalibDbCoolStrTool.h"
using namespace MuonCalib;
DECLARE_TOOL_FACTORY( MdtCalibDbCoolStrTool )
-DECLARE_FACTORY_ENTRIES( MdtCalibDbCoolStrTool ){
- DECLARE_TOOL( MdtCalibDbCoolStrTool )
-}
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/src/components/MdtCalibDbCoolStrTool_load.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/src/components/MdtCalibDbCoolStrTool_load.cxx
deleted file mode 100644
index 36fed031bc0d..000000000000
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibDbCoolStrTool/src/components/MdtCalibDbCoolStrTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
- LOAD_FACTORY_ENTRIES( MdtCalibDbCoolStrTool)
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/components/MdtCalibSvc_entries.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/components/MdtCalibSvc_entries.cxx
index d2a114fde8d3..b6249d8f0ec9 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/components/MdtCalibSvc_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/components/MdtCalibSvc_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "MdtCalibSvc/MdtCalibrationSvc.h"
#include "MdtCalibSvc/MdtCalibrationRegionSvc.h"
#include "MdtCalibSvc/MdtCalibrationDbSvc.h"
@@ -8,8 +6,3 @@ DECLARE_SERVICE_FACTORY ( MdtCalibrationSvc )
DECLARE_SERVICE_FACTORY ( MdtCalibrationRegionSvc )
DECLARE_SERVICE_FACTORY ( MdtCalibrationDbSvc )
-DECLARE_FACTORY_ENTRIES(MdtCalibSvc) {
- DECLARE_SERVICE(MdtCalibrationSvc)
- DECLARE_SERVICE(MdtCalibrationRegionSvc)
- DECLARE_SERVICE(MdtCalibrationDbSvc)
-}
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/components/MdtCalibSvc_load.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/components/MdtCalibSvc_load.cxx
deleted file mode 100644
index 3f34364daa17..000000000000
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc/src/components/MdtCalibSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MdtCalibSvc)
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/src/components/MdtCalibTools_entries.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/src/components/MdtCalibTools_entries.cxx
index 39ee5545e138..1861d4e3df15 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/src/components/MdtCalibTools_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/src/components/MdtCalibTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MdtCalibTools/DCSLFitterTool.h"
#include "MdtCalibTools/QuasianalyticLineReconstructionTool.h"
#include "MdtCalibTools/MdtCalibTool.h"
@@ -16,13 +15,3 @@ DECLARE_TOOL_FACTORY( SimpleMdtSegmentSelectorTool )
DECLARE_TOOL_FACTORY( SimplePatternSelectorTool )
DECLARE_TOOL_FACTORY( MdtCalibNtupleMakerTool )
-/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( MdtCalibTools )
-{
- DECLARE_TOOL( DCSLFitterTool )
- DECLARE_TOOL( QuasianalyticLineReconstructionTool )
- DECLARE_TOOL( MdtCalibTool )
- DECLARE_TOOL( SimpleMdtSegmentSelectorTool )
- DECLARE_TOOL( SimplePatternSelectorTool )
- DECLARE_TOOL( MdtCalibNtupleMakerTool )
-}
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/src/components/MdtCalibTools_load.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/src/components/MdtCalibTools_load.cxx
deleted file mode 100644
index a524da78fab6..000000000000
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibTools/src/components/MdtCalibTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MdtCalibTools )
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibValidation/src/components/MdtValidationAlg_entries.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibValidation/src/components/MdtValidationAlg_entries.cxx
index 7f67a206dc2a..9f3799ba6dfc 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibValidation/src/components/MdtValidationAlg_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibValidation/src/components/MdtValidationAlg_entries.cxx
@@ -1,10 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MdtCalibValidation/MdtValidationAlg.h"
using namespace MuonCalib;
DECLARE_ALGORITHM_FACTORY ( MdtValidationAlg )
-DECLARE_FACTORY_ENTRIES(MdtValidationAlg) {
- DECLARE_ALGORITHM(MdtValidationAlg)
-}
+
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibValidation/src/components/MdtValidationAlg_load.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibValidation/src/components/MdtValidationAlg_load.cxx
deleted file mode 100644
index 293832a0062f..000000000000
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibValidation/src/components/MdtValidationAlg_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MdtValidationAlg)
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibAlgs/src/components/MuonCalibAlgs_entries.cxx b/MuonSpectrometer/MuonCalib/MuonCalibAlgs/src/components/MuonCalibAlgs_entries.cxx
index 0f71830f9243..98a2273b7057 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibAlgs/src/components/MuonCalibAlgs_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibAlgs/src/components/MuonCalibAlgs_entries.cxx
@@ -1,10 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonCalibAlgs/MuonCalibAlg.h"
using namespace MuonCalib;
DECLARE_ALGORITHM_FACTORY ( MuonCalibAlg )
-DECLARE_FACTORY_ENTRIES(MuonCalibAlgs) {
- DECLARE_ALGORITHM(MuonCalibAlg)
-}
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibAlgs/src/components/MuonCalibAlgs_load.cxx b/MuonSpectrometer/MuonCalib/MuonCalibAlgs/src/components/MuonCalibAlgs_load.cxx
deleted file mode 100644
index 04ca7daafac7..000000000000
--- a/MuonSpectrometer/MuonCalib/MuonCalibAlgs/src/components/MuonCalibAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonCalibAlgs)
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/src/components/MuonCalibDbOperations_entries.cxx b/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/src/components/MuonCalibDbOperations_entries.cxx
index 5ffbc7a0d83e..229e0f2627fd 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/src/components/MuonCalibDbOperations_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/src/components/MuonCalibDbOperations_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonCalibDbOperations/CalibrationDbIOTool.h"
#include "MuonCalibDbOperations/CoolInserter.h"
#include "MuonCalibDbOperations/MuonCalibDbCalibrationSource.h"
@@ -11,14 +10,6 @@ DECLARE_TOOL_FACTORY ( CalibrationDbIOTool )
DECLARE_TOOL_FACTORY ( MuonCalibDbCalibrationSource )
DECLARE_TOOL_FACTORY ( MuonCalibDefaultCalibrationSource )
-DECLARE_FACTORY_ENTRIES(MuonCalibDbOperations) {
- DECLARE_TOOL(CalibrationDbIOTool)
- DECLARE_TOOL(MuonCalibDbCalibrationSource)
- DECLARE_TOOL(MuonCalibDefaultCalibrationSource)
-}
DECLARE_ALGORITHM_FACTORY ( CoolInserter )
-DECLARE_FACTORY_ENTRIES( CoolInserter ) {
- DECLARE_TOOL(CoolInserter)
-}
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/src/components/MuonCalibDbOperations_load.cxx b/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/src/components/MuonCalibDbOperations_load.cxx
deleted file mode 100644
index add89ad104c3..000000000000
--- a/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/src/components/MuonCalibDbOperations_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonCalibDbOperations)
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/components/MuonCalibExtraTreeAlg_entries.cxx b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/components/MuonCalibExtraTreeAlg_entries.cxx
index dd5747be4872..6b00e86d43cf 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/components/MuonCalibExtraTreeAlg_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/components/MuonCalibExtraTreeAlg_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonCalibExtraTreeAlg/MuonCalibExtraTreeAlg.h"
#include "MuonCalibExtraTreeAlg/MuonCalibExtraTreeTriggerAlg.h"
#include "MuonCalibExtraTreeAlg/SegmentOnTrackSelector.h"
@@ -13,10 +12,3 @@ DECLARE_TOOL_FACTORY ( SegmentOnTrackSelector )
DECLARE_TOOL_FACTORY ( ExtraTreeTrackFillerTool )
DECLARE_TOOL_FACTORY ( ExtraTreeMuonFillerTool )
-DECLARE_FACTORY_ENTRIES(MuonCalibExtraTreeAlg) {
- DECLARE_ALGORITHM(MuonCalibExtraTreeAlg)
- DECLARE_ALGORITHM(MuonCalibExtraTreeTriggerAlg)
- DECLARE_TOOL ( ExtraTreeTrackFillerTool )
- DECLARE_TOOL ( ExtraTreeMuonFillerTool )
- DECLARE_TOOL ( SegmentOnTrackSelector )
-}
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/components/MuonCalibExtraTreeAlg_load.cxx b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/components/MuonCalibExtraTreeAlg_load.cxx
deleted file mode 100644
index 389c268b2164..000000000000
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/components/MuonCalibExtraTreeAlg_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonCalibExtraTreeAlg)
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibPatRec/src/components/MuonCalibPatRec_entries.cxx b/MuonSpectrometer/MuonCalib/MuonCalibPatRec/src/components/MuonCalibPatRec_entries.cxx
index c57cc5b54582..2a4faf0fc562 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibPatRec/src/components/MuonCalibPatRec_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibPatRec/src/components/MuonCalibPatRec_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "MuonCalibPatRec/MuonSegmentToCalibSegment.h"
using namespace MuonCalib;
DECLARE_ALGORITHM_FACTORY ( MuonSegmentToCalibSegment )
-DECLARE_FACTORY_ENTRIES(MuonCalibPatRec) {
- DECLARE_ALGORITHM(MuonSegmentToCalibSegment)
-}
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibPatRec/src/components/MuonCalibPatRec_load.cxx b/MuonSpectrometer/MuonCalib/MuonCalibPatRec/src/components/MuonCalibPatRec_load.cxx
deleted file mode 100644
index 9562401b2c28..000000000000
--- a/MuonSpectrometer/MuonCalib/MuonCalibPatRec/src/components/MuonCalibPatRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonCalibPatRec)
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/src/components/CalibNtupleAnalysisAlg_entries.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/src/components/CalibNtupleAnalysisAlg_entries.cxx
index 39459c693568..a40587982fb3 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/src/components/CalibNtupleAnalysisAlg_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/src/components/CalibNtupleAnalysisAlg_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CalibNtupleAnalysisAlg/CalibNtupleAnalysisAlg2.h"
#include "CalibNtupleAnalysisAlg/BarrelSecondCoordinatePreparationTool.h"
#include "CalibNtupleAnalysisAlg/BFieldCorrectionUpdateTool.h"
@@ -22,17 +21,8 @@ DECLARE_ALGORITHM_FACTORY ( CalibNtupleAnalysisAlg2 )
DECLARE_ALGORITHM_FACTORY ( WriteMdtGeometry )
DECLARE_ALGORITHM_FACTORY ( MuonCalibGeometryDumper )
-DECLARE_FACTORY_ENTRIES(CalibNtupleAnalysisAlg) {
- DECLARE_ALGORITHM(CalibNtupleAnalysisAlg2)
-}
-DECLARE_FACTORY_ENTRIES(WriteMdtGeometry) {
- DECLARE_ALGORITHM(WriteMdtGeometry)
-}
-DECLARE_FACTORY_ENTRIES(MuonCalibGeometryDumper) {
- DECLARE_ALGORITHM(MuonCalibGeometryDumper)
-}
DECLARE_TOOL_FACTORY ( BarrelSecondCoordinatePreparationTool )
DECLARE_TOOL_FACTORY ( BFieldCorrectionUpdateTool )
@@ -47,18 +37,3 @@ DECLARE_TOOL_FACTORY (SegmentRefitter)
DECLARE_TOOL_FACTORY (ApplyRawTimes)
DECLARE_TOOL_FACTORY (GoodRunListFilter)
-
-DECLARE_FACTORY_ENTRIES( CalibSegmentPreparationTools ) {
- DECLARE_TOOL (BarrelSecondCoordinatePreparationTool)
- DECLARE_TOOL (BFieldCorrectionUpdateTool)
- DECLARE_TOOL (UpdateBField)
- DECLARE_TOOL (CalibNtupleLoader)
- DECLARE_TOOL (SegmentRegionSelector)
- DECLARE_TOOL (SegmentRawdataSelector)
- DECLARE_TOOL (SegmentRecalibration)
- DECLARE_TOOL (InitialDqFilter)
- DECLARE_TOOL (SegmentRefitter)
-// DECLARE_TOOL (RpcTimingCorr)
- DECLARE_TOOL (ApplyRawTimes)
- DECLARE_TOOL (GoodRunListFilter)
-}
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/src/components/CalibNtupleAnalysisAlg_load.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/src/components/CalibNtupleAnalysisAlg_load.cxx
deleted file mode 100644
index 13804b696465..000000000000
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/src/components/CalibNtupleAnalysisAlg_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CalibNtupleAnalysisAlg)
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/src/components/MdtCalibIOSvc_entries.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/src/components/MdtCalibIOSvc_entries.cxx
index 90da297a0671..bc9bd40b4371 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/src/components/MdtCalibIOSvc_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/src/components/MdtCalibIOSvc_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MdtCalibIOSvc/MdtCalibInputSvc.h"
#include "MdtCalibIOSvc/MdtCalibOutputDbSvc.h"
#include "MdtCalibIOSvc/CalibrationFileIOTool.h"
@@ -11,10 +10,3 @@ DECLARE_SERVICE_FACTORY ( MdtCalibInputSvc )
DECLARE_TOOL_FACTORY ( CalibrationFileIOTool )
DECLARE_TOOL_FACTORY ( CalibrationOracleFileIOTool )
-DECLARE_FACTORY_ENTRIES(MdtCalibIOSvc) {
- DECLARE_SERVICE(MdtCalibOutputDbSvc)
- DECLARE_SERVICE(MdtCalibInputSvc)
- DECLARE_TOOL(CalibrationFileIOTool)
- DECLARE_TOOL(CalibrationOracleFileIOTool)
-}
-
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/src/components/MdtCalibIOSvc_load.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/src/components/MdtCalibIOSvc_load.cxx
deleted file mode 100644
index 1f241329ff84..000000000000
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/src/components/MdtCalibIOSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MdtCalibIOSvc)
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/components/MuonCalibStandAloneBase_entries.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/components/MuonCalibStandAloneBase_entries.cxx
index c9ddb64a228d..3a45d988cb70 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/components/MuonCalibStandAloneBase_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/components/MuonCalibStandAloneBase_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonCalibStandAloneBase/RegionSelectionSvc.h"
#include "MuonCalibStandAloneBase/CalibrationDummyIOTool.h"
#include "MuonCalibStandAloneBase/CalibrationTeeIOTool.h"
@@ -9,9 +8,3 @@ DECLARE_SERVICE_FACTORY ( RegionSelectionSvc )
DECLARE_TOOL_FACTORY ( CalibrationDummyIOTool )
DECLARE_TOOL_FACTORY ( CalibrationTeeIOTool )
-DECLARE_FACTORY_ENTRIES(MuonCalibStandAloneBase) {
- DECLARE_SERVICE(RegionSelectionSvc)
- DECLARE_TOOL(CalibrationDummyIOTool)
- DECLARE_TOOL(CalibrationTeeIOTool)
-}
-
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/components/MuonCalibStandAloneBase_load.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/components/MuonCalibStandAloneBase_load.cxx
deleted file mode 100644
index 8afccab5cc63..000000000000
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/components/MuonCalibStandAloneBase_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonCalibStandAloneBase)
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/components/MuonCalibStandAloneExtraTools_entries.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/components/MuonCalibStandAloneExtraTools_entries.cxx
index 8325b18e02f0..3a6b1042f3c3 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/components/MuonCalibStandAloneExtraTools_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/components/MuonCalibStandAloneExtraTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonCalibStandAloneExtraTools/CalibExtraNtupleLoader.h"
#include "MuonCalibStandAloneExtraTools/ExtraRegionSelector.h"
#include "MuonCalibStandAloneExtraTools/ExtraRegionSelectorSuperFast.h"
@@ -17,13 +16,3 @@ DECLARE_TOOL_FACTORY (TrackSecondCoordinateToSegment)
DECLARE_TOOL_FACTORY (NtupleMdtDqaTool)
DECLARE_TOOL_FACTORY (NtupleSplitterTool)
-DECLARE_FACTORY_ENTRIES(MuonCalibStandAloneExtraTools) {
- DECLARE_TOOL (CalibExtraNtupleLoader)
- DECLARE_TOOL (ExtraRegionSelector)
- DECLARE_TOOL (ExtraRegionSelectorFast)
- DECLARE_TOOL (ExtraRegionSelectorSuperFast)
- DECLARE_TOOL (TrackSecondCoordinateToSegment)
- DECLARE_TOOL (NtupleMdtDqaTool)
- DECLARE_TOOL (NtupleSplitterTool)
-}
-
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/components/MuonCalibStandAloneExtraTools_load.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/components/MuonCalibStandAloneExtraTools_load.cxx
deleted file mode 100644
index c17a1dbd8640..000000000000
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneExtraTools/src/components/MuonCalibStandAloneExtraTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonCalibStandAloneExtraTools)
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneTools/src/components/MuonCalibStandAloneTools_entries.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneTools/src/components/MuonCalibStandAloneTools_entries.cxx
index bbcb262b010c..bbb1d19329da 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneTools/src/components/MuonCalibStandAloneTools_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneTools/src/components/MuonCalibStandAloneTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonCalibStandAloneTools/NtupleMTT0Tool.h"
#include "MuonCalibStandAloneTools/NtupleCalibADCTool.h"
#include "MuonCalibStandAloneTools/NtupleClassicT0Tool.h"
@@ -35,23 +34,3 @@ DECLARE_TOOL_FACTORY ( NtupleCurvedAutocalibrationTool )
DECLARE_TOOL_FACTORY ( NtupleDbCheckTool )
DECLARE_TOOL_FACTORY ( NtupleResidualVsTimeTool )
-DECLARE_FACTORY_ENTRIES(MuonCalibStandAloneTools) {
- DECLARE_TOOL (NtupleMTT0Tool)
- DECLARE_TOOL (NtupleCalibADCTool)
- DECLARE_TOOL (NtupleClassicT0Tool)
- DECLARE_TOOL (NtupleIntegrationTool)
- DECLARE_TOOL (NtupleAnalyticAutocalibrationTool)
- DECLARE_TOOL ( NtupleClassicAutocalibrationTool )
- DECLARE_TOOL (NtupleChisqResolutionTool)
- DECLARE_TOOL (NtupleSimpleResolutionTool)
- DECLARE_TOOL (NtupleTubeEfficiencyTool)
- DECLARE_TOOL (NtupleRunScanTool)
- DECLARE_TOOL (NtupleControlHistogramsTool)
- DECLARE_TOOL (NtupleResidualTool)
- DECLARE_TOOL (NtupleDisplayTool)
- DECLARE_TOOL (NtupleWireCentricityTool)
- DECLARE_TOOL (NtupleCurvedAutocalibrationTool)
- DECLARE_TOOL (NtupleDbCheckTool)
- DECLARE_TOOL (NtupleResidualVsTimeTool)
-}
-
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneTools/src/components/MuonCalibStandAloneTools_load.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneTools/src/components/MuonCalibStandAloneTools_load.cxx
deleted file mode 100644
index a57296971a14..000000000000
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneTools/src/components/MuonCalibStandAloneTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonCalibStandAloneTools)
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibTools/src/components/MuonCalibTools_entries.cxx b/MuonSpectrometer/MuonCalib/MuonCalibTools/src/components/MuonCalibTools_entries.cxx
index 7454a0abbd05..9a3efea06ca5 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibTools/src/components/MuonCalibTools_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibTools/src/components/MuonCalibTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonCalibTools/PatternNtupleMaker.h"
#include "MuonCalibTools/IdToFixedIdTool.h"
@@ -7,9 +6,3 @@ using namespace MuonCalib;
DECLARE_TOOL_FACTORY( PatternNtupleMaker )
DECLARE_TOOL_FACTORY( IdToFixedIdTool )
-/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( MuonCalibTools )
-{
- DECLARE_TOOL( PatternNtupleMaker )
- DECLARE_TOOL( IdToFixedIdTool )
-}
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibTools/src/components/MuonCalibTools_load.cxx b/MuonSpectrometer/MuonCalib/MuonCalibTools/src/components/MuonCalibTools_load.cxx
deleted file mode 100644
index 267566a641d0..000000000000
--- a/MuonSpectrometer/MuonCalib/MuonCalibTools/src/components/MuonCalibTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCalibTools )
diff --git a/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/components/RpcCalibTools_entries.cxx b/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/components/RpcCalibTools_entries.cxx
index dc6941c3bcdd..fafe425694cb 100644
--- a/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/components/RpcCalibTools_entries.cxx
+++ b/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/components/RpcCalibTools_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "RpcCalibTools/RpcExtrapolationTool.h"
#include "RpcCalibTools/RpcResidualsTool.h"
DECLARE_TOOL_FACTORY(RpcExtrapolationTool)
DECLARE_TOOL_FACTORY(RpcResidualsTool)
-DECLARE_FACTORY_ENTRIES(RpcCalibTools) {
- DECLARE_TOOL( RpcExtrapolationTool )
- DECLARE_TOOL( RpcResidualsTool )
-}
-
diff --git a/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/components/RpcCalibTools_load.cxx b/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/components/RpcCalibTools_load.cxx
deleted file mode 100644
index 61fa0caa61e9..000000000000
--- a/MuonSpectrometer/MuonCalib/RpcCalib/RpcCalibTools/src/components/RpcCalibTools_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(RpcCalibrationTools)
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_entries.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_entries.cxx
index 2b75362a02e0..00676d619738 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonByteStream/MdtRawDataProvider.h"
#include "MuonByteStream/RpcRawDataProvider.h"
#include "MuonByteStream/TgcRawDataProvider.h"
@@ -17,13 +16,3 @@ DECLARE_CONVERTER_FACTORY (CscRdoContByteStreamCnv)
DECLARE_CONVERTER_FACTORY (RpcPadContByteStreamCnv)
DECLARE_CONVERTER_FACTORY (TgcRdoContByteStreamCnv)
-DECLARE_FACTORY_ENTRIES(MuonByteStream) {
- DECLARE_NAMESPACE_ALGORITHM( Muon, MdtRawDataProvider )
- DECLARE_NAMESPACE_ALGORITHM( Muon, RpcRawDataProvider )
- DECLARE_NAMESPACE_ALGORITHM( Muon, TgcRawDataProvider )
- DECLARE_NAMESPACE_ALGORITHM( Muon, CscRawDataProvider )
- DECLARE_CONVERTER (MdtCsmContByteStreamCnv)
- DECLARE_CONVERTER (CscRdoContByteStreamCnv)
- DECLARE_CONVERTER (RpcPadContByteStreamCnv)
- DECLARE_CONVERTER (TgcRdoContByteStreamCnv)
-}
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_load.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_load.cxx
deleted file mode 100644
index 26d56fa5e200..000000000000
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/components/MuonByteStream_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonByteStream)
-
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/components/MuonByteStreamCnvTest_entries.cxx b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/components/MuonByteStreamCnvTest_entries.cxx
index 2350d26decae..56b4d1901d7d 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/components/MuonByteStreamCnvTest_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/components/MuonByteStreamCnvTest_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "MuonByteStreamCnvTest/MdtDigitToMdtRDO.h"
#include "MuonByteStreamCnvTest/RpcDigitToRpcRDO.h"
#include "MuonByteStreamCnvTest/TgcDigitToTgcRDO.h"
@@ -37,27 +35,10 @@ DECLARE_ALGORITHM_FACTORY( MuonRdoToMuonDigit )
DECLARE_TOOL_FACTORY( MuonRdoToMuonDigitTool )
-DECLARE_FACTORY_ENTRIES(MuonByteStreamCnvTest) {
- DECLARE_ALGORITHM ( RpcDigitToRpcRDO )
- DECLARE_ALGORITHM ( MdtDigitToMdtRDO )
- DECLARE_ALGORITHM ( TgcDigitToTgcRDO )
- DECLARE_ALGORITHM ( CscDigitToCscRDO )
- DECLARE_ALGORITHM ( ReadRpcRDO )
- DECLARE_ALGORITHM ( ReadMdtRDO )
- DECLARE_ALGORITHM ( ReadTgcRDO )
- DECLARE_ALGORITHM ( ReadRpcDigit )
- DECLARE_ALGORITHM ( ReadMdtDigit )
- DECLARE_ALGORITHM ( ReadTgcDigit )
- DECLARE_ALGORITHM ( ReadCscDigit )
- DECLARE_ALGORITHM ( ReadMdtPRD )
- DECLARE_ALGORITHM ( MuonRdoToMuonDigit )
- DECLARE_TOOL( CscDigitToCscRDOTool )
- DECLARE_TOOL( MuonRdoToMuonDigitTool )
-}
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/components/MuonByteStreamCnvTest_load.cxx b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/components/MuonByteStreamCnvTest_load.cxx
deleted file mode 100644
index 9730020b5ee5..000000000000
--- a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/components/MuonByteStreamCnvTest_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonByteStreamCnvTest)
-
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/components/MuonCSC_CnvTools_entries.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/components/MuonCSC_CnvTools_entries.cxx
index e643eb858d5c..f54328a91793 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/components/MuonCSC_CnvTools_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/components/MuonCSC_CnvTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../CscRdoToCscPrepDataTool.h"
#include "../CSC_RawDataProviderTool.h"
#include "../CscRdoContByteStreamTool.h"
@@ -13,13 +12,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Muon, CscROD_Decoder)
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, CscRDO_Decoder)
DECLARE_TOOL_FACTORY( CscDigitToCscRDOTool )
-DECLARE_FACTORY_ENTRIES( MuonCSC_CnvTools )
-{
- DECLARE_NAMESPACE_TOOL( Muon, CscRdoToCscPrepDataTool )
- DECLARE_NAMESPACE_TOOL( Muon, CscRdoContByteStreamTool )
- DECLARE_NAMESPACE_TOOL( Muon, CSC_RawDataProviderTool )
- DECLARE_NAMESPACE_TOOL( Muon, CscROD_Decoder)
- DECLARE_NAMESPACE_TOOL( Muon, CscRDO_Decoder)
- DECLARE_TOOL( CscDigitToCscRDOTool )
-}
-
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/components/MuonCSC_CnvTools_load.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/components/MuonCSC_CnvTools_load.cxx
deleted file mode 100644
index 35d92a5cd9ba..000000000000
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/components/MuonCSC_CnvTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCSC_CnvTools )
-
diff --git a/MuonSpectrometer/MuonCnv/MuonEventCnvTools/src/components/MuonEventCnvTools_entries.cxx b/MuonSpectrometer/MuonCnv/MuonEventCnvTools/src/components/MuonEventCnvTools_entries.cxx
old mode 100755
new mode 100644
index 68dd31a06c96..c169c0accb77
--- a/MuonSpectrometer/MuonCnv/MuonEventCnvTools/src/components/MuonEventCnvTools_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventCnvTools/src/components/MuonEventCnvTools_entries.cxx
@@ -1,15 +1,5 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonEventCnvTools/MuonEventCnvTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonEventCnvTool )
-DECLARE_FACTORY_ENTRIES( MuonEventCnvTools )
-{
- DECLARE_NAMESPACE_TOOL( Muon, MuonEventCnvTool )
-}
-
-
-
-
diff --git a/MuonSpectrometer/MuonCnv/MuonEventCnvTools/src/components/MuonEventCnvTools_load.cxx b/MuonSpectrometer/MuonCnv/MuonEventCnvTools/src/components/MuonEventCnvTools_load.cxx
deleted file mode 100755
index a706eb222e0a..000000000000
--- a/MuonSpectrometer/MuonCnv/MuonEventCnvTools/src/components/MuonEventCnvTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonEventCnvTools )
-
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx
old mode 100755
new mode 100644
index 2d4db94d9e9b..7767e605abc1
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_entries.cxx
@@ -1,10 +1,3 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MDT_IDDetDescrCnv.h"
#include "CSC_IDDetDescrCnv.h"
#include "RPC_IDDetDescrCnv.h"
@@ -22,15 +15,3 @@ DECLARE_CONVERTER_FACTORY( TGC_IDDetDescrCnv )
DECLARE_CONVERTER_FACTORY( sTGC_IDDetDescrCnv )
DECLARE_CONVERTER_FACTORY( MM_IDDetDescrCnv )
-DECLARE_FACTORY_ENTRIES ( MuonIdCnv ) {
- DECLARE_CONVERTER ( MDT_IDDetDescrCnv );
- DECLARE_CONVERTER ( CSC_IDDetDescrCnv );
- DECLARE_CONVERTER ( RPC_IDDetDescrCnv );
- DECLARE_CONVERTER ( TGC_IDDetDescrCnv );
-// for nSW
- DECLARE_CONVERTER ( sTGC_IDDetDescrCnv );
- DECLARE_CONVERTER ( MM_IDDetDescrCnv );
-}
-
-
-
diff --git a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_load.cxx b/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_load.cxx
deleted file mode 100755
index 1cd3733d8b17..000000000000
--- a/MuonSpectrometer/MuonCnv/MuonIdCnv/src/MuonIdCnv_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonIdCnv )
diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/components/MuonJiveXML_entries.cxx b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/components/MuonJiveXML_entries.cxx
index 574452bfc242..1dad96d1132d 100644
--- a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/components/MuonJiveXML_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/components/MuonJiveXML_entries.cxx
@@ -6,7 +6,6 @@
//#include "MuonJiveXML/MuidTrackRetriever.h"
#include "MuonJiveXML/TrigRpcDataRetriever.h"
#include "MuonJiveXML/TrigMuonROIRetriever.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace JiveXML;
@@ -19,15 +18,3 @@ DECLARE_TOOL_FACTORY(RpcPrepDataRetriever)
DECLARE_TOOL_FACTORY(TrigRpcDataRetriever)
DECLARE_TOOL_FACTORY(TrigMuonROIRetriever)
-
-
-DECLARE_FACTORY_ENTRIES(MuonJiveXML) {
- DECLARE_ALGTOOL(CSCClusterRetriever)
- DECLARE_ALGTOOL(TgcPrepDataRetriever)
- DECLARE_ALGTOOL(CscPrepDataRetriever)
- DECLARE_ALGTOOL(MdtPrepDataRetriever)
- DECLARE_ALGTOOL(RpcPrepDataRetriever)
-// DECLARE_ALGTOOL(MuidTrackRetriever)
- DECLARE_ALGTOOL(TrigRpcDataRetriever)
- DECLARE_ALGTOOL(TrigMuonROIRetriever)
-}
diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/components/MuonJiveXML_load.cxx b/MuonSpectrometer/MuonCnv/MuonJiveXML/src/components/MuonJiveXML_load.cxx
deleted file mode 100644
index e240fee8e176..000000000000
--- a/MuonSpectrometer/MuonCnv/MuonJiveXML/src/components/MuonJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonJiveXML)
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/components/MuonMDT_CnvTools_entries.cxx b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/components/MuonMDT_CnvTools_entries.cxx
index 1709e1ccf6dc..4a071c3f8913 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/components/MuonMDT_CnvTools_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/components/MuonMDT_CnvTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MdtRdoToPrepDataTool.h"
#include "../MdtCsmContByteStreamTool.h"
#include "../MDT_RawDataProviderTool.h"
@@ -11,12 +10,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MDT_RawDataProviderTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MdtRDO_Decoder )
DECLARE_TOOL_FACTORY( MdtROD_Decoder )
-DECLARE_FACTORY_ENTRIES( MuonMDT_CnvTools )
-{
- DECLARE_NAMESPACE_TOOL( Muon, MdtRdoToPrepDataTool )
- DECLARE_NAMESPACE_TOOL( Muon, MdtCsmContByteStreamTool )
- DECLARE_NAMESPACE_TOOL( Muon, MDT_RawDataProviderTool )
- DECLARE_NAMESPACE_TOOL( Muon, MdtRDO_Decoder )
- DECLARE_TOOL( MdtROD_Decoder )
-}
-
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/components/MuonMDT_CnvTools_load.cxx b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/components/MuonMDT_CnvTools_load.cxx
deleted file mode 100644
index ff95fe0aaffa..000000000000
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/components/MuonMDT_CnvTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonMDT_CnvTools )
-
diff --git a/MuonSpectrometer/MuonCnv/MuonPrdSelector/src/components/MuonPrdSelector_entries.cxx b/MuonSpectrometer/MuonCnv/MuonPrdSelector/src/components/MuonPrdSelector_entries.cxx
index d374519c9f89..1c9f00178111 100644
--- a/MuonSpectrometer/MuonCnv/MuonPrdSelector/src/components/MuonPrdSelector_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonPrdSelector/src/components/MuonPrdSelector_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonPrdSelector/MuonPrdSelectorAlg.h"
#include "MuonPrdSelector/MuonIdCutTool.h"
DECLARE_ALGORITHM_FACTORY( MuonPrdSelectorAlg )
DECLARE_TOOL_FACTORY( MuonIdCutTool )
-DECLARE_FACTORY_ENTRIES( MuonPrdSelector ) {
- DECLARE_ALGORITHM( MuonPrdSelectorAlg )
- DECLARE_TOOL( MuonIdCutTool )
-}
-
-
diff --git a/MuonSpectrometer/MuonCnv/MuonPrdSelector/src/components/MuonPrdSelector_load.cxx b/MuonSpectrometer/MuonCnv/MuonPrdSelector/src/components/MuonPrdSelector_load.cxx
deleted file mode 100644
index d632182c637a..000000000000
--- a/MuonSpectrometer/MuonCnv/MuonPrdSelector/src/components/MuonPrdSelector_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonPrdSelector )
diff --git a/MuonSpectrometer/MuonCnv/MuonPrepRawDataProviderTools/src/components/MuonPrepRawDataProviderTools_entries.cxx b/MuonSpectrometer/MuonCnv/MuonPrepRawDataProviderTools/src/components/MuonPrepRawDataProviderTools_entries.cxx
old mode 100755
new mode 100644
index 9fa87199189b..714e7c51ce22
--- a/MuonSpectrometer/MuonCnv/MuonPrepRawDataProviderTools/src/components/MuonPrepRawDataProviderTools_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonPrepRawDataProviderTools/src/components/MuonPrepRawDataProviderTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonPrepRawDataProviderTools/MuonLayerHashProviderTool.h"
#include "MuonPrepRawDataProviderTools/MuonPrepRawDataCollectionProviderTool.h"
#include "../MuonPRDSelectionTool.h"
@@ -9,9 +8,3 @@ DECLARE_TOOL_FACTORY( MuonLayerHashProviderTool )
DECLARE_TOOL_FACTORY( MuonPrepRawDataCollectionProviderTool )
DECLARE_TOOL_FACTORY( MuonPRDSelectionTool )
-DECLARE_FACTORY_ENTRIES( MuonPrepRawDataProviderTools )
-{
- DECLARE_TOOL( MuonLayerHashProviderTool )
- DECLARE_TOOL( MuonPrepRawDataCollectionProviderTool )
- DECLARE_TOOL( MuonPRDSelectionTool )
-}
diff --git a/MuonSpectrometer/MuonCnv/MuonPrepRawDataProviderTools/src/components/MuonPrepRawDataProviderTools_load.cxx b/MuonSpectrometer/MuonCnv/MuonPrepRawDataProviderTools/src/components/MuonPrepRawDataProviderTools_load.cxx
deleted file mode 100755
index 1d77fbb9e5a5..000000000000
--- a/MuonSpectrometer/MuonCnv/MuonPrepRawDataProviderTools/src/components/MuonPrepRawDataProviderTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonPrepRawDataProviderTools )
diff --git a/MuonSpectrometer/MuonCnv/MuonPrepRawDataToxAOD/src/components/MuonPrepRawDataToxAOD_entries.cxx b/MuonSpectrometer/MuonCnv/MuonPrepRawDataToxAOD/src/components/MuonPrepRawDataToxAOD_entries.cxx
old mode 100755
new mode 100644
index 71a3aea6b396..6edeb49e5e89
--- a/MuonSpectrometer/MuonCnv/MuonPrepRawDataToxAOD/src/components/MuonPrepRawDataToxAOD_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonPrepRawDataToxAOD/src/components/MuonPrepRawDataToxAOD_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MDT_PrepDataToxAOD.h"
#include "../RPC_PrepDataToxAOD.h"
#include "../TGC_PrepDataToxAOD.h"
@@ -14,11 +13,3 @@ DECLARE_ALGORITHM_FACTORY( TGC_PrepDataToxAOD )
DECLARE_ALGORITHM_FACTORY( CSC_PrepDataToxAOD )
DECLARE_ALGORITHM_FACTORY( RPC_RDOToxAOD )
-DECLARE_FACTORY_ENTRIES( MuonPrepRawDataToxAOD )
-{
- DECLARE_ALGORITHM( MDT_PrepDataToxAOD )
- DECLARE_ALGORITHM( RPC_PrepDataToxAOD )
- DECLARE_ALGORITHM( TGC_PrepDataToxAOD )
- DECLARE_ALGORITHM( CSC_PrepDataToxAOD )
- DECLARE_ALGORITHM( RPC_RDOToxAOD )
-}
diff --git a/MuonSpectrometer/MuonCnv/MuonPrepRawDataToxAOD/src/components/MuonPrepRawDataToxAOD_load.cxx b/MuonSpectrometer/MuonCnv/MuonPrepRawDataToxAOD/src/components/MuonPrepRawDataToxAOD_load.cxx
deleted file mode 100755
index 4959d21f44fc..000000000000
--- a/MuonSpectrometer/MuonCnv/MuonPrepRawDataToxAOD/src/components/MuonPrepRawDataToxAOD_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonPrepRawDataToxAOD )
-
diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/components/MuonRPC_CnvTools_entries.cxx b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/components/MuonRPC_CnvTools_entries.cxx
index 2563a35c6bf0..826505fad272 100644
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/components/MuonRPC_CnvTools_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/components/MuonRPC_CnvTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../RpcRdoToPrepDataTool.h"
#include "../RpcPadContByteStreamTool.h"
#include "../RpcROD_Decoder.h"
@@ -11,12 +10,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Muon, RpcROD_Decoder )
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, RPC_RawDataProviderTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, RpcRDO_Decoder )
-DECLARE_FACTORY_ENTRIES( MuonRPC_CnvTools )
-{
- DECLARE_NAMESPACE_TOOL( Muon, RpcRdoToPrepDataTool )
- DECLARE_NAMESPACE_TOOL( Muon, RpcPadContByteStreamTool )
- DECLARE_NAMESPACE_TOOL( Muon, RpcROD_Decoder )
- DECLARE_NAMESPACE_TOOL( Muon, RPC_RawDataProviderTool )
- DECLARE_NAMESPACE_TOOL( Muon, RpcRDO_Decoder )
-}
-
diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/components/MuonRPC_CnvTools_load.cxx b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/components/MuonRPC_CnvTools_load.cxx
deleted file mode 100644
index 149faf555a76..000000000000
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/components/MuonRPC_CnvTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonRPC_CnvTools )
-
diff --git a/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/components/MuonRdoToPrepData_entries.cxx b/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/components/MuonRdoToPrepData_entries.cxx
old mode 100755
new mode 100644
index 1eed4a162b61..4737d0891d63
--- a/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/components/MuonRdoToPrepData_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/components/MuonRdoToPrepData_entries.cxx
@@ -2,18 +2,9 @@
#include "MuonRdoToPrepData/MdtRdoToMdtPrepData.h"
#include "MuonRdoToPrepData/RpcRdoToRpcPrepData.h"
#include "MuonRdoToPrepData/TgcRdoToTgcPrepData.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( CscRdoToCscPrepData )
DECLARE_ALGORITHM_FACTORY( MdtRdoToMdtPrepData )
DECLARE_ALGORITHM_FACTORY( RpcRdoToRpcPrepData )
DECLARE_ALGORITHM_FACTORY( TgcRdoToTgcPrepData )
-DECLARE_FACTORY_ENTRIES( MuonRdoToPrepData ) {
- DECLARE_ALGORITHM( CscRdoToCscPrepData )
- DECLARE_ALGORITHM( MdtRdoToMdtPrepData )
- DECLARE_ALGORITHM( RpcRdoToRpcPrepData )
- DECLARE_ALGORITHM( TgcRdoToTgcPrepData )
-}
-
-
diff --git a/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/components/MuonRdoToPrepData_load.cxx b/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/components/MuonRdoToPrepData_load.cxx
deleted file mode 100755
index 7c6517d69ae5..000000000000
--- a/MuonSpectrometer/MuonCnv/MuonRdoToPrepData/src/components/MuonRdoToPrepData_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonRdoToPrepData )
-
diff --git a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/components/MuonTGC_CnvTools_entries.cxx b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/components/MuonTGC_CnvTools_entries.cxx
index 2ea0d878e90a..b0560fa99b45 100644
--- a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/components/MuonTGC_CnvTools_entries.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/components/MuonTGC_CnvTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../TgcRdoToPrepDataTool.h"
#include "../TgcRdoContByteStreamTool.h"
#include "../TgcPrepDataReplicationTool.h"
@@ -22,16 +21,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Muon, TGC_RawDataProviderTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, TgcRDO_Decoder )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Muon, TgcPrepDataReplicationAlg )
-DECLARE_FACTORY_ENTRIES( MuonTGC_CnvTools )
-{
- DECLARE_NAMESPACE_TOOL( Muon, TgcRdoToPrepDataTool )
- DECLARE_NAMESPACE_TOOL( Muon, TgcRdoContByteStreamTool )
- DECLARE_NAMESPACE_TOOL( Muon, TgcPrepDataReplicationTool )
- DECLARE_NAMESPACE_TOOL( Muon, TGC_RodDecoderReadout )
- DECLARE_NAMESPACE_TOOL( Muon, TGC_RodDecoderRawdata )
- DECLARE_NAMESPACE_TOOL( Muon, TGC_RawDataProviderTool )
- DECLARE_NAMESPACE_TOOL( Muon, TgcRDO_Decoder )
- DECLARE_NAMESPACE_TOOL( Muon, TgcPrepDataReplicationTool3BCtoAllBC )
- DECLARE_NAMESPACE_TOOL( Muon, TgcPrepDataReplicationToolAllBCto3BC )
- DECLARE_NAMESPACE_ALGORITHM( Muon, TgcPrepDataReplicationAlg )
-}
diff --git a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/components/MuonTGC_CnvTools_load.cxx b/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/components/MuonTGC_CnvTools_load.cxx
deleted file mode 100644
index 22bb0bce5fb9..000000000000
--- a/MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/components/MuonTGC_CnvTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonTGC_CnvTools )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondCabling/MDT_CondCabling/src/components/MDT_CondCabling_entries.cxx b/MuonSpectrometer/MuonConditions/MuonCondCabling/MDT_CondCabling/src/components/MDT_CondCabling_entries.cxx
index 8c9b359efb63..5fac4f4a93b9 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondCabling/MDT_CondCabling/src/components/MDT_CondCabling_entries.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondCabling/MDT_CondCabling/src/components/MDT_CondCabling_entries.cxx
@@ -1,11 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MDT_CondCabling/MDTCablingDbTool.h"
DECLARE_TOOL_FACTORY(MDTCablingDbTool)
-DECLARE_FACTORY_ENTRIES(MDT_CondCabling) {
-
- DECLARE_TOOL(MDTCablingDbTool)
-
-}
-
diff --git a/MuonSpectrometer/MuonConditions/MuonCondCabling/MDT_CondCabling/src/components/MDT_CondCabling_load.cxx b/MuonSpectrometer/MuonConditions/MuonCondCabling/MDT_CondCabling/src/components/MDT_CondCabling_load.cxx
deleted file mode 100644
index 17a7ee9804eb..000000000000
--- a/MuonSpectrometer/MuonConditions/MuonCondCabling/MDT_CondCabling/src/components/MDT_CondCabling_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MDT_CondCabling )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling/src/components/RPC_CondCabling_entries.cxx b/MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling/src/components/RPC_CondCabling_entries.cxx
old mode 100755
new mode 100644
index 43d381b2e050..66458a664696
--- a/MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling/src/components/RPC_CondCabling_entries.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling/src/components/RPC_CondCabling_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "RPC_CondCabling/RPCTriggerDbTool.h"
#include "RPC_CondCabling/RPCCablingDbTool.h"
DECLARE_TOOL_FACTORY( RPCCablingDbTool )
DECLARE_TOOL_FACTORY( RPCTriggerDbTool )
-
-DECLARE_FACTORY_ENTRIES( RPC_CondCabling ){
- DECLARE_TOOL( RPCCablingDbTool )
- DECLARE_TOOL( RPCTriggerDbTool )
-}
-
diff --git a/MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling/src/components/RPC_CondCabling_load.cxx b/MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling/src/components/RPC_CondCabling_load.cxx
deleted file mode 100755
index f14bcbfbc7b3..000000000000
--- a/MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling/src/components/RPC_CondCabling_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( RPC_CondCabling )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/src/components/TGC_CondCabling_entries.cxx b/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/src/components/TGC_CondCabling_entries.cxx
old mode 100755
new mode 100644
index b72727ac0f43..09ed367ce0a2
--- a/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/src/components/TGC_CondCabling_entries.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/src/components/TGC_CondCabling_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TGC_CondCabling/TGCCablingDbTool.h"
#include "TGC_CondCabling/TGCTriggerDbTool.h"
DECLARE_TOOL_FACTORY( TGCCablingDbTool )
DECLARE_TOOL_FACTORY( TGCTriggerDbTool )
-DECLARE_FACTORY_ENTRIES( TGC_CondCabling ){
- DECLARE_TOOL( TGCCablingDbTool )
- DECLARE_TOOL( TGCTriggerDbTool )
-}
-
diff --git a/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/src/components/TGC_CondCabling_load.cxx b/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/src/components/TGC_CondCabling_load.cxx
deleted file mode 100755
index d6c5a409d50e..000000000000
--- a/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/src/components/TGC_CondCabling_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TGC_CondCabling )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/components/MuonCondCool_entries.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/components/MuonCondCool_entries.cxx
old mode 100755
new mode 100644
index d3de2a1af58b..751ab4ccb220
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/components/MuonCondCool_entries.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/components/MuonCondCool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonCondCool/MdtReadWriteCoolStr.h"
#include "MuonCondCool/RpcReadWriteCoolStr.h"
#include "../CscReadWriteCoolStr.h"
@@ -14,12 +13,3 @@ DECLARE_ALGORITHM_FACTORY( CscReadWriteCoolStr )
DECLARE_ALGORITHM_FACTORY( CscCoolTest )
DECLARE_ALGORITHM_FACTORY( TriggerCool )
-DECLARE_FACTORY_ENTRIES( MuonCondCool ){
- DECLARE_ALGORITHM( MdtReadWriteCoolStr )
- DECLARE_ALGORITHM( RpcReadWriteCoolStr )
- DECLARE_ALGORITHM( MdtTubeCondCool )
- DECLARE_ALGORITHM( CscReadWriteCoolStr )
- DECLARE_ALGORITHM( CscCoolTest )
- DECLARE_ALGORITHM( TriggerCool )
-
-}
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/components/MuonCondCool_load.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/components/MuonCondCool_load.cxx
deleted file mode 100755
index 1b2043814069..000000000000
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/src/components/MuonCondCool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCondCool )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/components/MuonCondSvc_entries.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/components/MuonCondSvc_entries.cxx
old mode 100755
new mode 100644
index aae78126bf34..c05497fb59e3
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/components/MuonCondSvc_entries.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/components/MuonCondSvc_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "MuonCondSvc/MuonAlignmentDbSvc.h"
//#include "MuonCondSvc/MuonDetectorStatusDbSvc.h"
@@ -45,25 +43,3 @@ DECLARE_SERVICE_FACTORY( TriggerCoolSvc )
DECLARE_SERVICE_FACTORY( TGC_STATUSConditionsSvc )
DECLARE_SERVICE_FACTORY( MDT_DCSConditionsRun2Svc )
-DECLARE_FACTORY_ENTRIES( MuonCondSvc ){
-
- DECLARE_SERVICE( MuonAlignmentDbSvc )
- DECLARE_SERVICE( MuonAlignmentErrorDbSvc )
- DECLARE_SERVICE( RPC_DCSConditionsSvc )
- DECLARE_SERVICE( RpcDetectorStatusDbSvc )
- DECLARE_SERVICE( CscCoolStrSvc )
- DECLARE_SERVICE( MdtCoolStrSvc )
- DECLARE_SERVICE( RpcCoolStrSvc )
- DECLARE_SERVICE( MDT_DCSConditionsSvc )
- DECLARE_SERVICE( CSC_DCSConditionsSvc )
- DECLARE_SERVICE( MDTCondSummarySvc )
- DECLARE_SERVICE( RPCCondSummarySvc )
- DECLARE_SERVICE( TGCCondSummarySvc )
- DECLARE_SERVICE( CSCCondSummarySvc )
- DECLARE_SERVICE( MDT_DeadTubeConditionsSvc )
- DECLARE_SERVICE( MDT_DQConditionsSvc )
- DECLARE_SERVICE( RPC_STATUSConditionsSvc )
- DECLARE_SERVICE( TriggerCoolSvc )
- DECLARE_SERVICE( TGC_STATUSConditionsSvc )
- DECLARE_SERVICE( MDT_DCSConditionsRun2Svc )
-}
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/components/MuonCondSvc_load.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/components/MuonCondSvc_load.cxx
deleted file mode 100755
index 1deccc41cba1..000000000000
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/components/MuonCondSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCondSvc )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_entries.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_entries.cxx
old mode 100755
new mode 100644
index a2439778ed86..f169973b4adb
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_entries.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_entries.cxx
@@ -1,10 +1,5 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
#include "MuonCondTest/AlignCondAthTest.h"
#include "MuonCondTest/MuonDetectorStatusTest.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
//#include "MuonCondTest/RpcStatusTest.h"
#include "MuonCondTest/MuonConditionsTestAlg.h"
#include "MuonCondTest/MDT_DCSStatusTest.h"
@@ -21,14 +16,3 @@ DECLARE_ALGORITHM_FACTORY( MDTConditionsTestAlg )
DECLARE_ALGORITHM_FACTORY( RPCStatusTestAlg )
DECLARE_ALGORITHM_FACTORY( MuonConditionsHistoSummary )
-DECLARE_FACTORY_ENTRIES( MuonCondTest ) {
- DECLARE_ALGORITHM( AlignCondAthTest );
- DECLARE_ALGORITHM( MuonDetectorStatusTest );
-// DECLARE_ALGORITHM( RpcStatusTest );
- DECLARE_ALGORITHM( MuonConditionsTestAlg );
- DECLARE_ALGORITHM( MDT_DCSStatusTest );
- DECLARE_ALGORITHM( MDTConditionsTestAlg );
- DECLARE_ALGORITHM( RPCStatusTestAlg );
- DECLARE_ALGORITHM( MuonConditionsHistoSummary );
-}
-
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_load.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_load.cxx
deleted file mode 100755
index 72925fc10adb..000000000000
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCondTest )
-
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/components/MuonCondTool_entries.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/components/MuonCondTool_entries.cxx
index c791f7bef435..f2cd0f771c54 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/components/MuonCondTool_entries.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/components/MuonCondTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonCondTool/MuonAlignmentDbTool.h"
#include "MuonCondTool/MultiLevelAlignmentDbTool.h"
#include "MuonCondTool/MDT_DCSConditionsTool.h"
@@ -25,18 +24,3 @@ DECLARE_TOOL_FACTORY( MDT_MapConversion )
DECLARE_TOOL_FACTORY( MuonAlignmentErrorDbTool )
DECLARE_TOOL_FACTORY( MDT_DCSConditionsRun2Tool )
-DECLARE_FACTORY_ENTRIES( MuonCondTool ){
- DECLARE_TOOL( MuonAlignmentDbTool )
- DECLARE_TOOL( MultiLevelAlignmentDbTool )
- DECLARE_TOOL( MDT_DCSConditionsTool )
- DECLARE_TOOL( CSC_DCSConditionsTool )
- DECLARE_TOOL( MDT_DeadTubeConditionsTool )
- DECLARE_TOOL( MDT_DQConditionsTool )
- DECLARE_TOOL( MDT_MapConversion )
- DECLARE_TOOL( RpcDetectorStatusDbTool )
- DECLARE_TOOL( RPC_DCSConditionsTool )
- DECLARE_TOOL( TGC_STATUSConditionsTool )
- DECLARE_TOOL( MuonAlignmentErrorDbTool )
- DECLARE_TOOL( MDT_DCSConditionsRun2Tool )
-}
-
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/components/MuonCondTool_load.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/components/MuonCondTool_load.cxx
deleted file mode 100644
index af7ac19ca6d8..000000000000
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/src/components/MuonCondTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCondTool )
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/components/MuonAGDD_entries.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/components/MuonAGDD_entries.cxx
index 9d9c4b2c8530..9eb5967fe3f6 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/components/MuonAGDD_entries.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/components/MuonAGDD_entries.cxx
@@ -1,13 +1,6 @@
-
#include "MuonAGDD/MuonAGDDTool.h"
#include "MuonAGDD/NSWAGDDTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(MuonAGDDTool)
DECLARE_TOOL_FACTORY(NSWAGDDTool)
-DECLARE_FACTORY_ENTRIES(MuonAGDD) {
- DECLARE_ALGTOOL ( MuonAGDDTool )
- DECLARE_ALGTOOL ( NSWAGDDTool )
-}
-
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/components/MuonAGDD_load.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/components/MuonAGDD_load.cxx
deleted file mode 100644
index e77da4e9ee75..000000000000
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/components/MuonAGDD_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonAGDD)
-
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/components/MuonRegionSelector_entries.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/components/MuonRegionSelector_entries.cxx
index 05ce5b545c3e..61ed4e0505af 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/components/MuonRegionSelector_entries.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/components/MuonRegionSelector_entries.cxx
@@ -2,7 +2,6 @@
#include "MuonRegionSelector/TGC_RegionSelectorTable.h"
#include "MuonRegionSelector/MDT_RegionSelectorTable.h"
#include "MuonRegionSelector/CSC_RegionSelectorTable.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
// DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDetDD, InDetRegionSelectorLUT )
DECLARE_TOOL_FACTORY( RPC_RegionSelectorTable )
@@ -10,10 +9,3 @@ DECLARE_TOOL_FACTORY( TGC_RegionSelectorTable )
DECLARE_TOOL_FACTORY( MDT_RegionSelectorTable )
DECLARE_TOOL_FACTORY( CSC_RegionSelectorTable )
-DECLARE_FACTORY_ENTRIES(MuonRegionSelector) {
- // DECLARE_NAMESPACE_ALGORITHM( InDetDD, InDetRegionSelectorLUT )
- DECLARE_TOOL( RPC_RegionSelectorTable )
- DECLARE_TOOL( TGC_RegionSelectorTable )
- DECLARE_TOOL( MDT_RegionSelectorTable )
- DECLARE_TOOL( CSC_RegionSelectorTable )
-}
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/components/MuonRegionSelector_load.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/components/MuonRegionSelector_load.cxx
deleted file mode 100644
index 9f3d53c9745e..000000000000
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/components/MuonRegionSelector_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonRegionSelector)
-
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/components/MuonTrackingGeometry_entries.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/components/MuonTrackingGeometry_entries.cxx
index 85be999d50c3..5e71fb7cbdb0 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/components/MuonTrackingGeometry_entries.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/components/MuonTrackingGeometry_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonTrackingGeometry/MuonTrackingGeometryBuilder.h"
#include "MuonTrackingGeometry/MuonStationBuilder.h"
#include "MuonTrackingGeometry/MuonStationTypeBuilder.h"
@@ -12,12 +11,3 @@ DECLARE_TOOL_FACTORY( MuonStationBuilder )
DECLARE_TOOL_FACTORY( MuonStationTypeBuilder )
DECLARE_TOOL_FACTORY( MuonInertMaterialBuilder )
-DECLARE_FACTORY_ENTRIES( MuonTrackingGeometry )
-{
- DECLARE_TOOL( MuonTrackingGeometryBuilder )
- DECLARE_TOOL( MuonStationBuilder )
- DECLARE_TOOL( MuonStationTypeBuilder )
- DECLARE_TOOL( MuonInertMaterialBuilder )
-}
-
-
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/components/MuonTrackingGeometry_load.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/components/MuonTrackingGeometry_load.cxx
deleted file mode 100644
index 2ac0cf62b8b3..000000000000
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/components/MuonTrackingGeometry_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonTrackingGeometry )
-
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/components/CSC_Digitization_entries.cxx b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/components/CSC_Digitization_entries.cxx
index 23c88aaf030f..86a2cca277aa 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/components/CSC_Digitization_entries.cxx
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/components/CSC_Digitization_entries.cxx
@@ -1,14 +1,8 @@
#include "CSC_Digitization/CscDigitBuilder.h"
#include "CSC_Digitization/CscDigitizationTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
DECLARE_ALGORITHM_FACTORY( CscDigitBuilder )
DECLARE_TOOL_FACTORY( CscDigitizationTool )
-DECLARE_FACTORY_ENTRIES(CSC_Digitization) {
- DECLARE_ALGORITHM(CscDigitBuilder)
- DECLARE_TOOL( CscDigitizationTool )
-}
-
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/components/CSC_Digitization_load.cxx b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/components/CSC_Digitization_load.cxx
deleted file mode 100644
index d2335a88f0d1..000000000000
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/components/CSC_Digitization_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CSC_Digitization)
-
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/components/MDT_Digitization_entries.cxx b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/components/MDT_Digitization_entries.cxx
index 536c22d8c854..f143623738ea 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/components/MDT_Digitization_entries.cxx
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/components/MDT_Digitization_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MDT_Digitization/MdtDigitizationTool.h"
#include "MDT_Digitization/MDT_Digitizer.h"
#include "MDT_Digitization/MDT_Response_DigiTool.h"
@@ -13,12 +12,3 @@ DECLARE_TOOL_FACTORY( RT_Relation_DigiTool )
DECLARE_TOOL_FACTORY( RT_Relation_DB_DigiTool )
DECLARE_TOOL_FACTORY( MdtDigitizationTool )
-DECLARE_FACTORY_ENTRIES(MDT_Digitization) {
- DECLARE_ALGORITHM( MDT_Digitizer )
-
- DECLARE_TOOL( MDT_Response_DigiTool )
- DECLARE_TOOL( RT_Relation_DigiTool )
- DECLARE_TOOL( RT_Relation_DB_DigiTool )
- DECLARE_TOOL( MdtDigitizationTool )
-
-}
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/components/MDT_Digitization_load.cxx b/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/components/MDT_Digitization_load.cxx
deleted file mode 100644
index 2874b55c9f26..000000000000
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/src/components/MDT_Digitization_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MDT_Digitization)
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/components/MM_Digitization_entries.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/components/MM_Digitization_entries.cxx
index 9d856cfddfb4..7ebb61e9e87b 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/components/MM_Digitization_entries.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/components/MM_Digitization_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MM_Digitization/MmDigitizationTool.h"
#include "MM_Digitization/MM_Digitizer.h"
#include "MM_Digitization/MM_Response_DigitTool.h"
@@ -9,8 +8,3 @@ DECLARE_ALGORITHM_FACTORY( MM_Digitizer )
DECLARE_TOOL_FACTORY( MM_Response_DigitTool )
DECLARE_TOOL_FACTORY( MmDigitizationTool )
-DECLARE_FACTORY_ENTRIES(MM_Digitization) {
- DECLARE_ALGORITHM( MM_Digitizer )
- DECLARE_TOOL( MM_Response_DigitTool )
- DECLARE_TOOL( MmDigitizationTool )
-}
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/components/MM_Digitization_load.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/components/MM_Digitization_load.cxx
deleted file mode 100644
index a4418a12d1ce..000000000000
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/components/MM_Digitization_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MM_Digitization)
diff --git a/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/components/MuonFastDigitization_entries.cxx b/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/components/MuonFastDigitization_entries.cxx
index 2fba76343862..3ca6b1c2eb23 100644
--- a/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/components/MuonFastDigitization_entries.cxx
+++ b/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/components/MuonFastDigitization_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../sTgcFastDigitizer.h"
#include "../MM_FastDigitizer.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
@@ -6,7 +5,3 @@
DECLARE_ALGORITHM_FACTORY( sTgcFastDigitizer )
DECLARE_ALGORITHM_FACTORY( MM_FastDigitizer )
-DECLARE_FACTORY_ENTRIES(MuonFastDigitization) {
- DECLARE_ALGORITHM( sTgcFastDigitizer )
- DECLARE_ALGORITHM( MM_FastDigitizer )
-}
diff --git a/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/components/MuonFastDigitization_load.cxx b/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/components/MuonFastDigitization_load.cxx
deleted file mode 100644
index c43658554961..000000000000
--- a/MuonSpectrometer/MuonDigitization/MuonFastDigitization/src/components/MuonFastDigitization_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonFastDigitization)
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/components/RPC_Digitization_entries.cxx b/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/components/RPC_Digitization_entries.cxx
index 7d49f7b5df4e..9e83b0572da5 100644
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/components/RPC_Digitization_entries.cxx
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/components/RPC_Digitization_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "RPC_Digitization/RPC_Digitizer.h"
#include "RPC_Digitization/RpcDigitizationTool.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
@@ -7,9 +6,3 @@ DECLARE_ALGORITHM_FACTORY( RPC_Digitizer )
DECLARE_TOOL_FACTORY( RpcDigitizationTool )
-DECLARE_FACTORY_ENTRIES(RPC_Digitization) {
- DECLARE_ALGORITHM( RPC_Digitizer )
-
- DECLARE_TOOL( RpcDigitizationTool )
-
-}
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/components/RPC_Digitization_load.cxx b/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/components/RPC_Digitization_load.cxx
deleted file mode 100644
index 609ba5a65541..000000000000
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/src/components/RPC_Digitization_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RPC_Digitization)
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/components/TGC_Digitization_entries.cxx b/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/components/TGC_Digitization_entries.cxx
index 8c1684e65a76..b72f5b7dcbb7 100644
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/components/TGC_Digitization_entries.cxx
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/components/TGC_Digitization_entries.cxx
@@ -1,14 +1,6 @@
#include "TGC_Digitization/TGCDigitizer.h"
#include "TGC_Digitization/TgcDigitizationTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
DECLARE_ALGORITHM_FACTORY( TGCDigitizer )
-
DECLARE_TOOL_FACTORY( TgcDigitizationTool )
-DECLARE_FACTORY_ENTRIES(TGC_Digitization) {
- DECLARE_ALGORITHM( TGCDigitizer )
-
- DECLARE_TOOL( TgcDigitizationTool )
-}
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/components/TGC_Digitization_load.cxx b/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/components/TGC_Digitization_load.cxx
deleted file mode 100644
index 32c23f4c5a07..000000000000
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/components/TGC_Digitization_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TGC_Digitization)
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/components/sTGC_Digitization_entries.cxx b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/components/sTGC_Digitization_entries.cxx
index 49f8e61b9c88..4c29d27272ad 100644
--- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/components/sTGC_Digitization_entries.cxx
+++ b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/components/sTGC_Digitization_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "sTGC_Digitization/sTgcDigitizationTool.h"
#include "sTGC_Digitization/sTGC_Digitizer.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
@@ -7,7 +6,3 @@ DECLARE_ALGORITHM_FACTORY( sTGC_Digitizer )
DECLARE_TOOL_FACTORY( sTgcDigitizationTool )
-DECLARE_FACTORY_ENTRIES(sTGC_Digitization) {
- DECLARE_ALGORITHM( sTGC_Digitizer )
- DECLARE_TOOL( sTgcDigitizationTool )
-}
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/components/sTGC_Digitization_load.cxx b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/components/sTGC_Digitization_load.cxx
deleted file mode 100644
index fa82988c3a73..000000000000
--- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/components/sTGC_Digitization_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(sTGC_Digitization)
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/src/components/MuonG4SD_entries.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/src/components/MuonG4SD_entries.cxx
index c91324fb0ba3..89fdb4ab35a9 100644
--- a/MuonSpectrometer/MuonG4/MuonG4SD/src/components/MuonG4SD_entries.cxx
+++ b/MuonSpectrometer/MuonG4/MuonG4SD/src/components/MuonG4SD_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../CSCSensitiveDetectorTool.h"
#include "../CSCSensitiveDetectorCosmicsTool.h"
#include "../GenericMuonSensitiveDetectorTool.h"
@@ -24,16 +22,3 @@ DECLARE_TOOL_FACTORY( TGCSensitiveDetectorTool )
DECLARE_TOOL_FACTORY( TGCSensitiveDetectorCosmicsTool )
DECLARE_TOOL_FACTORY( sTGCSensitiveDetectorTool )
-DECLARE_FACTORY_ENTRIES( MuonG4SD ) {
- DECLARE_TOOL( CSCSensitiveDetectorTool )
- DECLARE_TOOL( CSCSensitiveDetectorCosmicsTool )
- DECLARE_TOOL( GenericMuonSensitiveDetectorTool )
- DECLARE_TOOL( MDTSensitiveDetectorTool )
- DECLARE_TOOL( MDTSensitiveDetectorCosmicsTool )
- DECLARE_TOOL( MicromegasSensitiveDetectorTool )
- DECLARE_TOOL( RPCSensitiveDetectorTool )
- DECLARE_TOOL( RPCSensitiveDetectorCosmicsTool )
- DECLARE_TOOL( TGCSensitiveDetectorTool )
- DECLARE_TOOL( TGCSensitiveDetectorCosmicsTool )
- DECLARE_TOOL( sTGCSensitiveDetectorTool )
-}
diff --git a/MuonSpectrometer/MuonG4/MuonG4SD/src/components/MuonG4SD_load.cxx b/MuonSpectrometer/MuonG4/MuonG4SD/src/components/MuonG4SD_load.cxx
deleted file mode 100644
index 5d619b3526e5..000000000000
--- a/MuonSpectrometer/MuonG4/MuonG4SD/src/components/MuonG4SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( MuonG4SD )
diff --git a/MuonSpectrometer/MuonGeoModel/src/components/MuonGeoModel_entries.cxx b/MuonSpectrometer/MuonGeoModel/src/components/MuonGeoModel_entries.cxx
old mode 100755
new mode 100644
index 67c96cb29f3c..0a70e5b8cc89
--- a/MuonSpectrometer/MuonGeoModel/src/components/MuonGeoModel_entries.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/components/MuonGeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "MuonGeoModel/MuonDetectorTool.h"
DECLARE_TOOL_FACTORY(MuonDetectorTool)
+
diff --git a/MuonSpectrometer/MuonGeoModelTest/src/components/MuonGeoModelTest_entries.cxx b/MuonSpectrometer/MuonGeoModelTest/src/components/MuonGeoModelTest_entries.cxx
index 939840df176f..39db337d21ce 100644
--- a/MuonSpectrometer/MuonGeoModelTest/src/components/MuonGeoModelTest_entries.cxx
+++ b/MuonSpectrometer/MuonGeoModelTest/src/components/MuonGeoModelTest_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "MuonGeoModelTest/MuonGMCheck.h"
#include "MuonGeoModelTest/MuonGMTestOnPrd.h"
#include "MuonGeoModelTest/MuonHitRelocation.h"
@@ -8,8 +6,3 @@ DECLARE_ALGORITHM_FACTORY( MuonGMCheck )
DECLARE_ALGORITHM_FACTORY( MuonGMTestOnPrd )
DECLARE_ALGORITHM_FACTORY( MuonHitRelocation )
-DECLARE_FACTORY_ENTRIES(MuonGeoModelTest) {
- DECLARE_ALGORITHM( MuonGMCheck )
- DECLARE_ALGORITHM( MuonGMTestOnPrd )
- DECLARE_ALGORITHM( MuonHitRelocation )
-}
diff --git a/MuonSpectrometer/MuonGeoModelTest/src/components/MuonGeoModelTest_load.cxx b/MuonSpectrometer/MuonGeoModelTest/src/components/MuonGeoModelTest_load.cxx
deleted file mode 100644
index 0b5030c9e7de..000000000000
--- a/MuonSpectrometer/MuonGeoModelTest/src/components/MuonGeoModelTest_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonGeoModelTest)
diff --git a/MuonSpectrometer/MuonIdHelpers/src/components/MuonIdHelpers_entries.cxx b/MuonSpectrometer/MuonIdHelpers/src/components/MuonIdHelpers_entries.cxx
index 8f081dc8fb76..b1e0d5c36b50 100644
--- a/MuonSpectrometer/MuonIdHelpers/src/components/MuonIdHelpers_entries.cxx
+++ b/MuonSpectrometer/MuonIdHelpers/src/components/MuonIdHelpers_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonIdHelpers/MuonIdHelperTool.h"
@@ -8,7 +7,3 @@ using namespace Muon;
DECLARE_TOOL_FACTORY( MuonIdHelperTool )
-DECLARE_FACTORY_ENTRIES( MuonIdHelpers )
-{
- DECLARE_TOOL( MuonIdHelperTool );
-}
diff --git a/MuonSpectrometer/MuonIdHelpers/src/components/MuonIdHelpers_load.cxx b/MuonSpectrometer/MuonIdHelpers/src/components/MuonIdHelpers_load.cxx
deleted file mode 100644
index cf76b062aa4d..000000000000
--- a/MuonSpectrometer/MuonIdHelpers/src/components/MuonIdHelpers_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonIdHelpers )
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonIdHelpersAlgs/src/components/TestMuonIdHelpers_entries.cxx b/MuonSpectrometer/MuonIdHelpersAlgs/src/components/TestMuonIdHelpers_entries.cxx
index 9e27ced3de50..254a4a571563 100644
--- a/MuonSpectrometer/MuonIdHelpersAlgs/src/components/TestMuonIdHelpers_entries.cxx
+++ b/MuonSpectrometer/MuonIdHelpersAlgs/src/components/TestMuonIdHelpers_entries.cxx
@@ -1,12 +1,6 @@
#include "MuonIdHelpersAlgs/TestMuonIdHelpers.h"
#include "MuonIdHelpersAlgs/CscHashId.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( TestMuonIdHelpers )
DECLARE_ALGORITHM_FACTORY( CscHashId )
-DECLARE_FACTORY_ENTRIES(MuonIdHelpersAlgs) {
- DECLARE_ALGORITHM( TestMuonIdHelpers )
- DECLARE_ALGORITHM( CscHashId )
-}
-
diff --git a/MuonSpectrometer/MuonIdHelpersAlgs/src/components/TestMuonIdHelpers_load.cxx b/MuonSpectrometer/MuonIdHelpersAlgs/src/components/TestMuonIdHelpers_load.cxx
deleted file mode 100644
index d8d36cbdf149..000000000000
--- a/MuonSpectrometer/MuonIdHelpersAlgs/src/components/TestMuonIdHelpers_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonIdHelpersAlgs)
-
-
diff --git a/MuonSpectrometer/MuonOverlay/CscOverlay/src/components/CscOverlay_entries.cxx b/MuonSpectrometer/MuonOverlay/CscOverlay/src/components/CscOverlay_entries.cxx
index 467c40be7412..d12130b75f00 100644
--- a/MuonSpectrometer/MuonOverlay/CscOverlay/src/components/CscOverlay_entries.cxx
+++ b/MuonSpectrometer/MuonOverlay/CscOverlay/src/components/CscOverlay_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CscOverlay/CscOverlay.h"
DECLARE_ALGORITHM_FACTORY( CscOverlay )
-
-DECLARE_FACTORY_ENTRIES( CscOverlay ) {
- DECLARE_ALGORITHM( CscOverlay )
-}
diff --git a/MuonSpectrometer/MuonOverlay/CscOverlay/src/components/CscOverlay_load.cxx b/MuonSpectrometer/MuonOverlay/CscOverlay/src/components/CscOverlay_load.cxx
deleted file mode 100644
index 5ef9917ae1d1..000000000000
--- a/MuonSpectrometer/MuonOverlay/CscOverlay/src/components/CscOverlay_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CscOverlay)
-
diff --git a/MuonSpectrometer/MuonOverlay/MdtOverlay/src/components/MdtOverlay_entries.cxx b/MuonSpectrometer/MuonOverlay/MdtOverlay/src/components/MdtOverlay_entries.cxx
index 7df0fd5dd48a..8d102f46f794 100644
--- a/MuonSpectrometer/MuonOverlay/MdtOverlay/src/components/MdtOverlay_entries.cxx
+++ b/MuonSpectrometer/MuonOverlay/MdtOverlay/src/components/MdtOverlay_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MdtOverlay/MdtOverlay.h"
DECLARE_ALGORITHM_FACTORY( MdtOverlay )
-
-DECLARE_FACTORY_ENTRIES( MdtOverlay ) {
- DECLARE_ALGORITHM( MdtOverlay )
-}
diff --git a/MuonSpectrometer/MuonOverlay/MdtOverlay/src/components/MdtOverlay_load.cxx b/MuonSpectrometer/MuonOverlay/MdtOverlay/src/components/MdtOverlay_load.cxx
deleted file mode 100644
index 25e9bc9a160e..000000000000
--- a/MuonSpectrometer/MuonOverlay/MdtOverlay/src/components/MdtOverlay_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MdtOverlay)
-
diff --git a/MuonSpectrometer/MuonOverlay/RpcOverlay/src/components/RpcOverlay_entries.cxx b/MuonSpectrometer/MuonOverlay/RpcOverlay/src/components/RpcOverlay_entries.cxx
index a94e23a46ccd..4dfa7ab20d97 100644
--- a/MuonSpectrometer/MuonOverlay/RpcOverlay/src/components/RpcOverlay_entries.cxx
+++ b/MuonSpectrometer/MuonOverlay/RpcOverlay/src/components/RpcOverlay_entries.cxx
@@ -1,9 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "RpcOverlay/RpcOverlay.h"
DECLARE_ALGORITHM_FACTORY( RpcOverlay )
-DECLARE_FACTORY_ENTRIES( RpcOverlay ) {
- DECLARE_ALGORITHM( RpcOverlay )
-}
diff --git a/MuonSpectrometer/MuonOverlay/RpcOverlay/src/components/RpcOverlay_load.cxx b/MuonSpectrometer/MuonOverlay/RpcOverlay/src/components/RpcOverlay_load.cxx
deleted file mode 100644
index 781cc54691b9..000000000000
--- a/MuonSpectrometer/MuonOverlay/RpcOverlay/src/components/RpcOverlay_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RpcOverlay)
-
diff --git a/MuonSpectrometer/MuonOverlay/TgcOverlay/src/components/TgcOverlay_entries.cxx b/MuonSpectrometer/MuonOverlay/TgcOverlay/src/components/TgcOverlay_entries.cxx
index 9ce2476393a8..e5e237c6c771 100644
--- a/MuonSpectrometer/MuonOverlay/TgcOverlay/src/components/TgcOverlay_entries.cxx
+++ b/MuonSpectrometer/MuonOverlay/TgcOverlay/src/components/TgcOverlay_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TgcOverlay/TgcOverlay.h"
DECLARE_ALGORITHM_FACTORY( TgcOverlay )
-
-DECLARE_FACTORY_ENTRIES( TgcOverlay ) {
- DECLARE_ALGORITHM( TgcOverlay )
-}
diff --git a/MuonSpectrometer/MuonOverlay/TgcOverlay/src/components/TgcOverlay_load.cxx b/MuonSpectrometer/MuonOverlay/TgcOverlay/src/components/TgcOverlay_load.cxx
deleted file mode 100644
index 77363ed83c2b..000000000000
--- a/MuonSpectrometer/MuonOverlay/TgcOverlay/src/components/TgcOverlay_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TgcOverlay)
-
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/components/CscClusterization_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/components/CscClusterization_entries.cxx
old mode 100755
new mode 100644
index f9d13e9563d9..4c8f5a5685ee
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/components/CscClusterization_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/components/CscClusterization_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../CscThresholdClusterBuilder.h"
#include "../CscThresholdClusterBuilderTool.h"
#include "../CscPeakThresholdClusterBuilderTool.h"
@@ -21,16 +19,4 @@ DECLARE_TOOL_FACTORY( CscSplitClusterFitter )
DECLARE_TOOL_FACTORY( ParabolaCscClusterFitter )
DECLARE_TOOL_FACTORY( CscClusterUtilTool )
DECLARE_TOOL_FACTORY( CscAlignmentTool )
-
-DECLARE_FACTORY_ENTRIES(CscClusterization) {
- DECLARE_ALGORITHM ( CscThresholdClusterBuilder )
- DECLARE_TOOL ( CscThresholdClusterBuilderTool )
- DECLARE_TOOL ( CscPeakThresholdClusterBuilderTool )
- DECLARE_TOOL ( CalibCscStripFitter )
- DECLARE_TOOL ( SimpleCscClusterFitter )
- DECLARE_TOOL ( QratCscClusterFitter )
- DECLARE_TOOL ( CscSplitClusterFitter )
- DECLARE_TOOL ( ParabolaCscClusterFitter )
- DECLARE_TOOL ( CscClusterUtilTool )
- DECLARE_TOOL ( CscAlignmentTool )
-}
+
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/components/CscClusterization_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/components/CscClusterization_load.cxx
deleted file mode 100755
index b24ca8713c59..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/components/CscClusterization_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CscClusterization)
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonClusterization/src/components/MuonClusterization_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonClusterization/src/components/MuonClusterization_entries.cxx
old mode 100755
new mode 100644
index d8aeedf5743d..554783097d9a
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonClusterization/src/components/MuonClusterization_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonClusterization/src/components/MuonClusterization_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../MuonClusterizationAlg.h"
#include "../MuonClusterizationTool.h"
@@ -7,9 +5,4 @@ using namespace Muon;
DECLARE_ALGORITHM_FACTORY( MuonClusterizationAlg )
DECLARE_TOOL_FACTORY( MuonClusterizationTool )
-
-DECLARE_FACTORY_ENTRIES( MuonClusterization )
-{
- DECLARE_ALGORITHM( MuonClusterizationAlg )
- DECLARE_TOOL( MuonClusterizationTool )
-}
+
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonClusterization/src/components/MuonClusterization_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonClusterization/src/components/MuonClusterization_load.cxx
deleted file mode 100755
index 94562f5d9908..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonClusterization/src/components/MuonClusterization_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonSegmentOverlapRemovalTools )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonTGMeasAssocAlg/src/components/MuonTGMeasAssocAlg_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonTGMeasAssocAlg/src/components/MuonTGMeasAssocAlg_entries.cxx
index e05cf230cee7..d57dcc6463a9 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonTGMeasAssocAlg/src/components/MuonTGMeasAssocAlg_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonTGMeasAssocAlg/src/components/MuonTGMeasAssocAlg_entries.cxx
@@ -1,13 +1,5 @@
#include "MuonTGMeasAssocAlg/MuonTGMeasAssocAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace Muon;
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Muon, MuonTGMeasAssocAlg )
-DECLARE_FACTORY_ENTRIES(MuonTGMeasAssocAlg) {
- DECLARE_NAMESPACE_ALGORITHM( Muon, MuonTGMeasAssocAlg)
-}
-
-
-
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonTGMeasAssocAlg/src/components/MuonTGMeasAssocAlg_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonTGMeasAssocAlg/src/components/MuonTGMeasAssocAlg_load.cxx
deleted file mode 100644
index d7e6a2f2598e..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/MuonTGMeasAssocAlg/src/components/MuonTGMeasAssocAlg_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonTGMeasAssocAlg)
-
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/src/components/RpcClusterBuilder_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/src/components/RpcClusterBuilder_entries.cxx
old mode 100755
new mode 100644
index 078c8eb3b67d..6b4305d31c40
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/src/components/RpcClusterBuilder_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/src/components/RpcClusterBuilder_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "RpcClusterization/RpcClusterBuilderPRD.h"
DECLARE_ALGORITHM_FACTORY( RpcClusterBuilderPRD )
-DECLARE_FACTORY_ENTRIES(RpcClusterization) {
- DECLARE_ALGORITHM ( RpcClusterBuilderPRD )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/src/components/RpcClusterBuilder_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/src/components/RpcClusterBuilder_load.cxx
deleted file mode 100755
index 49a10624a39c..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/RpcClusterization/src/components/RpcClusterBuilder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RpcClusterization)
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/components/MuonCombinePatternTool_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/components/MuonCombinePatternTool_entries.cxx
index 552014f85279..859fb68b89b3 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/components/MuonCombinePatternTool_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/components/MuonCombinePatternTool_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonCombinePatternTools/MuonCombinePatternTool.h"
DECLARE_TOOL_FACTORY( MuonCombinePatternTool )
-DECLARE_FACTORY_ENTRIES( MuonCombinePatternTools )
-{
- DECLARE_TOOL( MuonCombinePatternTool )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/components/MuonCombinePatternTool_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/components/MuonCombinePatternTool_load.cxx
deleted file mode 100644
index da208f1bd780..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonCombinePatternTools/src/components/MuonCombinePatternTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinePatternTools )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/components/MuonHoughPatternTool_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/components/MuonHoughPatternTool_entries.cxx
old mode 100755
new mode 100644
index aeea5fa2c267..575f19429c7d
--- a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/components/MuonHoughPatternTool_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/components/MuonHoughPatternTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonHoughPatternTools/MuonHoughPatternTool.h"
#include "MuonHoughPatternTools/MuonHoughPatternFinderTool.h"
#include "MuonHoughPatternTools/MuonLayerHoughTool.h"
@@ -11,10 +10,3 @@ DECLARE_TOOL_FACTORY( MuonHoughPatternFinderTool )
DECLARE_TOOL_FACTORY( MuonLayerHoughTool )
DECLARE_ALGORITHM_FACTORY( MuonLayerHoughAlg )
-DECLARE_FACTORY_ENTRIES( MuonHoughPatternTools )
-{
- DECLARE_TOOL( MuonHoughPatternTool )
- DECLARE_TOOL( MuonLayerHoughTool )
- DECLARE_TOOL( MuonHoughPatternFinderTool )
- DECLARE_ALGORITHM( MuonLayerHoughAlg )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/components/MuonHoughPatternTool_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/components/MuonHoughPatternTool_load.cxx
deleted file mode 100755
index 0366db197679..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/components/MuonHoughPatternTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonHoughPatternTools )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/components/MdtDriftCircleOnTrackCreator_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/components/MdtDriftCircleOnTrackCreator_entries.cxx
index 4ffb818d79c5..8a6a5899fa3b 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/components/MdtDriftCircleOnTrackCreator_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/components/MdtDriftCircleOnTrackCreator_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MdtDriftCircleOnTrackCreator/MdtDriftCircleOnTrackCreator.h"
#include "../AdjustableT0Tool.h"
@@ -8,8 +7,3 @@ using namespace AdjT0;
DECLARE_TOOL_FACTORY(MdtDriftCircleOnTrackCreator)
DECLARE_TOOL_FACTORY(AdjustableT0Tool)
-DECLARE_FACTORY_ENTRIES(MdtDriftCircleOnTrackCreator) {
- DECLARE_TOOL(MdtDriftCircleOnTrackCreator)
- DECLARE_TOOL(AdjustableT0Tool)
-}
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/components/MdtDriftCircleOnTrackCreator_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/components/MdtDriftCircleOnTrackCreator_load.cxx
deleted file mode 100644
index 9d39119ace4a..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator/src/components/MdtDriftCircleOnTrackCreator_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MdtDriftCircleOnTrackCreator)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/src/components/MuonClusterOnTrackCreator_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/src/components/MuonClusterOnTrackCreator_entries.cxx
old mode 100755
new mode 100644
index 34ca5b82c37d..a3c7821b1151
--- a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/src/components/MuonClusterOnTrackCreator_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/src/components/MuonClusterOnTrackCreator_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonClusterOnTrackCreator.h"
#include "../CscClusterOnTrackCreator.h"
@@ -7,8 +6,3 @@ using namespace Muon;
DECLARE_TOOL_FACTORY(MuonClusterOnTrackCreator)
DECLARE_TOOL_FACTORY(CscClusterOnTrackCreator)
-DECLARE_FACTORY_ENTRIES(MuonClusterOnTrackCreator) {
- DECLARE_TOOL(MuonClusterOnTrackCreator)
- DECLARE_TOOL(CscClusterOnTrackCreator)
-}
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/src/components/MuonClusterOnTrackCreator_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/src/components/MuonClusterOnTrackCreator_load.cxx
deleted file mode 100755
index b2de2d08664d..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonClusterOnTrackCreator/src/components/MuonClusterOnTrackCreator_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonClusterOnTrackCreator )
-LOAD_FACTORY_ENTRIES( CscClusterOnTrackCreator )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/src/components/MuonCompetingClustersOnTrackCreator_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/src/components/MuonCompetingClustersOnTrackCreator_entries.cxx
index 786853765330..047889f1cc32 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/src/components/MuonCompetingClustersOnTrackCreator_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/src/components/MuonCompetingClustersOnTrackCreator_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonCompetingClustersOnTrackCreator.h"
#include "../TriggerChamberClusterOnTrackCreator.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonCompetingClustersOnTrackCreator )
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, TriggerChamberClusterOnTrackCreator )
-DECLARE_FACTORY_ENTRIES( MuonCompetingClustersOnTrackCreator )
-{
- DECLARE_NAMESPACE_TOOL( Muon, MuonCompetingClustersOnTrackCreator )
- DECLARE_NAMESPACE_TOOL( Muon, TriggerChamberClusterOnTrackCreator )
-}
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/src/components/MuonCompetingClustersOnTrackCreator_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/src/components/MuonCompetingClustersOnTrackCreator_load.cxx
deleted file mode 100644
index d9c530f951ed..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MuonCompetingClustersOnTrackCreator/src/components/MuonCompetingClustersOnTrackCreator_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonCompetingClustersOnTrackCreator)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonTrigCoinData/src/components/MuonTrigCoinData_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonTrigCoinData/src/components/MuonTrigCoinData_entries.cxx
index b3261ba7f50a..9060ed8698b5 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonTrigCoinData/src/components/MuonTrigCoinData_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonTrigCoinData/src/components/MuonTrigCoinData_entries.cxx
@@ -1,8 +1,4 @@
//#include "MuonTrigCoinData/TgcCoinData.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
//DECLARE_ALGORITHM_FACTORY( TgcCoinData )
- DECLARE_FACTORY_ENTRIES( MuonTrigCoinData ) {
- //DECLARE_ALGORITHM( TgcCoinData )
- }
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonTrigCoinData/src/components/MuonTrigCoinData_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonTrigCoinData/src/components/MuonTrigCoinData_load.cxx
deleted file mode 100644
index 1406ad9f822c..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonTrigCoinData/src/components/MuonTrigCoinData_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonTrigCoinData )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/components/MuonAmbiTrackSelectionTool_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/components/MuonAmbiTrackSelectionTool_entries.cxx
index 86b90c468d77..49e528d81fe4 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/components/MuonAmbiTrackSelectionTool_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/components/MuonAmbiTrackSelectionTool_entries.cxx
@@ -1,11 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonAmbiTrackSelectionTool/MuonAmbiTrackSelectionTool.h"
using namespace Muon;
DECLARE_TOOL_FACTORY( MuonAmbiTrackSelectionTool )
-DECLARE_FACTORY_ENTRIES( MuonAmbiTrackSelectionTool )
-{
- DECLARE_TOOL( MuonAmbiTrackSelectionTool )
-}
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/components/MuonAmbiTrackSelectionTool_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/components/MuonAmbiTrackSelectionTool_load.cxx
deleted file mode 100644
index 6301c4a1d77b..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAmbiTrackSelectionTool/src/components/MuonAmbiTrackSelectionTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonAmbiTrackSelectionTool )
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/src/components/MuonAssociationTools_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/src/components/MuonAssociationTools_entries.cxx
index 32d5b5c0ef1d..6af85e0dff61 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/src/components/MuonAssociationTools_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/src/components/MuonAssociationTools_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonAssociationTools/MuonPatternSegmentAssociationTool.h"
#include "../MuonPRD_Provider.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonPatternSegmentAssociationTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonPRD_Provider )
-DECLARE_FACTORY_ENTRIES( MuonAssociationTools )
-{
- DECLARE_NAMESPACE_TOOL( Muon, MuonPatternSegmentAssociationTool )
- DECLARE_NAMESPACE_TOOL( Muon, MuonPRD_Provider )
-}
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/src/components/MuonAssociationTools_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/src/components/MuonAssociationTools_load.cxx
deleted file mode 100644
index 4cea42a77f6f..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonAssociationTools/src/components/MuonAssociationTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonAssociationTools )
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/src/components/MuonErrorScalingTools_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/src/components/MuonErrorScalingTools_entries.cxx
index 27f42af8a61f..e983ffdd8713 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/src/components/MuonErrorScalingTools_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/src/components/MuonErrorScalingTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonErrorScalingTools/MuonRIO_OnTrackErrorScalingTool.h"
#include "MuonErrorScalingTools/MuonErrorScaleDbTool.h"
@@ -7,8 +6,3 @@ using namespace Muon;
DECLARE_TOOL_FACTORY( MuonRIO_OnTrackErrorScalingTool )
DECLARE_TOOL_FACTORY( MuonErrorScaleDbTool )
-DECLARE_FACTORY_ENTRIES( MuonErrorScalingTools )
-{
- DECLARE_TOOL( MuonRIO_OnTrackErrorScalingTool )
- DECLARE_TOOL( MuonErrorScaleDbTool )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/src/components/MuonErrorScalingTools_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/src/components/MuonErrorScalingTools_load.cxx
deleted file mode 100644
index 111a041096b9..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonErrorScalingTools/src/components/MuonErrorScalingTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonRIO_OnTrackErrorScalingTools )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/components/MuonRecHelperTools_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/components/MuonRecHelperTools_entries.cxx
index 5e6eeef47194..a73313b1797a 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/components/MuonRecHelperTools_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/components/MuonRecHelperTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonRecHelperTools/MuonEDMHelperTool.h"
#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
#include "../MuonSegmentConverterTool.h"
@@ -9,9 +8,3 @@ DECLARE_TOOL_FACTORY( MuonEDMHelperTool )
DECLARE_TOOL_FACTORY( MuonEDMPrinterTool )
DECLARE_TOOL_FACTORY( MuonSegmentConverterTool )
-DECLARE_FACTORY_ENTRIES( MuonRecHelperTools )
-{
- DECLARE_TOOL( MuonEDMHelperTool );
- DECLARE_TOOL( MuonEDMPrinterTool );
- DECLARE_TOOL( MuonSegmentConverterTool );
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/components/MuonRecHelperTools_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/components/MuonRecHelperTools_load.cxx
deleted file mode 100644
index ac61420dd074..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools/src/components/MuonRecHelperTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonRecHelperTools )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/src/components/MuonResidualPullCalculators_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/src/components/MuonResidualPullCalculators_entries.cxx
index 72829bd28095..e30fa0452b14 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/src/components/MuonResidualPullCalculators_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/src/components/MuonResidualPullCalculators_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../RPC_ResidualPullCalculator.h"
#include "../TGC_ResidualPullCalculator.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, RPC_ResidualPullCalculator )
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, TGC_ResidualPullCalculator )
-DECLARE_FACTORY_ENTRIES( MuonResidualPullCalculators )
-{
- DECLARE_NAMESPACE_TOOL( Muon, RPC_ResidualPullCalculator )
- DECLARE_NAMESPACE_TOOL( Muon, TGC_ResidualPullCalculator )
-}
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/src/components/MuonResidualPullCalculators_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/src/components/MuonResidualPullCalculators_load.cxx
deleted file mode 100644
index 1e8e3b643996..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonResidualPullCalculators/src/components/MuonResidualPullCalculators_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonResidualPullCalculators )
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/components/MuonTGRecTools_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/components/MuonTGRecTools_entries.cxx
index ae06e168ae2d..3e8b2485ca2f 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/components/MuonTGRecTools_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/components/MuonTGRecTools_entries.cxx
@@ -2,7 +2,6 @@
#include "MuonTGRecTools/MuonTGMeasurementTool.h"
#include "MuonTGRecTools/MuonTGHitNtuple.h"
#include "../MuonSystemExtensionTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace Muon;
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonHolesOnTrackTool )
@@ -10,13 +9,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonTGMeasurementTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonSystemExtensionTool )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Muon, MuonTGHitNtuple )
-DECLARE_FACTORY_ENTRIES(MuonTGRecTools) {
- DECLARE_NAMESPACE_TOOL( Muon, MuonHolesOnTrackTool)
- DECLARE_NAMESPACE_TOOL( Muon, MuonTGMeasurementTool)
- DECLARE_NAMESPACE_TOOL( Muon, MuonSystemExtensionTool)
- DECLARE_NAMESPACE_ALGORITHM( Muon, MuonTGHitNtuple )
-}
-
-
-
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/components/MuonTGRecTools_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/components/MuonTGRecTools_load.cxx
deleted file mode 100644
index 1a987a170992..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/components/MuonTGRecTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonTGRecTools)
-
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTimingTools/src/components/MuonTimingTools_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTimingTools/src/components/MuonTimingTools_entries.cxx
index 9853c8e4ad2f..1cb25ba3acca 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTimingTools/src/components/MuonTimingTools_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTimingTools/src/components/MuonTimingTools_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../RPC_TimingTool.h"
#include "../MuonHitTimingTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, RPC_TimingTool )
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonHitTimingTool )
-DECLARE_FACTORY_ENTRIES( SegmentTimingTool ) {
- DECLARE_NAMESPACE_TOOL( Muon, RPC_TimingTool )
- DECLARE_NAMESPACE_TOOL( Muon, MuonHitTimingTool )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTimingTools/src/components/MuonTimingTools_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTimingTools/src/components/MuonTimingTools_load.cxx
deleted file mode 100644
index a9420201cb5e..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTimingTools/src/components/MuonTimingTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonTimingTools)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/src/components/MuonTrackSummaryHelperTool_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/src/components/MuonTrackSummaryHelperTool_entries.cxx
old mode 100755
new mode 100644
index 77ca9bcedcd4..26949f5fdc8a
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/src/components/MuonTrackSummaryHelperTool_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/src/components/MuonTrackSummaryHelperTool_entries.cxx
@@ -1,5 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonTrackSummaryHelperTool/MuonTrackSummaryHelperTool.h"
#include "../MuonHitSummaryTool.h"
@@ -8,12 +6,3 @@ using namespace Muon;
DECLARE_TOOL_FACTORY( MuonTrackSummaryHelperTool )
DECLARE_TOOL_FACTORY( MuonHitSummaryTool )
-DECLARE_FACTORY_ENTRIES( MuonTrackSummaryHelperTool )
-{
- DECLARE_TOOL( MuonTrackSummaryHelperTool )
- DECLARE_TOOL( MuonHitSummaryTool );
-}
-
-
-
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/src/components/MuonTrackSummaryHelperTool_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/src/components/MuonTrackSummaryHelperTool_load.cxx
deleted file mode 100755
index d2a4b4223298..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTrackSummaryHelperTool/src/components/MuonTrackSummaryHelperTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonTrackSummaryHelperTool )
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTruthTools/src/components/MuonTruthTools_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTruthTools/src/components/MuonTruthTools_entries.cxx
index b236ab07f691..7f62d5777578 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTruthTools/src/components/MuonTruthTools_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTruthTools/src/components/MuonTruthTools_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonTruthTrackBuilder.h"
#include "../MuonTruthSummaryTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonTruthTrackBuilder )
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonTruthSummaryTool )
-DECLARE_FACTORY_ENTRIES( MuonAssociationTools )
-{
- DECLARE_NAMESPACE_TOOL( Muon, MuonTruthTrackBuilder )
- DECLARE_NAMESPACE_TOOL( Muon, MuonTruthSummaryTool )
-}
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTruthTools/src/components/MuonTruthTools_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTruthTools/src/components/MuonTruthTools_load.cxx
deleted file mode 100644
index 527e1328729a..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTruthTools/src/components/MuonTruthTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonTruthTools )
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/src/components/MuonStationIntersectSvc_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/src/components/MuonStationIntersectSvc_entries.cxx
old mode 100755
new mode 100644
index f2e8f57d99c6..b867c68cfc2f
--- a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/src/components/MuonStationIntersectSvc_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/src/components/MuonStationIntersectSvc_entries.cxx
@@ -1,10 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "MuonStationIntersectSvc/MuonStationIntersectSvc.h"
DECLARE_SERVICE_FACTORY ( MuonStationIntersectSvc )
-DECLARE_FACTORY_ENTRIES(MuonStationIntersectSvc) {
- DECLARE_SERVICE(MuonStationIntersectSvc)
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/src/components/MuonStationIntersectSvc_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/src/components/MuonStationIntersectSvc_load.cxx
deleted file mode 100755
index 27645fc21233..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonStationIntersectSvc/src/components/MuonStationIntersectSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonStationIntersectSvc)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/components/MooSegmentFinder_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/components/MooSegmentFinder_entries.cxx
index 94f8d5f03af4..1e7e4c923ffb 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/components/MooSegmentFinder_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/components/MooSegmentFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MooSegmentCombinationFinder.h"
#include "../MooSegmentFinderAlg.h"
#include "../MuonSegmentFinderAlg.h"
@@ -9,11 +8,3 @@ DECLARE_ALGORITHM_FACTORY( MuonSegmentFinderAlg )
DECLARE_ALGORITHM_FACTORY( NSWSectorRoadFinderAlg )
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MooSegmentCombinationFinder )
-DECLARE_FACTORY_ENTRIES( MooSegmentFinder )
-{
- DECLARE_ALGORITHM( MooSegmentFinderAlg )
- DECLARE_ALGORITHM( MuonSegmentFinderAlg )
- DECLARE_ALGORITHM( NSWSectorRoadFinderAlg )
- DECLARE_NAMESPACE_TOOL( Muon, MooSegmentCombinationFinder )
-}
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/components/MooSegmentFinder_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/components/MooSegmentFinder_load.cxx
deleted file mode 100644
index d3bf5307ad4e..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MooSegmentCombinationFinder/src/components/MooSegmentFinder_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MooSegmentFinder )
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/src/components/MuonCurvedSegmentCombiner_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/src/components/MuonCurvedSegmentCombiner_entries.cxx
index 2cf5c85a9177..3a40f2f1b709 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/src/components/MuonCurvedSegmentCombiner_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/src/components/MuonCurvedSegmentCombiner_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonCurvedSegmentCombiner/MuonCurvedSegmentCombiner.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonCurvedSegmentCombiner )
-DECLARE_FACTORY_ENTRIES( MuonCurvedSegmentCombiner )
-{
- DECLARE_NAMESPACE_TOOL( Muon, MuonCurvedSegmentCombiner )
-}
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/src/components/MuonCurvedSegmentCombiner_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/src/components/MuonCurvedSegmentCombiner_load.cxx
deleted file mode 100644
index efe8cb4c8ad4..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentCombiners/MuonSegmentCombinerTools/MuonCurvedSegmentCombiner/src/components/MuonCurvedSegmentCombiner_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-
-LOAD_FACTORY_ENTRIES( MuonCurvedSegmentCombiner )
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/components/CscSegmentMakers_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/components/CscSegmentMakers_entries.cxx
index 757b67dd49fe..8167691dd5c0 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/components/CscSegmentMakers_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/components/CscSegmentMakers_entries.cxx
@@ -2,16 +2,9 @@
#include "../Csc2dSegmentMaker.h"
#include "../Csc4dSegmentMaker.h"
#include "../CscSegmentUtilTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(CscSegmentMaker)
DECLARE_TOOL_FACTORY(Csc2dSegmentMaker)
DECLARE_TOOL_FACTORY(Csc4dSegmentMaker)
DECLARE_TOOL_FACTORY(CscSegmentUtilTool)
-DECLARE_FACTORY_ENTRIES(CscSegmentMakers) {
- DECLARE_ALGORITHM(CscSegmentMaker);
- DECLARE_TOOL(Csc2dSegmentMaker);
- DECLARE_TOOL(Csc4dSegmentMaker);
- DECLARE_TOOL(CscSegmentUtilTool);
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/components/CscSegmentMakers_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/components/CscSegmentMakers_load.cxx
deleted file mode 100644
index 196fde037c99..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/components/CscSegmentMakers_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CscSegmentMakers)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/components/DCMathSegmentMaker_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/components/DCMathSegmentMaker_entries.cxx
index 989c230167ec..f766b6790172 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/components/DCMathSegmentMaker_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/components/DCMathSegmentMaker_entries.cxx
@@ -1,5 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../DCMathSegmentMaker.h"
#include "../MdtMathSegmentFinder.h"
#include "../MuonSegmentFittingTool.h"
@@ -12,14 +10,3 @@ DECLARE_TOOL_FACTORY( MdtMathSegmentFinder )
DECLARE_TOOL_FACTORY( MuonSegmentFittingTool )
DECLARE_TOOL_FACTORY( MuonClusterSegmentFinderTool )
-DECLARE_FACTORY_ENTRIES( DCMathSegmentMaker )
-{
- DECLARE_TOOL( DCMathSegmentMaker )
- DECLARE_TOOL( MdtMathSegmentFinder )
- DECLARE_TOOL( MuonSegmentFittingTool )
- DECLARE_TOOL( MuonClusterSegmentFinderTool )
-}
-
-
-
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/components/DCMathSegmentMaker_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/components/DCMathSegmentMaker_load.cxx
deleted file mode 100644
index 4b721a52246e..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/DCMathSegmentMaker/src/components/DCMathSegmentMaker_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DCMathSegmentMaker )
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/components/MdtSegmentT0Fitter_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/components/MdtSegmentT0Fitter_entries.cxx
old mode 100755
new mode 100644
index 053f166afb71..a432c145d385
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/components/MdtSegmentT0Fitter_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/components/MdtSegmentT0Fitter_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MdtSegmentT0Fitter/MdtSegmentT0Fitter.h"
using namespace TrkDriftCircleMath;
DECLARE_TOOL_FACTORY(MdtSegmentT0Fitter)
-DECLARE_FACTORY_ENTRIES(MdtSegmentT0Fitter) {
- DECLARE_TOOL(MdtSegmentT0Fitter)
-}
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/components/MdtSegmentT0Fitter_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/components/MdtSegmentT0Fitter_load.cxx
deleted file mode 100755
index 20f3676db4f8..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MdtSegmentT0Fitter/src/components/MdtSegmentT0Fitter_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MdtSegmentT0Fitter)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonClusterSegmentMakerTools/src/components/MuonClusterSegmentMakerTools_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonClusterSegmentMakerTools/src/components/MuonClusterSegmentMakerTools_entries.cxx
old mode 100755
new mode 100644
index 6793163f0ff8..e951b3e7c4f6
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonClusterSegmentMakerTools/src/components/MuonClusterSegmentMakerTools_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonClusterSegmentMakerTools/src/components/MuonClusterSegmentMakerTools_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../MuonClusterSegmentFinder.h"
using namespace Muon;
DECLARE_TOOL_FACTORY( MuonClusterSegmentFinder )
-DECLARE_FACTORY_ENTRIES( MuonClusterSegmentMakerTools )
-{
-
- DECLARE_TOOL( MuonClusterSegmentFinder )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonClusterSegmentMakerTools/src/components/MuonClusterSegmentMakerTools_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonClusterSegmentMakerTools/src/components/MuonClusterSegmentMakerTools_load.cxx
deleted file mode 100755
index 0a577a91db37..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonClusterSegmentMakerTools/src/components/MuonClusterSegmentMakerTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonClusterSegmentMakerTools )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonLayerSegmentMakerTools/src/components/MuonLayerSegmentMakerTools_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonLayerSegmentMakerTools/src/components/MuonLayerSegmentMakerTools_entries.cxx
old mode 100755
new mode 100644
index 26e48c4875c5..40b29a1fec38
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonLayerSegmentMakerTools/src/components/MuonLayerSegmentMakerTools_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonLayerSegmentMakerTools/src/components/MuonLayerSegmentMakerTools_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonLayerSegmentFinderTool.h"
using namespace Muon;
DECLARE_TOOL_FACTORY( MuonLayerSegmentFinderTool )
-DECLARE_FACTORY_ENTRIES( MuonLayerSegmentMakerTools )
-{
- DECLARE_TOOL( MuonLayerSegmentFinderTool )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonLayerSegmentMakerTools/src/components/MuonLayerSegmentMakerTools_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonLayerSegmentMakerTools/src/components/MuonLayerSegmentMakerTools_load.cxx
deleted file mode 100755
index 8c73373240fa..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonLayerSegmentMakerTools/src/components/MuonLayerSegmentMakerTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonLayerSegmentMakerTools )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/components/MuonPatternSegmentMaker_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/components/MuonPatternSegmentMaker_entries.cxx
index 69a017b60735..2b382f9c5543 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/components/MuonPatternSegmentMaker_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/components/MuonPatternSegmentMaker_entries.cxx
@@ -1,17 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonPatternSegmentMaker/MuonPatternSegmentMaker.h"
#include "MuonPatternSegmentMaker/MuonPatternCalibration.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonPatternSegmentMaker )
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonPatternCalibration )
-DECLARE_FACTORY_ENTRIES( MuonPatternSegmentMaker )
-{
- DECLARE_NAMESPACE_TOOL( Muon, MuonPatternSegmentMaker )
-}
-DECLARE_FACTORY_ENTRIES( MuonPatternCalibration )
-{
- DECLARE_NAMESPACE_TOOL( Muon, MuonPatternCalibration )
-}
-
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/components/MuonPatternSegmentMaker_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/components/MuonPatternSegmentMaker_load.cxx
deleted file mode 100644
index cd30c5b61220..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonPatternSegmentMaker/src/components/MuonPatternSegmentMaker_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonPatternSegmentMaker )
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/src/components/MuonSegmentCleaner_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/src/components/MuonSegmentCleaner_entries.cxx
index f1a83b999334..8d99842341ab 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/src/components/MuonSegmentCleaner_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/src/components/MuonSegmentCleaner_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonSegmentCleaner/MuonSegmentAmbiCleaner.h"
#include "MuonSegmentCleaner/MuonPhiHitSelector.h"
DECLARE_TOOL_FACTORY( MuonSegmentAmbiCleaner )
DECLARE_TOOL_FACTORY( MuonPhiHitSelector )
-DECLARE_FACTORY_ENTRIES( MuonSegmentCleaner )
-{
- DECLARE_TOOL( MuonSegmentAmbiCleaner )
- DECLARE_TOOL( MuonPhiHitSelector )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/src/components/MuonSegmentCleaner_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/src/components/MuonSegmentCleaner_load.cxx
deleted file mode 100644
index 42f36f8a53b3..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentCleaner/src/components/MuonSegmentCleaner_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonSegmentCleaner )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMatchingTools/src/components/MuonSegmentMatchingTool_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMatchingTools/src/components/MuonSegmentMatchingTool_entries.cxx
old mode 100755
new mode 100644
index 0861b614d0eb..eb79ada1d302
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMatchingTools/src/components/MuonSegmentMatchingTool_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMatchingTools/src/components/MuonSegmentMatchingTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonSegmentInOverlapResolvingTool.h"
#include "../MuonSegmentMatchingTool.h"
#include "../MuonSegmentPairMatchingTool.h"
@@ -9,9 +8,3 @@ DECLARE_TOOL_FACTORY( MuonSegmentInOverlapResolvingTool )
DECLARE_TOOL_FACTORY( MuonSegmentMatchingTool )
DECLARE_TOOL_FACTORY( MuonSegmentPairMatchingTool )
-DECLARE_FACTORY_ENTRIES( MuonSegmentMatchingTools )
-{
- DECLARE_TOOL( MuonSegmentInOverlapResolvingTool )
- DECLARE_TOOL( MuonSegmentMatchingTool )
- DECLARE_TOOL( MuonSegmentPairMatchingTool )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMatchingTools/src/components/MuonSegmentMatchingTool_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMatchingTools/src/components/MuonSegmentMatchingTool_load.cxx
deleted file mode 100755
index b647450bde08..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMatchingTools/src/components/MuonSegmentMatchingTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonSegmentMatchingTools )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/src/components/MuonSegmentMomentum_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/src/components/MuonSegmentMomentum_entries.cxx
index 75991985264e..12d9facc03b1 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/src/components/MuonSegmentMomentum_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/src/components/MuonSegmentMomentum_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonSegmentMomentum/MuonSegmentMomentum.h"
#include "MuonSegmentMomentum/MuonSegmentMomentumFromField.h"
DECLARE_TOOL_FACTORY( MuonSegmentMomentum )
DECLARE_TOOL_FACTORY( MuonSegmentMomentumFromField )
-DECLARE_FACTORY_ENTRIES( MuonSegmentMomentum )
-{
- DECLARE_TOOL( MuonSegmentMomentum )
- DECLARE_TOOL( MuonSegmentMomentumFromField )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/src/components/MuonSegmentMomentum_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/src/components/MuonSegmentMomentum_load.cxx
deleted file mode 100644
index 2ad70bcb1e07..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentMomentum/src/components/MuonSegmentMomentum_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonSegmentMomentum )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentOverlapRemovalTools/src/components/MuonSegmentOverlapRemovalTools_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentOverlapRemovalTools/src/components/MuonSegmentOverlapRemovalTools_entries.cxx
old mode 100755
new mode 100644
index 5a0563ba55a2..cbfaa89ccd61
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentOverlapRemovalTools/src/components/MuonSegmentOverlapRemovalTools_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentOverlapRemovalTools/src/components/MuonSegmentOverlapRemovalTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonSegmentOverlapRemovalTool.h"
#include "../MuonSegmentCombinationCleanerTool.h"
#include "../MuonSegmentMerger.h"
@@ -9,9 +8,3 @@ DECLARE_TOOL_FACTORY( MuonSegmentOverlapRemovalTool )
DECLARE_TOOL_FACTORY( MuonSegmentCombinationCleanerTool )
DECLARE_TOOL_FACTORY( MuonSegmentMerger )
-DECLARE_FACTORY_ENTRIES( MuonSegmentOverlapRemovalTools )
-{
- DECLARE_TOOL( MuonSegmentOverlapRemovalTool )
- DECLARE_TOOL( MuonSegmentCombinationCleanerTool )
- DECLARE_TOOL( MuonSegmentMerger )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentOverlapRemovalTools/src/components/MuonSegmentOverlapRemovalTools_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentOverlapRemovalTools/src/components/MuonSegmentOverlapRemovalTools_load.cxx
deleted file mode 100755
index 94562f5d9908..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentOverlapRemovalTools/src/components/MuonSegmentOverlapRemovalTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonSegmentOverlapRemovalTools )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentSelectionTools/src/components/MuonSegmentSelectionTools_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentSelectionTools/src/components/MuonSegmentSelectionTools_entries.cxx
index 52b37e9c8b96..0f0bc0de8a29 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentSelectionTools/src/components/MuonSegmentSelectionTools_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentSelectionTools/src/components/MuonSegmentSelectionTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonSegmentSelectionTool.h"
#include "../MuonSegmentHitSummaryTool.h"
@@ -7,8 +6,3 @@ using namespace Muon;
DECLARE_TOOL_FACTORY( MuonSegmentSelectionTool )
DECLARE_TOOL_FACTORY( MuonSegmentHitSummaryTool )
-DECLARE_FACTORY_ENTRIES( MuonSegmentSelectionTool )
-{
- DECLARE_TOOL( MuonSegmentSelectionTool )
- DECLARE_TOOL( MuonSegmentHitSummaryTool )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentSelectionTools/src/components/MuonSegmentSelectionTools_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentSelectionTools/src/components/MuonSegmentSelectionTools_load.cxx
deleted file mode 100644
index b647450bde08..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/MuonSegmentSelectionTools/src/components/MuonSegmentSelectionTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonSegmentMatchingTools )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/RPC_LinearSegmentMakerTool/src/components/RPC_LinearSegmentMakerTool_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/RPC_LinearSegmentMakerTool/src/components/RPC_LinearSegmentMakerTool_entries.cxx
index cfc63c60cc08..c590bf9e1b45 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/RPC_LinearSegmentMakerTool/src/components/RPC_LinearSegmentMakerTool_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/RPC_LinearSegmentMakerTool/src/components/RPC_LinearSegmentMakerTool_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "RPC_LinearSegmentMakerTool/RPC_LinearSegmentMakerTool.h"
DECLARE_TOOL_FACTORY( RPC_LinearSegmentMakerTool )
-DECLARE_FACTORY_ENTRIES( RPC_LinearSegmentMakerTool )
-{
- DECLARE_TOOL( RPC_LinearSegmentMakerTool )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/RPC_LinearSegmentMakerTool/src/components/RPC_LinearSegmentMakerTool_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/RPC_LinearSegmentMakerTool/src/components/RPC_LinearSegmentMakerTool_load.cxx
deleted file mode 100644
index c8b1e4204fc6..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/RPC_LinearSegmentMakerTool/src/components/RPC_LinearSegmentMakerTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( RPC_LinearSegmentMakerTool )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/TGC_LinearSegmentMakerTool/src/components/TGC_LinearSegmentMakerTool_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/TGC_LinearSegmentMakerTool/src/components/TGC_LinearSegmentMakerTool_entries.cxx
index 1746ddde36fc..4320ee31c8eb 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/TGC_LinearSegmentMakerTool/src/components/TGC_LinearSegmentMakerTool_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/TGC_LinearSegmentMakerTool/src/components/TGC_LinearSegmentMakerTool_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TGC_LinearSegmentMakerTool/TGC_LinearSegmentMakerTool.h"
DECLARE_TOOL_FACTORY( TGC_LinearSegmentMakerTool )
-DECLARE_FACTORY_ENTRIES( TGC_LinearSegmentMakerTool )
-{
- DECLARE_TOOL( TGC_LinearSegmentMakerTool )
-}
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/TGC_LinearSegmentMakerTool/src/components/TGC_LinearSegmentMakerTool_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/TGC_LinearSegmentMakerTool/src/components/TGC_LinearSegmentMakerTool_load.cxx
deleted file mode 100644
index 910ba885bdc3..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerTools/TGC_LinearSegmentMakerTool/src/components/TGC_LinearSegmentMakerTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TGC_LinearSegmentMakerTool )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/components/MuonSegmentTrackMaker_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/components/MuonSegmentTrackMaker_entries.cxx
old mode 100755
new mode 100644
index 25ed854b1e4e..11d9c6442a2d
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/components/MuonSegmentTrackMaker_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/components/MuonSegmentTrackMaker_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonSegmentTrackMaker/MuonCombiTrackBuilder.h"
#include "MuonSegmentTrackMaker/MuPatTrackBuilder.h"
DECLARE_ALGORITHM_FACTORY( MuonCombiTrackBuilder )
DECLARE_ALGORITHM_FACTORY( MuPatTrackBuilder )
-DECLARE_FACTORY_ENTRIES( MuonSegmentTrackMaker )
-{
- DECLARE_ALGORITHM( MuonCombiTrackBuilder );
- DECLARE_ALGORITHM( MuPatTrackBuilder );
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/components/MuonSegmentTrackMaker_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/components/MuonSegmentTrackMaker_load.cxx
deleted file mode 100755
index adb5951e49af..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerAlgs/MuonSegmentTrackMaker/src/components/MuonSegmentTrackMaker_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonSegmentTrackMaker )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/components/MuonTrackFinderTools_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/components/MuonTrackFinderTools_entries.cxx
old mode 100755
new mode 100644
index def52f974ec9..022f5c94d214
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/components/MuonTrackFinderTools_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/components/MuonTrackFinderTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonTrackCleaner.h"
#include "../MuonChamberHoleRecoveryTool.h"
#include "../MuonSegmentRegionRecoveryTool.h"
@@ -23,16 +22,3 @@ DECLARE_TOOL_FACTORY( MuonTrackExtrapolationTool )
DECLARE_TOOL_FACTORY( MuonRefitTool )
DECLARE_TOOL_FACTORY( MuonErrorOptimisationTool )
-DECLARE_FACTORY_ENTRIES( MuonTrackFinderTools )
-{
- DECLARE_TOOL( MuonTrackCleaner )
- DECLARE_TOOL( MuonChamberHoleRecoveryTool )
- DECLARE_TOOL( MuonSegmentRegionRecoveryTool )
- DECLARE_TOOL( MuonTrackToSegmentTool )
- DECLARE_TOOL( MuonTrackSelectorTool )
- DECLARE_TOOL( MuonSeededSegmentFinder )
- DECLARE_TOOL( MuonTrackScoringTool )
- DECLARE_TOOL( MuonTrackExtrapolationTool )
- DECLARE_TOOL( MuonRefitTool )
- DECLARE_TOOL( MuonErrorOptimisationTool )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/components/MuonTrackFinderTools_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/components/MuonTrackFinderTools_load.cxx
deleted file mode 100755
index 06efcbbea19e..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/components/MuonTrackFinderTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonTrackFinderTools )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/components/MuonTrackSteeringTools_entries.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/components/MuonTrackSteeringTools_entries.cxx
old mode 100755
new mode 100644
index c059ed09719b..3b523245c217
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/components/MuonTrackSteeringTools_entries.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/components/MuonTrackSteeringTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonTrackSteering.h"
#include "../MuPatCandidateTool.h"
#include "../MuPatHitTool.h"
@@ -15,12 +14,3 @@ DECLARE_TOOL_FACTORY( MooCandidateMatchingTool )
DECLARE_TOOL_FACTORY( MooTrackFitter )
DECLARE_TOOL_FACTORY( MooTrackBuilder )
-DECLARE_FACTORY_ENTRIES( MuonTrackSteeringTools )
-{
- DECLARE_TOOL( MuonTrackSteering )
- DECLARE_TOOL( MuPatHitTool )
- DECLARE_TOOL( MuPatCandidateTool )
- DECLARE_TOOL( MooCandidateMatchingTool )
- DECLARE_TOOL( MooTrackFitter )
- DECLARE_TOOL( MooTrackBuilder )
-}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/components/MuonTrackSteeringTools_load.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/components/MuonTrackSteeringTools_load.cxx
deleted file mode 100755
index ec49936d4786..000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/components/MuonTrackSteeringTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonTrackSteeringTools )
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/components/MuonTruthAlgs_entries.cxx b/MuonSpectrometer/MuonTruthAlgs/src/components/MuonTruthAlgs_entries.cxx
old mode 100755
new mode 100644
index 3e9addb38aed..bf52d7540811
--- a/MuonSpectrometer/MuonTruthAlgs/src/components/MuonTruthAlgs_entries.cxx
+++ b/MuonSpectrometer/MuonTruthAlgs/src/components/MuonTruthAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonTruthAlgs/MuonPRD_MultiTruthMaker.h"
#include "MuonTruthAlgs/MuonDetailedTrackTruthMaker.h"
#include "MuonTruthAlgs/MuonPatternCombinationDetailedTrackTruthMaker.h"
@@ -28,18 +27,3 @@ DECLARE_TOOL_FACTORY( MuonTrackTruthTool )
DECLARE_TOOL_FACTORY( MuonDecayTruthTrajectoryBuilder )
DECLARE_TOOL_FACTORY( DetailedMuonPatternTruthBuilder )
-DECLARE_FACTORY_ENTRIES( MuonTruthAlgs )
-{
- DECLARE_ALGORITHM( MuonTruthSummaryAlg );
- DECLARE_ALGORITHM( MuonPRD_MultiTruthMaker )
- DECLARE_ALGORITHM( MuonDetailedTrackTruthMaker )
- DECLARE_ALGORITHM( MuonPatternCombinationDetailedTrackTruthMaker )
- DECLARE_ALGORITHM( TrackParticleTruthMaker )
- DECLARE_ALGORITHM( MuonTruthDecorationAlg )
- DECLARE_ALGORITHM( MuonTruthAssociationAlg )
- DECLARE_ALGORITHM( MuonSegmentTruthAssociationAlg )
-
- DECLARE_TOOL( MuonTrackTruthTool )
- DECLARE_TOOL( MuonDecayTruthTrajectoryBuilder )
- DECLARE_TOOL( DetailedMuonPatternTruthBuilder )
-}
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/components/MuonTruthAlgs_load.cxx b/MuonSpectrometer/MuonTruthAlgs/src/components/MuonTruthAlgs_load.cxx
deleted file mode 100755
index 290392b489c0..000000000000
--- a/MuonSpectrometer/MuonTruthAlgs/src/components/MuonTruthAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonTruthAlgs )
-
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/components/MuonAlignMonitoring_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/components/MuonAlignMonitoring_entries.cxx
old mode 100755
new mode 100644
index f94b5b8bc084..bbf00c3bf8b9
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/components/MuonAlignMonitoring_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/components/MuonAlignMonitoring_entries.cxx
@@ -1,14 +1,6 @@
-// #include "GaudiKernel/DeclareFactoryEntries.h"
// #include "MuonAlignMonitoring/MuonAlignValidation.h"
// #include "MuonAlignMonitoring/MuonAlignSegment.h"
// DECLARE_TOOL_FACTORY( MuonAlignValidation )
// DECLARE_TOOL_FACTORY( MuonAlignSegment )
-// DECLARE_FACTORY_ENTRIES( MuonAlignMonitoring ) {
-
-// DECLARE_ALGTOOL( MuonAlignValidation )
-// DECLARE_ALGTOOL( MuonAlignSegment )
-
-// }
-
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/components/MuonAlignMonitoring_load.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/components/MuonAlignMonitoring_load.cxx
deleted file mode 100755
index 77df46cac275..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonAlignMonitoring/src/components/MuonAlignMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(MuonAlignMonitoring)
-
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/components/MuonCalibMonitoring_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/components/MuonCalibMonitoring_entries.cxx
old mode 100755
new mode 100644
index 71b1d4e74406..fe950b859a61
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/components/MuonCalibMonitoring_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/components/MuonCalibMonitoring_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../CscCalibMonToolBase.h"
#include "../CscCalibMonToolPed.h"
#include "../CscCalibMonToolSlope.h"
@@ -9,11 +8,3 @@ DECLARE_TOOL_FACTORY(CscCalibMonToolBase)
DECLARE_TOOL_FACTORY(CscCalibMonToolPed)
DECLARE_TOOL_FACTORY(CscCalibMonToolSlope)
-DECLARE_FACTORY_ENTRIES(MuonCalibMonitoring)
-{
- DECLARE_ALGTOOL(CscCalibMonToolBase)
- DECLARE_ALGTOOL(CscCalibMonToolPed)
- DECLARE_ALGTOOL(CscCalibMonToolSlope)
-
-}
-
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/components/MuonCalibMonitoring_load.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/components/MuonCalibMonitoring_load.cxx
deleted file mode 100755
index d88bd6551b66..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonCalibMonitoring/src/components/MuonCalibMonitoring_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(MuonCalibMonitoring)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/src/components/MuonDQAMonitoring_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/src/components/MuonDQAMonitoring_entries.cxx
index f4bd5657fbd7..134fa9d4ebdb 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/src/components/MuonDQAMonitoring_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/src/components/MuonDQAMonitoring_entries.cxx
@@ -1,16 +1,8 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonDQAMonitoring/MuonDQAEvent.h"
#include "MuonDQAMonitoring/MuonDQAEventInfo.h"
#include "MuonDQAMonitoring/MuonEventInfoMonTool.h"
using namespace MuonDQA;
-DECLARE_ALGORITHM(MuonDQAEvent)
-DECLARE_ALGORITHM(MuonDQAEventInfo)
-DECLARE_TOOL_FACTORY(MuonEventInfoMonTool)
-
-DECLARE_FACTORY_ENTRIES(MuonDQAMonitoring)
-{
- DECLARE_ALGTOOL(MuonEventInfoMonTool)
-}
-
+DECLARE_TOOL_FACTORY(MuonEventInfoMonTool)
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/src/components/MuonDQAMonitoring_load.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/src/components/MuonDQAMonitoring_load.cxx
deleted file mode 100644
index 9f73c3a00617..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/src/components/MuonDQAMonitoring_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(MuonDQAMonitoring)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/components/MuonDQAUtils_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/components/MuonDQAUtils_entries.cxx
old mode 100755
new mode 100644
index d8535e081585..82dd91481f68
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/components/MuonDQAUtils_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/components/MuonDQAUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonDQAUtils/MuonDQAFitFunc.h"
#include "MuonDQAUtils/InsituTrackTools.h"
#include "MuonDQAUtils/MuonSpectrometerProbeCollectorTool.h"
@@ -11,12 +10,6 @@ using namespace Muon;
DECLARE_TOOL_FACTORY(InnerDetProbeCollectorTool)
DECLARE_TOOL_FACTORY(InsituTrackTools)
- DECLARE_FACTORY_ENTRIES(MuonDQAUtils)
-{
- DECLARE_ALGTOOL(MuonDQAFitFunc);
- DECLARE_TOOL(MuonSpectrometerProbeCollectorTool)
- DECLARE_TOOL(InnerDetProbeCollectorTool)
- DECLARE_TOOL(InsituTrackTools)
-}
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/components/MuonDQAUtils_load.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/components/MuonDQAUtils_load.cxx
deleted file mode 100755
index 05cffa3881b1..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/src/components/MuonDQAUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonDQAUtils)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/components/MuonPhysValMon_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/components/MuonPhysValMon_entries.cxx
index b2e12f05e512..6c3a6f74a49b 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/components/MuonPhysValMon_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/components/MuonPhysValMon_entries.cxx
@@ -1,13 +1,4 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "../MuonPhysValMonitoringTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( MuonPhysValMonitoring, MuonPhysValMonitoringTool )
-DECLARE_FACTORY_ENTRIES( MuonPhysValMonitoring ) {
-
- DECLARE_NAMESPACE_TOOL( MuonPhysValMonitoring, MuonPhysValMonitoringTool )
-
-}
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/components/MuonPhysValMon_load.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/components/MuonPhysValMon_load.cxx
deleted file mode 100644
index e6c639eb78da..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonPhysValMonitoring/src/components/MuonPhysValMon_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( MuonMonitoring )
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/components/CscRawDataMonitoring_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/components/CscRawDataMonitoring_entries.cxx
old mode 100755
new mode 100644
index 05fdb1687f08..3e56be1f17fe
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/components/CscRawDataMonitoring_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/components/CscRawDataMonitoring_entries.cxx
@@ -1,20 +1,10 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-//////////// CSC ///////////////////////////////
#include "CscRawDataMonitoring/CscRdoValAlg.h"
#include "CscRawDataMonitoring/CscPrdValAlg.h"
#include "CscRawDataMonitoring/CscClusterValAlg.h"
#include "CscRawDataMonitoring/CSCSegmValAlg.h"
- DECLARE_TOOL_FACTORY(CscRdoValAlg)
- DECLARE_TOOL_FACTORY(CscPrdValAlg)
- DECLARE_TOOL_FACTORY(CscClusterValAlg)
- DECLARE_TOOL_FACTORY(CSCSegmValAlg)
-
- DECLARE_FACTORY_ENTRIES(CscRawDataMonitoring)
-{
- DECLARE_ALGTOOL(CscRdoValAlg)
- DECLARE_ALGTOOL(CscPrdValAlg)
- DECLARE_ALGTOOL(CscClusterValAlg)
- DECLARE_ALGTOOL(CSCSegmValAlg)
-}
-
+DECLARE_TOOL_FACTORY(CscRdoValAlg)
+DECLARE_TOOL_FACTORY(CscPrdValAlg)
+DECLARE_TOOL_FACTORY(CscClusterValAlg)
+DECLARE_TOOL_FACTORY(CSCSegmValAlg)
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/components/CscRawDataMonitoring_load.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/components/CscRawDataMonitoring_load.cxx
deleted file mode 100755
index 37b9e7e69408..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/src/components/CscRawDataMonitoring_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(CscRawDataMonitoring)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/components/MdtRawDataMonitoring_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/components/MdtRawDataMonitoring_entries.cxx
old mode 100755
new mode 100644
index 83967e01aa56..1b204c139201
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/components/MdtRawDataMonitoring_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/components/MdtRawDataMonitoring_entries.cxx
@@ -1,17 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-//////////// MDT ///////////////////////////////
#include "MdtRawDataMonitoring/MdtRawDataValAlg.h"
//#include "MdtRawDataMonitoring/MuonChamberIDSelector.h"
//#include "MdtRawDataMonitoring/MuonEventInfoMonTool.h"
DECLARE_TOOL_FACTORY(MdtRawDataValAlg)
-//DECLARE_ALGORITHM(MuonChamberIDSelector)
//DECLARE_TOOL_FACTORY(MuonEventInfoMonTool)
-DECLARE_FACTORY_ENTRIES(MtdRawDataMonitoring)
-{
- DECLARE_ALGTOOL(MdtRawDataValAlg)
-// DECLARE_ALGTOOL(MuonChamberIDSelector)
-// DECLARE_ALGTOOL(MuonEventInfoMonTool)
-}
-
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/components/MdtRawDataMonitoring_load.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/components/MdtRawDataMonitoring_load.cxx
deleted file mode 100755
index b353c21590e8..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/src/components/MdtRawDataMonitoring_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(MdtRawDataMonitoring)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/src/components/MdtVsRpcRawDataMonitoring_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/src/components/MdtVsRpcRawDataMonitoring_entries.cxx
old mode 100755
new mode 100644
index 620225d72718..6f7d19724ea2
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/src/components/MdtVsRpcRawDataMonitoring_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/src/components/MdtVsRpcRawDataMonitoring_entries.cxx
@@ -1,11 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-//////////// MdtVsRpc /////////////
#include "MdtVsRpcRawDataMonitoring/MdtVsRpcRawDataValAlg.h"
DECLARE_TOOL_FACTORY(MdtVsRpcRawDataValAlg)
-DECLARE_FACTORY_ENTRIES(MdtVsRpcRawDataMonitoring)
-{
- DECLARE_ALGTOOL(MdtVsRpcRawDataValAlg)
-}
-
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/src/components/MdtVsRpcRawDataMonitoring_load.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/src/components/MdtVsRpcRawDataMonitoring_load.cxx
deleted file mode 100755
index 3d51aed25dee..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/src/components/MdtVsRpcRawDataMonitoring_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(MuonRawDataMonitoring)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/components/MdtVsTgcRawDataMonitoring_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/components/MdtVsTgcRawDataMonitoring_entries.cxx
old mode 100755
new mode 100644
index d5a78cedbf30..b9d0030a3fab
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/components/MdtVsTgcRawDataMonitoring_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/components/MdtVsTgcRawDataMonitoring_entries.cxx
@@ -1,11 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-//////////// MdtVsTgc /////////////
#include "MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataValAlg.h"
DECLARE_TOOL_FACTORY(MdtVsTgcRawDataValAlg)
-
-DECLARE_FACTORY_ENTRIES(MdtVsTgcRawDataMonitoring)
-{
- DECLARE_ALGTOOL(MdtVsTgcRawDataValAlg)
-}
-
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/components/MdtVsTgcRawDataMonitoring_load.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/components/MdtVsTgcRawDataMonitoring_load.cxx
deleted file mode 100755
index b0785deda348..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/src/components/MdtVsTgcRawDataMonitoring_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(MdtVsTgcRawDataMonitoring)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/components/RpcRawDataMonitoring_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/components/RpcRawDataMonitoring_entries.cxx
old mode 100755
new mode 100644
index 77b7942ad368..0584d9363bdc
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/components/RpcRawDataMonitoring_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/components/RpcRawDataMonitoring_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-//////////// RPC ///////////////////////////////
#include "RpcRawDataMonitoring/RpcRawDataValAlg.h"
#include "RpcRawDataMonitoring/RpcLv1RawDataValAlg.h"
#include "RpcRawDataMonitoring/RpcLv1RawDataSectorLogic.h"
@@ -12,13 +10,3 @@ DECLARE_TOOL_FACTORY(RpcLv1RawDataSectorLogic)
DECLARE_TOOL_FACTORY(RpcLv1RawDataEfficiency)
DECLARE_TOOL_FACTORY(RPCStandaloneTracksMon)
-
-DECLARE_FACTORY_ENTRIES(RpcRawDataMonitoring)
-{
- DECLARE_ALGTOOL(RpcRawDataValAlg)
- DECLARE_ALGTOOL(RpcLv1RawDataValAlg)
- DECLARE_ALGTOOL(RpcLv1RawDataSectorLogic)
- DECLARE_ALGTOOL(RpcLv1RawDataEfficiency)
- DECLARE_ALGTOOL(RPCStandaloneTracksMon)
-}
-
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/components/RpcRawDataMonitoring_load.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/components/RpcRawDataMonitoring_load.cxx
deleted file mode 100755
index 3d51aed25dee..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/components/RpcRawDataMonitoring_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(MuonRawDataMonitoring)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/components/TgcRawDataMonitoring_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/components/TgcRawDataMonitoring_entries.cxx
old mode 100755
new mode 100644
index 6058a213e416..5a307c031231
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/components/TgcRawDataMonitoring_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/components/TgcRawDataMonitoring_entries.cxx
@@ -1,14 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-//////////// TGC ///////////////////////////////
#include "TgcRawDataMonitoring/TgcRawDataValAlg.h"
#include "TgcRawDataMonitoring/TgcLv1RawDataValAlg.h"
DECLARE_TOOL_FACTORY(TgcRawDataValAlg)
DECLARE_TOOL_FACTORY(TgcLv1RawDataValAlg)
-
-DECLARE_FACTORY_ENTRIES(TgcRawDataMonitoring)
-{
- DECLARE_ALGTOOL(TgcRawDataValAlg)
- DECLARE_ALGTOOL(TgcLv1RawDataValAlg)
-}
-
+
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/components/TgcRawDataMonitoring_load.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/components/TgcRawDataMonitoring_load.cxx
deleted file mode 100755
index f70f12960100..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/src/components/TgcRawDataMonitoring_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(TgcRawDataMonitoring)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonSegmMonitoring/src/components/MuonSegmMonitoring_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonSegmMonitoring/src/components/MuonSegmMonitoring_entries.cxx
old mode 100755
new mode 100644
index e585bc2cf5e4..75200b67c5cb
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonSegmMonitoring/src/components/MuonSegmMonitoring_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonSegmMonitoring/src/components/MuonSegmMonitoring_entries.cxx
@@ -1,4 +1,3 @@
-// #include "GaudiKernel/DeclareFactoryEntries.h"
// #include "MuonSegmMonitoring/MuonSegmValidation.h"
// #include "MuonSegmMonitoring/CSCSegmValidation.h"
// #include "MuonSegmMonitoring/CSCSegmValAlg.h"
@@ -7,9 +6,3 @@
// DECLARE_TOOL_FACTORY(CSCSegmValidation)
// DECLARE_TOOL_FACTORY(CSCSegmValAlg)
-// DECLARE_FACTORY_ENTRIES(MuonSegmMonitoring)
-// {
-// DECLARE_ALGTOOL(MuonSegmValidation)
-// DECLARE_ALGTOOL(CSCSegmValidation)
-// DECLARE_ALGTOOL(CSCSegmValAlg)
-// }
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonSegmMonitoring/src/components/MuonSegmMonitoring_load.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonSegmMonitoring/src/components/MuonSegmMonitoring_load.cxx
deleted file mode 100755
index dca047786a5d..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonSegmMonitoring/src/components/MuonSegmMonitoring_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(MuonSegmMonitoring)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/components/MuonTrackMonitoring_entries.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/components/MuonTrackMonitoring_entries.cxx
old mode 100755
new mode 100644
index 2b526d55e071..37ecd4b14777
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/components/MuonTrackMonitoring_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/components/MuonTrackMonitoring_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonTrackMonitoring/MuonGenericTracksMon.h"
DECLARE_TOOL_FACTORY(MuonGenericTracksMon)
-DECLARE_FACTORY_ENTRIES(MuonTrackMonitoring)
-{
- DECLARE_ALGTOOL(MuonGenericTracksMon)
-}
-
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/components/MuonTrackMonitoring_load.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/components/MuonTrackMonitoring_load.cxx
deleted file mode 100755
index be5d4401f125..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/components/MuonTrackMonitoring_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(MuonTrackMonitoring)
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomTest/src/components/MuonGMCheckCorners_entries.cxx b/MuonSpectrometer/MuonValidation/MuonGeomTest/src/components/MuonGMCheckCorners_entries.cxx
index f569b3a0c780..379949cd8b27 100644
--- a/MuonSpectrometer/MuonValidation/MuonGeomTest/src/components/MuonGMCheckCorners_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonGeomTest/src/components/MuonGMCheckCorners_entries.cxx
@@ -1,10 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonGMCheckCorners.h"
#include "../MuonGMNtupleWriter.h"
DECLARE_ALGORITHM_FACTORY(MuonGMCheckCorners)
DECLARE_ALGORITHM_FACTORY(MuonGMNtupleWriter)
-DECLARE_FACTORY_ENTRIES(MuonGeomTest) {
- DECLARE_ALGORITHM( MuonGMCheckCorners );
- DECLARE_ALGORITHM( MuonGMNtupleWriter );
-}
+
diff --git a/MuonSpectrometer/MuonValidation/MuonGeomTest/src/components/MuonGMCheckCorners_load.cxx b/MuonSpectrometer/MuonValidation/MuonGeomTest/src/components/MuonGMCheckCorners_load.cxx
deleted file mode 100644
index 99e665bb9c2d..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonGeomTest/src/components/MuonGMCheckCorners_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonGeomTest)
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/components/MuonPRDTest_entries.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/components/MuonPRDTest_entries.cxx
index 443e7ce424c7..87b19e95aa43 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/components/MuonPRDTest_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/components/MuonPRDTest_entries.cxx
@@ -1,16 +1,8 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../MDTPRDValAlg.h"
#include "../NSWPRDValAlg.h"
-DECLARE_FACTORY_ENTRIES(MuonPRDTest)
-{
- DECLARE_ALGORITHM( MDTPRDValAlg )
- DECLARE_ALGORITHM( NSWPRDValAlg )
-}
DECLARE_ALGORITHM_FACTORY( MDTPRDValAlg )
DECLARE_ALGORITHM_FACTORY( NSWPRDValAlg )
-
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/components/MuonPRDTest_load.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/components/MuonPRDTest_load.cxx
deleted file mode 100644
index 417e1fa33f63..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/components/MuonPRDTest_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(MuonPRDTest)
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/components/MuonTrackPerformance_entries.cxx b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/components/MuonTrackPerformance_entries.cxx
old mode 100755
new mode 100644
index 949f71346d6a..8fa279d7306d
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/components/MuonTrackPerformance_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/components/MuonTrackPerformance_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonTrackPerformance/MuonTrackPerformanceAlg.h"
#include "../MuonPerformanceAlg.h"
#include "../MuonSegmentPerformanceAlg.h"
@@ -15,12 +14,3 @@ DECLARE_ALGORITHM_FACTORY( MuonTrackStatisticsAlg )
DECLARE_TOOL_FACTORY( MuonTrackStatisticsTool )
DECLARE_TOOL_FACTORY( MuonRecoValidationTool )
-DECLARE_FACTORY_ENTRIES( MuonTrackPerformance )
-{
- DECLARE_ALGORITHM( MuonPerformanceAlg );
- DECLARE_ALGORITHM( MuonSegmentPerformanceAlg );
- DECLARE_ALGORITHM( MuonTrackPerformanceAlg );
- DECLARE_ALGORITHM( MuonTrackStatisticsAlg );
- DECLARE_TOOL( MuonTrackStatisticsTool );
- DECLARE_TOOL( MuonRecoValidationTool );
-}
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/components/MuonTrackPerformance_load.cxx b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/components/MuonTrackPerformance_load.cxx
deleted file mode 100755
index c1317044e14c..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/components/MuonTrackPerformance_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonTrackPerformance )
diff --git a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/src/components/MuonSimHitToPrdTest_entries.cxx b/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/src/components/MuonSimHitToPrdTest_entries.cxx
index fa128d5c82d5..9f33536d4615 100644
--- a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/src/components/MuonSimHitToPrdTest_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/src/components/MuonSimHitToPrdTest_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonSimHitToPrdTest/RPC_SimHitToPrdCBNTAlgo.h"
//#include "MuonSimHitToPrdTest/MDT_SimHitToPrdCBNTAlgo.h"
DECLARE_ALGORITHM_FACTORY(RPC_SimHitToPrdCBNTAlgo)
//DECLARE_ALGORITHM_FACTORY(MDT_SimHitToPrdCBNTAlgo)
-DECLARE_FACTORY_ENTRIES(MuonSimHitToPrdTest)
-{
- DECLARE_ALGORITHM(RPC_DigitRdoPrepCBNTAlgo)
- //DECLARE_ALGORITHM(MDT_DigitRdoPrepCBNTAlgo)
-}
diff --git a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/src/components/MuonSimHitToPrdTest_load.cxx b/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/src/components/MuonSimHitToPrdTest_load.cxx
deleted file mode 100644
index 0c57b6c86c1f..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/src/components/MuonSimHitToPrdTest_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonSimHitToPrdTest)
diff --git a/MuonSpectrometer/MuonValidation/MuonTrackValidation/src/components/MuonTrackValidation_entries.cxx b/MuonSpectrometer/MuonValidation/MuonTrackValidation/src/components/MuonTrackValidation_entries.cxx
index 353bda32cb56..5b05cbb2e29a 100644
--- a/MuonSpectrometer/MuonValidation/MuonTrackValidation/src/components/MuonTrackValidation_entries.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonTrackValidation/src/components/MuonTrackValidation_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonStationNtupleHelperTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( Muon, MuonStationNtupleHelperTool )
-DECLARE_FACTORY_ENTRIES( MuonTrackValidation )
-{
- DECLARE_NAMESPACE_TOOL( Muon, MuonStationNtupleHelperTool )
-}
-
diff --git a/MuonSpectrometer/MuonValidation/MuonTrackValidation/src/components/MuonTrackValidation_load.cxx b/MuonSpectrometer/MuonValidation/MuonTrackValidation/src/components/MuonTrackValidation_load.cxx
deleted file mode 100644
index 2a7b87673d90..000000000000
--- a/MuonSpectrometer/MuonValidation/MuonTrackValidation/src/components/MuonTrackValidation_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonTrackValidation )
-
--
GitLab