From bab3719f083e97777bf1fc6347d8fe7d6c65ef6e Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 26 Oct 2017 14:33:24 +0200
Subject: [PATCH] Remove obsolete factory entries for components in
InnerDetector
- 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.
Former-commit-id: 72a333514fe38483388cbc07c250683df691aef8
---
.../components/InDetAlignGenAlgs_entries.cxx | 9 ---
.../src/components/InDetAlignGenAlgs_load.cxx | 3 -
.../components/InDetAlignGenTools_entries.cxx | 15 +----
.../components/InDetAlignGenTools_load.cxx | 3 -
.../InDetSurveyConstraintTool_entries.cxx | 5 --
.../InDetSurveyConstraintTool_load.cxx | 3 -
.../components/InDetAlignDBTools_entries.cxx | 7 ---
.../src/components/InDetAlignDBTools_load.cxx | 3 -
.../InDetAlignGeomTools_entries.cxx | 10 ----
.../components/InDetAlignGeomTools_load.cxx | 3 -
.../InDetAlignNtupleTool_entries.cxx | 7 ---
.../components/InDetAlignNtupleTool_load.cxx | 3 -
.../InDetBeamSpotFinder_entries.cxx | 8 ---
.../components/InDetBeamSpotFinder_load.cxx | 4 --
.../src/components/PixelCalibAlgs_entries.cxx | 10 ----
.../src/components/PixelCalibAlgs_load.cxx | 3 -
.../src/components/SCT_CalibAlgs_entries.cxx | 10 ----
.../src/components/SCT_CalibAlgs_load.cxx | 4 --
.../src/components/TRT_CalibAlgs_entries.cxx | 10 ----
.../src/components/TRT_CalibAlgs_load.cxx | 5 --
.../src/components/TRT_CalibTools_entries.cxx | 14 -----
.../src/components/TRT_CalibTools_load.cxx | 5 --
.../InDetBeamSpotService_entries.cxx | 5 --
.../components/InDetBeamSpotService_load.cxx | 3 -
.../PixelConditionsServices_entries.cxx | 20 -------
.../PixelConditionsServices_load.cxx | 4 --
.../PixelConditionsTools_entries.cxx | 13 +----
.../components/PixelConditionsTools_load.cxx | 3 -
.../SCT_ConditionsServices_entries.cxx | 55 +------------------
.../SCT_ConditionsServices_load.cxx | 4 --
.../components/SiLorentzAngleSvc_entries.cxx | 5 --
.../src/components/SiLorentzAngleSvc_load.cxx | 3 -
.../components/SiPropertiesSvc_entries.cxx | 5 --
.../src/components/SiPropertiesSvc_load.cxx | 3 -
.../components/TRT_ConditionsAlgs_entries.cxx | 10 ----
.../components/TRT_ConditionsAlgs_load.cxx | 5 --
.../TRT_ConditionsServices_entries.cxx | 2 +-
.../TRT_ConditionsServices_load.cxx | 3 -
.../TRT_RecoConditionsServices_entries.cxx | 2 +-
.../InDetCosmicsEventPhase_entries.cxx | 10 ----
.../InDetCosmicsEventPhase_load.cxx | 5 --
.../InDetCosmicsFilters_entries.cxx | 6 +-
.../components/InDetCosmicsFilters_load.cxx | 5 --
.../TRT_SegmentsToTrack_entries.cxx | 6 --
.../components/TRT_SegmentsToTrack_load.cxx | 3 -
.../src/components/BCM_GeoModel_entries.cxx | 5 --
.../src/components/BCM_GeoModel_load.cxx | 3 -
.../src/components/BLM_GeoModel_entries.cxx | 5 --
.../src/components/BLM_GeoModel_load.cxx | 3 -
.../InDetRegionSelector_entries.cxx | 7 ---
.../components/InDetRegionSelector_load.cxx | 4 --
.../InDetServMatGeoModel_entries.cxx | 1 +
.../InDetTrackingGeometry_entries.cxx | 12 ----
.../components/InDetTrackingGeometry_load.cxx | 4 --
.../src/components/PixelCabling_entries.cxx | 7 ---
.../src/components/PixelCabling_load.cxx | 4 --
.../src/components/PixelGeoModel_entries.cxx | 1 +
.../src/components/SCT_Cabling_entries.cxx | 8 ---
.../src/components/SCT_Cabling_load.cxx | 4 --
.../src/components/SCT_GeoModel_entries.cxx | 1 +
.../SCT_ModuleDistortions_entries.cxx | 6 --
.../components/SCT_ModuleDistortions_load.cxx | 4 --
.../components/SCT_SLHC_GeoModel_entries.cxx | 1 +
.../src/components/TRT_Cabling_entries.cxx | 13 -----
.../src/components/TRT_Cabling_load.cxx | 4 --
.../src/components/TRT_GeoModel_entries.cxx | 0
.../InDetIdCnv/src/InDetIdCnv_entries.cxx | 13 -----
.../InDetIdCnv/src/InDetIdCnv_load.cxx | 9 ---
.../components/BCM_Digitization_entries.cxx | 6 --
.../src/components/BCM_Digitization_load.cxx | 4 --
.../components/FastSiDigitization_entries.cxx | 13 -----
.../components/FastSiDigitization_load.cxx | 5 --
.../components/TRTDigitization_entries.cxx | 6 --
.../src/components/TRTDigitization_load.cxx | 5 --
.../components/PixelDigitization_entries.cxx | 18 ------
.../src/components/PixelDigitization_load.cxx | 4 --
.../components/SCT_Digitization_entries.cxx | 13 -----
.../src/components/SCT_Digitization_load.cxx | 3 -
.../components/TRTDigitization_entries.cxx | 7 ---
.../src/components/TRTDigitization_load.cxx | 5 --
.../BCM_RawDataByteStreamCnv_entries.cxx | 12 ----
.../BCM_RawDataByteStreamCnv_load.cxx | 3 -
.../components/InDetEventCnvTools_entries.cxx | 10 ----
.../components/InDetEventCnvTools_load.cxx | 5 --
.../src/components/InDetJiveXML_entries.cxx | 11 ----
.../src/components/InDetJiveXML_load.cxx | 3 -
.../InDetPrepRawDataToxAOD_entries.cxx | 11 ----
.../InDetPrepRawDataToxAOD_load.cxx | 4 --
.../PixelRawDataByteStreamCnv_entries.cxx | 10 ----
.../PixelRawDataByteStreamCnv_load.cxx | 3 -
.../SCT_RawDataByteStreamCnv_entries.cxx | 10 ----
.../SCT_RawDataByteStreamCnv_load.cxx | 2 -
.../TRT_RawDataByteStreamCnv_entries.cxx | 9 ---
.../TRT_RawDataByteStreamCnv_load.cxx | 3 -
.../InDetDetDescrExample_entries.cxx | 10 ----
.../components/InDetDetDescrExample_load.cxx | 4 --
.../src/components/BCM_G4_SD_entries.cxx | 5 --
.../src/components/BCM_G4_SD_load.cxx | 2 -
.../src/components/BLM_G4_SD_entries.cxx | 5 --
.../src/components/BLM_G4_SD_load.cxx | 2 -
.../src/components/PixelG4_SD_entries.cxx | 5 --
.../src/components/PixelG4_SD_load.cxx | 2 -
.../src/components/SCT_G4_SD_entries.cxx | 6 --
.../src/components/SCT_G4_SD_load.cxx | 2 -
.../src/components/TRT_G4_SD_entries.cxx | 5 --
.../src/components/TRT_G4_SD_load.cxx | 2 -
.../components/InDetSimpleVisual_entries.cxx | 9 ---
.../src/components/InDetSimpleVisual_load.cxx | 5 --
.../InDetAlignmentMonitoring_entries.cxx | 4 --
.../InDetAlignmentMonitoring_load.cxx | 3 -
.../InDetDiMuonMonitoring_entries.cxx | 1 -
.../components/InDetDiMuonMonitoring_load.cxx | 2 -
.../InDetGlobalMonitoring_entries.cxx | 17 ------
.../components/InDetGlobalMonitoring_load.cxx | 4 --
.../InDetPerformanceMonitoring_entries.cxx | 2 -
.../InDetPerformanceMonitoring_load.cxx | 3 -
.../InDetVertexMonitoring_entries.cxx | 4 --
.../components/InDetVertexMonitoring_load.cxx | 4 --
.../components/PixelMonitoring_entries.cxx | 9 ---
.../src/components/PixelMonitoring_load.cxx | 7 ---
.../src/components/SCT_Monitoring_entries.cxx | 13 -----
.../src/components/SCT_Monitoring_load.cxx | 4 --
.../src/components/TRT_Monitoring_entries.cxx | 7 +--
.../src/components/TRT_Monitoring_load.cxx | 3 -
.../src/components/SCTExtension_entries.cxx | 5 +-
.../src/components/SCTExtension_load.cxx | 2 -
.../BCM_ZeroSuppression_entries.cxx | 5 --
.../components/BCM_ZeroSuppression_load.cxx | 3 -
.../src/components/InDetOverlay_entries.cxx | 6 +-
.../src/components/InDetOverlay_load.cxx | 3 -
.../components/BCM_BackgroundAlgs_entries.cxx | 4 --
.../components/BCM_BackgroundAlgs_load.cxx | 2 -
.../InDetCaloClusterROISelector_entries.cxx | 7 +--
.../InDetCaloClusterROISelector_load.cxx | 3 -
.../InDetConversionFinder_entries.cxx | 5 --
.../components/InDetConversionFinder_load.cxx | 3 -
.../InDetExtensionProcessor_entries.cxx | 8 ---
.../InDetExtensionProcessor_load.cxx | 5 --
.../components/InDetLowBetaFinder_entries.cxx | 6 +-
.../components/InDetLowBetaFinder_load.cxx | 2 -
.../InDetPrepRawDataFormation_entries.cxx | 19 -------
.../InDetPrepRawDataFormation_load.cxx | 5 --
.../components/InDetPriVxFinder_entries.cxx | 8 ---
.../src/components/InDetPriVxFinder_load.cxx | 3 -
.../InDetTrackPRD_Association_entries.cxx | 6 --
.../InDetTrackPRD_Association_load.cxx | 4 --
.../src/components/InDetV0Finder_entries.cxx | 14 -----
.../src/components/InDetV0Finder_load.cxx | 4 --
.../src/components/InDetZVTOP_Alg_entries.cxx | 5 --
.../src/components/InDetZVTOP_Alg_load.cxx | 4 --
.../SiSPSeededTrackFinder_entries.cxx | 6 --
.../components/SiSPSeededTrackFinder_load.cxx | 4 --
.../SiSpacePointFormation_entries.cxx | 7 ---
.../components/SiSpacePointFormation_load.cxx | 3 -
.../TRT_SeededTrackFinder_entries.cxx | 6 --
.../components/TRT_SeededTrackFinder_load.cxx | 4 --
.../TRT_StandaloneTrackFinder_entries.cxx | 6 --
.../TRT_StandaloneTrackFinder_load.cxx | 4 --
.../TRT_TrackExtensionAlg_entries.cxx | 6 --
.../components/TRT_TrackExtensionAlg_load.cxx | 4 --
.../TRT_TrackSegmentsFinder_entries.cxx | 6 --
.../TRT_TrackSegmentsFinder_load.cxx | 4 --
.../src/components/BCM_CollisionTime_load.cxx | 2 -
.../InDetAmbiTrackSelectionTool_entries.cxx | 8 ---
.../InDetAmbiTrackSelectionTool_load.cxx | 5 --
.../InDetAssociationTools_entries.cxx | 11 ----
.../components/InDetAssociationTools_load.cxx | 5 --
.../InDetCaloClusterROIBuilder_entries.cxx | 4 --
.../InDetCaloClusterROIBuilder_load.cxx | 4 --
...ingTRT_DriftCirclesOnTrackTool_entries.cxx | 9 ---
...petingTRT_DriftCirclesOnTrackTool_load.cxx | 4 --
.../InDetConversionFinderTool_entries.cxx | 11 ----
.../InDetConversionFinderTool_load.cxx | 3 -
.../components/InDetDNASeparator_entries.cxx | 6 --
.../src/components/InDetDNASeparator_load.cxx | 5 --
.../InDetMultipleVertexSeedFinder_entries.cxx | 7 ---
.../InDetMultipleVertexSeedFinder_load.cxx | 3 -
...tMultipleVertexSeedFinderUtils_entries.cxx | 6 --
...nDetMultipleVertexSeedFinderUtils_load.cxx | 3 -
.../InDetPriVxFinderTool_entries.cxx | 11 ----
.../components/InDetPriVxFinderTool_load.cxx | 3 -
.../InDetResidualPullCalculators_entries.cxx | 5 --
.../InDetResidualPullCalculators_load.cxx | 3 -
.../InDetSVWithMuonTool_entries.cxx | 15 +----
.../components/InDetSVWithMuonTool_load.cxx | 8 ---
.../InDetSecVxFinderTool_entries.cxx | 7 ---
.../components/InDetSecVxFinderTool_load.cxx | 3 -
.../components/InDetTestBLayer_entries.cxx | 5 --
.../src/components/InDetTestBLayer_load.cxx | 5 --
.../InDetTestPixelLayer_entries.cxx | 5 --
.../components/InDetTestPixelLayer_load.cxx | 5 --
.../InDetTrackHoleSearch_entries.cxx | 6 --
.../components/InDetTrackHoleSearch_load.cxx | 5 --
.../InDetTrackScoringTools_entries.cxx | 12 ----
.../InDetTrackScoringTools_load.cxx | 5 --
.../InDetTrackSelectionTool_entries.cxx | 12 ----
.../InDetTrackSelectionTool_load.cxx | 5 --
.../InDetTrackSelectorTool_entries.cxx | 10 ----
.../InDetTrackSelectorTool_load.cxx | 3 -
.../InDetTrackSummaryHelperTool_entries.cxx | 10 ----
.../InDetTrackSummaryHelperTool_load.cxx | 5 --
.../InDetVKalPriVxFinderTool_entries.cxx | 15 +----
.../InDetVKalPriVxFinderTool_load.cxx | 8 ---
.../InDetVKalVxInJetTool_entries.cxx | 15 +----
.../components/InDetVKalVxInJetTool_load.cxx | 8 ---
.../components/InDetZVTOPVxFinder_entries.cxx | 12 ----
.../components/InDetZVTOPVxFinder_load.cxx | 5 --
.../components/PixelToTPIDTool_entries.cxx | 9 ---
.../src/components/PixelToTPIDTool_load.cxx | 4 --
.../SeedToTrackConversionTool_entries.cxx | 6 --
.../SeedToTrackConversionTool_load.cxx | 5 --
.../SiClusterOnTrackTool_entries.cxx | 8 ---
.../components/SiClusterOnTrackTool_load.cxx | 4 --
.../SiClusterizationTool_entries.cxx | 23 --------
.../components/SiClusterizationTool_load.cxx | 5 --
...ombinatorialTrackFinderTool_xk_entries.cxx | 11 ----
...SiCombinatorialTrackFinderTool_xk_load.cxx | 4 --
.../SiDetElementsRoadTool_xk_entries.cxx | 11 ----
.../SiDetElementsRoadTool_xk_load.cxx | 4 --
.../components/SiSpacePointTool_entries.cxx | 8 ---
.../src/components/SiSpacePointTool_load.cxx | 4 --
.../SiSpacePointsSeedTool_xk_entries.cxx | 17 ------
.../SiSpacePointsSeedTool_xk_load.cxx | 4 --
.../SiTrackMakerTool_xk_entries.cxx | 11 ----
.../components/SiTrackMakerTool_xk_load.cxx | 4 --
.../components/SiZvertexTool_xk_entries.cxx | 11 ----
.../src/components/SiZvertexTool_xk_load.cxx | 4 --
.../TRT_DetElementsRoadTool_xk_entries.cxx | 11 ----
.../TRT_DetElementsRoadTool_xk_load.cxx | 4 --
.../TRT_DriftCircleOnTrackTool_entries.cxx | 8 ---
.../TRT_DriftCircleOnTrackTool_load.cxx | 4 --
.../TRT_DriftCircleTool_entries.cxx | 6 --
.../components/TRT_DriftCircleTool_load.cxx | 4 --
.../TRT_DriftFunctionTool_entries.cxx | 8 ---
.../components/TRT_DriftFunctionTool_load.cxx | 5 --
.../TRT_ElectronPidTools_entries.cxx | 8 ---
.../components/TRT_ElectronPidTools_load.cxx | 5 --
...TRT_SeededSpacePointFinderTool_entries.cxx | 12 ----
.../TRT_SeededSpacePointFinderTool_load.cxx | 5 --
.../TRT_SeededTrackFinderTool_entries.cxx | 11 ----
.../TRT_SeededTrackFinderTool_load.cxx | 4 --
.../TRT_SegmentToTrackTool_entries.cxx | 6 --
.../TRT_SegmentToTrackTool_load.cxx | 3 -
.../src/components/TRT_ToT_tools_entries.cxx | 5 --
.../src/components/TRT_ToT_tools_load.cxx | 2 -
.../TRT_TrackExtensionTool_DAF_entries.cxx | 13 -----
.../TRT_TrackExtensionTool_DAF_load.cxx | 4 --
.../TRT_TrackExtensionTool_xk_entries.cxx | 12 ----
.../TRT_TrackExtensionTool_xk_load.cxx | 4 --
.../TRT_TrackHoleSearch_entries.cxx | 6 --
.../components/TRT_TrackHoleSearch_load.cxx | 4 --
.../TRT_TrackSegmentsTool_xk_entries.cxx | 12 ----
.../TRT_TrackSegmentsTool_xk_load.cxx | 4 --
.../TrackVertexAssociationTool_entries.cxx | 14 -----
.../TrackVertexAssociationTool_load.cxx | 3 -
.../components/TRT_PAI_Process_entries.cxx | 6 --
.../src/components/TRT_PAI_Process_load.cxx | 4 --
.../src/components/TRT_TR_Process_entries.cxx | 6 +-
.../src/components/TRT_TR_Process_load.cxx | 2 -
.../InDetTrigAmbiguitySolver_entries.cxx | 10 ----
.../InDetTrigAmbiguitySolver_load.cxx | 4 --
.../InDetTrigConversionFinder_entries.cxx | 5 --
.../InDetTrigConversionFinder_load.cxx | 3 -
.../InDetTrigExtensProcessor_entries.cxx | 8 ---
.../InDetTrigExtensProcessor_load.cxx | 5 --
.../InDetTrigParticleCreation_entries.cxx | 9 +--
.../InDetTrigParticleCreation_load.cxx | 3 -
.../InDetTrigPrepRawDataFormat_entries.cxx | 10 ----
.../InDetTrigPrepRawDataFormat_load.cxx | 4 --
.../InDetTrigPriVxFinder_entries.cxx | 7 ---
.../components/InDetTrigPriVxFinder_load.cxx | 3 -
.../InDetTrigRawDataProvider_entries.cxx | 12 ----
.../InDetTrigRawDataProvider_load.cxx | 4 --
.../TrkTrigTrackCollectionMerger_entries.cxx | 7 ---
.../TrkTrigTrackCollectionMerger_load.cxx | 6 --
.../InDetTrigTrackPRD_Association_entries.cxx | 6 --
.../InDetTrigTrackPRD_Association_load.cxx | 4 --
.../InDetTrigTrackResidualMonitor_entries.cxx | 6 +-
.../InDetTrigTrackResidualMonitor_load.cxx | 3 -
.../InDetTrigTrackSlimmer_entries.cxx | 6 +-
.../components/InDetTrigTrackSlimmer_load.cxx | 3 -
.../components/InDetTrigTruthAlgs_entries.cxx | 7 ---
.../components/InDetTrigTruthAlgs_load.cxx | 4 --
.../InDetTrigVxSecondary_entries.cxx | 6 --
.../components/InDetTrigVxSecondary_load.cxx | 3 -
.../SiTrigSPSeededTrackFinder_entries.cxx | 6 --
.../SiTrigSPSeededTrackFinder_load.cxx | 4 --
.../SiTrigSpacePointFormation_entries.cxx | 9 ---
.../SiTrigSpacePointFormation_load.cxx | 4 --
.../TRT_TrigSeededTrackFinder_entries.cxx | 6 --
.../TRT_TrigSeededTrackFinder_load.cxx | 4 --
.../TRT_TrigStandaloneTrackFinder_entries.cxx | 6 --
.../TRT_TrigStandaloneTrackFinder_load.cxx | 4 --
.../TRT_TrigTrackExtensionAlg_entries.cxx | 6 --
.../TRT_TrigTrackExtensionAlg_load.cxx | 4 --
.../TRT_TrigTrackSegmentsFinder_entries.cxx | 6 --
.../TRT_TrigTrackSegmentsFinder_load.cxx | 4 --
.../src/components/InDetTruthAlgs_entries.cxx | 6 --
.../src/components/InDetTruthAlgs_load.cxx | 4 --
.../components/InDetTruthTools_entries.cxx | 7 ---
.../src/components/InDetTruthTools_load.cxx | 3 -
.../InDetPerformanceRTT_entries.cxx | 1 -
.../components/InDetPerformanceRTT_load.cxx | 3 -
.../InDetPhysValMonitoring_entries.cxx | 20 -------
.../InDetPhysValMonitoring_load.cxx | 4 --
.../components/InDetRecStatistics_entries.cxx | 4 --
.../components/InDetRecStatistics_load.cxx | 3 -
...egmentDriftCircleAssValidation_entries.cxx | 7 ---
...etSegmentDriftCircleAssValidation_load.cxx | 4 --
...InDetTrackClusterAssValidation_entries.cxx | 7 ---
.../InDetTrackClusterAssValidation_load.cxx | 4 --
.../InDetTrackSplitterTool_entries.cxx | 6 +-
.../InDetTrackSplitterTool_load.cxx | 3 -
.../InDetTrackValidation_entries.cxx | 11 ----
.../components/InDetTrackValidation_load.cxx | 3 -
.../InDetVertexSplitter_entries.cxx | 6 --
.../components/InDetVertexSplitter_load.cxx | 4 --
.../DiTauRec/src/components/DiTauRec_load.cxx | 3 -
.../src/components/EventShapeTools_load.cxx | 3 -
.../HIGlobal/src/components/HIGlobal_load.cxx | 5 --
.../HIJetRec/src/components/HIJetRec_load.cxx | 3 -
.../src/components/HIMonitoring_load.cxx | 3 -
.../src/components/JetTileCorrection_load.cxx | 3 -
.../src/components/JetCalibTools_load.cxx | 5 --
.../src/components/JetJvtEfficiency_load.cxx | 5 --
.../src/components/JetMomentTools_load.cxx | 5 --
.../src/components/JetMonitoring_load.cxx | 3 -
.../Jet/JetRec/src/components/JetRec_load.cxx | 5 --
.../src/components/JetRecCalo_load.cxx | 3 -
.../src/components/JetRecTools_load.cxx | 3 -
.../src/components/JetReclustering_load.cxx | 3 -
.../src/components/JetResolution_load.cxx | 5 --
.../src/components/JetSimTools_load.cxx | 3 -
.../src/components/JetSubStructure_load.cxx | 5 --
.../src/components/JetUncertainties_load.cxx | 7 ---
.../src/components/JetValidation_load.cxx | 2 -
.../src/components/METReconstruction_load.cxx | 3 -
.../src/components/METUtilities_load.cxx | 3 -
.../src/components/MissingETGoodness_load.cxx | 4 --
.../components/MissingETMonitoring_load.cxx | 3 -
.../components/MissingETPerformance_load.cxx | 3 -
.../src/components/CaloTrkMuIdTools_load.cxx | 5 --
.../src/components/CombinedMuonRefit_load.cxx | 5 --
.../MuGirl/src/components/MuGirl_load.cxx | 3 -
.../src/components/MuGirlCandidate_load.cxx | 5 --
.../src/components/MuGirlGlobalFit_load.cxx | 5 --
.../MuGirlParticleCreatorTool_load.cxx | 5 --
.../MuGirlPerformanceTools_load.cxx | 5 --
.../src/components/MuGirlSelection_load.cxx | 5 --
.../src/components/MuGirlStau_load.cxx | 4 --
.../components/MuidCaloEnergyTools_load.cxx | 12 ----
.../MuidCaloIsolationTools_load.cxx | 3 -
.../MuidCaloScatteringTools_load.cxx | 4 --
.../src/components/MuidCombinedTools_load.cxx | 3 -
.../src/components/MuidTrackBuilder_load.cxx | 4 --
.../MuonCombinedEventStoreAlgs_load.cxx | 4 --
.../src/components/MuonCombinedAlgs_load.cxx | 5 --
.../components/MuonCombinedBaseTools_load.cxx | 5 --
.../MuonCombinedEvaluationTools_load.cxx | 5 --
.../components/MuonCombinedTestTools_load.cxx | 4 --
.../MuonCombinedTimingTools_load.cxx | 5 --
.../MuonCombinedTrackFindingTools_load.cxx | 3 -
.../MuonSegmentTaggerTools_load.cxx | 3 -
.../MuonSpShowerBuilderAlgs_load.cxx | 2 -
.../src/components/PFlowUtils_load.cxx | 3 -
.../PFODQA/src/components/PFODQA_load.cxx | 2 -
.../src/components/PanTauAlgs_load.cxx | 5 --
.../RecAlgs/src/components/RecAlgs_load.cxx | 4 --
.../src/components/RecBackgroundAlgs_load.cxx | 3 -
.../src/components/RecExAlgs_load.cxx | 4 --
.../src/components/RecJiveXML_load.cxx | 3 -
.../src/components/CaloRingerAlgs_load.cxx | 4 --
.../src/components/IsolationAlgs_load.cxx | 3 -
.../TrackParticleAssociationAlgs_load.cxx | 5 --
.../components/CaloClusterMatching_load.cxx | 3 -
.../src/components/CaloRingerTool_load.cxx | 5 --
.../src/components/IsolationTool_load.cxx | 6 --
.../components/ParticlesInConeTools_load.cxx | 5 --
.../src/components/TrackToCalo_load.cxx | 5 --
.../src/components/TrackToVertex_load.cxx | 4 --
.../TRT_Rec/src/components/TRT_Rec_load.cxx | 10 ----
.../TrackCaloClusterRecAlgs_load.cxx | 3 -
.../ParticleToCaloExtrapolationTool_load.cxx | 3 -
.../TrackCaloClusterRecValidation_load.cxx | 3 -
.../src/components/VrtSecInclusive_load.cxx | 8 ---
.../eflowRec/src/components/eflowRec_load.cxx | 3 -
.../EgammaPhysValMonitoring_load.cxx | 5 --
.../src/components/egammaAlgs_load.cxx | 4 --
.../src/components/egammaCaloTools_load.cxx | 3 -
.../src/components/egammaMVACalib_load.cxx | 4 --
.../src/components/egammaPerformance_load.cxx | 4 --
.../src/components/egammaTools_load.cxx | 4 --
.../src/components/egammaTrackTools_load.cxx | 4 --
.../src/components/iPatGeometryTools_load.cxx | 8 ---
.../src/components/iPatQuality_load.cxx | 4 --
.../src/components/iPatRecAlgs_load.cxx | 11 ----
.../src/components/iPatTrackFinder_load.cxx | 10 ----
.../src/components/iPatTrackFitter_load.cxx | 4 --
.../src/components/iPatTrackFollower_load.cxx | 10 ----
.../components/iPatTruthTrajectory_load.cxx | 11 ----
.../src/components/tauMonitoring_load.cxx | 3 -
.../tauRec/src/components/tauRec_load.cxx | 6 --
.../src/components/tauRecTools_load.cxx | 4 --
403 files changed, 26 insertions(+), 2331 deletions(-)
mode change 100755 => 100644 InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_entries.cxx
delete mode 100755 InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_load.cxx
mode change 100755 => 100644 InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_entries.cxx
delete mode 100755 InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_load.cxx
mode change 100755 => 100644 InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_entries.cxx
delete mode 100755 InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_load.cxx
delete mode 100644 InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_load.cxx
delete mode 100644 InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_load.cxx
delete mode 100644 InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_load.cxx
delete mode 100644 InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx
delete mode 100755 InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_load.cxx
mode change 100755 => 100644 InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_entries.cxx
delete mode 100755 InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_load.cxx
mode change 100755 => 100644 InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_entries.cxx
delete mode 100755 InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_load.cxx
mode change 100755 => 100644 InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_entries.cxx
delete mode 100755 InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_load.cxx
delete mode 100644 InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_load.cxx
mode change 100755 => 100644 InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx
delete mode 100755 InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_load.cxx
mode change 100755 => 100644 InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_entries.cxx
delete mode 100755 InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_load.cxx
delete mode 100644 InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_load.cxx
delete mode 100644 InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_load.cxx
delete mode 100644 InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_load.cxx
mode change 100755 => 100644 InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_entries.cxx
delete mode 100755 InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_load.cxx
delete mode 100644 InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_load.cxx
mode change 100755 => 100644 InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_entries.cxx
delete mode 100755 InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_load.cxx
mode change 100755 => 100644 InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_entries.cxx
delete mode 100755 InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_load.cxx
mode change 100755 => 100644 InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_entries.cxx
delete mode 100755 InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_load.cxx
mode change 100755 => 100644 InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_entries.cxx
delete mode 100755 InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_load.cxx
delete mode 100644 InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_load.cxx
mode change 100755 => 100644 InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_entries.cxx
delete mode 100755 InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_load.cxx
mode change 100755 => 100644 InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/components/InDetServMatGeoModel_entries.cxx
mode change 100755 => 100644 InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_entries.cxx
delete mode 100755 InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_load.cxx
mode change 100755 => 100644 InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx
delete mode 100755 InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_load.cxx
delete mode 100644 InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_load.cxx
mode change 100755 => 100644 InnerDetector/InDetDetDescr/SCT_GeoModel/src/components/SCT_GeoModel_entries.cxx
delete mode 100644 InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_load.cxx
mode change 100755 => 100644 InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/components/SCT_SLHC_GeoModel_entries.cxx
delete mode 100644 InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_load.cxx
mode change 100755 => 100644 InnerDetector/InDetDetDescr/TRT_GeoModel/src/components/TRT_GeoModel_entries.cxx
mode change 100755 => 100644 InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
delete mode 100755 InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_load.cxx
delete mode 100644 InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_load.cxx
delete mode 100644 InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_load.cxx
delete mode 100644 InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_load.cxx
mode change 100755 => 100644 InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_entries.cxx
delete mode 100755 InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_load.cxx
delete mode 100644 InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_load.cxx
delete mode 100644 InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_load.cxx
delete mode 100644 InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_load.cxx
mode change 100755 => 100644 InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_entries.cxx
delete mode 100755 InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_load.cxx
mode change 100755 => 100644 InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_entries.cxx
delete mode 100755 InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_load.cxx
mode change 100755 => 100644 InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_entries.cxx
delete mode 100755 InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_load.cxx
delete mode 100644 InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_load.cxx
delete mode 100644 InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_load.cxx
delete mode 100644 InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_load.cxx
mode change 100755 => 100644 InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_entries.cxx
delete mode 100755 InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_load.cxx
delete mode 100644 InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_load.cxx
delete mode 100644 InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_load.cxx
delete mode 100644 InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_load.cxx
delete mode 100644 InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_load.cxx
delete mode 100644 InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_load.cxx
mode change 100755 => 100644 InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_entries.cxx
delete mode 100755 InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_load.cxx
mode change 100755 => 100644 InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_entries.cxx
delete mode 100755 InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_load.cxx
delete mode 100644 InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_load.cxx
mode change 100755 => 100644 InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_entries.cxx
delete mode 100755 InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_load.cxx
mode change 100755 => 100644 InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_entries.cxx
delete mode 100755 InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_load.cxx
mode change 100755 => 100644 InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_entries.cxx
delete mode 100755 InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_load.cxx
mode change 100755 => 100644 InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx
delete mode 100755 InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_load.cxx
mode change 100755 => 100644 InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_entries.cxx
delete mode 100755 InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_load.cxx
delete mode 100644 InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_load.cxx
delete mode 100644 InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_load.cxx
delete mode 100644 InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_entries.cxx
delete mode 100755 InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_load.cxx
delete mode 100644 InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_load.cxx
delete mode 100644 InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_entries.cxx
delete mode 100755 InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_entries.cxx
delete mode 100755 InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_load.cxx
delete mode 100644 InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_entries.cxx
delete mode 100755 InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_entries.cxx
delete mode 100755 InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_entries.cxx
delete mode 100755 InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_entries.cxx
delete mode 100755 InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_entries.cxx
delete mode 100755 InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_entries.cxx
delete mode 100755 InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_entries.cxx
delete mode 100755 InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_entries.cxx
delete mode 100755 InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_entries.cxx
delete mode 100755 InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_entries.cxx
delete mode 100755 InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_entries.cxx
delete mode 100755 InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_load.cxx
delete mode 100644 InnerDetector/InDetRecEvent/BCM_CollisionTime/src/components/BCM_CollisionTime_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_load.cxx
delete mode 100644 InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_load.cxx
delete mode 100644 InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_load.cxx
delete mode 100644 InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_load.cxx
delete mode 100644 InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_load.cxx
delete mode 100644 InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_load.cxx
delete mode 100644 InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_load.cxx
delete mode 100644 InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_load.cxx
delete mode 100644 InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_load.cxx
delete mode 100644 InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_load.cxx
delete mode 100644 InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_load.cxx
delete mode 100644 InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_load.cxx
mode change 100755 => 100644 InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_entries.cxx
delete mode 100755 InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_load.cxx
delete mode 100644 InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_entries.cxx
delete mode 100755 InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_load.cxx
delete mode 100644 InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_load.cxx
delete mode 100644 InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx
delete mode 100755 InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_entries.cxx
delete mode 100755 InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_load.cxx
mode change 100755 => 100644 InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_entries.cxx
delete mode 100755 InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_load.cxx
mode change 100755 => 100644 InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_entries.cxx
delete mode 100755 InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_load.cxx
delete mode 100644 InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_load.cxx
mode change 100755 => 100644 InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_entries.cxx
delete mode 100755 InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_load.cxx
mode change 100755 => 100644 InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_entries.cxx
delete mode 100644 InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_load.cxx
mode change 100755 => 100644 InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_entries.cxx
delete mode 100755 InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_load.cxx
delete mode 100644 InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_load.cxx
mode change 100755 => 100644 InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_entries.cxx
delete mode 100755 InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_load.cxx
delete mode 100644 InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_load.cxx
delete mode 100644 Reconstruction/DiTauRec/src/components/DiTauRec_load.cxx
delete mode 100755 Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_load.cxx
delete mode 100755 Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_load.cxx
delete mode 100644 Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_load.cxx
delete mode 100644 Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_load.cxx
delete mode 100644 Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_load.cxx
delete mode 100644 Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_load.cxx
delete mode 100644 Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_load.cxx
delete mode 100644 Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_load.cxx
delete mode 100755 Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_load.cxx
delete mode 100644 Reconstruction/Jet/JetRec/src/components/JetRec_load.cxx
delete mode 100644 Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_load.cxx
delete mode 100755 Reconstruction/Jet/JetRecTools/src/components/JetRecTools_load.cxx
delete mode 100644 Reconstruction/Jet/JetReclustering/src/components/JetReclustering_load.cxx
delete mode 100644 Reconstruction/Jet/JetResolution/src/components/JetResolution_load.cxx
delete mode 100755 Reconstruction/Jet/JetSimTools/src/components/JetSimTools_load.cxx
delete mode 100644 Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_load.cxx
delete mode 100644 Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_load.cxx
delete mode 100644 Reconstruction/Jet/JetValidation/src/components/JetValidation_load.cxx
delete mode 100644 Reconstruction/MET/METReconstruction/src/components/METReconstruction_load.cxx
delete mode 100644 Reconstruction/MET/METUtilities/src/components/METUtilities_load.cxx
delete mode 100644 Reconstruction/MissingETGoodness/src/components/MissingETGoodness_load.cxx
delete mode 100755 Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_load.cxx
delete mode 100755 Reconstruction/MissingETPerformance/src/components/MissingETPerformance_load.cxx
delete mode 100755 Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_load.cxx
delete mode 100755 Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_load.cxx
delete mode 100755 Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_load.cxx
delete mode 100755 Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_load.cxx
delete mode 100755 Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_load.cxx
delete mode 100755 Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_load.cxx
delete mode 100644 Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_load.cxx
delete mode 100644 Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_load.cxx
delete mode 100644 Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_load.cxx
delete mode 100644 Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_load.cxx
delete mode 100755 Reconstruction/RecAlgs/src/components/RecAlgs_load.cxx
delete mode 100755 Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_load.cxx
delete mode 100755 Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_load.cxx
delete mode 100755 Reconstruction/RecJiveXML/src/components/RecJiveXML_load.cxx
delete mode 100644 Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_load.cxx
delete mode 100644 Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_load.cxx
delete mode 100644 Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_load.cxx
delete mode 100644 Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_load.cxx
delete mode 100644 Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_load.cxx
delete mode 100644 Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_load.cxx
delete mode 100644 Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_load.cxx
delete mode 100755 Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_load.cxx
delete mode 100755 Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_load.cxx
delete mode 100755 Reconstruction/TRT_Rec/src/components/TRT_Rec_load.cxx
delete mode 100644 Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_load.cxx
delete mode 100644 Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_load.cxx
delete mode 100644 Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_load.cxx
delete mode 100755 Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_load.cxx
delete mode 100644 Reconstruction/eflowRec/src/components/eflowRec_load.cxx
delete mode 100644 Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_load.cxx
delete mode 100755 Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_load.cxx
delete mode 100755 Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_load.cxx
delete mode 100644 Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_load.cxx
delete mode 100755 Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_load.cxx
delete mode 100755 Reconstruction/egamma/egammaTools/src/components/egammaTools_load.cxx
delete mode 100755 Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_load.cxx
delete mode 100755 Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_load.cxx
delete mode 100755 Reconstruction/iPat/iPatQuality/src/components/iPatQuality_load.cxx
delete mode 100755 Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_load.cxx
delete mode 100755 Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_load.cxx
delete mode 100755 Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_load.cxx
delete mode 100755 Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_load.cxx
delete mode 100755 Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_load.cxx
delete mode 100644 Reconstruction/tauMonitoring/src/components/tauMonitoring_load.cxx
delete mode 100755 Reconstruction/tauRec/src/components/tauRec_load.cxx
delete mode 100644 Reconstruction/tauRecTools/src/components/tauRecTools_load.cxx
diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_entries.cxx b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_entries.cxx
old mode 100755
new mode 100644
index 09270599523..c018066d7c8
--- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_entries.cxx
+++ b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetAlignGenAlgs/SiDistWriteAlg.h"
#include "InDetAlignGenAlgs/InDetAlignCog.h"
#include "InDetAlignGenAlgs/AddTRTMomConstr.h"
@@ -12,11 +11,3 @@ DECLARE_ALGORITHM_FACTORY( AddTRTMomConstr )
DECLARE_ALGORITHM_FACTORY( InDetAlignWrt )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDetAlignment, CreateMisalignAlg )
-DECLARE_FACTORY_ENTRIES( InDetAlignGenAlgs )
-{
- DECLARE_ALGORITHM( SiDistWriteAlg )
- DECLARE_ALGORITHM( InDetAlignCog )
- DECLARE_ALGORITHM( AddTRTMomConstr )
- DECLARE_ALGORITHM( InDetAlignWrt )
- DECLARE_NAMESPACE_ALGORITHM( InDetAlignment, CreateMisalignAlg )
-}
diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_load.cxx b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_load.cxx
deleted file mode 100755
index c106f875888..00000000000
--- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAlignGenAlgs )
diff --git a/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_entries.cxx b/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_entries.cxx
old mode 100755
new mode 100644
index 66d5f6b4636..40f8fc62d3e
--- a/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_entries.cxx
+++ b/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_entries.cxx
@@ -1,30 +1,19 @@
#include "InDetAlignGenTools/InDetAlignDBTool.h"
#include "InDetAlignGenTools/InDetAlignTrackSelTool.h"
#include "InDetAlignGenTools/InDetAlignFillTrack.h"
-//**
+
#include "InDetAlignGenTools/InDetAlignOverlapTool.h"
#include "InDetAlignGenTools/InDetAlignFillSiCluster.h"
#include "InDetAlignGenTools/RefitSiOnlyTool.h"
#include "InDetAlignGenTools/InDetAlignHitQualSelTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( InDetAlignDBTool )
DECLARE_TOOL_FACTORY( InDetAlignTrackSelTool )
DECLARE_TOOL_FACTORY( InDetAlignFillTrack )
-//**
+
DECLARE_TOOL_FACTORY( InDetAlignOverlapTool )
DECLARE_TOOL_FACTORY( InDetAlignFillSiCluster )
DECLARE_TOOL_FACTORY( InDetAlignHitQualSelTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDetAlignment, RefitSiOnlyTool )
-DECLARE_FACTORY_ENTRIES(InDetAlignGenTools) {
- DECLARE_TOOL( InDetAlignDBTool );
- DECLARE_TOOL( InDetAlignTrackSelTool );
- DECLARE_TOOL( InDetAlignFillTrack );
- //**
- DECLARE_TOOL( InDetAlignOverlapTool );
- DECLARE_TOOL( InDetAlignFillSiCluster );
- DECLARE_TOOL( InDetAlignHitQualSelTool );
- DECLARE_NAMESPACE_TOOL( InDetAlignment, RefitSiOnlyTool );
-}
diff --git a/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_load.cxx b/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_load.cxx
deleted file mode 100755
index 1735bb29256..00000000000
--- a/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAlignGenTools )
diff --git a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_entries.cxx b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_entries.cxx
old mode 100755
new mode 100644
index 1f14b5fb035..e9067992c3a
--- a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_entries.cxx
+++ b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_entries.cxx
@@ -1,11 +1,6 @@
#include "InDetSurveyConstraintTool/SurveyConstraint.h"
#include "InDetSurveyConstraintTool/SurveyConstraintTestAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( SurveyConstraintTestAlg )
DECLARE_TOOL_FACTORY( SurveyConstraint )
-DECLARE_FACTORY_ENTRIES(InDetSurveyConstraintTool) {
- DECLARE_TOOL( SurveyConstraint );
- DECLARE_ALGORITHM( SurveyConstraintTestAlg );
-}
diff --git a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_load.cxx b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_load.cxx
deleted file mode 100755
index 9383d4b212a..00000000000
--- a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetSurveyConstraintTool)
diff --git a/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_entries.cxx b/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_entries.cxx
index 4bf8e234fac..224a87809ef 100644
--- a/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_entries.cxx
+++ b/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetAlignDBTools/SiTrkAlignDBTool.h"
#include "InDetAlignDBTools/TRTTrkAlignDBTool.h"
#include "InDetAlignDBTools/InDetTrkAlignDBTool.h"
@@ -7,9 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SiTrkAlignDBTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRTTrkAlignDBTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrkAlignDBTool )
-DECLARE_FACTORY_ENTRIES( InDetAlignDBTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, SiTrkAlignDBTool )
- DECLARE_NAMESPACE_TOOL( InDet, TRTTrkAlignDBTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrkAlignDBTool )
-}
diff --git a/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_load.cxx b/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_load.cxx
deleted file mode 100644
index 6a63e8472c8..00000000000
--- a/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAlignDBTools )
diff --git a/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_entries.cxx b/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_entries.cxx
index ad6d90df0a1..ef52743e96c 100644
--- a/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_entries.cxx
+++ b/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetAlignGeomTools/TRTGeometryManagerTool.h"
#include "InDetAlignGeomTools/PixelGeometryManagerTool.h"
#include "InDetAlignGeomTools/SCTGeometryManagerTool.h"
@@ -13,12 +12,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SiGeometryManagerTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetGeometryManagerTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetAlignModuleTool )
-DECLARE_FACTORY_ENTRIES( InDetAlignGeomTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, TRTGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( InDet, PixelGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( InDet, SCTGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( InDet, SiGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetAlignModuleTool )
-}
diff --git a/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_load.cxx b/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_load.cxx
deleted file mode 100644
index 341d339a95f..00000000000
--- a/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAlignGeomTools )
diff --git a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_entries.cxx b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_entries.cxx
index c247b9087a2..15758bb0482 100644
--- a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_entries.cxx
+++ b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetAlignNtupleTools/SimpleIDNtupleTool.h"
#include "InDetAlignNtupleTools/DetailedIDNtupleTool.h"
@@ -6,9 +5,3 @@
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SimpleIDNtupleTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, DetailedIDNtupleTool )
-
-DECLARE_FACTORY_ENTRIES( InDetAlignNtupleTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, SimpleIDNtupleTool )
- DECLARE_NAMESPACE_TOOL( InDet, DetailedIDNtupleTool )
-}
diff --git a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_load.cxx b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_load.cxx
deleted file mode 100644
index 664890139dd..00000000000
--- a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAlignNtupleTools )
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_entries.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_entries.cxx
index 66d496905ba..c57c17c75c9 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_entries.cxx
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_entries.cxx
@@ -3,17 +3,9 @@
#include "../InDetBeamSpotVertex.h"
#include "../RefitTracksAndVertex.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, InDetBeamSpotFinder )
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, InDetBeamSpotVertex)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, InDetBeamSpotRooFit)
DECLARE_ALGORITHM_FACTORY( RefitTracksAndVertex )
-DECLARE_FACTORY_ENTRIES(InDetBeamSpotFinder){
- DECLARE_NAMESPACE_ALGORITHM(InDet, InDetBeamSpotFinder)
- DECLARE_NAMESPACE_TOOL(InDet, InDetBeamSpotVertex)
- DECLARE_NAMESPACE_TOOL(InDet, InDetBeamSpotRooFit)
- DECLARE_ALGORITHM(RefitTracksAndVertex)
-}
-
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_load.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_load.cxx
deleted file mode 100644
index 106e891ab3c..00000000000
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetBeamSpotFinder)
-
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx
old mode 100755
new mode 100644
index 5183e2f8836..909c847dfef
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx
@@ -1,5 +1,4 @@
#include "PixelCalibAlgs/PixelBarrelSurvey.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "PixelCalibAlgs/NoiseMapBuilder.h"
#include "PixelCalibAlgs/PixMapDBWriter.h"
#include "PixelCalibAlgs/PixMapOverlayWriter.h"
@@ -15,12 +14,3 @@ DECLARE_ALGORITHM_FACTORY( PixelChargeToTConversion )
DECLARE_ALGORITHM_FACTORY( CompareModulesTDAQandBytestream )
DECLARE_ALGORITHM_FACTORY( PixelCalibCondAlg )
-DECLARE_FACTORY_ENTRIES( PixelCalibAlgs ) {
- DECLARE_ALGORITHM( PixelBarrelSurvey )
- DECLARE_ALGORITHM( NoiseMapBuilder )
- DECLARE_ALGORITHM( PixMapDBWriter )
- DECLARE_ALGORITHM( PixMapOverlayWriter )
- DECLARE_ALGORITHM( PixelChargeToTConversion )
- DECLARE_ALGORITHM( CompareModulesTDAQandBytestream )
- DECLARE_ALGORITHM( PixelCalibCondAlg )
-}
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_load.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_load.cxx
deleted file mode 100755
index ca336aac7da..00000000000
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelCalibAlgs )
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_entries.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_entries.cxx
old mode 100755
new mode 100644
index 3ac79279436..cd4c4e87cb7
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_entries.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SCT_CalibAlgs/SCTCalib.h"
#include "SCT_CalibAlgs/SCTCalibWriteSvc.h"
#include "../SCT_CalibHitmapSvc.h"
@@ -17,14 +16,5 @@ DECLARE_SERVICE_FACTORY( SCT_CalibLbSvc )
DECLARE_SERVICE_FACTORY( SCT_CalibModuleListSvc )
DECLARE_SERVICE_FACTORY( SCT_CalibEventInfo )
-DECLARE_FACTORY_ENTRIES( SCT_CalibAlgs ) {
- DECLARE_SERVICE( SCTCalibWriteSvc )
- DECLARE_SERVICE( SCT_CalibHitmapSvc )
- DECLARE_ALGORITHM( SCTCalib )
- DECLARE_SERVICE( SCT_CalibBsErrorSvc )
- DECLARE_SERVICE(SCT_CalibLbSvc)
- DECLARE_SERVICE(SCT_CalibEventInfo)
- DECLARE_SERVICE(SCT_CalibModuleListSvc)
-}
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_load.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_load.cxx
deleted file mode 100755
index 8b8feeec36b..00000000000
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SCT_CalibAlgs )
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_entries.cxx b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_entries.cxx
old mode 100755
new mode 100644
index 27683b3ae80..daa26e1c5e8
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_entries.cxx
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_entries.cxx
@@ -1,19 +1,9 @@
#include "TRT_CalibAlgs/TRTCalibrationMgr.h"
#include "TRT_CalibAlgs/TRT_StrawStatus.h"
#include "TRT_CalibAlgs/TRTOccupancyInclude.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( TRTCalibrationMgr )
DECLARE_ALGORITHM_FACTORY( TRTOccupancyInclude )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_StrawStatus )
-DECLARE_FACTORY_ENTRIES( TRT_CalibAlgs )
-{
- DECLARE_ALGORITHM( TRTCalibrationMgr ) ;
- DECLARE_ALGORITHM( TRTOccupancyInclude ) ;
- DECLARE_NAMESPACE_ALGORITHM( InDet, TRT_StrawStatus );
-}
-
-
-
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_load.cxx b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_load.cxx
deleted file mode 100755
index f5b01310cad..00000000000
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_CalibAlgs )
-
-
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_entries.cxx b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_entries.cxx
old mode 100755
new mode 100644
index 4cfc3abfcbc..8e901c1e718
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_entries.cxx
+++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_entries.cxx
@@ -7,7 +7,6 @@
//#include "../TRTCalChipAccumulator.h"
//#include "../TRTCalModuleAccumulator.h"
//#include "../TRTCalStrawAccumulator.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( TRTCalibTrackSelectionTool )
DECLARE_TOOL_FACTORY( FillAlignTrkInfo )
@@ -19,16 +18,3 @@ DECLARE_TOOL_FACTORY( FitTool )
//DECLARE_TOOL_FACTORY( TRTCalModuleAccumulator )
//DECLARE_TOOL_FACTORY( TRTCalStrawAccumulator )
-
-DECLARE_FACTORY_ENTRIES( TRT_CalibTools )
-{
- DECLARE_TOOL( TRTCalibTrackSelectionTool )
- DECLARE_TOOL( FillAlignTrkInfo )
- DECLARE_TOOL( FillAlignTRTHits )
- DECLARE_TOOL( TRTCalibrator )
-// DECLARE_TOOL( TRTCalAccumulator )
- DECLARE_TOOL( FitTool )
-// DECLARE_TOOL( TRTCalChipAccumulator )
-// DECLARE_TOOL( TRTCalModuleAccumulator )
-// DECLARE_TOOL( TRTCalStrawAccumulator )
-}
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_load.cxx b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_load.cxx
deleted file mode 100755
index d5b35a5dbe8..00000000000
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_CalibTools )
-
-
diff --git a/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_entries.cxx b/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_entries.cxx
index 5df0b7e1578..6c3d9f04b1f 100644
--- a/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_entries.cxx
+++ b/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../BeamCondSvc.h"
DECLARE_SERVICE_FACTORY( BeamCondSvc )
-DECLARE_FACTORY_ENTRIES( InDetBeamSpotService ) {
- DECLARE_SERVICE( BeamCondSvc )
-}
-
diff --git a/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_load.cxx b/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_load.cxx
deleted file mode 100644
index 2824722b7bf..00000000000
--- a/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetBeamSpotService )
diff --git a/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx b/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx
old mode 100755
new mode 100644
index 1e4c3a50dd4..202044c31d2
--- a/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../PixelOfflineCalibSvc.h"
#include "../PixelCalibSvc.h"
#include "../PixelCalibServiceTest.h"
@@ -29,22 +28,3 @@ DECLARE_SERVICE_FACTORY( PixelTDAQSvc )
DECLARE_SERVICE_FACTORY( PixelRunConditionsDbSvc )
//DECLARE_SERVICE_FACTORY( PixelConnCoolDbSvc )
-DECLARE_FACTORY_ENTRIES( PixelConditionsServices )
-{
- DECLARE_SERVICE( PixelOfflineCalibSvc )
- DECLARE_SERVICE( PixelCalibSvc )
- DECLARE_ALGORITHM( PixelOfflineCalibServiceTest )
- DECLARE_ALGORITHM( PixelCalibServiceTest )
- DECLARE_SERVICE( SpecialPixelMapSvc )
- DECLARE_ALGORITHM( PixelMapTestAlg )
- DECLARE_ALGORITHM( PixelRunConditionsDbTest )
- DECLARE_SERVICE( PixelDCSSvc )
- DECLARE_ALGORITHM( PixelDCSTestSvc )
- DECLARE_SERVICE( PixelConditionsSummarySvc )
- DECLARE_SERVICE( PixelSiliconConditionsSvc )
- DECLARE_SERVICE( PixelByteStreamErrorsSvc )
- DECLARE_SERVICE( PixelTDAQSvc )
- DECLARE_SERVICE( PixelRunConditionsDbSvc )
- //DECLARE_SERVICE( PixelConnCoolDbSvc )
-}
-
diff --git a/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_load.cxx b/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_load.cxx
deleted file mode 100755
index b444960efff..00000000000
--- a/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelConditionsServices )
-
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_entries.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_entries.cxx
old mode 100755
new mode 100644
index f281aa54675..9c827b4783c
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_entries.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "src/PixelRecoDbTool.h"
#include "src/PixelRecoDbTestWriteRead.h"
#include "src/PixelCalibDbTool.h"
@@ -7,7 +6,6 @@
#include "src/PixelDCSTestReadWrite.h"
#include "src/PixelDistortionsTool.h"
#include "src/PixelDistortionsTestReadWrite.h"
-//using namespace PixelCalib;
DECLARE_TOOL_FACTORY( PixelRecoDbTool )
DECLARE_TOOL_FACTORY( PixelCalibDbTool )
@@ -18,14 +16,5 @@ DECLARE_ALGORITHM_FACTORY( PixelDCSTestReadWrite )
DECLARE_TOOL_FACTORY( PixelDistortionsTool )
DECLARE_ALGORITHM_FACTORY( PixelDistortionsTestReadWrite )
-DECLARE_FACTORY_ENTRIES( PixelConditionsTools ) {
- DECLARE_TOOL( PixelRecoDbTool )
- DECLARE_TOOL( PixelCalibDbTool )
- DECLARE_ALGORITHM( PixelCalibDbTestWriteRead )
- DECLARE_ALGORITHM( PixelRecoDbTestWriteRead )
- DECLARE_TOOL( PixelDCSTool )
- DECLARE_ALGORITHM( PixelDCSTestReadWrite )
- DECLARE_TOOL( PixelDistortionsTool )
- DECLARE_ALGORITHM( PixelDistortionsTestReadWrite )
-}
+
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_load.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_load.cxx
deleted file mode 100755
index 928c0d0b8dd..00000000000
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelConditionsTools )
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_entries.cxx b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_entries.cxx
index 140065ba438..16f7f85087b 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_entries.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../SCT_ConditionsSummarySvc.h"
#include "../SCT_ModuleVetoSvc.h"
#include "../SCT_StripVetoSvc.h"
@@ -112,57 +111,9 @@ DECLARE_SERVICE_FACTORY(SCT_RadDamageSummarySvc)
DECLARE_TOOL_FACTORY(SCT_ReadoutTool)
DECLARE_TOOL_FACTORY(SCT_ElectricFieldTool)
-DECLARE_FACTORY_ENTRIES(SCT_ConditionsServices) {
- DECLARE_SERVICE( SCT_RODVetoSvc );
-
- DECLARE_SERVICE( SCT_CachedSummarySvc);
- DECLARE_SERVICE( SCT_ConditionsSummarySvc);
- DECLARE_SERVICE( SCT_ModuleVetoSvc );
- DECLARE_SERVICE( SCT_StripVetoSvc );
- DECLARE_SERVICE( SCT_ConfigurationConditionsSvc );
- DECLARE_SERVICE( SCT_DCSConditionsSvc );
- DECLARE_SERVICE( SCT_ByteStreamErrorsSvc );
- DECLARE_SERVICE( SCT_MonitorConditionsSvc );
- DECLARE_SERVICE( SCT_FlaggedConditionSvc );
- DECLARE_SERVICE( SCT_ReadCalibDataSvc )
- DECLARE_SERVICE( SCT_ReadCalibChipDataSvc )
- DECLARE_SERVICE( SCT_SiliconConditionsSvc )
- DECLARE_SERVICE( SCT_LinkMaskingSvc )
- DECLARE_SERVICE( SCT_TdaqEnabledSvc )
- DECLARE_SERVICE( SCT_ConditionsParameterSvc )
- DECLARE_SERVICE( SCT_SensorsSvc )
- DECLARE_SERVICE( SCT_MajorityConditionsSvc )
- DECLARE_SERVICE( SCT_ChargeTrappingSvc )
- DECLARE_SERVICE( SCT_RadDamageSummarySvc )
-
- DECLARE_ALGORITHM( SCT_RODVetoTestAlg )
- DECLARE_ALGORITHM( SCT_ModuleVetoTestAlg )
- DECLARE_ALGORITHM( SCT_ConditionsSummaryTestAlg )
- DECLARE_ALGORITHM( SCT_CachedSummaryTestAlg )
-
- DECLARE_ALGORITHM( SCT_DCSConditionsHVCondAlg )
- DECLARE_ALGORITHM( SCT_DCSConditionsStatCondAlg )
- DECLARE_ALGORITHM( SCT_DCSConditionsTempCondAlg )
- DECLARE_ALGORITHM( SCT_DCSConditionsTestAlg )
- DECLARE_ALGORITHM( SCT_MonitorConditionsCondAlg )
- DECLARE_ALGORITHM( SCT_MonitorConditionsTestAlg )
- DECLARE_ALGORITHM( SCT_ReadCalibDataTestAlg )
- DECLARE_ALGORITHM( SCT_ReadCalibChipDataTestAlg )
- DECLARE_ALGORITHM( SCT_SiliconConditionsTestAlg )
- DECLARE_ALGORITHM( SCT_ReadoutTestAlg )
- DECLARE_ALGORITHM( SCT_LinkMaskingTestAlg )
- DECLARE_ALGORITHM( SCT_ConfigurationConditionsTestAlg )
- DECLARE_ALGORITHM( SCT_MajorityCondAlg )
- DECLARE_ALGORITHM( SCT_MajorityConditionsTestAlg )
- DECLARE_ALGORITHM( SCT_ConditionsParameterTestAlg )
- DECLARE_ALGORITHM( SCT_SensorsTestAlg )
- DECLARE_ALGORITHM(SCT_TdaqEnabledCondAlg)
- DECLARE_ALGORITHM(SCT_TdaqEnabledTestAlg)
-
-
- DECLARE_TOOL(SCT_ReadoutTool)
- DECLARE_TOOL(SCT_ElectricFieldTool)
-}
+
+
+
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_load.cxx b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_load.cxx
deleted file mode 100644
index c73f8e2fc14..00000000000
--- a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SCT_ConditionsServices)
-
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx
index 9678b48e0d1..47082db30e4 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx
+++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiLorentzAngleSvc/SiLorentzAngleSvc.h"
DECLARE_SERVICE_FACTORY(SiLorentzAngleSvc)
-DECLARE_FACTORY_ENTRIES(SiLorentzAngleSvc) {
- DECLARE_SERVICE( SiLorentzAngleSvc)
-}
-
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_load.cxx b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_load.cxx
deleted file mode 100644
index 9e699003e07..00000000000
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiLorentzAngleSvc)
diff --git a/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_entries.cxx b/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_entries.cxx
index 76985efc57e..d09775722c4 100644
--- a/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_entries.cxx
+++ b/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiPropertiesSvc/SiPropertiesSvc.h"
DECLARE_SERVICE_FACTORY(SiPropertiesSvc)
-DECLARE_FACTORY_ENTRIES(SiPropertiesSvc) {
- DECLARE_SERVICE( SiPropertiesSvc)
-}
-
diff --git a/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_load.cxx b/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_load.cxx
deleted file mode 100644
index c5c0308a7a0..00000000000
--- a/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiPropertiesSvc)
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_entries.cxx b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_entries.cxx
old mode 100755
new mode 100644
index b35a85290e7..23761e2f527
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_entries.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_entries.cxx
@@ -1,18 +1,8 @@
#include "TRT_ConditionsAlgs/TRTCondWrite.h"
#include "TRT_ConditionsAlgs/TRTStrawAlign.h"
#include "TRT_ConditionsAlgs/TRTStrawStatusWrite.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( TRTCondWrite )
DECLARE_ALGORITHM_FACTORY( TRTStrawAlign )
DECLARE_ALGORITHM_FACTORY( TRTStrawStatusWrite )
-DECLARE_FACTORY_ENTRIES( TRT_ConditionsAlgs )
-{
- DECLARE_ALGORITHM( TRTCondWrite )
- DECLARE_ALGORITHM( TRTStrawAlign )
- DECLARE_ALGORITHM( TRTStrawStatusWrite )
-}
-
-
-
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_load.cxx b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_load.cxx
deleted file mode 100755
index fbf9d213567..00000000000
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_ConditionsAlgs )
-
-
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx
index 678be9e606b..2678c0ca52d 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "src/TRT_ConditionsSummarySvc.h"
#include "src/TRT_ConditionsTestSvc.h"
#include "src/TRT_AlignDbSvc.h"
@@ -22,3 +21,4 @@ DECLARE_SERVICE_FACTORY( TRT_StrawNeighbourSvc )
DECLARE_SERVICE_FACTORY( TRT_StrawStatusSummarySvc )
DECLARE_SERVICE_FACTORY( TRT_ByteStream_ConditionsSvc )
DECLARE_SERVICE_FACTORY( TRT_DAQ_ConditionsSvc )
+
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_load.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_load.cxx
deleted file mode 100644
index d9c5fd8bf5f..00000000000
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_ConditionsServices)
diff --git a/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx
index 160952fc1c7..430056d2fd5 100644
--- a/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx
+++ b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx
@@ -1,4 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "src/TRT_ActiveFractionSvc.h"
DECLARE_SERVICE_FACTORY( TRT_ActiveFractionSvc )
+
diff --git a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_entries.cxx b/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_entries.cxx
old mode 100755
new mode 100644
index a82dd57700c..6980238b44f
--- a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_entries.cxx
+++ b/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_entries.cxx
@@ -3,7 +3,6 @@
#include "InDetCosmicsEventPhase/InDetFixedWindowTrackTimeTool.h"
#include "InDetCosmicsEventPhase/InDetSlidingWindowTrackTimeTool.h"
#include "InDetCosmicsEventPhase/TRT_TrackTimingTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetCosmicsEventPhase )
@@ -13,14 +12,5 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetFixedWindowTrackTimeTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetSlidingWindowTrackTimeTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_TrackTimingTool )
-DECLARE_FACTORY_ENTRIES(InDetCosmicsEventPhase) {
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetCosmicsEventPhase);
- DECLARE_NAMESPACE_TOOL( InDet, InDetCosmicsEventPhaseTool );
- DECLARE_NAMESPACE_TOOL( InDet, InDetFixedWidnowTrackTimeTool );
- DECLARE_NAMESPACE_TOOL( InDet, InDetSlidingWidnowTrackTimeTool );
- DECLARE_NAMESPACE_TOOL( InDet, TRT_TrackTimingTool );
-
-}
-
diff --git a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_load.cxx b/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_load.cxx
deleted file mode 100755
index 391f45b8005..00000000000
--- a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetCosmicsEventPhase)
-
-
diff --git a/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_entries.cxx b/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_entries.cxx
old mode 100755
new mode 100644
index 725cd466f62..e6667354f2c
--- a/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_entries.cxx
+++ b/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_entries.cxx
@@ -1,9 +1,5 @@
#include "InDetCosmicsFilters/TrackFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet , TrackFilter )
-DECLARE_FACTORY_ENTRIES( InDetCosmicsFilters )
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet , TrackFilter )
-}
+
diff --git a/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_load.cxx b/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_load.cxx
deleted file mode 100755
index 61a371c7e10..00000000000
--- a/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetCosmicsFilters )
-
-
diff --git a/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_entries.cxx b/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_entries.cxx
old mode 100755
new mode 100644
index c6d64cee3a9..ce063361354
--- a/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_entries.cxx
+++ b/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_SegmentsToTrack/TRT_SegmentsToTrack.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_SegmentsToTrack )
-DECLARE_FACTORY_ENTRIES( TRT_SegmentsToTrack ){
- DECLARE_NAMESPACE_ALGORITHM( InDet, TRT_SegmentsToTrack )
-}
-
-
diff --git a/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_load.cxx b/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_load.cxx
deleted file mode 100755
index 9c95d659fb8..00000000000
--- a/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_SegmentsToTrack )
diff --git a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_entries.cxx
old mode 100755
new mode 100644
index d3256fc447b..211401ce04b
--- a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "BCM_GeoModel/BCM_Builder.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDetDD, BCM_Builder )
-DECLARE_FACTORY_ENTRIES( BCM_GeoModel )
-{
- DECLARE_NAMESPACE_TOOL( InDetDD, BCM_Builder )
-}
diff --git a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_load.cxx b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_load.cxx
deleted file mode 100755
index 7ad2e18a6ad..00000000000
--- a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( BCM_GeoModel )
diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_entries.cxx
index d3e2e5617a0..ee30d2c4b9e 100644
--- a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "BLM_GeoModel/BLM_Builder.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDetDD, BLM_Builder )
-DECLARE_FACTORY_ENTRIES( BLM_GeoModel )
-{
- DECLARE_NAMESPACE_TOOL( InDetDD, BLM_Builder )
-}
diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_load.cxx b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_load.cxx
deleted file mode 100644
index 5e54864be1e..00000000000
--- a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( BLM_GeoModel )
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_entries.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_entries.cxx
old mode 100755
new mode 100644
index ca12e3dcc55..d0f20efd9c3
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_entries.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_entries.cxx
@@ -2,16 +2,9 @@
#include "InDetRegionSelector/SiRegionSelectorTable.h"
#include "InDetRegionSelector/FTK_RegionSelectorTable.h"
#include "InDetRegionSelector/TRT_RegionSelectorTable.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDetDD, InDetRegionSelectorLUT )
DECLARE_TOOL_FACTORY( SiRegionSelectorTable )
DECLARE_TOOL_FACTORY( TRT_RegionSelectorTable )
DECLARE_TOOL_FACTORY( FTK_RegionSelectorTable )
-DECLARE_FACTORY_ENTRIES(InDetRegionSelector) {
- DECLARE_NAMESPACE_ALGORITHM( InDetDD, InDetRegionSelectorLUT )
- DECLARE_TOOL( SiRegionSelectorTable )
- DECLARE_TOOL( TRT_RegionSelectorTable )
- DECLARE_TOOL( FTK_RegionSelectorTable )
-}
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_load.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_load.cxx
deleted file mode 100755
index 71df7a3006b..00000000000
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetRegionSelector)
-
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/components/InDetServMatGeoModel_entries.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/components/InDetServMatGeoModel_entries.cxx
old mode 100755
new mode 100644
index c91f319e733..33849f2dec8
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/components/InDetServMatGeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/components/InDetServMatGeoModel_entries.cxx
@@ -3,3 +3,4 @@
DECLARE_TOOL_FACTORY(InDetServMatTool)
DECLARE_TOOL_FACTORY(InDetServMatBuilderToolSLHC)
+
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_entries.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_entries.cxx
old mode 100755
new mode 100644
index 650dffe5ffb..feb1ae6d55b
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_entries.cxx
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-// Atlas AlgTools
#include "InDetTrackingGeometry/BeamPipeBuilder.h"
#include "InDetTrackingGeometry/SiLayerBuilder.h"
#include "InDetTrackingGeometry/TRT_LayerBuilder.h"
@@ -14,13 +12,3 @@ DECLARE_TOOL_FACTORY( TRT_LayerBuilder )
DECLARE_TOOL_FACTORY( RobustTrackingGeometryBuilder )
DECLARE_TOOL_FACTORY( StagedTrackingGeometryBuilder )
-DECLARE_FACTORY_ENTRIES( InDetTrackingGeometry )
-{
- DECLARE_TOOL( BeamPipeBuilder )
- DECLARE_TOOL( SiLayerBuilder )
- DECLARE_TOOL( TRT_LayerBuilder )
- DECLARE_TOOL( RobustTrackingGeometryBuilder )
- DECLARE_TOOL( StagedTrackingGeometryBuilder )
-}
-
-
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_load.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_load.cxx
deleted file mode 100755
index 0cee69c3803..00000000000
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrackingGeometry )
-
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx b/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx
old mode 100755
new mode 100644
index 59bc6e21936..c3924de3185
--- a/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx
+++ b/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx
@@ -2,15 +2,8 @@
#include "../PixelFillCablingData.h"
#include "../PixelCablingSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( PixelFillCablingData_Final )
DECLARE_TOOL_FACTORY( PixelFillCablingData )
DECLARE_SERVICE_FACTORY(PixelCablingSvc)
-DECLARE_FACTORY_ENTRIES( PixelCabling )
-{
- DECLARE_TOOL( PixelFillCablingData )
- DECLARE_TOOL( PixelFillCablingData_Final )
- DECLARE_SERVICE(PixelCablingSvc)
-}
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_load.cxx b/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_load.cxx
deleted file mode 100755
index eecfee6149e..00000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelCabling )
-
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/components/PixelGeoModel_entries.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/components/PixelGeoModel_entries.cxx
index 85f97430448..68b6391402c 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/components/PixelGeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/components/PixelGeoModel_entries.cxx
@@ -3,3 +3,4 @@
DECLARE_TOOL_FACTORY(PixelDetectorTool)
DECLARE_SERVICE_FACTORY(IBLParameterSvc)
+
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_entries.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_entries.cxx
index f75a32327c1..aaa0c75e358 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_entries.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SCT_Cabling/SCT_CablingSvc.h"
#include "../SCT_FillCablingFromText.h"
#include "../SCT_FillCablingFromCoraCool.h"
@@ -9,10 +8,3 @@ DECLARE_SERVICE_FACTORY(SCT_FillCablingFromText)
DECLARE_SERVICE_FACTORY(SCT_FillCablingFromCoraCool)
DECLARE_ALGORITHM_FACTORY(SCT_TestCablingAlg)
-DECLARE_FACTORY_ENTRIES(SCT_Cabling) {
- DECLARE_SERVICE( SCT_CablingSvc)
- DECLARE_SERVICE( SCT_FillCablingFromText)
- DECLARE_SERVICE( SCT_FillCablingFromCoraCool)
- DECLARE_ALGORITHM( SCT_TestCablingAlg )
-}
-
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_load.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_load.cxx
deleted file mode 100644
index eccdf1bd220..00000000000
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SCT_Cabling)
-
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/components/SCT_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/components/SCT_GeoModel_entries.cxx
old mode 100755
new mode 100644
index ecf5eb4199e..1a82db644bb
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/components/SCT_GeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/components/SCT_GeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "SCT_GeoModel/SCT_DetectorTool.h"
DECLARE_TOOL_FACTORY(SCT_DetectorTool)
+
diff --git a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_entries.cxx b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_entries.cxx
index 20986fcd5be..bf065da41bd 100644
--- a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_entries.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../SCT_DistortionsTool.h"
#include "../SCT_TestDistortionsTool.h"
DECLARE_TOOL_FACTORY(SCT_DistortionsTool)
DECLARE_ALGORITHM_FACTORY(SCT_TestDistortionsTool)
-DECLARE_FACTORY_ENTRIES(SCT_ModuleDistortions) {
- DECLARE_TOOL( SCT_DistortionsTool )
- DECLARE_ALGORITHM( SCT_TestDistortionsTool )
-}
-
diff --git a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_load.cxx b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_load.cxx
deleted file mode 100644
index 7ffd320eecd..00000000000
--- a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SCT_ModuleDistortions)
-
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/components/SCT_SLHC_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/components/SCT_SLHC_GeoModel_entries.cxx
old mode 100755
new mode 100644
index cbaafb41221..09c43d6755c
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/components/SCT_SLHC_GeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/components/SCT_SLHC_GeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "SCT_SLHC_GeoModel/SCT_SLHC_DetectorTool.h"
DECLARE_TOOL_FACTORY(SCT_SLHC_DetectorTool)
+
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_entries.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_entries.cxx
index 2ad87729272..5394988c494 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_entries.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_entries.cxx
@@ -6,7 +6,6 @@
#include "../TRT_FillCablingData_DC2.h"
#include "../TRT_FillCablingData_DC3.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY( TRT_CablingSvc )
@@ -17,15 +16,3 @@ DECLARE_TOOL_FACTORY( TRT_FillCablingData_SR1 )
DECLARE_TOOL_FACTORY( TRT_FillCablingData_TB04 )
DECLARE_TOOL_FACTORY( TRT_FillCablingData_SR1_ECC )
-
-
-DECLARE_FACTORY_ENTRIES( TRT_Cabling )
-{
- DECLARE_SERVICE( TRT_CablingSvc )
- DECLARE_TOOL( TRT_FillCablingData_DC1 )
- DECLARE_TOOL( TRT_FillCablingData_DC2 )
- DECLARE_TOOL( TRT_FillCablingData_DC3 )
- DECLARE_TOOL( TRT_FillCablingData_SR1 )
- DECLARE_TOOL( TRT_FillCablingData_TB04 )
- DECLARE_TOOL( TRT_FillCablingData_SR1_ECC )
-}
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_load.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_load.cxx
deleted file mode 100644
index 6c2893f5ee8..00000000000
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_Cabling )
-
diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/components/TRT_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/components/TRT_GeoModel_entries.cxx
old mode 100755
new mode 100644
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
old mode 100755
new mode 100644
index 82cea747fd5..1c559c85c6b
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
@@ -1,10 +1,3 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "PixelIDDetDescrCnv.h"
#include "SCT_IDDetDescrCnv.h"
#include "SiliconIDDetDescrCnv.h"
@@ -15,9 +8,3 @@ DECLARE_CONVERTER_FACTORY(PixelIDDetDescrCnv)
DECLARE_CONVERTER_FACTORY(SiliconIDDetDescrCnv)
DECLARE_CONVERTER_FACTORY(TRT_IDDetDescrCnv)
-DECLARE_FACTORY_ENTRIES ( InDetIdCnv ) {
- DECLARE_CONVERTER ( PixelIDDetDescrCnv );
- DECLARE_CONVERTER ( SCT_IDDetDescrCnv );
- DECLARE_CONVERTER ( SiliconIDDetDescrCnv );
- DECLARE_CONVERTER ( TRT_IDDetDescrCnv );
-}
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_load.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_load.cxx
deleted file mode 100755
index 3d266fd0f1d..00000000000
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_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( InDetIdCnv )
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_entries.cxx b/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_entries.cxx
index aa82c7b9cf3..903f1f20986 100644
--- a/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_entries.cxx
@@ -1,12 +1,6 @@
#include "../BCM_Digitization.h"
#include "../BCM_DigitizationTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( BCM_Digitization )
DECLARE_TOOL_FACTORY( BCM_DigitizationTool )
-DECLARE_FACTORY_ENTRIES( BCM_Digitization ) {
- DECLARE_ALGORITHM( BCM_Digitization )
- DECLARE_ALGTOOL( BCM_DigitizationTool )
-}
-
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_load.cxx b/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_load.cxx
deleted file mode 100644
index 1e287535877..00000000000
--- a/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( BCM_Digitization )
-
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx
index bcd688e324d..12f00953b30 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "FastSiDigitization/PixelFastDigitizationTool.h"
#include "FastSiDigitization/PixelFastDigitization.h"
#include "FastSiDigitization/IPixelFastDigitizationTool.h"
@@ -19,14 +17,3 @@ DECLARE_TOOL_FACTORY(PixelFastDigitizationTool)
DECLARE_TOOL_FACTORY(SiSmearedDigitizationTool)
DECLARE_TOOL_FACTORY(SCT_FastDigitizationTool)
-DECLARE_FACTORY_ENTRIES(FastSiDigitization) {
- DECLARE_ALGORITHM(PixelFastDigitization)
- DECLARE_ALGORITHM(SCT_FastDigitization)
- DECLARE_ALGORITHM(SiSmearedDigitization)
- DECLARE_TOOL(PixelFastDigitizationTool)
- DECLARE_TOOL(SiSmearedDigitizationTool)
- DECLARE_TOOL(SCT_FastDigitizationTool)
-
-}
-
-
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_load.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_load.cxx
deleted file mode 100644
index 2fb3306cc18..00000000000
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( FastSiDigitization )
-
-
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx
index 9b827675a53..e6f6ed06dc3 100644
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx
@@ -1,14 +1,8 @@
#include "../../FastTRT_Digitization/TRTFastDigitization.h"
#include "../../FastTRT_Digitization/TRTFastDigitizationTool.h"
#include "../../FastTRT_Digitization/ITRTFastDigitizationTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( TRTFastDigitization )
DECLARE_TOOL_FACTORY(TRTFastDigitizationTool)
-DECLARE_FACTORY_ENTRIES( FastTRT_Digitization ) {
- DECLARE_ALGORITHM( TRTFastDigitization )
- DECLARE_ALGTOOL( TRTFastDigitizationTool )
-}
-
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_load.cxx b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_load.cxx
deleted file mode 100644
index 28a3b3b952f..00000000000
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( FastTRT_Digitization )
-
-
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_entries.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_entries.cxx
old mode 100755
new mode 100644
index cb5298648d9..e7bf072e5d5
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "src/PixelDigitization.h"
#include "src/PixelDigitizationTool.h"
#include "src/PixelNoisyCellGenerator.h"
@@ -28,19 +26,3 @@ DECLARE_TOOL_FACTORY(FEI4SimTool)
DECLARE_TOOL_FACTORY(FEI3SimTool)
DECLARE_SERVICE_FACTORY(ChargeCollProbSvc)
-DECLARE_FACTORY_ENTRIES(PixelDigitization) {
- DECLARE_ALGORITHM(PixelDigitization)
- DECLARE_TOOL(EnergyDepositionTool)
- DECLARE_TOOL(PixelDigitizationTool)
- DECLARE_TOOL(PixelNoisyCellGenerator)
- DECLARE_TOOL(PixelChargeSmearer)
- DECLARE_TOOL(PixelDiodeCrossTalkGenerator)
- DECLARE_TOOL(PixelRandomDisabledCellGenerator)
- DECLARE_TOOL(SensorSimPlanarTool)
- DECLARE_TOOL(SensorSim3DTool)
- DECLARE_TOOL(RD53SimTool)
- DECLARE_TOOL(FEI4SimTool)
- DECLARE_TOOL(FEI3SimTool)
- DECLARE_SERVICE(ChargeCollProbSvc)
-}
-
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_load.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_load.cxx
deleted file mode 100755
index e044f4a24c8..00000000000
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelDigitization )
-LOAD_FACTORY_ENTRIES( ChargeCollProbSvc )
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_entries.cxx b/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_entries.cxx
index d550d12e77e..222e1ac133f 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../SCT_Amp.h"
#include "../SCT_FrontEnd.h"
#include "SCT_Digitization/SCT_Digitization.h"
@@ -16,14 +14,3 @@ DECLARE_TOOL_FACTORY(SCT_SurfaceChargesGenerator)
DECLARE_TOOL_FACTORY(SCT_DetailedSurfaceChargesGenerator)
DECLARE_TOOL_FACTORY(SCT_RandomDisabledCellGenerator)
-
-DECLARE_FACTORY_ENTRIES(SCT_Digitization) {
- DECLARE_ALGORITHM(SCT_Digitization)
- DECLARE_ALGTOOL(SCT_Amp)
- DECLARE_ALGTOOL(SCT_FrontEnd)
- DECLARE_ALGTOOL(SCT_DigitizationTool)
- DECLARE_ALGTOOL(SCT_SurfaceChargesGenerator)
- DECLARE_ALGTOOL(SCT_DetailedSurfaceChargesGenerator)
- DECLARE_ALGTOOL(SCT_RandomDisabledCellGenerator)
-}
-
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_load.cxx b/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_load.cxx
deleted file mode 100644
index 232f0a0f9f8..00000000000
--- a/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SCT_Digitization )
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_entries.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_entries.cxx
index f1a8885a66c..ed3a18fbae2 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_entries.cxx
@@ -1,16 +1,9 @@
#include "../TRTDigitization.h"
#include "../TRTDigitizationTool.h"
#include "../TRT_SimDriftTimeTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( TRTDigitization )
DECLARE_TOOL_FACTORY(TRTDigitizationTool)
DECLARE_TOOL_FACTORY( TRT_SimDriftTimeTool )
-DECLARE_FACTORY_ENTRIES( TRT_Digitization ) {
- DECLARE_ALGORITHM( TRTDigitization )
- DECLARE_ALGTOOL( TRTDigitizationTool )
- DECLARE_ALGTOOL( TRT_SimDriftTimeTool )
-}
-
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_load.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_load.cxx
deleted file mode 100644
index 53abb6e6d25..00000000000
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_Digitization )
-
-
diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_entries.cxx b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_entries.cxx
index 5b17e98c60b..4db96fd4315 100644
--- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_entries.cxx
+++ b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "BCM_RawDataByteStreamCnv/BCM_RawContByteStreamCnv.h"
DECLARE_CONVERTER_FACTORY( BCM_RawContByteStreamCnv )
@@ -15,13 +13,3 @@ DECLARE_TOOL_FACTORY( BCM_RawDataProviderTool)
#include "BCM_RawDataByteStreamCnv/BCM_RodDecoder.h"
DECLARE_TOOL_FACTORY( BCM_RodDecoder )
-DECLARE_FACTORY_ENTRIES(BCM_RawDataByteStreamCnv) {
- DECLARE_CONVERTER( BCM_RawContByteStreamCnv )
- DECLARE_TOOL ( BCM_RawContByteStreamTool )
- DECLARE_ALGORITHM( BCM_RawDataProvider )
- DECLARE_TOOL ( BCM_RawDataProviderTool )
- DECLARE_TOOL ( BCM_RodDecoder )
-}
-
-
-
diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_load.cxx b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_load.cxx
deleted file mode 100644
index 302bb82e09f..00000000000
--- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(BCM_RawDataByteStreamCnv)
diff --git a/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_entries.cxx b/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_entries.cxx
old mode 100755
new mode 100644
index e6ee96ff46d..d95cda34360
--- a/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_entries.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_entries.cxx
@@ -1,16 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetEventCnvTools/InDetEventCnvTool.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( InDetEventCnvTool )
-DECLARE_FACTORY_ENTRIES( InDetEventCnvTools )
-{
- DECLARE_TOOL( InDetEventCnvTool )
-}
-
-
-
-
diff --git a/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_load.cxx b/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_load.cxx
deleted file mode 100755
index 413a43a9150..00000000000
--- a/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetEventCnvTools )
-
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_entries.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_entries.cxx
old mode 100755
new mode 100644
index c507e203d39..78a9e8f5069
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_entries.cxx
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_entries.cxx
@@ -6,7 +6,6 @@
#include "InDetJiveXML/PixelRDORetriever.h"
#include "InDetJiveXML/InDetGeoModelTool.h"
#include "InDetJiveXML/BeamSpotRetriever.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace JiveXML;
@@ -19,13 +18,3 @@ DECLARE_TOOL_FACTORY(PixelRDORetriever)
DECLARE_TOOL_FACTORY(InDetGeoModelTool)
DECLARE_TOOL_FACTORY(BeamSpotRetriever)
-DECLARE_FACTORY_ENTRIES(InDetJiveXML) {
- DECLARE_ALGTOOL(SiSpacePointRetriever)
- DECLARE_ALGTOOL(TRTRetriever)
- DECLARE_ALGTOOL(SiClusterRetriever)
- DECLARE_ALGTOOL(PixelClusterRetriever)
- DECLARE_ALGTOOL(SCTRDORetriever)
- DECLARE_ALGTOOL(PixelRDORetriever)
- DECLARE_ALGTOOL(InDetGeoModelTool)
- DECLARE_ALGTOOL(BeamSpotRetriever)
-}
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_load.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_load.cxx
deleted file mode 100755
index c96f0acbf40..00000000000
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetJiveXML)
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_entries.cxx b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_entries.cxx
old mode 100755
new mode 100644
index f931e8db211..76bc59bfa76
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_entries.cxx
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_entries.cxx
@@ -1,21 +1,10 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../TRT_PrepDataToxAOD.h"
#include "../SCT_PrepDataToxAOD.h"
#include "../SCT_RawDataToxAOD.h"
#include "../PixelPrepDataToxAOD.h"
-
-//using namespace InDet;
-
DECLARE_ALGORITHM_FACTORY( TRT_PrepDataToxAOD )
DECLARE_ALGORITHM_FACTORY( SCT_PrepDataToxAOD )
DECLARE_ALGORITHM_FACTORY( SCT_RawDataToxAOD )
DECLARE_ALGORITHM_FACTORY( PixelPrepDataToxAOD )
-DECLARE_FACTORY_ENTRIES( InDetPrepRawDataToxAOD )
-{
- DECLARE_ALGORITHM( TRT_PrepDataToxAOD )
- DECLARE_ALGORITHM( SCT_PrepDataToxAOD )
- DECLARE_ALGORITHM( SCT_RawDataToxAOD )
- DECLARE_ALGORITHM( PixelPrepDataToxAOD )
-}
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_load.cxx b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_load.cxx
deleted file mode 100755
index 249ab411bec..00000000000
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetPrepRawDataToxAOD )
-
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx
index c0753dcbb91..d21cfdf3f62 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../PixelRawContByteStreamCnv.h"
DECLARE_CONVERTER_FACTORY( PixelRawContByteStreamCnv )
@@ -15,11 +13,3 @@ DECLARE_TOOL_FACTORY( PixelRawDataProviderTool)
#include "../PixelRodDecoder.h"
DECLARE_TOOL_FACTORY( PixelRodDecoder )
-
-DECLARE_FACTORY_ENTRIES(PixelRawDataByteStreamCnv) {
- DECLARE_CONVERTER( PixelRawContByteStreamCnv )
- DECLARE_TOOL ( PixelRawContByteStreamTool )
- DECLARE_ALGORITHM( PixelRawDataProvider )
- DECLARE_TOOL ( PixelRawDataProviderTool )
- DECLARE_TOOL ( PixelRodDecoder )
-}
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_load.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_load.cxx
deleted file mode 100644
index b367f431bae..00000000000
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(PixelRawDataByteStreamCnv)
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_entries.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_entries.cxx
index dea3f283fbc..77aabbfa3ec 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_entries.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../SCTRawContByteStreamCnv.h"
DECLARE_CONVERTER_FACTORY( SCTRawContByteStreamCnv )
@@ -18,11 +16,3 @@ DECLARE_TOOL_FACTORY( SCT_RodDecoder )
#include "../SCT_RodEncoder.h"
DECLARE_TOOL_FACTORY( SCT_RodEncoder )
-DECLARE_FACTORY_ENTRIES(SCT_RawDataByteStreamCnv) {
- DECLARE_CONVERTER( SCTRawContByteStreamCnv )
- DECLARE_SERVICE ( SCTRawContByteStreamService )
- DECLARE_ALGORITHM( SCTRawDataProvider )
- DECLARE_TOOL ( SCTRawDataProviderTool )
- DECLARE_TOOL ( SCT_RodDecoder )
- DECLARE_TOOL ( SCT_RodEncoder )
-}
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_load.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_load.cxx
deleted file mode 100644
index 9acfa28db84..00000000000
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(SCT_RawDataByteStreamCnv)
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_entries.cxx b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_entries.cxx
index e5ceb2117f3..d1892562b77 100644
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_entries.cxx
+++ b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../TRTRawContByteStreamCnv.h"
DECLARE_CONVERTER_FACTORY( TRTRawContByteStreamCnv )
@@ -15,10 +13,3 @@ DECLARE_TOOL_FACTORY( TRTRawDataProviderTool)
#include "../TRT_RodDecoder.h"
DECLARE_TOOL_FACTORY( TRT_RodDecoder )
-DECLARE_FACTORY_ENTRIES(TRT_RawDataByteStreamCnv) {
- DECLARE_CONVERTER( TRTRawContByteStreamCnv )
- DECLARE_TOOL ( TRTRawContByteStreamTool )
- DECLARE_ALGORITHM( TRTRawDataProvider )
- DECLARE_TOOL ( TRTRawDataProviderTool )
- DECLARE_TOOL ( TRT_RodDecoder )
-}
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_load.cxx b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_load.cxx
deleted file mode 100644
index 02893a7d49e..00000000000
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_RawDataByteStreamCnv)
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_entries.cxx b/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_entries.cxx
old mode 100755
new mode 100644
index 5931713ceb4..8855fd3c605
--- a/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_entries.cxx
+++ b/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_entries.cxx
@@ -4,7 +4,6 @@
#include "InDetDetDescrExample/TestTRT_Alignment.h"
#include "InDetDetDescrExample/InDetUpdateCaches.h"
#include "InDetDetDescrExample/PrintSiElements.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( ReadSiDetectorElements )
DECLARE_ALGORITHM_FACTORY( ReadTRT_DetectorElements )
@@ -13,12 +12,3 @@ DECLARE_ALGORITHM_FACTORY( TestTRT_Alignment )
DECLARE_ALGORITHM_FACTORY( InDetUpdateCaches )
DECLARE_ALGORITHM_FACTORY( PrintSiElements )
-DECLARE_FACTORY_ENTRIES(InDetDetDescrExample) {
- DECLARE_ALGORITHM( ReadSiDetectorElements )
- DECLARE_ALGORITHM( ReadTRT_DetectorElements )
- DECLARE_ALGORITHM( TestSiAlignment )
- DECLARE_ALGORITHM( TestTRT_Alignment )
- DECLARE_ALGORITHM( InDetUpdateCaches )
- DECLARE_ALGORITHM( PrintSiElements )
-}
-
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_load.cxx b/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_load.cxx
deleted file mode 100755
index 3c1d48c688e..00000000000
--- a/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetDetDescrExample)
-
diff --git a/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_entries.cxx b/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_entries.cxx
index 6c9a8286309..3ccebbc3d6a 100644
--- a/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../BCMSensorSDTool.h"
DECLARE_TOOL_FACTORY( BCMSensorSDTool )
-DECLARE_FACTORY_ENTRIES( BCM_G4_SD ) {
- DECLARE_TOOL( BCMSensorSDTool )
-}
diff --git a/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_load.cxx b/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_load.cxx
deleted file mode 100644
index 95fbe726059..00000000000
--- a/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( BCM_G4_SD )
diff --git a/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_entries.cxx b/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_entries.cxx
index cdec3f52932..81b6eaf481e 100644
--- a/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../BLMSensorSDTool.h"
DECLARE_TOOL_FACTORY( BLMSensorSDTool )
-DECLARE_FACTORY_ENTRIES( BLM_G4_SD ) {
- DECLARE_TOOL( BLMSensorSDTool )
-}
diff --git a/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_load.cxx b/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_load.cxx
deleted file mode 100644
index 75fa2e8cc1d..00000000000
--- a/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( BLM_G4_SD )
\ No newline at end of file
diff --git a/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_entries.cxx b/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_entries.cxx
index 3579d67979a..88734839b2d 100644
--- a/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../PixelSensorSDTool.h"
DECLARE_TOOL_FACTORY( PixelSensorSDTool )
-DECLARE_FACTORY_ENTRIES( PixelG4_SD ) {
- DECLARE_TOOL( PixelSensorSDTool )
-}
diff --git a/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_load.cxx b/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_load.cxx
deleted file mode 100644
index 7a0160d1370..00000000000
--- a/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( PixelG4_SD )
diff --git a/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_entries.cxx b/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_entries.cxx
index 3cfd4b2ff10..ad69db55dd7 100644
--- a/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../SctSensorSDTool.h"
#include "../SctSensor_CTBTool.h"
DECLARE_TOOL_FACTORY( SctSensorSDTool )
DECLARE_TOOL_FACTORY( SctSensor_CTBTool )
-DECLARE_FACTORY_ENTRIES( SCT_G4_SD ) {
- DECLARE_TOOL( SctSensorSDTool )
- DECLARE_TOOL( SctSensor_CTBTool )
-}
diff --git a/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_load.cxx b/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_load.cxx
deleted file mode 100644
index 8c34a89c9ac..00000000000
--- a/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( SCT_G4_SD )
diff --git a/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_entries.cxx b/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_entries.cxx
index 117aa0549a2..fbc0082ed23 100644
--- a/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../TRTSensitiveDetectorTool.h"
DECLARE_TOOL_FACTORY( TRTSensitiveDetectorTool )
-DECLARE_FACTORY_ENTRIES( TRT_G4_SD ) {
- DECLARE_TOOL( TRTSensitiveDetectorTool )
-}
diff --git a/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_load.cxx b/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_load.cxx
deleted file mode 100644
index dab1b50b5a8..00000000000
--- a/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( TRT_G4_SD )
\ No newline at end of file
diff --git a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_entries.cxx b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_entries.cxx
old mode 100755
new mode 100644
index f1d81b6e27d..00d92d6d341
--- a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_entries.cxx
+++ b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_entries.cxx
@@ -1,17 +1,8 @@
#include "InDetSimpleVisual/GetDetectorPositions.h"
#include "InDetSimpleVisual/GetDetectorLocalFrames.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( GetDetectorPositions )
DECLARE_ALGORITHM_FACTORY( GetDetectorLocalFrames )
-DECLARE_FACTORY_ENTRIES( InDetSimpleVisual )
-{
- DECLARE_ALGORITHM( GetDetectorPositions ) ;
- DECLARE_ALGORITHM( GetDetectorLocalFrames ) ;
-}
-
-
-
diff --git a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_load.cxx b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_load.cxx
deleted file mode 100755
index 867958ecd9b..00000000000
--- a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetSimpleVisual )
-
-
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_entries.cxx
old mode 100755
new mode 100644
index fa24b072749..ba8bd102944
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_entries.cxx
@@ -10,7 +10,6 @@
#include "src/TrackSelectionAlg.h"
#include "src/IDAlignMonPVBiases.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(IDAlignMonPVBiases)
DECLARE_TOOL_FACTORY(IDAlignMonEfficiencies)
DECLARE_TOOL_FACTORY(IDAlignMonGenericTracks)
@@ -23,6 +22,3 @@ DECLARE_TOOL_FACTORY(IDAlignMonSivsTRT)
DECLARE_NAMESPACE_TOOL_FACTORY(InDetAlignMon, TrackSelectionTool)
DECLARE_ALGORITHM_FACTORY(TrackSelectionAlg)
-DECLARE_FACTORY_ENTRIES(InDetAlignmentMonitoring) {
- DECLARE_NAMESPACE_TOOL(InDetAlignMon, TrackSelectionTool);
-}
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_load.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_load.cxx
deleted file mode 100755
index eac941c6391..00000000000
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetAlignmentMonitoring)
diff --git a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_entries.cxx
index d4443bceaf0..c4126150686 100644
--- a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_entries.cxx
@@ -1,4 +1,3 @@
#include "InDetDiMuonMonitoring/DiMuMon.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( DiMuMon )
diff --git a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_load.cxx b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_load.cxx
deleted file mode 100644
index 3f4443bd236..00000000000
--- a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(InDetDiMuonMonitoring)
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_entries.cxx
old mode 100755
new mode 100644
index 9ff8bf31c12..718de63eeab
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_entries.cxx
@@ -10,7 +10,6 @@
#include "../InDetGlobalBeamSpotMonTool.h"
#include "../InDetGlobalPrimaryVertexMonTool.h"
#include "../InDetGlobalErrorMonTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(InDetGlobalManager)
DECLARE_TOOL_FACTORY(InDetGlobalHitsMonTool)
@@ -24,19 +23,3 @@ DECLARE_TOOL_FACTORY(InDetGlobalBeamSpotMonTool)
DECLARE_TOOL_FACTORY(InDetGlobalPrimaryVertexMonTool)
DECLARE_TOOL_FACTORY(InDetGlobalErrorMonTool)
-
-
-DECLARE_FACTORY_ENTRIES(InDetGlobalMonitoring) {
- DECLARE_ALGORITHM(InDetGlobalManager);
- DECLARE_ALGTOOL(InDetGlobalHitsMonTool);
- DECLARE_ALGTOOL(InDetGlobalMotherMonTool);
- DECLARE_ALGTOOL(InDetGlobalSynchMonTool);
- DECLARE_ALGTOOL(InDetGlobalNoiseOccupancyMonTool);
- DECLARE_ALGTOOL(InDetGlobalTrackMonTool);
- DECLARE_ALGTOOL(InDetGlobalBCMTool);
- DECLARE_ALGTOOL(InDetGlobalPixelTool);
- DECLARE_ALGTOOL(InDetGlobalBeamSpotMonTool);
- DECLARE_ALGTOOL(InDetGlobalPrimaryVertexMonTool);
- DECLARE_ALGTOOL(InDetGlobalErrorMonTool);
-}
-
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_load.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_load.cxx
deleted file mode 100755
index 5eb103db0a6..00000000000
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetGlobalMonitoring)
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_entries.cxx
old mode 100755
new mode 100644
index 8cdacf1e6a4..caffe46a382
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_entries.cxx
@@ -6,7 +6,6 @@
#include "InDetPerformanceMonitoring/IDPerfMonEoverP.h"
#include "InDetPerformanceMonitoring/IDPerfMuonRefitter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(IDPerfMonZee)
DECLARE_TOOL_FACTORY(IDPerfMonWenu)
@@ -16,4 +15,3 @@ DECLARE_TOOL_FACTORY(TRT_Electron_Monitoring_Tool)
DECLARE_ALGORITHM_FACTORY( IDPerfMonEoverP )
DECLARE_ALGORITHM_FACTORY(IDPerfMuonRefitter)
-
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_load.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_load.cxx
deleted file mode 100755
index 2b481cac130..00000000000
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetPerformanceMonitoring)
diff --git a/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_entries.cxx
old mode 100755
new mode 100644
index 6b5a355fc0f..0224b47a12f
--- a/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_entries.cxx
@@ -1,8 +1,4 @@
#include "../InDetVertexMonitoring.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( InDetVertexMonitoring )
-DECLARE_FACTORY_ENTRIES( InDetVertexMonitoring ){
- DECLARE_ALGTOOL( InDetVertexMonitoring )
-}
diff --git a/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_load.cxx b/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_load.cxx
deleted file mode 100755
index 1bbacde8c83..00000000000
--- a/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaMonitoring)
-
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx
old mode 100755
new mode 100644
index 9ddd038fdac..468b7e27b7d
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx
@@ -1,14 +1,5 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
#include "PixelMonitoring/PixelMainMon.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( PixelMainMon )
-DECLARE_FACTORY_ENTRIES( PixelMonitoring ) {
- DECLARE_TOOL( PixelMainMon )
-}
-
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_load.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_load.cxx
deleted file mode 100755
index 7eb778034a5..00000000000
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelMonitoring )
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_entries.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_entries.cxx
old mode 100755
new mode 100644
index 4a60451dc29..0d198e8e6a1
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SCT_Monitoring/SCTMotherTrigMonTool.h"
#include "SCT_Monitoring/SCTTracksMonTool.h"
#include "SCT_Monitoring/SCTLorentzMonTool.h"
@@ -19,15 +18,3 @@ DECLARE_TOOL_FACTORY(SCTHitEffMonTool)
DECLARE_TOOL_FACTORY(SCTHitsNoiseMonTool)
DECLARE_TOOL_FACTORY(SCTSummaryMonTool)
-
-DECLARE_FACTORY_ENTRIES(SCT_Monitoring) {
- DECLARE_ALGTOOL(SCTMotherTrigMonTool)
- DECLARE_ALGTOOL(SCTTracksMonTool)
- DECLARE_ALGTOOL(SCTLorentzMonTool)
- DECLARE_ALGTOOL(SCTRatioNoiseMonTool)
- DECLARE_ALGTOOL(SCTErrMonTool)
- DECLARE_ALGTOOL(SCTHitEffMonTool)
- DECLARE_ALGTOOL(SCTHitsNoiseMonTool)
- DECLARE_ALGTOOL(SCTSummaryMonTool)
-}
-
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_load.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_load.cxx
deleted file mode 100755
index f22c6cb0edd..00000000000
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SCT_Monitoring)
diff --git a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_entries.cxx b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_entries.cxx
index 1ed477874d7..1ddbcfa7af9 100644
--- a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_entries.cxx
@@ -1,16 +1,11 @@
#include "TRT_Monitoring/TRT_Monitoring_Tool.h"
#include "TRT_Monitoring/TRT_Hits_Monitoring_Tool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(TRT_Monitoring_Tool)
#ifdef ONLINE
DECLARE_TOOL_FACTORY(TRT_Hits_Monitoring_Tool)
#endif
-DECLARE_FACTORY_ENTRIES(TRT_Monitoring)
-{
- DECLARE_ALGTOOL(TRT_Monitoring_Tool);
#ifdef ONLINE
- DECLARE_ALGTOOL(TRT_Hits_Monitoring_Tool);
#endif
-}
+
diff --git a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_load.cxx b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_load.cxx
deleted file mode 100644
index 436160ed9a9..00000000000
--- a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_Monitoring)
diff --git a/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_entries.cxx b/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_entries.cxx
index 6fdc25527aa..5e6a1d16725 100644
--- a/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_entries.cxx
+++ b/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_entries.cxx
@@ -1,6 +1,3 @@
#include "SCTExtension/SCTExtensionAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( SCTExtensionAlg )
-DECLARE_FACTORY_ENTRIES(SCTExtension) {
-DECLARE_ALGORITHM( SCTExtensionAlg )
-}
+
diff --git a/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_load.cxx b/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_load.cxx
deleted file mode 100644
index 9e181d924d7..00000000000
--- a/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(SCTExtension)
diff --git a/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_entries.cxx b/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_entries.cxx
index 68f779cbd57..ab2069c00a4 100644
--- a/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_entries.cxx
+++ b/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "BCM_ZeroSuppression/BCM_ZeroSuppression.h"
DECLARE_ALGORITHM_FACTORY( BCM_ZeroSuppression )
-DECLARE_FACTORY_ENTRIES(BCM_ZeroSuppression) {
- DECLARE_ALGORITHM(BCM_ZeroSuppression)
-}
diff --git a/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_load.cxx b/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_load.cxx
deleted file mode 100644
index 9b05e08b81b..00000000000
--- a/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(BCM_ZeroSuppression)
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_entries.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_entries.cxx
old mode 100755
new mode 100644
index 910c0fc60c5..3f46a1e2a50
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_entries.cxx
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_entries.cxx
@@ -1,11 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetOverlay/InDetOverlay.h"
#include "InDetOverlay/InDetSDOOverlay.h"
DECLARE_ALGORITHM_FACTORY( InDetOverlay )
DECLARE_ALGORITHM_FACTORY( InDetSDOOverlay )
-DECLARE_FACTORY_ENTRIES( InDetOverlay ) {
- DECLARE_ALGORITHM( InDetOverlay )
- DECLARE_ALGORITHM( InDetSDOOverlay )
-}
+
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_load.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_load.cxx
deleted file mode 100755
index b5381e578f9..00000000000
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetOverlay)
diff --git a/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_entries.cxx b/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_entries.cxx
index 48d62b0c2ba..e59eb99310c 100644
--- a/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_entries.cxx
@@ -1,7 +1,3 @@
#include "BCM_BackgroundAlgs/BcmCollisionTimeAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( BcmCollisionTimeAlg )
-DECLARE_FACTORY_ENTRIES(BCM_BackgroundAlgs) {
-DECLARE_ALGORITHM( BcmCollisionTimeAlg )
-}
diff --git a/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_load.cxx b/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_load.cxx
deleted file mode 100644
index 72752da3f91..00000000000
--- a/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(BCM_BackgroundAlgs)
diff --git a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_entries.cxx b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_entries.cxx
index ad10c2b761f..85dcd7fb104 100644
--- a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_entries.cxx
@@ -1,12 +1,7 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetCaloClusterROISelector/CaloClusterROI_Selector.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( CaloClusterROI_Selector )
-DECLARE_FACTORY_ENTRIES( InDetCaloClusterROISelector )
-{
- DECLARE_ALGORITHM( CaloClusterROI_Selector )
-}
+
diff --git a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_load.cxx b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_load.cxx
deleted file mode 100644
index 38fed34af54..00000000000
--- a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetCaloClusterROISelector )
diff --git a/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_entries.cxx b/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_entries.cxx
old mode 100755
new mode 100644
index 02004276b29..ab7a45b90d4
--- a/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_entries.cxx
@@ -1,11 +1,6 @@
#include "InDetConversionFinder/ConversionFinder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( ConversionFinder )
-DECLARE_FACTORY_ENTRIES(InDetConversionFinder)
-{
- DECLARE_ALGORITHM( ConversionFinder )
-}
diff --git a/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_load.cxx b/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_load.cxx
deleted file mode 100755
index 11ff1b0dec6..00000000000
--- a/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetConversionFinder )
diff --git a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_entries.cxx b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_entries.cxx
old mode 100755
new mode 100644
index 45cb36c7947..60465a2b912
--- a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_entries.cxx
@@ -1,13 +1,5 @@
#include "InDetExtensionProcessor/InDetExtensionProcessor.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetExtensionProcessor )
-DECLARE_FACTORY_ENTRIES(InDetExtensionProcessor) {
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetExtensionProcessor)
-}
-
-
-
-
diff --git a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_load.cxx b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_load.cxx
deleted file mode 100755
index dc4d6133a41..00000000000
--- a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetExtensionProcessor)
-
-
diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_entries.cxx b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_entries.cxx
index 36722a279fb..e53c7c00eeb 100644
--- a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_entries.cxx
@@ -1,10 +1,6 @@
#include "InDetLowBetaFinder/LowBetaAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( LowBetaAlg )
-
-DECLARE_FACTORY_ENTRIES(InDetLowBetaFinder) {
- DECLARE_ALGORITHM( LowBetaAlg )
- }
+
diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_load.cxx b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_load.cxx
deleted file mode 100644
index 957d81087e4..00000000000
--- a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(InDetLowBetaFinder)
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_entries.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_entries.cxx
old mode 100755
new mode 100644
index 036a7f6a216..69e09e0d8df
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_entries.cxx
@@ -3,7 +3,6 @@
#include "InDetPrepRawDataFormation/TRT_RIO_Maker.h"
#include "InDetPrepRawDataFormation/CacheCreator.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
@@ -12,21 +11,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, SCT_Clusterization )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_RIO_Maker )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, CacheCreator )
-DECLARE_FACTORY_ENTRIES( InDetPrepRawDataFormation )
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet, PixelClusterization)
- DECLARE_NAMESPACE_ALGORITHM( InDet, SCT_Clusterization )
- DECLARE_NAMESPACE_ALGORITHM( InDet, TRT_RIO_Maker )
- DECLARE_NAMESPACE_ALGORITHM( InDet, CacheCreator )
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_load.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_load.cxx
deleted file mode 100755
index 1f9deb31883..00000000000
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetPrepRawDataFormation )
-
-
diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_entries.cxx b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_entries.cxx
old mode 100755
new mode 100644
index dcf64c23bb6..a85485c151b
--- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetPriVxFinder/InDetPriVxFinder.h"
#include "InDetPriVxFinder/InDetPriVxDummyFinder.h"
#include "InDetPriVxFinder/InDetVxLinksToTrackParticles.h"
@@ -7,10 +6,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetPriVxFinder )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetPriVxDummyFinder )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetVxLinksToTrackParticles )
-DECLARE_FACTORY_ENTRIES( InDetPriVxFinder )
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetPriVxFinder )
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetPriVxDummyFinder )
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetVxLinksToTrackParticles )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_load.cxx b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_load.cxx
deleted file mode 100755
index 7a2378abd8a..00000000000
--- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetPriVxFinder )
diff --git a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_entries.cxx b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_entries.cxx
old mode 100755
new mode 100644
index 9faacf8b545..3636efbf526
--- a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrackPRD_Association/InDetTrackPRD_Association.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( InDetTrackPRD_Association )
-DECLARE_FACTORY_ENTRIES( InDetTrackPRD_Association )
-{
- DECLARE_ALGORITHM( InDetTrackPRD_Association )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_load.cxx b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_load.cxx
deleted file mode 100755
index 6da85f8d4d7..00000000000
--- a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrackPRD_Association)
-
diff --git a/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_entries.cxx b/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_entries.cxx
old mode 100755
new mode 100644
index b073bea300b..150a3d63e30
--- a/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetV0Finder/InDetV0FinderTool.h"
#include "InDetV0Finder/InDetV0Finder.h"
//#include "InDetV0Finder/InDetSimpleV0Finder.h"
@@ -7,20 +6,7 @@ using namespace InDet;
DECLARE_TOOL_FACTORY( InDetV0FinderTool )
-DECLARE_FACTORY_ENTRIES( InDetV0FinderTool )
-{
- DECLARE_TOOL( InDetV0FinderTool )
-}
DECLARE_ALGORITHM_FACTORY( InDetV0Finder )
//DECLARE_ALGORITHM_FACTORY( InDetSimpleV0Finder )
-DECLARE_FACTORY_ENTRIES( InDetV0Finder )
-{
- DECLARE_ALGORITHM( InDetV0Finder );
-}
-
-//DECLARE_FACTORY_ENTRIES( InDetSimpleV0Finder )
-//{
-// DECLARE_ALGORITHM( InDetSimpleV0Finder );
-//}
diff --git a/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_load.cxx b/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_load.cxx
deleted file mode 100755
index 81c4d96fe84..00000000000
--- a/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetV0Finder)
-
diff --git a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_entries.cxx b/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_entries.cxx
old mode 100755
new mode 100644
index 12cf2a1d58b..841ff268c7b
--- a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetZVTOP_Alg/InDetZVTOP_Alg.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( InDetZVTOP_Alg )
-DECLARE_FACTORY_ENTRIES( InDetZVTOP_Alg )
-{
- DECLARE_ALGORITHM( InDetZVTOP_Alg )
-}
diff --git a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_load.cxx b/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_load.cxx
deleted file mode 100755
index af817606869..00000000000
--- a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetZVTOP_Alg )
-
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_entries.cxx b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_entries.cxx
old mode 100755
new mode 100644
index a7e410232bb..b21701ffc65
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiSPSeededTrackFinder/SiSPSeededTrackFinder.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( SiSPSeededTrackFinder )
-DECLARE_FACTORY_ENTRIES( SiSPSeededTrackFinder )
-{
- DECLARE_ALGORITHM( SiSPSeededTrackFinder )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_load.cxx b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_load.cxx
deleted file mode 100755
index 9c08bc0646b..00000000000
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SiSPSeededTrackFinder)
-
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_entries.cxx b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_entries.cxx
old mode 100755
new mode 100644
index bdf42503ed7..83e52a96999
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_entries.cxx
@@ -1,11 +1,4 @@
-
#include "SiSpacePointFormation/SiTrackerSpacePointFinder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, SiTrackerSpacePointFinder)
-DECLARE_FACTORY_ENTRIES( SiSpacePointFormation )
-{
- DECLARE_NAMESPACE_ALGORITHM(InDet, SiTrackerSpacePointFinder )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_load.cxx b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_load.cxx
deleted file mode 100755
index fa5a18c01c4..00000000000
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiSpacePointFormation)
diff --git a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_entries.cxx b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_entries.cxx
old mode 100755
new mode 100644
index 449bba82730..cca4895330b
--- a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_SeededTrackFinder/TRT_SeededTrackFinder.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TRT_SeededTrackFinder )
-DECLARE_FACTORY_ENTRIES( TRT_SeededTrackFinder )
-{
- DECLARE_ALGORITHM( TRT_SeededTrackFinder )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_load.cxx b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_load.cxx
deleted file mode 100755
index cc4978127cd..00000000000
--- a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_SeededTrackFinder)
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_entries.cxx b/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_entries.cxx
old mode 100755
new mode 100644
index cc7dec67539..c538cb0b5d0
--- a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_StandaloneTrackFinder/TRT_StandaloneTrackFinder.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TRT_StandaloneTrackFinder )
-DECLARE_FACTORY_ENTRIES( TRT_StandaloneTrackFinder )
-{
- DECLARE_ALGORITHM( TRT_StandaloneTrackFinder )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_load.cxx b/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_load.cxx
deleted file mode 100755
index 5d9003ae9d6..00000000000
--- a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_StandaloneTrackFinder)
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_entries.cxx b/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_entries.cxx
old mode 100755
new mode 100644
index 0e66fa88d9f..5ceec201e55
--- a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrackExtensionAlg/TRT_TrackExtensionAlg.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, TRT_TrackExtensionAlg )
-DECLARE_FACTORY_ENTRIES( TRT_TrackExtensionAlg )
-{
- DECLARE_NAMESPACE_ALGORITHM(InDet, TRT_TrackExtensionAlg )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_load.cxx b/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_load.cxx
deleted file mode 100755
index e0be0f0e1e5..00000000000
--- a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrackExtensionAlg )
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_entries.cxx b/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_entries.cxx
old mode 100755
new mode 100644
index a11fbb75e34..b316c2131b0
--- a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrackSegmentsFinder/TRT_TrackSegmentsFinder.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TRT_TrackSegmentsFinder )
-DECLARE_FACTORY_ENTRIES( TRT_TrackSegmentsFinder )
-{
- DECLARE_ALGORITHM( TRT_TrackSegmentsFinder )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_load.cxx b/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_load.cxx
deleted file mode 100755
index d6b12d7e872..00000000000
--- a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrackSegmentsFinder)
-
diff --git a/InnerDetector/InDetRecEvent/BCM_CollisionTime/src/components/BCM_CollisionTime_load.cxx b/InnerDetector/InDetRecEvent/BCM_CollisionTime/src/components/BCM_CollisionTime_load.cxx
deleted file mode 100644
index 9586c8e749b..00000000000
--- a/InnerDetector/InDetRecEvent/BCM_CollisionTime/src/components/BCM_CollisionTime_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(BCM_CollisionTime)
diff --git a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_entries.cxx b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_entries.cxx
old mode 100755
new mode 100644
index e1b3ae297f5..aa622f97ec2
--- a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool.h"
#include "InDetAmbiTrackSelectionTool/InDetDenseEnvAmbiTrackSelectionTool.h"
@@ -6,10 +5,3 @@
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetAmbiTrackSelectionTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetDenseEnvAmbiTrackSelectionTool )
-
-DECLARE_FACTORY_ENTRIES( InDetAmbiTrackSelectionTool )
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetAmbiTrackSelectionTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetDenseEnvAmbiTrackSelectionTool )
-}
-
diff --git a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_load.cxx b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_load.cxx
deleted file mode 100755
index ef60d4952e9..00000000000
--- a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAmbiTrackSelectionTool )
-
diff --git a/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_entries.cxx b/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_entries.cxx
old mode 100755
new mode 100644
index 38342c6c41b..91d4b2e889c
--- a/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetAssociationTools/InDetPRD_AssociationToolGangedPixels.h"
#include "InDetAssociationTools/InDetPRD_Provider.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetPRD_AssociationToolGangedPixels )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetPRD_Provider )
-DECLARE_FACTORY_ENTRIES( InDetAssociationTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetPRD_AssociationToolGangedPixels )
- DECLARE_NAMESPACE_TOOL( InDet, InDetPRD_Provider )
-}
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_load.cxx b/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_load.cxx
deleted file mode 100755
index c09cb6e637d..00000000000
--- a/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAssociationTools )
-
diff --git a/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_entries.cxx b/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_entries.cxx
old mode 100755
new mode 100644
index 904ba7eb73b..3110c1e2b13
--- a/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_entries.cxx
@@ -1,11 +1,7 @@
#include "../CaloClusterROI_Builder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_TOOL_FACTORY (CaloClusterROI_Builder)
-DECLARE_FACTORY_ENTRIES(InDetCaloClusterROIBuilder) {
- DECLARE_TOOL ( CaloClusterROI_Builder )
-}
diff --git a/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_load.cxx b/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_load.cxx
deleted file mode 100755
index 8fc00905ac4..00000000000
--- a/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetCaloClusterROIBuilder)
-
diff --git a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_entries.cxx b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_entries.cxx
old mode 100755
new mode 100644
index fbfdd52d76f..2c560e0bceb
--- a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_entries.cxx
@@ -1,17 +1,8 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetCompetingRIOsOnTrackTool/CompetingTRT_DriftCirclesOnTrackTool.h"
#include "InDetCompetingRIOsOnTrackTool/CompetingPixelClustersOnTrackTool.h"
#include "InDetCompetingRIOsOnTrackTool/CompetingSCT_ClustersOnTrackTool.h"
-//using namespace InDet;
-
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, CompetingTRT_DriftCirclesOnTrackTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, CompetingPixelClustersOnTrackTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, CompetingSCT_ClustersOnTrackTool )
-DECLARE_FACTORY_ENTRIES(InDetCompetingRIOsOnTrackTool)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_TOOL(InDet, CompetingTRT_DriftCirclesOnTrackTool)
- DECLARE_NAMESPACE_TOOL(InDet, CompetingPixelClustersOnTrackTool)
- DECLARE_NAMESPACE_TOOL(InDet, CompetingSCT_ClustersOnTrackTool)
-}
diff --git a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_load.cxx b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_load.cxx
deleted file mode 100755
index 0c3c466e6e8..00000000000
--- a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetCompetingRIOsOnTrackTool)
diff --git a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_entries.cxx b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_entries.cxx
old mode 100755
new mode 100644
index 76123168387..076a16391f0
--- a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetConversionFinderTools/InDetConversionFinderTools.h"
#include "InDetConversionFinderTools/TrackPairsSelector.h"
#include "InDetConversionFinderTools/ConversionFinderUtils.h"
@@ -14,13 +13,3 @@ DECLARE_TOOL_FACTORY( VertexPointEstimator )
DECLARE_TOOL_FACTORY( ConversionPostSelector )
DECLARE_TOOL_FACTORY( SingleTrackConversionTool )
-DECLARE_FACTORY_ENTRIES( InDetConversionFinderTools )
-{
- DECLARE_TOOL( InDetConversionFinderTools )
- DECLARE_TOOL( TrackPairsSelector )
- DECLARE_TOOL( ConversionFinderUtils )
- DECLARE_TOOL( VertexPointEstimator )
- DECLARE_TOOL( ConversionPostSelector )
- DECLARE_TOOL( SingleTrackConversionTool )
-
-}
diff --git a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_load.cxx b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_load.cxx
deleted file mode 100755
index 9efba0af330..00000000000
--- a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetConversionFinderTools )
diff --git a/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_entries.cxx b/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_entries.cxx
index a42b1cec5d0..101d112ecde 100644
--- a/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetDNASeparator/InDetDNASeparator.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetDNASeparator )
-DECLARE_FACTORY_ENTRIES( InDetDNASeparator )
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetDNASeparator )
-}
-
diff --git a/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_load.cxx b/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_load.cxx
deleted file mode 100644
index c9847b34399..00000000000
--- a/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetDNASeparator )
-
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_entries.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_entries.cxx
index 161aa272391..68398ec6acf 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetMultipleVertexSeedFinder/SlidingWindowMultiSeedFinder.h"
#include "InDetMultipleVertexSeedFinder/DivisiveMultiSeedFinder.h"
#include "InDetMultipleVertexSeedFinder/HistogrammingMultiSeedFinder.h"
@@ -9,9 +8,3 @@ DECLARE_TOOL_FACTORY( SlidingWindowMultiSeedFinder )
DECLARE_TOOL_FACTORY( DivisiveMultiSeedFinder )
DECLARE_TOOL_FACTORY( HistogrammingMultiSeedFinder )
-DECLARE_FACTORY_ENTRIES( TrkMultipleVertexSeedFinder )
-{
- DECLARE_TOOL( SlidingWindowMultiSeedFinder );
- DECLARE_TOOL( DivisiveMultiSeedFinder );
- DECLARE_TOOL( HistogrammingMultiSeedFinder );
-}
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_load.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_load.cxx
deleted file mode 100644
index 74a2fbb614f..00000000000
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetMultipleVertexSeedFinder )
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_entries.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_entries.cxx
index 40e85f7b470..694453f3be3 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetMultipleVertexSeedFinderUtils/InDetTrackZ0SortingTool.h"
#include "InDetMultipleVertexSeedFinderUtils/InDetTrackClusterCleaningTool.h"
@@ -7,8 +6,3 @@ using namespace InDet;
DECLARE_TOOL_FACTORY( InDetTrackZ0SortingTool )
DECLARE_TOOL_FACTORY( InDetTrackClusterCleaningTool )
-DECLARE_FACTORY_ENTRIES( InDetMultipleVertexSeedFinderUtils )
-{
- DECLARE_TOOL( InDetTrackZ0SortingTool );
- DECLARE_TOOL( InDetTrackClusterCleaningTool );
-}
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_load.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_load.cxx
deleted file mode 100644
index df867e443f6..00000000000
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetMultipleVertexSeedFinderUtils )
diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_entries.cxx b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_entries.cxx
old mode 100755
new mode 100644
index 4d79b4ccdc7..6f564930778
--- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetPriVxFinderTool/InDetPriVxFinderTool.h"
#include "InDetPriVxFinderTool/InDetAdaptivePriVxFinderTool.h"
#include "InDetPriVxFinderTool/InDetIterativePriVxFinderTool.h"
@@ -15,13 +14,3 @@ DECLARE_TOOL_FACTORY( InDetIterativePriVxFinderTool )
DECLARE_TOOL_FACTORY( InDetAdaptiveMultiPriVxFinderTool )
DECLARE_TOOL_FACTORY( InDetMultiPriVxFinderTool )
-DECLARE_FACTORY_ENTRIES( InDetPriVxFinderTool )
-{
- DECLARE_TOOL( InDetPriVxFinderTool )
- DECLARE_TOOL( InDetAdaptivePriVxFinderTool )
- DECLARE_TOOL( InDetIterativePriVxFinderTool )
- DECLARE_TOOL( InDetAdaptiveMultiPriVxFinderTool )
- DECLARE_TOOL( InDetMultiPriVxFinderTool )
-
-}
-
diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_load.cxx b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_load.cxx
deleted file mode 100755
index 252cae7ea25..00000000000
--- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetPriVxFinderTool )
diff --git a/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_entries.cxx b/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_entries.cxx
old mode 100755
new mode 100644
index 164520bb9b7..f55a52823d4
--- a/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_entries.cxx
@@ -1,9 +1,4 @@
#include "../SCT_ResidualPullCalculator.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SCT_ResidualPullCalculator )
-DECLARE_FACTORY_ENTRIES(InDetTrackValidation){
- DECLARE_NAMESPACE_TOOL(InDet, SCT_ResidualPullCalculator)
-}
-
diff --git a/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_load.cxx b/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_load.cxx
deleted file mode 100755
index 79e11dd51fa..00000000000
--- a/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetResidualPullCalculators)
diff --git a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_entries.cxx b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_entries.cxx
old mode 100755
new mode 100644
index ce24dcbc1fa..58fa9a1e15c
--- a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_entries.cxx
@@ -1,19 +1,6 @@
#include "InDetSVWithMuonTool/InDetSVWithMuonTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( InDetSVWithMuonTool )
-DECLARE_FACTORY_ENTRIES( InDetSVWithMuonTool ) {
- DECLARE_TOOL( InDetSVWithMuonTool );
-}
-//Notes:
-//
-//1. The argument to the DECLARE_FACTORY_ENTRIES(XXX) is the name of the
-// component library (libXXX.so).
-//2. Each Algorithm that is contained in the library should be declared
-// by the DECLARE_ALGORITHM() statement.
-//3. Each Service that is contained in the library should be declared
-// by the DECLARE_SERVICE() statement.
-//
-// See Athena User Guide for more information
+
diff --git a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_load.cxx b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_load.cxx
deleted file mode 100755
index e32e02194dc..00000000000
--- a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( InDetSVWithMuonTool )
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx
old mode 100755
new mode 100644
index a615a4b4860..1724022f60d
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetSecVxFinderTool/InDetJetFitterVxFinder.h"
#include "InDetSecVxFinderTool/InDetJetFitterUtils.h"
#include "InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h"
@@ -9,9 +8,3 @@ DECLARE_TOOL_FACTORY( InDetJetFitterVxFinder )
DECLARE_TOOL_FACTORY( InDetJetFitterUtils )
DECLARE_TOOL_FACTORY( InDetImprovedJetFitterVxFinder )
-DECLARE_FACTORY_ENTRIES( InDetSecVxFinderTool )
-{
- DECLARE_TOOL( InDetJetFitterVxFinder );
- DECLARE_TOOL( InDetJetFitterUtils );
- DECLARE_TOOL( InDetImprovedJetFitterVxFinder );
-}
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_load.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_load.cxx
deleted file mode 100755
index 860b56e4f55..00000000000
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetSecVxFinderTool )
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_entries.cxx b/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_entries.cxx
old mode 100755
new mode 100644
index cebf4e42d28..458c6085c61
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTestBLayer/InDetTestBLayerTool.h"
@@ -8,8 +7,4 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTestBLayerTool )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( InDetTestBLayer )
-{
- DECLARE_NAMESPACE_TOOL( InDet, inDetTestBLayerTool );
-}
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_load.cxx b/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_load.cxx
deleted file mode 100755
index fde9d02609f..00000000000
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTestBLayer )
-
-
diff --git a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_entries.cxx b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_entries.cxx
old mode 100755
new mode 100644
index 01cdd776aa1..4bf1cf617b7
--- a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTestPixelLayer/InDetTestPixelLayerTool.h"
@@ -8,8 +7,4 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTestPixelLayerTool )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( InDetTestPixelLayer )
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetTestPixelLayerTool );
-}
diff --git a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_load.cxx b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_load.cxx
deleted file mode 100755
index c789328224c..00000000000
--- a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTestPixelLayer )
-
-
diff --git a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_entries.cxx
index 10cda84b38b..b791dadebc9 100644
--- a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrackHoleSearch/InDetTrackHoleSearchTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackHoleSearchTool )
-DECLARE_FACTORY_ENTRIES( InDetTrackHoleSearch )
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrackHoleSearchTool )
-}
-
diff --git a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_load.cxx b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_load.cxx
deleted file mode 100644
index bafe132af63..00000000000
--- a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrackHoleSearch )
-
diff --git a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx
old mode 100755
new mode 100644
index 7fbb5de4aa1..b9f639fd5ad
--- a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx
@@ -1,5 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrackScoringTools/InDetAmbiScoringTool.h"
#include "InDetTrackScoringTools/InDetCosmicScoringTool.h"
#include "InDetTrackScoringTools/InDetTrtTrackScoringTool.h"
@@ -8,13 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetAmbiScoringTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetCosmicScoringTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrtTrackScoringTool )
-DECLARE_FACTORY_ENTRIES( InDetTrackScoringTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetAmbiScoringTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetCosmicScoringTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrtTrackScoringTool )
-}
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_load.cxx b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_load.cxx
deleted file mode 100755
index ac59d6b8abb..00000000000
--- a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrackScoringTools )
-
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_entries.cxx
index 9284f454ed1..954f4767a9b 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_entries.cxx
@@ -1,7 +1,3 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "InDetTrackSelectionTool/InDetTrackSelectionTool.h"
#include "../ToolTester.h"
@@ -10,11 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackSelectionTool )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, ToolTester )
-DECLARE_FACTORY_ENTRIES( InDetTrackSelectionTool ) {
-
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrackSelectionTool );
-
- //the athena tool tester library src/ToolTester
- DECLARE_NAMESPACE_ALGORITHM( InDet, ToolTester );
-
-}
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_load.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_load.cxx
deleted file mode 100644
index 0276600e241..00000000000
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_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( InDetTrackSelectionTool )
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_entries.cxx
index f48544f66c1..05ebb86baf0 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrackSelectorTool/InDetTrackSelectorTool.h"
#include "InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h"
#include "InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h"
@@ -15,12 +14,3 @@ DECLARE_TOOL_FACTORY( InDetDetailedTrackSelectorTool )
DECLARE_TOOL_FACTORY( InDetConversionTrackSelectorTool )
DECLARE_TOOL_FACTORY( InDetTrtDriftCircleCutTool )
-DECLARE_FACTORY_ENTRIES( InDetTrackSelectorTool )
-{
- DECLARE_TOOL( InDetTrackSelectorTool );
- DECLARE_TOOL( InDetIsoTrackSelectorTool );
- DECLARE_TOOL( InDetCosmicTrackSelectorTool );
- DECLARE_TOOL( InDetDetailedTrackSelectorTool );
- DECLARE_TOOL( InDetConversionTrackSelectorTool );
- DECLARE_TOOL( InDetTrtDriftCircleCutTool );
-}
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_load.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_load.cxx
deleted file mode 100644
index 4877876e806..00000000000
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrackSelectorTool )
diff --git a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_entries.cxx
old mode 100755
new mode 100644
index 1f4ca7fa463..b3f32aad539
--- a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_entries.cxx
@@ -1,16 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrackSummaryHelperTool/InDetTrackSummaryHelperTool.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( InDetTrackSummaryHelperTool )
-DECLARE_FACTORY_ENTRIES( InDetTrackSummaryHelperTool )
-{
- DECLARE_TOOL( InDetTrackSummaryHelperTool )
-}
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_load.cxx b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_load.cxx
deleted file mode 100755
index 16a38bf245d..00000000000
--- a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrackSummaryHelperTool )
-
diff --git a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_entries.cxx b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_entries.cxx
old mode 100755
new mode 100644
index ab76d0ca685..09a43271f50
--- a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_entries.cxx
@@ -1,19 +1,6 @@
#include "InDetVKalPriVxFinderTool/InDetVKalPriVxFinderTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( InDetVKalPriVxFinderTool )
-DECLARE_FACTORY_ENTRIES( InDetVKalPriVxFinderTool ) {
- DECLARE_TOOL( InDetVKalPriVxFinderTool );
-}
-//Notes:
-//
-//1. The argument to the DECLARE_FACTORY_ENTRIES(XXX) is the name of the
-// component library (libXXX.so).
-//2. Each Algorithm that is contained in the library should be declared
-// by the DECLARE_ALGORITHM() statement.
-//3. Each Service that is contained in the library should be declared
-// by the DECLARE_SERVICE() statement.
-//
-// See Athena User Guide for more information
+
diff --git a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_load.cxx b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_load.cxx
deleted file mode 100755
index 907bc4af093..00000000000
--- a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( InDetVKalPriVxFinderTool )
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_entries.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_entries.cxx
old mode 100755
new mode 100644
index bb2ab4c6038..c6ee63e8e9b
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_entries.cxx
@@ -1,19 +1,6 @@
#include "InDetVKalVxInJetTool/InDetVKalVxInJetTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( InDetVKalVxInJetTool )
-DECLARE_FACTORY_ENTRIES( InDetVKalVxInJetTool ) {
- DECLARE_TOOL( InDetVKalVxInJetTool );
-}
-//Notes:
-//
-//1. The argument to the DECLARE_FACTORY_ENTRIES(XXX) is the name of the
-// component library (libXXX.so).
-//2. Each Algorithm that is contained in the library should be declared
-// by the DECLARE_ALGORITHM() statement.
-//3. Each Service that is contained in the library should be declared
-// by the DECLARE_SERVICE() statement.
-//
-// See Athena User Guide for more information
+
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_load.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_load.cxx
deleted file mode 100755
index 1c8627cd266..00000000000
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( InDetVKalVxInJetTool )
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
diff --git a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_entries.cxx b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_entries.cxx
old mode 100755
new mode 100644
index ac1ecc1cd22..933c7e5521e
--- a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetZVTOPVxFinder/ZVTOP_Tool.h"
#include "InDetZVTOPVxFinder/ZVTOP_SecVtxTool.h"
#include "InDetZVTOPVxFinder/ZVTOP_SpatialPointFinder.h"
@@ -15,14 +14,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ZVTOP_TrkProbTubeCalc )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ZVTOP_SimpleVtxProbCalc )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ZVTOP_AmbiguitySolver )
-DECLARE_FACTORY_ENTRIES( InDetZVTOPVxFinder )
-{
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_Tool )
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_SecVtxTool )
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_SpatialPointFinder )
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_SlowSpatialPointFinder )
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_TrkProbTubeCalc )
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_SimpleVtxProbCalc )
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_AmbiguitySolver)
-}
-
diff --git a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_load.cxx b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_load.cxx
deleted file mode 100755
index cd14b7e1e72..00000000000
--- a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetZVTOPVxFinder )
-
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx
index 786004b8063..6787b15f6c8 100644
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "PixelToTPIDTool/PixelToTPIDTool.h"
#include "PixelToTPIDTool/PixeldEdxTestAlg.h"
#include "PixelToTPIDTool/PixeldEdxAODFix.h"
@@ -7,11 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, PixelToTPIDTool )
DECLARE_ALGORITHM_FACTORY(PixeldEdxTestAlg)
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet,PixeldEdxAODFix)
-DECLARE_FACTORY_ENTRIES( PixelToTPIDTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, PixelToTPIDTool )
- DECLARE_ALGORITHM(PixeldEdxTestAlg)
- DECLARE_NAMESPACE_ALGORITHM(InDet, PixeldEdxAODFix)
-
-}
-
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_load.cxx b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_load.cxx
deleted file mode 100644
index 5dc3cb45eef..00000000000
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelToTPIDTools )
-
diff --git a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_entries.cxx b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_entries.cxx
index f865989284a..8c815df9e33 100644
--- a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SeedToTrackConversionTool/SeedToTrackConversionTool.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( SeedToTrackConversionTool )
-DECLARE_FACTORY_ENTRIES( SeedToTrackConversionTool )
-{
- DECLARE_TOOL( SeedToTrackConversionTool )
-}
-
diff --git a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_load.cxx b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_load.cxx
deleted file mode 100644
index 9669612b306..00000000000
--- a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SeedToTrackConversionTool )
-
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_entries.cxx b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_entries.cxx
old mode 100755
new mode 100644
index 4df7ac15dfb..ecbcbbb3550
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_entries.cxx
@@ -1,14 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiClusterOnTrackTool/PixelClusterOnTrackTool.h"
#include "SiClusterOnTrackTool/SCT_ClusterOnTrackTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PixelClusterOnTrackTool)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, SCT_ClusterOnTrackTool)
-DECLARE_FACTORY_ENTRIES(SiClusterOnTrackTool) {
- DECLARE_NAMESPACE_TOOL(InDet, PixelClusterOnTrackTool)
- DECLARE_NAMESPACE_TOOL(InDet, SCT_ClusterOnTrackTool)
-}
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_load.cxx b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_load.cxx
deleted file mode 100755
index f9e36344f64..00000000000
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiClusterOnTrackTool )
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_entries.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_entries.cxx
old mode 100755
new mode 100644
index 91db630a96f..9dec14c2ca1
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_entries.cxx
@@ -7,7 +7,6 @@
#include "SiClusterizationTool/SCT_ReClustering.h"
#include "SiClusterizationTool/ClusterMakerTool.h"
#include "SiClusterizationTool/PixelGangedAmbiguitiesFinder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiClusterizationTool/TotPixelClusterSplitter.h"
#include "SiClusterizationTool/NnPixelClusterSplitter.h"
#include "SiClusterizationTool/NnClusterizationFactory.h"
@@ -30,28 +29,6 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TruthPixelClusterSplitter )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TruthClusterizationFactory )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TruthPixelClusterSplitProbTool )
-DECLARE_FACTORY_ENTRIES( SiClusterizationTool ){
- DECLARE_NAMESPACE_TOOL( InDet, MergedPixelsTool )
- DECLARE_NAMESPACE_TOOL( InDet, SCT_ClusteringTool )
- DECLARE_NAMESPACE_TOOL( InDet, PixelGangedAmbiguitiesFinder )
- DECLARE_NAMESPACE_TOOL( InDet, ClusterMakerTool )
- DECLARE_NAMESPACE_TOOL( InDet, TotPixelClusterSplitter )
- DECLARE_NAMESPACE_TOOL( InDet, NnPixelClusterSplitter )
- DECLARE_NAMESPACE_TOOL( InDet, NnClusterizationFactory )
- DECLARE_NAMESPACE_TOOL( InDet, NnPixelClusterSplitProbTool )
- DECLARE_NAMESPACE_TOOL( InDet, TruthPixelClusterSplitter )
- DECLARE_NAMESPACE_TOOL( InDet, TruthClusterizationFactory )
- DECLARE_NAMESPACE_TOOL( InDet, TruthPixelClusterSplitProbTool )
-}
-
-
-
-
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_load.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_load.cxx
deleted file mode 100755
index 5dc884f17d4..00000000000
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SiClusterizationTool )
-
-
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_entries.cxx
old mode 100755
new mode 100644
index 96343f924be..00f9e7d3e04
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( SiCombinatorialTrackFinder_xk)
-DECLARE_FACTORY_ENTRIES( SiCombinatorialTrackFinderTool_xk )
-{
- DECLARE_TOOL( SiCombinatorialTrackFinder_xk )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_load.cxx b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_load.cxx
deleted file mode 100755
index d5cd861d038..00000000000
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiCombinatorialTrackFinderTool_xk)
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_entries.cxx
old mode 100755
new mode 100644
index 2b0268fbe19..34c2aa13f82
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiDetElementsRoadTool_xk/SiDetElementsRoadMaker_xk.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( SiDetElementsRoadMaker_xk)
-DECLARE_FACTORY_ENTRIES( SiDetElementsRoadTool_xk )
-{
- DECLARE_TOOL( SiDetElementsRoadMaker_xk )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_load.cxx b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_load.cxx
deleted file mode 100755
index 43908602a26..00000000000
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiDetElementsRoadTool_xk)
diff --git a/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_entries.cxx b/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_entries.cxx
old mode 100755
new mode 100644
index e920fb20571..b306838c01a
--- a/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_entries.cxx
@@ -1,12 +1,4 @@
-
#include "SiSpacePointTool/SiSpacePointMakerTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SiSpacePointMakerTool )
-DECLARE_FACTORY_ENTRIES( SiSpacePointTool ){
-
- DECLARE_NAMESPACE_TOOL( InDet, SiSpacePointMakerTool )
-
-}
-
diff --git a/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_load.cxx b/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_load.cxx
deleted file mode 100755
index eb068bd0f35..00000000000
--- a/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SiSpacePointTool )
-
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx
old mode 100755
new mode 100644
index f7de97bc61f..70014883eb1
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx
@@ -1,5 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h"
#include "SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h"
#include "SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h"
@@ -18,18 +16,3 @@ DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_HeavyIon )
DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_Trigger )
DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_ITK )
-DECLARE_FACTORY_ENTRIES( SiSpacePointsSeedTool_xk )
-{
- DECLARE_TOOL( SiSpacePointsSeedMaker_ATLxk )
- DECLARE_TOOL( SiSpacePointsSeedMaker_LowMomentum)
- DECLARE_TOOL( SiSpacePointsSeedMaker_BeamGas )
- DECLARE_TOOL( SiSpacePointsSeedMaker_Cosmic )
- DECLARE_TOOL( SiSpacePointsSeedMaker_HeavyIon )
- DECLARE_TOOL( SiSpacePointsSeedMaker_Trigger )
- DECLARE_TOOL( SiSpacePointsSeedMaker_ITK )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_load.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_load.cxx
deleted file mode 100755
index 2a5d0978ece..00000000000
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiSpacePointsSeedTool_xk)
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_entries.cxx
old mode 100755
new mode 100644
index 511e7807afa..dcd12ed87e1
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiTrackMakerTool_xk/SiTrackMaker_xk.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( SiTrackMaker_xk)
-DECLARE_FACTORY_ENTRIES( SiTrackMakerTool_xk )
-{
- DECLARE_TOOL( SiTrackMaker_xk )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_load.cxx b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_load.cxx
deleted file mode 100755
index ebdf5a4b11d..00000000000
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiTrackMakerTool_xk)
diff --git a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_entries.cxx
old mode 100755
new mode 100644
index 3337d41244f..f161eadcc9d
--- a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiZvertexTool_xk/SiZvertexMaker_xk.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( SiZvertexMaker_xk )
-DECLARE_FACTORY_ENTRIES( SiZvertexTool_xk )
-{
- DECLARE_TOOL( SiZvertexMaker_xk )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_load.cxx b/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_load.cxx
deleted file mode 100755
index 4e4e9693140..00000000000
--- a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiZvertexTool_xk)
diff --git a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_entries.cxx b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_entries.cxx
old mode 100755
new mode 100644
index 6665911a63e..b7a991e90d4
--- a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_DetElementsRoadTool_xk/TRT_DetElementsRoadMaker_xk.h"
using namespace InDet;
DECLARE_TOOL_FACTORY(TRT_DetElementsRoadMaker_xk)
-DECLARE_FACTORY_ENTRIES( TRT_DetElementsRoadTool_xk )
-{
- DECLARE_TOOL( TRT_DetElementsRoadMaker_xk )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_load.cxx b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_load.cxx
deleted file mode 100755
index 84bb40250cc..00000000000
--- a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_DetElementsRoadTool_xk)
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_entries.cxx
old mode 100755
new mode 100644
index eec1cb29f5e..d265ef6d324
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_DriftCircleOnTrackTool/TRT_DriftCircleOnTrackTool.h"
#include "TRT_DriftCircleOnTrackTool/TRT_DriftCircleOnTrackUniversalTool.h"
#include "TRT_DriftCircleOnTrackTool/TRT_DriftCircleOnTrackRecalibrateTool.h"
@@ -9,10 +8,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY(InDet, TRT_DriftCircleOnTrackUniversalTool)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, TRT_DriftCircleOnTrackRecalibrateTool)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, TRT_DriftCircleOnTrackNoDriftTimeTool)
-DECLARE_FACTORY_ENTRIES(TRT_DriftCircleOnTrackTool) {
- DECLARE_NAMESPACE_TOOL(InDet, TRT_DriftCircleOnTrackTool)
- DECLARE_NAMESPACE_TOOL(InDet, TRT_DriftCircleOnTrackUniversalTool)
- DECLARE_NAMESPACE_TOOL(InDet, TRT_DriftCircleOnTrackRecalibrateTool)
- DECLARE_NAMESPACE_TOOL(InDet, TRT_DriftCircleOnTrackNoDriftTimeTool)
-}
-
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_load.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_load.cxx
deleted file mode 100755
index 64828e82359..00000000000
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_DriftCircleOnTrackTool )
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_entries.cxx
old mode 100755
new mode 100644
index dc3e0bc69eb..94597659054
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_DriftCircleTool/TRT_DriftCircleTool.h"
#include "TRT_DriftCircleTool/TRT_DriftCircleToolCosmics.h"
@@ -6,8 +5,3 @@
DECLARE_NAMESPACE_TOOL_FACTORY(InDet,TRT_DriftCircleTool)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet,TRT_DriftCircleToolCosmics)
-DECLARE_FACTORY_ENTRIES(TRT_DriftCircleTool) {
-DECLARE_NAMESPACE_TOOL(InDet,TRT_DriftCircleTool)
-DECLARE_NAMESPACE_TOOL(InDet,TRT_DriftCircleToolCosmics)
-}
-
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_load.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_load.cxx
deleted file mode 100755
index 540841663be..00000000000
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_DriftCircleTool )
diff --git a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx
old mode 100755
new mode 100644
index 5ef6ced3c15..5f1f4b60afe
--- a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx
@@ -1,12 +1,4 @@
#include "TRT_DriftFunctionTool/TRT_DriftFunctionTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( TRT_DriftFunctionTool )
-DECLARE_FACTORY_ENTRIES( TRT_DriftFunctionTool )
-{
- DECLARE_TOOL( TRT_DriftFunctionTool )
-}
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_load.cxx b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_load.cxx
deleted file mode 100755
index 65caec1dc4d..00000000000
--- a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_DriftFunctionTool )
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_entries.cxx b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_entries.cxx
index 3a50e011267..d6e52af58d0 100644
--- a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_ElectronPidTools/BaseTRTPIDCalculator.h"
#include "TRT_ElectronPidTools/TRT_ElectronPidToolRun2.h"
#include "TRT_ElectronPidTools/TRT_LocalOccupancy.h"
@@ -6,10 +5,3 @@
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_ElectronPidToolRun2 )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_LocalOccupancy )
-DECLARE_FACTORY_ENTRIES( TRT_ElectronPidTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, BaseTRTPIDCalculator)
- DECLARE_NAMESPACE_TOOL( InDet, TRT_ElectronPidToolRun2 )
- DECLARE_NAMESPACE_TOOL( InDet, TRT_LocalOccupancy )
-}
-
diff --git a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_load.cxx b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_load.cxx
deleted file mode 100644
index b4dbb3cdedc..00000000000
--- a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_ElectronPidTools )
-
diff --git a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_entries.cxx
old mode 100755
new mode 100644
index 2caaf14bc0f..4f37cd36b00
--- a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_entries.cxx
@@ -1,5 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_SeededSpacePointFinderTool/TRT_SeededSpacePointFinder_ATL.h"
#include "TRT_SeededSpacePointFinderTool/SimpleTRT_SeededSpacePointFinder_ATL.h"
@@ -8,13 +6,3 @@ using namespace InDet;
DECLARE_TOOL_FACTORY( TRT_SeededSpacePointFinder_ATL )
DECLARE_TOOL_FACTORY( SimpleTRT_SeededSpacePointFinder_ATL )
-DECLARE_FACTORY_ENTRIES( TRT_SeededSpacePointFinderTool)
-{
- DECLARE_TOOL( TRT_SeededSpacePointFinder_ATL )
- DECLARE_TOOL( SimpleTRT_SeededSpacePointFinder_ATL )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_load.cxx b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_load.cxx
deleted file mode 100755
index e6a8bc38ab1..00000000000
--- a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_SeededSpacePointFinderTool)
-LOAD_FACTORY_ENTRIES(SimpleTRT_SeededSpacePointFinderTool)
diff --git a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_entries.cxx
old mode 100755
new mode 100644
index 42a1bb4de7a..fed16ec1513
--- a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_SeededTrackFinderTool/TRT_SeededTrackFinder_ATL.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( TRT_SeededTrackFinder_ATL)
-DECLARE_FACTORY_ENTRIES( TRT_SeededTrackFinderTool )
-{
- DECLARE_TOOL( TRT_SeededTrackFinder_ATL )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_load.cxx b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_load.cxx
deleted file mode 100755
index 2a958535c67..00000000000
--- a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_SeededTrackFinderTool)
diff --git a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_entries.cxx
index f59fa1bb419..4fc9d6bdad6 100644
--- a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_entries.cxx
@@ -1,11 +1,5 @@
#include "TRT_SegmentToTrackTool/TRT_SegmentToTrackTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_SegmentToTrackTool )
-DECLARE_FACTORY_ENTRIES( TRT_SegmentToTrackTool ) {
-
- DECLARE_NAMESPACE_TOOL( InDet, TRT_SegmentToTrackTool )
-
-}
diff --git a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_load.cxx b/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_load.cxx
deleted file mode 100644
index a773c81f962..00000000000
--- a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_SegmentToTrackTool )
diff --git a/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_entries.cxx b/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_entries.cxx
index dd1d2627511..d3f069e9bbe 100644
--- a/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_entries.cxx
@@ -1,8 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TRT_ToT_Tools/TRT_ToT_dEdx.h"
DECLARE_TOOL_FACTORY( TRT_ToT_dEdx )
-DECLARE_FACTORY_ENTRIES( TRT_ToT_Tools ) {
- DECLARE_TOOL( TRT_ToT_dEdx )
-}
diff --git a/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_load.cxx b/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_load.cxx
deleted file mode 100644
index b4695830089..00000000000
--- a/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(TRT_ToT_Tools)
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_entries.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_entries.cxx
old mode 100755
new mode 100644
index 1308b7569d6..3d882b7bb7d
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_entries.cxx
@@ -1,17 +1,4 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrackExtensionTool_DAF/TRT_TrackExtensionTool_DAF.h"
-//using namespace InDet;
-
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_TrackExtensionTool_DAF )
-DECLARE_FACTORY_ENTRIES(TRT_TrackExtensionTool_DAF)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_TOOL(InDet, TRT_TrackExtensionTool_DAF)
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_load.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_load.cxx
deleted file mode 100755
index 472be5d56ad..00000000000
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_TrackExtensionTool_DAF)
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_entries.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_entries.cxx
old mode 100755
new mode 100644
index bcd38e35ef4..6a55bc84526
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_entries.cxx
@@ -1,5 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrackExtensionTool_xk/TRT_TrackExtensionTool_xk.h"
#include "TRT_TrackExtensionTool_xk/TRT_TrackExtensionToolCosmics.h"
@@ -8,13 +6,3 @@ using namespace InDet;
DECLARE_TOOL_FACTORY(TRT_TrackExtensionTool_xk)
DECLARE_TOOL_FACTORY(TRT_TrackExtensionToolCosmics)
-DECLARE_FACTORY_ENTRIES( TRT_TrackExtensionTool_xk )
-{
- DECLARE_TOOL( TRT_TrackExtensionTool_xk )
- DECLARE_TOOL( TRT_TrackExtensionToolCosmics )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_load.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_load.cxx
deleted file mode 100755
index 583a8342745..00000000000
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_TrackExtensionTool_xk)
diff --git a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_entries.cxx b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_entries.cxx
old mode 100755
new mode 100644
index bf5e389d818..69586eb55c8
--- a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_entries.cxx
@@ -1,13 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrackHoleSearch/TRTTrackHoleSearchTool.h"
#include "TRT_TrackHoleSearch/TRTStrawEfficiency.h"
DECLARE_TOOL_FACTORY( TRTTrackHoleSearchTool )
DECLARE_ALGORITHM_FACTORY( TRTStrawEfficiency )
-DECLARE_FACTORY_ENTRIES( TRT_CalibAlgs )
-{
- DECLARE_TOOL( TRTTrackHoleSearchTool )
- DECLARE_ALGORITHM( TRTStrawEfficiency )
-}
diff --git a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_load.cxx b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_load.cxx
deleted file mode 100755
index 28998e04978..00000000000
--- a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrackHoleSearch )
-
diff --git a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_entries.cxx b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_entries.cxx
old mode 100755
new mode 100644
index 0fd8f367ebd..4a7fb285f27
--- a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsMaker_ATLxk.h"
#include "TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsMaker_ECcosmics.h"
#include "TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsMaker_BarrelCosmics.h"
@@ -9,14 +8,3 @@ DECLARE_TOOL_FACTORY( TRT_TrackSegmentsMaker_ATLxk )
DECLARE_TOOL_FACTORY( TRT_TrackSegmentsMaker_ECcosmics )
DECLARE_TOOL_FACTORY( TRT_TrackSegmentsMaker_BarrelCosmics )
-DECLARE_FACTORY_ENTRIES( TRT_TrackSegmentsTool_xk )
-{
- DECLARE_TOOL( TRT_TrackSegmentsMaker_ATLxk )
- DECLARE_TOOL( TRT_TrackSegmentsMaker_ECcosmics )
- DECLARE_TOOL( TRT_TrackSegmentsMaker_BarrelCosmics )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_load.cxx b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_load.cxx
deleted file mode 100755
index cba0df201f9..00000000000
--- a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_TrackSegmentsTool_xk)
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_entries.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_entries.cxx
index c078640f76c..9c6ab9c22dc 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_entries.cxx
@@ -1,13 +1,9 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Top level tool
#include "TrackVertexAssociationTool/LooseTrackVertexAssociationTool.h"
#include "TrackVertexAssociationTool/TightTrackVertexAssociationTool.h"
#include "TrackVertexAssociationTool/BaseTrackVertexAssociationTool.h"
#include "TrackVertexAssociationTool/ElectronTrackVertexAssociationTool.h"
#include "TrackVertexAssociationTool/MuonTrackVertexAssociationTool.h"
-// Algs
#include "../TrackVertexAssoTestAlg.h"
using namespace xAOD;
@@ -18,14 +14,4 @@ DECLARE_NAMESPACE_TOOL_FACTORY(CP,BaseTrackVertexAssociationTool)
DECLARE_NAMESPACE_TOOL_FACTORY(CP,ElectronTrackVertexAssociationTool)
DECLARE_NAMESPACE_TOOL_FACTORY(CP,MuonTrackVertexAssociationTool)
DECLARE_ALGORITHM_FACTORY(TrackVertexAssoTestAlg)
-//
-DECLARE_FACTORY_ENTRIES(TrackVertexAssociationTool) {
- DECLARE_NAMESPACE_TOOL(CP,LooseTrackVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL(CP,TightTrackVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL(CP,BaseTrackVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL(CP,ElectronTrackVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL(CP,MuonTrackVertexAssociationTool)
- // Algs
- DECLARE_ALGORITHM(TrackVertexAssoTestAlg)
-}
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_load.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_load.cxx
deleted file mode 100644
index 2ecc63f07c6..00000000000
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrackVertexAssociationTool)
diff --git a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_entries.cxx b/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_entries.cxx
old mode 100755
new mode 100644
index 1d95e2fffa8..d818e0b7551
--- a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_entries.cxx
+++ b/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_entries.cxx
@@ -1,11 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_PAI_Process/TRT_PAI_Process.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
DECLARE_TOOL_FACTORY( TRT_PAI_Process )
-DECLARE_FACTORY_ENTRIES( TRT_PAI_Process )
-{
- DECLARE_TOOL( TRT_PAI_Process )
-}
-
diff --git a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_load.cxx b/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_load.cxx
deleted file mode 100755
index da13e26faa8..00000000000
--- a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_PAI_Process )
-
diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_entries.cxx b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_entries.cxx
index aa9bed19e1f..6a9731e808d 100644
--- a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_entries.cxx
+++ b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_entries.cxx
@@ -1,11 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../TRTPhysicsTool.h"
DECLARE_TOOL_FACTORY( TRTPhysicsTool )
-DECLARE_FACTORY_ENTRIES( TRT_TR_Process ) {
- DECLARE_TOOL( TRTPhysicsTool )
-}
+
diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_load.cxx b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_load.cxx
deleted file mode 100644
index 6cac7df5a8d..00000000000
--- a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( TRT_TR_Process )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_entries.cxx
old mode 100755
new mode 100644
index 6a0dc6743dc..503e564f919
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigAmbiguitySolver/InDetTrigAmbiguitySolver.h"
#include "TrkTrack/Track.h"
@@ -6,12 +5,3 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( InDetTrigAmbiguitySolver )
-DECLARE_FACTORY_ENTRIES( InDetTrigAmbiguitySolver )
-{
- DECLARE_ALGORITHM( InDetTrigAmbiguitySolver )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_load.cxx
deleted file mode 100755
index 39d8140b8f7..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigAmbiguitySolver )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_entries.cxx
old mode 100755
new mode 100644
index a52b3666c33..5aeda17ecb1
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_entries.cxx
@@ -1,11 +1,6 @@
#include "InDetTrigConversionFinder/TrigConversionFinder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TrigConversionFinder )
-DECLARE_FACTORY_ENTRIES(InDetTrigConversionFinder)
-{
- DECLARE_ALGORITHM( TrigConversionFinder )
-}
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_load.cxx
deleted file mode 100755
index a00cf05a05d..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigConversionFinder )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_entries.cxx
old mode 100755
new mode 100644
index 27bf8e6f211..e317c818dde
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_entries.cxx
@@ -1,13 +1,5 @@
#include "InDetTrigExtensProcessor/InDetTrigExtensProcessor.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetTrigExtensProcessor )
-DECLARE_FACTORY_ENTRIES(InDetTrigExtensProcessor) {
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetTrigExtensProcessor)
-}
-
-
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_load.cxx
deleted file mode 100755
index 89072fdaaf7..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrigExtensProcessor)
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_entries.cxx
old mode 100755
new mode 100644
index 17d6de6d0ac..56ca04c30a2
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigParticleCreation/TrigParticleCreator.h"
#include "InDetTrigParticleCreation/TrigTrackingxAODCnv.h"
#include "../TrigTrackingxAODCnvMT.h"
@@ -13,10 +12,4 @@ DECLARE_ALGORITHM_FACTORY( TrigTrackingxAODCnvMT )
DECLARE_ALGORITHM_FACTORY( TrigVertexxAODCnv )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( InDetTrigParticleCreation )
-{
- DECLARE_ALGORITHM( TrigParticleCreator )
- DECLARE_ALGORITHM( TrigTrackingxAODCnv )
- DECLARE_ALGORITHM( TrigTrackingxAODCnvMT )
- DECLARE_ALGORITHM( TrigVertexxAODCnv )
-}
+
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_load.cxx
deleted file mode 100755
index 1709e0d7b6b..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigParticleCreation )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_entries.cxx
old mode 100755
new mode 100644
index 8f32d8c8c8f..9063069c382
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_entries.cxx
@@ -3,7 +3,6 @@
#include "InDetTrigPrepRawDataFormat/TRT_TrgRIO_Maker.h"
#include "InDetTrigPrepRawDataFormat/FTK_TrackMaker.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
@@ -12,12 +11,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, Pixel_TrgClusterization )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_TrgRIO_Maker )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, FTK_TrackMaker )
-DECLARE_FACTORY_ENTRIES( InDetTrigPrepRawDataFormat )
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet, SCT_TrgClusterization )
- DECLARE_NAMESPACE_ALGORITHM( InDet, Pixel_TrgClusterization )
- DECLARE_NAMESPACE_ALGORITHM( InDet, TRT_TrgRIO_Maker )
- DECLARE_NAMESPACE_ALGORITHM( InDet, FTK_TrackMaker )
-}
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_load.cxx
deleted file mode 100755
index 9cd2df319ed..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrigPrepRawDataFormat)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_entries.cxx
old mode 100755
new mode 100644
index ea1b37919e9..bf8a84450a8
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigPriVxFinder/TrigVxPrimary.h"
#include "InDetTrigPriVxFinder/TrigVxPrimaryAllTE.h"
#include "TrkTrack/Track.h"
@@ -8,9 +7,3 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TrigVxPrimary )
DECLARE_ALGORITHM_FACTORY( TrigVxPrimaryAllTE )
-DECLARE_FACTORY_ENTRIES( InDetTrigPriVxFinder )
-{
- DECLARE_ALGORITHM( TrigVxPrimary )
- DECLARE_ALGORITHM( TrigVxPrimaryAllTE )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_load.cxx
deleted file mode 100755
index f2c83bfcfba..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigPriVxFinder )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_entries.cxx
old mode 100755
new mode 100644
index 628ff0384f9..e1525c007b8
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_entries.cxx
@@ -2,19 +2,7 @@
#include "InDetTrigRawDataProvider/TrigPixRawDataProvider.h"
#include "InDetTrigRawDataProvider/TrigSCTRawDataProvider.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-//using namespace InDet;
-
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TrigPixRawDataProvider )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TrigSCTRawDataProvider )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TrigTRTRawDataProvider )
-DECLARE_FACTORY_ENTRIES( InDetTrigRawDataProvider )
-{
- DECLARE_NAMESPACE_TOOL( InDet, TrigPixRawDataProvider )
- DECLARE_NAMESPACE_TOOL( InDet, TrigSCTRawDataProvider )
- DECLARE_NAMESPACE_TOOL( InDet, TrigTRTRawDataProvider )
-}
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_load.cxx
deleted file mode 100755
index 1a0eebbe134..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrigRawDataProvider)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_entries.cxx
index 0f877177f82..653ac56e5c4 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigTrackCollectionMerger/TrigTrackCollectionMerger.h"
#include "InDetTrigTrackCollectionMerger/SimpleTrigTrackCollMerger.h"
#include "TrkTrack/Track.h"
@@ -12,9 +11,3 @@ using namespace Trk;
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, TrigTrackCollectionMerger )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, SimpleTrigTrackCollMerger )
-DECLARE_FACTORY_ENTRIES( InDetTrigTrackCollectionMerger )
-{
- DECLARE_NAMESPACE_ALGORITHM( Trk, TrigTrackCollectionMerger )
- DECLARE_NAMESPACE_ALGORITHM( Trk, SimpleTrigTrackCollMerger )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_load.cxx
deleted file mode 100644
index 6758c62aeb0..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrigTrackCollectionMerger)
-LOAD_FACTORY_ENTRIES( SimpleTrigTrackCollMerger)
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_entries.cxx
old mode 100755
new mode 100644
index 3bf4f01dc68..a9ffce7aba2
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigTrackPRD_Association/InDetTrigTrackPRD_Association.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( InDetTrigTrackPRD_Association )
-DECLARE_FACTORY_ENTRIES( InDetTrigTrackPRD_Association )
-{
- DECLARE_ALGORITHM( InDetTrigTrackPRD_Association )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_load.cxx
deleted file mode 100755
index f87894d9233..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrigTrackPRD_Association)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_entries.cxx
old mode 100755
new mode 100644
index 13d0f6f63d9..b837bc5a3bf
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigTrackResidualMonitor/TrigTrackResidualMonitor.h"
#include "TrkTrack/Track.h"
@@ -7,7 +6,4 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TrigTrackResidualMonitor )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( InDetTrigTrackResidualMonitor )
-{
- DECLARE_ALGORITHM( TrigTrackResidualMonitor )
-}
+
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_load.cxx
deleted file mode 100755
index 727bb5d3b6e..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigTrackResidualMonitor )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_entries.cxx
old mode 100755
new mode 100644
index 6e816dd8b55..0f739395cb0
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigTrackSlimmer/TrigTrackSlimmer.h"
#include "TrkTrack/Track.h"
@@ -7,7 +6,4 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TrigTrackSlimmer )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( InDetTrigTrackSlimmer )
-{
- DECLARE_ALGORITHM( TrigTrackSlimmer )
-}
+
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_load.cxx
deleted file mode 100755
index df5d366f723..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigTrackSlimmer )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_entries.cxx
old mode 100755
new mode 100644
index d84aff19ed8..ae91bb0ed94
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigTruthAlgs/TrigTrackParticleTruthMaker.h"
#include "InDetTrigTruthAlgs/PRD_TrigMultiTruthMaker.h"
#include "InDetTrigTruthAlgs/InDetTrigDetailedTrackTruthMaker.h"
@@ -10,9 +9,3 @@ DECLARE_ALGORITHM_FACTORY( TrigTrackParticleTruthMaker )
DECLARE_ALGORITHM_FACTORY( PRD_TrigMultiTruthMaker )
DECLARE_ALGORITHM_FACTORY( InDetTrigDetailedTrackTruthMaker )
-DECLARE_FACTORY_ENTRIES( InDetTrigTruthAlgs )
-{
- DECLARE_ALGORITHM( TrigTrackParticleTruthMaker )
- DECLARE_ALGORITHM( PRD_TrigMultiTruthMaker )
- DECLARE_ALGORITHM( InDetTrigDetailedTrackTruthMaker )
-}
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_load.cxx
deleted file mode 100755
index c5b7307d092..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigTruthAlgs )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_entries.cxx
old mode 100755
new mode 100644
index bb759196386..353c9782ac2
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigVxSecondary/TrigVxSecondary.h"
#include "InDetTrigVxSecondary/TrigVxSecondaryCombo.h"
@@ -7,8 +6,3 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TrigVxSecondary )
DECLARE_ALGORITHM_FACTORY( TrigVxSecondaryCombo )
- DECLARE_FACTORY_ENTRIES( InDetTrigVxSecondary ) {
- DECLARE_ALGORITHM( TrigVxSecondary )
- DECLARE_ALGORITHM( TrigVxSecondaryCombo )
- }
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_load.cxx
deleted file mode 100755
index 025bd6b2a4c..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigVxSecondary )
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx
old mode 100755
new mode 100644
index e4623c42dcc..049993c01cc
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h"
#include "InDetRecToolInterfaces/ISiSpacePointsSeedMaker.h"
@@ -10,8 +9,3 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( SiTrigSPSeededTrackFinder )
-DECLARE_FACTORY_ENTRIES( SiTrigSPSeededTrackFinder )
-{
- DECLARE_ALGORITHM( SiTrigSPSeededTrackFinder )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_load.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_load.cxx
deleted file mode 100755
index 25fcf32636b..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SiTrigSPSeededTrackFinder)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_entries.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_entries.cxx
old mode 100755
new mode 100644
index 02248e9c3df..63ac69e7e9b
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_entries.cxx
@@ -1,17 +1,8 @@
#include "SCT_TrigSpacePointTool.h"
#include "SiTrigSpacePointFormation/SiTrigSpacePointFinder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SCT_TrigSpacePointTool )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, SiTrigSpacePointFinder )
-DECLARE_FACTORY_ENTRIES(SiTrigSpacePointFormation)
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet, SiTrigSpacePointFinder )
- DECLARE_NAMESPACE_TOOL( InDet, SCT_TrigSpacePointTool )
-
-}
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_load.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_load.cxx
deleted file mode 100755
index bd3eb9e8985..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiTrigSpacePointFormation)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_entries.cxx
old mode 100755
new mode 100644
index a94e93cb1a6..98eab4ed8b6
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrigSeededTrackFinder/TRT_TrigSeededTrackFinder.h"
#include "IRegionSelector/IRegSelSvc.h"
@@ -6,8 +5,3 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TRT_TrigSeededTrackFinder )
-DECLARE_FACTORY_ENTRIES( TRT_TrigSeededTrackFinder )
-{
- DECLARE_ALGORITHM( TRT_TrigSeededTrackFinder )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_load.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_load.cxx
deleted file mode 100755
index 3745b567901..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrigSeededTrackFinder)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_entries.cxx
old mode 100755
new mode 100644
index b4afe715fe1..5710295254b
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrigStandaloneTrackFinder/TRT_TrigStandaloneTrackFinder.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TRT_TrigStandaloneTrackFinder )
-DECLARE_FACTORY_ENTRIES( TRT_TrigStandaloneTrackFinder )
-{
- DECLARE_ALGORITHM( TRT_TrigStandaloneTrackFinder )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_load.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_load.cxx
deleted file mode 100755
index 30cf8ee1ea1..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrigStandaloneTrackFinder)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_entries.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_entries.cxx
old mode 100755
new mode 100644
index 1d0c56c870a..f40a858785b
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrigTrackExtensionAlg/TRT_TrigTrackExtensionAlg.h"
#include "InDetRecToolInterfaces/ITRT_TrackExtensionTool.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_TrigTrackExtensionAlg )
-DECLARE_FACTORY_ENTRIES( TRT_TrigTrackExtensionAlg )
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet, TRT_TrigTrackExtensionAlg )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_load.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_load.cxx
deleted file mode 100755
index 115841ae8a7..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrigTrackExtensionAlg )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx
old mode 100755
new mode 100644
index 1614d8c717a..d0034203269
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder.h"
#include "IRegionSelector/IRegSelSvc.h"
@@ -6,8 +5,3 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TRT_TrigTrackSegmentsFinder )
-DECLARE_FACTORY_ENTRIES( TRT_TrigTrackSegmentsFinder )
-{
- DECLARE_ALGORITHM( TRT_TrigTrackSegmentsFinder )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_load.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_load.cxx
deleted file mode 100755
index 2270882a101..00000000000
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrigTrackSegmentsFinder)
-
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_entries.cxx b/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_entries.cxx
old mode 100755
new mode 100644
index f5fb5452858..5e621d3ca79
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_entries.cxx
+++ b/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTruthAlgs/PRD_MultiTruthMaker.h"
#include "InDetTruthAlgs/InDetDetailedTrackTruthMaker.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetDetailedTrackTruthMaker )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, PRD_MultiTruthMaker )
-DECLARE_FACTORY_ENTRIES( InDetTruthAlgs )
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetDetailedTrackTruthMaker )
- DECLARE_NAMESPACE_ALGORITHM( InDet, PRD_MultiTruthMaker )
-}
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_load.cxx b/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_load.cxx
deleted file mode 100755
index beeb6f009d9..00000000000
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTruthAlgs )
-
diff --git a/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_entries.cxx b/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_entries.cxx
old mode 100755
new mode 100644
index 7e1963181ba..fcf7829950d
--- a/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_entries.cxx
+++ b/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_entries.cxx
@@ -2,16 +2,9 @@
#include "InDetTruthTools/PRD_TruthTrajectorySorterID.h"
#include "InDetTruthTools/PRD_TruthTrajectoryManipulatorID.h"
#include "InDetTruthTools/PRD_TruthTrajectorySelectorID.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PRD_MultiTruthBuilder)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PRD_TruthTrajectorySorterID)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PRD_TruthTrajectoryManipulatorID)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PRD_TruthTrajectorySelectorID)
-DECLARE_FACTORY_ENTRIES(InDetTruthTools) {
-DECLARE_NAMESPACE_TOOL(InDet, PRD_MultiTruthBuilder)
-DECLARE_NAMESPACE_TOOL(InDet, PRD_TruthTrajectorySorterID)
-DECLARE_NAMESPACE_TOOL(InDet, PRD_TruthTrajectoryManipulatorID)
-DECLARE_NAMESPACE_TOOL(InDet, PRD_TruthTrajectorySelectorID)
-}
diff --git a/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_load.cxx b/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_load.cxx
deleted file mode 100755
index c93797062ea..00000000000
--- a/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTruthTools)
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_entries.cxx b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_entries.cxx
old mode 100755
new mode 100644
index 6ce9414bb7b..51daa4030ba
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_entries.cxx
@@ -1,6 +1,5 @@
#include "InDetPerformanceRTT/IDStandardPerformance.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(IDStandardPerformance)
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_load.cxx b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_load.cxx
deleted file mode 100755
index 6858111c045..00000000000
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetPerformanceRTT)
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_entries.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_entries.cxx
index d39857ac457..1374ce8448b 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetPhysValMonitoring/InDetPhysValMonitoringTool.h"
#include "InDetPhysValMonitoring/InDetPhysValLargeD0Tool.h"
#include "../InDetPhysValTruthDecoratorTool.h"
@@ -32,22 +31,3 @@ DECLARE_TOOL_FACTORY(TrackSelectionTool)
DECLARE_TOOL_FACTORY( DummyTrackSlimmingTool)
DECLARE_TOOL_FACTORY( AthTruthSelectionTool)
-DECLARE_FACTORY_ENTRIES(InDetPhysValMonitoring){
- DECLARE_ALGORITHM( InDetPhysValDecoratorAlg )
- DECLARE_ALGORITHM( AlgTestHistoDefSvc )
- DECLARE_SERVICE(HistogramDefinitionSvc)
- DECLARE_TOOL(InDetPhysValMonitoringTool)
- DECLARE_TOOL(InDetPhysValLargeD0Tool)
- DECLARE_TOOL(ToolTestMonitoringPlots)
- DECLARE_TOOL(InDetPhysValTruthDecoratorTool)
- DECLARE_TOOL(InDetPhysHitDecoratorTool)
- DECLARE_TOOL(ParameterErrDecoratorTool)
- DECLARE_TOOL(TruthClassDecoratorTool)
- DECLARE_TOOL(TrackTruthSelectionTool)
- DECLARE_TOOL(dRMatchingTool)
- DECLARE_TOOL(TrackSelectionTool)
- DECLARE_TOOL( DummyTrackSlimmingTool)
- DECLARE_TOOL( AthTruthSelectionTool)
-
-}
-
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_load.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_load.cxx
deleted file mode 100644
index bdea3a3d2ab..00000000000
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetPhysValMonitoring)
-
\ No newline at end of file
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_entries.cxx b/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_entries.cxx
old mode 100755
new mode 100644
index 2bc9a384ba5..87166c3306f
--- a/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_entries.cxx
@@ -1,8 +1,4 @@
#include "InDetRecStatistics/InDetRecStatisticsAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetRecStatisticsAlg)
-DECLARE_FACTORY_ENTRIES(InDetRecStatistics) {
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetRecStatisticsAlg )
-}
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_load.cxx b/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_load.cxx
deleted file mode 100755
index ceb672214b3..00000000000
--- a/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetRecStatistics)
diff --git a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_entries.cxx b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_entries.cxx
old mode 100755
new mode 100644
index cb250e21836..2db92704671
--- a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_entries.cxx
@@ -1,11 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetSegmentDriftCircleAssValidation/SegmentDriftCircleAssValidation.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, SegmentDriftCircleAssValidation )
-DECLARE_FACTORY_ENTRIES( InDetSegmentDriftCircleAssValidation )
-{
- DECLARE_NAMESPACE_ALGORITHM(InDet, SegmentDriftCircleAssValidation )
-}
-
-
diff --git a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_load.cxx b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_load.cxx
deleted file mode 100644
index d6dcb2224aa..00000000000
--- a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetSegmentDriftCircleAssValidation)
-
diff --git a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_entries.cxx b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_entries.cxx
old mode 100755
new mode 100644
index bfa47680ed6..35072cd63de
--- a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_entries.cxx
@@ -1,11 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrackClusterAssValidation/TrackClusterAssValidation.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, TrackClusterAssValidation )
-DECLARE_FACTORY_ENTRIES( InDetTrackClusterAssValidation )
-{
- DECLARE_NAMESPACE_ALGORITHM(InDet, TrackClusterAssValidation )
-}
-
-
diff --git a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_load.cxx b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_load.cxx
deleted file mode 100755
index 3ddf7544d4e..00000000000
--- a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrackClusterAssValidation)
-
diff --git a/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_entries.cxx b/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_entries.cxx
index 525458f8e11..721160e6c0c 100644
--- a/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_entries.cxx
@@ -1,7 +1,3 @@
#include "InDetTrackSplitterTool/InDetTrackSplitterTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackSplitterTool )
-DECLARE_FACTORY_ENTRIES(InDetTrackSplitterTool)
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrackSplitterTool );
-}
+
diff --git a/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_load.cxx b/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_load.cxx
deleted file mode 100644
index c512c6b0624..00000000000
--- a/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrackSplitterTool )
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_entries.cxx b/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_entries.cxx
old mode 100755
new mode 100644
index bc84e751e9b..52f1c38d6c5
--- a/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_entries.cxx
@@ -1,19 +1,8 @@
-
#include "InDetTrackValidation/SCT_ClusterValidationNtupleWriter.h"
#include "InDetTrackValidation/InDetSplittedTracksCreator.h"
#include "InDetTrackValidation/HoleSearchValidation.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-//using namespace InDet;
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, SCT_ClusterValidationNtupleWriter )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetSplittedTracksCreator )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, HoleSearchValidation )
-DECLARE_FACTORY_ENTRIES(InDetTrackValidation)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_ALGORITHM( InDet, SCT_ClusterValidationNtupleWriter)
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetSplittedTracksCreator )
- DECLARE_NAMESPACE_ALGORITHM( InDet, HoleSearchValidation )
-}
-
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_load.cxx b/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_load.cxx
deleted file mode 100755
index 8fcefee8694..00000000000
--- a/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrackValidation)
diff --git a/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_entries.cxx b/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_entries.cxx
index 3ace98bcaee..09883e02df4 100644
--- a/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_entries.cxx
@@ -1,14 +1,8 @@
#include "../InDetVertexSplitter.h"
#include "../InDetVertexSplitterHist.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( InDetVertexSplitter )
DECLARE_ALGORITHM_FACTORY( InDetVertexSplitterHist )
-DECLARE_FACTORY_ENTRIES ( InDetVertexSplitter )
-{
- DECLARE_ALGORITHM( InDetVertexSplitter )
- DECLARE_ALGORITHM( InDetVertexSplitterHist )
-}
diff --git a/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_load.cxx b/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_load.cxx
deleted file mode 100644
index 5a0eddf7f1a..00000000000
--- a/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetVertexSplitter )
-
diff --git a/Reconstruction/DiTauRec/src/components/DiTauRec_load.cxx b/Reconstruction/DiTauRec/src/components/DiTauRec_load.cxx
deleted file mode 100644
index f4bcb00c12f..00000000000
--- a/Reconstruction/DiTauRec/src/components/DiTauRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(DiTauRec)
diff --git a/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_load.cxx b/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_load.cxx
deleted file mode 100755
index acc53fbd197..00000000000
--- a/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(EventShapeTools)
diff --git a/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_load.cxx b/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_load.cxx
deleted file mode 100755
index 82b0ba27ee4..00000000000
--- a/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( HIGlobal )
-
-
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_load.cxx b/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_load.cxx
deleted file mode 100644
index 341628605e1..00000000000
--- a/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(HIJetRec)
-
diff --git a/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_load.cxx b/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_load.cxx
deleted file mode 100644
index 72fe5c813a4..00000000000
--- a/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(HIMonitoring)
\ No newline at end of file
diff --git a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_load.cxx b/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_load.cxx
deleted file mode 100644
index ecb4b8cdbf8..00000000000
--- a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(JetTileCorrection)
diff --git a/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_load.cxx b/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_load.cxx
deleted file mode 100644
index f835c23a550..00000000000
--- a/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetCalibTools)
-
-
diff --git a/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_load.cxx b/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_load.cxx
deleted file mode 100644
index aedca1c6f7c..00000000000
--- a/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( JetJvtEfficiency)
diff --git a/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_load.cxx b/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_load.cxx
deleted file mode 100644
index 0e6ec8f4140..00000000000
--- a/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// JetRec_load.cxx
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetMomentTools)
diff --git a/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_load.cxx b/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_load.cxx
deleted file mode 100755
index d1a1ecf37ec..00000000000
--- a/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetMonitoring)
diff --git a/Reconstruction/Jet/JetRec/src/components/JetRec_load.cxx b/Reconstruction/Jet/JetRec/src/components/JetRec_load.cxx
deleted file mode 100644
index af1315591b0..00000000000
--- a/Reconstruction/Jet/JetRec/src/components/JetRec_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// JetRec_load.cxx
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetRec)
diff --git a/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_load.cxx b/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_load.cxx
deleted file mode 100644
index 25da647123d..00000000000
--- a/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetRecCalo)
diff --git a/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_load.cxx b/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_load.cxx
deleted file mode 100755
index 7744bcf9d09..00000000000
--- a/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetRecTools)
diff --git a/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_load.cxx b/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_load.cxx
deleted file mode 100644
index 91031247507..00000000000
--- a/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(JetReclustering)
diff --git a/Reconstruction/Jet/JetResolution/src/components/JetResolution_load.cxx b/Reconstruction/Jet/JetResolution/src/components/JetResolution_load.cxx
deleted file mode 100644
index eb2bae660a9..00000000000
--- a/Reconstruction/Jet/JetResolution/src/components/JetResolution_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena includes
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure
-LOAD_FACTORY_ENTRIES( JetResolution )
diff --git a/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_load.cxx b/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_load.cxx
deleted file mode 100755
index 25ff83d6cea..00000000000
--- a/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetSimTools)
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_load.cxx b/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_load.cxx
deleted file mode 100644
index 9aff038f171..00000000000
--- a/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// JetSubStructureMomentTools_load.cxx
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetSubStructureMomentTools)
diff --git a/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_load.cxx b/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_load.cxx
deleted file mode 100644
index ec42422977b..00000000000
--- a/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES(JetUncertainties)
diff --git a/Reconstruction/Jet/JetValidation/src/components/JetValidation_load.cxx b/Reconstruction/Jet/JetValidation/src/components/JetValidation_load.cxx
deleted file mode 100644
index 038179a4704..00000000000
--- a/Reconstruction/Jet/JetValidation/src/components/JetValidation_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(JetValidation)
diff --git a/Reconstruction/MET/METReconstruction/src/components/METReconstruction_load.cxx b/Reconstruction/MET/METReconstruction/src/components/METReconstruction_load.cxx
deleted file mode 100644
index ec06f87ad6e..00000000000
--- a/Reconstruction/MET/METReconstruction/src/components/METReconstruction_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(METReconstruction)
diff --git a/Reconstruction/MET/METUtilities/src/components/METUtilities_load.cxx b/Reconstruction/MET/METUtilities/src/components/METUtilities_load.cxx
deleted file mode 100644
index b0c3390521c..00000000000
--- a/Reconstruction/MET/METUtilities/src/components/METUtilities_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(METUtilities)
diff --git a/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_load.cxx b/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_load.cxx
deleted file mode 100644
index a4c4033e431..00000000000
--- a/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MissingETGoodness)
-
diff --git a/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_load.cxx b/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_load.cxx
deleted file mode 100755
index 967aa3f132f..00000000000
--- a/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MissingETMonitoring)
diff --git a/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_load.cxx b/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_load.cxx
deleted file mode 100755
index b7ae4d41940..00000000000
--- a/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( MissingETPerformance )
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_load.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_load.cxx
deleted file mode 100755
index aef4db52da8..00000000000
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CaloTrkMuIdTools )
diff --git a/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_load.cxx b/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_load.cxx
deleted file mode 100644
index 6b7ff242a09..00000000000
--- a/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkRefitAlg)
-
-
diff --git a/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_load.cxx b/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_load.cxx
deleted file mode 100644
index 7f0f898cf90..00000000000
--- a/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuGirl)
diff --git a/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_load.cxx b/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_load.cxx
deleted file mode 100644
index ba491661b5e..00000000000
--- a/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlCandidate )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_load.cxx b/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_load.cxx
deleted file mode 100644
index 7d2c46196ba..00000000000
--- a/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlGlobalFit )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_load.cxx b/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_load.cxx
deleted file mode 100644
index 89cfbf50c04..00000000000
--- a/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlParticleCreatorTool )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_load.cxx b/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_load.cxx
deleted file mode 100644
index 6d56e1d2ecb..00000000000
--- a/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlPerformanceTools )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_load.cxx b/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_load.cxx
deleted file mode 100644
index 1db364e34c1..00000000000
--- a/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlSelection )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_load.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_load.cxx
deleted file mode 100644
index 7668371b9ab..00000000000
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlStau )
-
diff --git a/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_load.cxx b/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_load.cxx
deleted file mode 100755
index d8ef51577bf..00000000000
--- a/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_load.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuidCaloEnergyTools)
-
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
-
-
diff --git a/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_load.cxx b/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_load.cxx
deleted file mode 100755
index efb3842c5f7..00000000000
--- a/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuidCaloIsolationTools )
diff --git a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_load.cxx b/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_load.cxx
deleted file mode 100755
index effee9176f4..00000000000
--- a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuidCaloScatteringTools )
-
diff --git a/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_load.cxx b/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_load.cxx
deleted file mode 100644
index 2b9bb67dc0a..00000000000
--- a/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuidMuidCombinedTools )
diff --git a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_load.cxx b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_load.cxx
deleted file mode 100755
index 115d97a6922..00000000000
--- a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuidTrackBuilder)
-
diff --git a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_load.cxx b/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_load.cxx
deleted file mode 100644
index 3aab1722bd4..00000000000
--- a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedEventStoreAlgs )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_load.cxx
deleted file mode 100644
index 9e8e1737663..00000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedAlgs )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_load.cxx
deleted file mode 100644
index 9e8e1737663..00000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedAlgs )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_load.cxx
deleted file mode 100644
index 7da912d5682..00000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedEvaluationTools )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_load.cxx
deleted file mode 100644
index 9cf28e1fc58..00000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedTestTools )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_load.cxx
deleted file mode 100644
index 894b821dc1b..00000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedTimingTools )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_load.cxx
deleted file mode 100755
index fcd623b1d26..00000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedTrackFindingTools )
diff --git a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_load.cxx b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_load.cxx
deleted file mode 100644
index f83ebc4f784..00000000000
--- a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonSegmentTaggerTools)
diff --git a/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_load.cxx b/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_load.cxx
deleted file mode 100644
index c23283887da..00000000000
--- a/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( MuonSpShowerBuilderAlgs )
diff --git a/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_load.cxx b/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_load.cxx
deleted file mode 100644
index eba0afe240a..00000000000
--- a/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(PFlowUtils)
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_load.cxx b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_load.cxx
deleted file mode 100644
index f9017ac5d81..00000000000
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( PFODQA)
diff --git a/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_load.cxx b/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_load.cxx
deleted file mode 100644
index 5316f811bd9..00000000000
--- a/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PanTauAlgs )
-
diff --git a/Reconstruction/RecAlgs/src/components/RecAlgs_load.cxx b/Reconstruction/RecAlgs/src/components/RecAlgs_load.cxx
deleted file mode 100755
index 36c0d478e78..00000000000
--- a/Reconstruction/RecAlgs/src/components/RecAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( RecAlgs )
-
diff --git a/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_load.cxx b/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_load.cxx
deleted file mode 100755
index 187039bef22..00000000000
--- a/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RecBackgroundAlgs)
diff --git a/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_load.cxx b/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_load.cxx
deleted file mode 100755
index 71e306fea4a..00000000000
--- a/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( RecExAlgs )
-
diff --git a/Reconstruction/RecJiveXML/src/components/RecJiveXML_load.cxx b/Reconstruction/RecJiveXML/src/components/RecJiveXML_load.cxx
deleted file mode 100755
index df21b4bcc67..00000000000
--- a/Reconstruction/RecJiveXML/src/components/RecJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RecJiveXML)
diff --git a/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_load.cxx b/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_load.cxx
deleted file mode 100644
index d03c7eed3c0..00000000000
--- a/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CaloRingerAlgs )
-
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_load.cxx b/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_load.cxx
deleted file mode 100644
index 89d79ccd506..00000000000
--- a/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(IsolationAlgs)
diff --git a/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_load.cxx b/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_load.cxx
deleted file mode 100644
index a4b13428ba2..00000000000
--- a/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrackParticleAssociationAlgs )
-
diff --git a/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_load.cxx b/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_load.cxx
deleted file mode 100644
index 0cc31f08534..00000000000
--- a/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloCusterMatching)
diff --git a/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_load.cxx b/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_load.cxx
deleted file mode 100644
index 6d6b06cbb70..00000000000
--- a/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CaloRingerTools )
-
diff --git a/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_load.cxx b/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_load.cxx
deleted file mode 100644
index e61116c8e26..00000000000
--- a/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id: IsolationTool_load.cxx 770003 2016-08-25 08:54:14Z krasznaa $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( IsolationTool )
diff --git a/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_load.cxx b/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_load.cxx
deleted file mode 100644
index f34bf991a4f..00000000000
--- a/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ParticlesInConeTools )
-
diff --git a/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_load.cxx b/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_load.cxx
deleted file mode 100755
index 1bc4de99b78..00000000000
--- a/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrackToCalo )
diff --git a/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_load.cxx b/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_load.cxx
deleted file mode 100755
index 0656f41487f..00000000000
--- a/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrackToVertex )
-
diff --git a/Reconstruction/TRT_Rec/src/components/TRT_Rec_load.cxx b/Reconstruction/TRT_Rec/src/components/TRT_Rec_load.cxx
deleted file mode 100755
index ca273b50eb9..00000000000
--- a/Reconstruction/TRT_Rec/src/components/TRT_Rec_load.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-/***************************************************************************
- TRT_Rec
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: TRT_Rec_load.cxx,v 1.1 2004-02-13 17:00:14 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_Rec )
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_load.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_load.cxx
deleted file mode 100644
index 41254fc6c5c..00000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrackCaloClusterRecAlgs)
\ No newline at end of file
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_load.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_load.cxx
deleted file mode 100644
index 6d0003695c1..00000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrackCaloClusterRecTools)
\ No newline at end of file
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_load.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_load.cxx
deleted file mode 100644
index 269de5f44d1..00000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrackCaloClusterRecValidation)
\ No newline at end of file
diff --git a/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_load.cxx b/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_load.cxx
deleted file mode 100755
index be3fd6ca6ed..00000000000
--- a/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(VrtSecInclusive)
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
diff --git a/Reconstruction/eflowRec/src/components/eflowRec_load.cxx b/Reconstruction/eflowRec/src/components/eflowRec_load.cxx
deleted file mode 100644
index f6e676c5d9c..00000000000
--- a/Reconstruction/eflowRec/src/components/eflowRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(eflowRec)
diff --git a/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_load.cxx b/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_load.cxx
deleted file mode 100644
index 70a2c4d5306..00000000000
--- a/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( EgammaMonitoring )
diff --git a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_load.cxx b/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_load.cxx
deleted file mode 100755
index fcd37bbd608..00000000000
--- a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaAlgs)
-
diff --git a/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_load.cxx b/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_load.cxx
deleted file mode 100755
index 554dc55e852..00000000000
--- a/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaCaloTools)
diff --git a/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_load.cxx b/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_load.cxx
deleted file mode 100644
index 6eea1c496f3..00000000000
--- a/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( egammaMVACalib )
-
diff --git a/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_load.cxx b/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_load.cxx
deleted file mode 100755
index d9cd5e3ac97..00000000000
--- a/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaPerformance)
-
diff --git a/Reconstruction/egamma/egammaTools/src/components/egammaTools_load.cxx b/Reconstruction/egamma/egammaTools/src/components/egammaTools_load.cxx
deleted file mode 100755
index 17c91b8ae80..00000000000
--- a/Reconstruction/egamma/egammaTools/src/components/egammaTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaTools)
-
diff --git a/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_load.cxx b/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_load.cxx
deleted file mode 100755
index 17c91b8ae80..00000000000
--- a/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaTools)
-
diff --git a/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_load.cxx b/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_load.cxx
deleted file mode 100755
index 731caa2266d..00000000000
--- a/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/***************************************************************************
- iPatGeometryTools
- ATLAS Collaboration
- ***************************************************************************/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatGeometryTools )
diff --git a/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_load.cxx b/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_load.cxx
deleted file mode 100755
index 0cb5e5227da..00000000000
--- a/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatQuality )
diff --git a/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_load.cxx b/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_load.cxx
deleted file mode 100755
index 47ab7fedd22..00000000000
--- a/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_load.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-/***************************************************************************
- iPatRecAlgs
- -----------
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatRecAlgs_load.cxx,v 1.1.1.1 2002-09-10 14:09:45 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatRecAlgs )
diff --git a/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_load.cxx b/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_load.cxx
deleted file mode 100755
index 6a0c360794f..00000000000
--- a/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_load.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-/***************************************************************************
- iPatTrackFinder
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatTrackFinder_load.cxx,v 1.1 2004-07-27 12:22:57 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatTrackFinder )
diff --git a/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_load.cxx b/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_load.cxx
deleted file mode 100755
index 98b8f17fbe1..00000000000
--- a/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatTrackFitter )
-
diff --git a/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_load.cxx b/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_load.cxx
deleted file mode 100755
index c6876ccefa7..00000000000
--- a/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_load.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-/***************************************************************************
- iPatTrackFollower
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatTrackFollower_load.cxx,v 1.1 2004-07-05 16:57:57 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatTrackFollower )
diff --git a/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_load.cxx b/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_load.cxx
deleted file mode 100755
index f946c511bb5..00000000000
--- a/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_load.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-/***************************************************************************
- iPatTruthTrajectory
-
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatTruthTrajectory_load.cxx,v 1.1 2003-10-07 15:56:49 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatTruthTrajectory )
diff --git a/Reconstruction/tauMonitoring/src/components/tauMonitoring_load.cxx b/Reconstruction/tauMonitoring/src/components/tauMonitoring_load.cxx
deleted file mode 100644
index 4a0c370aafb..00000000000
--- a/Reconstruction/tauMonitoring/src/components/tauMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(tauMonitoring)
diff --git a/Reconstruction/tauRec/src/components/tauRec_load.cxx b/Reconstruction/tauRec/src/components/tauRec_load.cxx
deleted file mode 100755
index 84f141f2296..00000000000
--- a/Reconstruction/tauRec/src/components/tauRec_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(tauRec)
-
-
-
diff --git a/Reconstruction/tauRecTools/src/components/tauRecTools_load.cxx b/Reconstruction/tauRecTools/src/components/tauRecTools_load.cxx
deleted file mode 100644
index 6b1c2188830..00000000000
--- a/Reconstruction/tauRecTools/src/components/tauRecTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(tauRecTools)
-
--
GitLab