From b54b335b647ae1a32049726fc4868b30c9e565d0 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Mon, 30 Oct 2017 17:15:51 +0100
Subject: [PATCH] Remove obsolete factory entries for components in various
packages
- Delete all obsolete src/components/*_load.cxx files
- Remove obsolete DECLARE_FACTORY_ENTRIES within
src/components/*_entries.cxx
The removed macros evaluate to NULL on the Gaudi side and have been
kept only for backwards compatibility.
---
.../components/AthenaDBTestRec_entries.cxx | 7 ---
.../src/components/AthenaDBTestRec_load.cxx | 3 -
.../AthenaPoolMultiTest_entries.cxx | 19 ------
.../components/AthenaPoolMultiTest_load.cxx | 8 ---
.../src/components/AthenaPoolTest_entries.cxx | 30 ---------
.../src/components/AthenaPoolTest_load.cxx | 15 -----
.../IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx | 10 ---
.../IOVDbTestAlg/src/IOVDbTestAlg_load.cxx | 7 ---
.../src/components/CommissionRec_entries.cxx | 6 +-
.../src/components/CommissionRec_load.cxx | 3 -
.../components/CommissionUtils_entries.cxx | 4 --
.../src/components/CommissionUtils_load.cxx | 3 -
.../components/DataQualityTools_entries.cxx | 18 ------
.../src/components/DataQualityTools_load.cxx | 3 -
.../src/components/GoodRunsLists_entries.cxx | 9 ---
.../src/components/GoodRunsLists_load.cxx | 4 --
.../components/GoodRunsListsUser_entries.cxx | 8 ---
.../src/components/GoodRunsListsUser_load.cxx | 4 --
.../components/AthenaPoolCnvSvc_entries.cxx | 15 -----
.../src/components/AthenaPoolCnvSvc_load.cxx | 9 ---
.../AthenaPoolExampleAlgorithms_entries.cxx | 19 ------
.../AthenaPoolExampleAlgorithms_load.cxx | 9 ---
.../components/AthenaPoolServices_entries.cxx | 13 ----
.../components/AthenaPoolServices_load.cxx | 9 ---
.../components/AthenaPoolTools_entries.cxx | 11 ----
.../src/components/AthenaPoolTools_load.cxx | 8 ---
.../fragments/ExamplePackageCnv_entries.cxx | 12 ----
.../cmt/fragments/ExamplePackageCnv_load.cxx | 14 -----
.../EventSelectorAthenaPool_entries.cxx | 12 ----
.../EventSelectorAthenaPool_load.cxx | 9 ---
.../OutputStreamAthenaPool_entries.cxx | 14 -----
.../OutputStreamAthenaPool_load.cxx | 9 ---
.../src/components/PoolSvc_entries.cxx | 11 +---
.../PoolSvc/src/components/PoolSvc_load.cxx | 9 ---
.../src/components/RDBAccessSvc_entries.cxx | 16 -----
.../src/components/RDBAccessSvc_load.cxx | 13 ----
.../RootFileTransformations_entries.cxx | 5 +-
.../RootFileTransformations_load.cxx | 3 -
.../components/AthenaRootComps_entries.cxx | 23 -------
.../src/components/AthenaRootComps_load.cxx | 3 -
.../src/components/DBReplicaSvc_entries.cxx | 4 --
.../src/components/DBReplicaSvc_load.cxx | 3 -
.../components/CoolLumiUtilities_entries.cxx | 7 ---
.../src/components/CoolLumiUtilities_load.cxx | 3 -
.../src/components/FileStager_entries.cxx | 5 --
.../src/components/FileStager_load.cxx | 4 --
.../components/IOVDbMetaDataTool_entries.cxx | 15 -----
.../src/components/IOVDbMetaDataTool_load.cxx | 13 ----
.../src/components/IOVDbSvc_entries.cxx | 5 +-
.../IOVDbSvc/src/components/IOVDbSvc_load.cxx | 3 -
.../RegistrationServices_entries.cxx | 20 ------
.../components/RegistrationServices_load.cxx | 16 -----
.../src/components/AGDD2GeoSvc_entries.cxx | 6 --
.../src/components/AGDD2GeoSvc_load.cxx | 4 --
.../src/components/DetDescrCnvSvc_entries.cxx | 8 ---
.../src/components/DetDescrCnvSvc_load.cxx | 5 --
.../DetDescrCondExample_entries.cxx | 8 ---
.../components/DetDescrCondExample_load.cxx | 3 -
.../components/DetDescrCondTools_entries.cxx | 6 --
.../src/components/DetDescrCondTools_load.cxx | 4 --
.../src/components/DetectorStatus_entries.cxx | 5 --
.../src/components/DetectorStatus_load.cxx | 3 -
.../components/GeoModelExamples_entries.cxx | 1 +
.../src/components/GeoModelSvc_entries.cxx | 6 --
.../src/components/GeoModelSvc_load.cxx | 4 --
.../src/components/GeometryDBSvc_entries.cxx | 5 --
.../src/components/GeometryDBSvc_load.cxx | 3 -
.../src/IdDictDetDescrCnv_entries.cxx | 14 -----
.../src/IdDictDetDescrCnv_load.cxx | 9 ---
.../src/components/RegionSelector_entries.cxx | 5 --
.../src/components/RegionSelector_load.cxx | 4 --
.../src/components/Decoder_entries.cxx | 10 ---
.../src/components/Decoder_load.cxx | 3 -
.../components/AFP_Digitization_entries.cxx | 7 ---
.../src/components/AFP_Digitization_load.cxx | 2 -
.../AFP_EventAthenaPool_entries.cxx | 8 ---
.../components/AFP_EventAthenaPool_load.cxx | 2 -
.../AFP_SimEvEventAthenaPool_entries.cxx | 6 --
.../AFP_SimEvEventAthenaPool_load.cxx | 2 -
.../src/components/AFP_SimEvTPCnv_entries.cxx | 33 ----------
.../src/components/AFP_SimEvTPCnv_load.cxx | 2 -
.../src/components/AFP_G4_SD_entries.cxx | 6 --
.../src/components/AFP_G4_SD_load.cxx | 2 -
.../src/components/AFP_GeoModel_entries.cxx | 1 +
.../src/components/AFP_Geometry_entries.cxx | 4 --
.../src/components/AFP_Geometry_load.cxx | 4 --
.../src/components/AFP_Monitoring_entries.cxx | 5 --
.../src/components/AFP_Monitoring_load.cxx | 4 --
.../src/components/Raw2Digi_entries.cxx | 10 ---
.../src/components/Raw2Digi_load.cxx | 6 --
.../src/components/AFP_LocRecoEv_entries.cxx | 5 --
.../src/components/AFP_LocRecoEv_load.cxx | 3 -
.../src/components/AFP_LocReco_entries.cxx | 5 --
.../src/components/AFP_LocReco_load.cxx | 4 --
.../components/AFP_SiClusterTools_entries.cxx | 7 ---
.../components/AFP_SiClusterTools_load.cxx | 7 ---
.../src/components/AFP_SimEv_entries.cxx | 6 --
.../src/components/AFP_SimEv_load.cxx | 3 -
.../components/ALFA_BeamTransport_entries.cxx | 18 +-----
.../components/ALFA_BeamTransport_load.cxx | 13 ----
.../src/components/ALFA_CLinkAlg_entries.cxx | 4 --
.../src/components/ALFA_CLinkAlg_load.cxx | 3 -
.../src/components/ALFA_CLinkEv_entries.cxx | 4 --
.../src/components/ALFA_CLinkEv_load.cxx | 3 -
.../components/ALFA_Digitization_entries.cxx | 6 --
.../src/components/ALFA_Digitization_load.cxx | 4 --
.../ALFA_EventAthenaPool_entries.cxx | 15 -----
.../components/ALFA_EventAthenaPool_load.cxx | 2 -
.../ALFA_SimEvEventAthenaPool_entries.cxx | 8 ---
.../ALFA_SimEvEventAthenaPool_load.cxx | 2 -
.../components/ALFA_SimEvTPCnv_entries.cxx | 62 -------------------
.../src/components/ALFA_SimEvTPCnv_load.cxx | 2 -
.../ALFA_RawDataByteStreamCnv_entries.cxx | 12 ----
.../ALFA_RawDataByteStreamCnv_load.cxx | 2 -
.../src/components/ALFA_G4_SD_entries.cxx | 5 --
.../src/components/ALFA_G4_SD_load.cxx | 3 -
.../src/components/ALFA_GeoModel_entries.cxx | 1 +
.../src/components/ALFA_Geometry_entries.cxx | 4 --
.../src/components/ALFA_Geometry_load.cxx | 4 --
.../src/components/ALFA_Ntuple_entries.cxx | 5 --
.../src/components/ALFA_Ntuple_load.cxx | 3 -
.../src/components/ALFA_Raw2Digit_entries.cxx | 4 --
.../src/components/ALFA_Raw2Digit_load.cxx | 4 --
.../src/components/ALFA_GloRecEv_entries.cxx | 5 --
.../src/components/ALFA_GloRecEv_load.cxx | 3 -
.../components/ALFA_LocRecCorrEv_entries.cxx | 5 --
.../src/components/ALFA_LocRecCorrEv_load.cxx | 3 -
.../src/components/ALFA_LocRecEv_entries.cxx | 5 --
.../src/components/ALFA_LocRecEv_load.cxx | 3 -
.../src/components/ALFA_GloRec_entries.cxx | 4 --
.../src/components/ALFA_GloRec_load.cxx | 3 -
.../src/components/ALFA_LocRec_entries.cxx | 4 --
.../src/components/ALFA_LocRec_load.cxx | 4 --
.../components/ALFA_LocRecCorr_entries.cxx | 4 --
.../src/components/ALFA_LocRecCorr_load.cxx | 4 --
.../src/components/ALFA_SimEv_entries.cxx | 8 ---
.../src/components/ALFA_SimEv_load.cxx | 3 -
.../ForwardIdCnv/src/ForwardIdCnv_entries.cxx | 10 ---
.../ForwardIdCnv/src/ForwardIdCnv_load.cxx | 9 ---
.../ForwardRegionGeoModel_entries.cxx | 1 +
.../ForwardRegionMgField_entries.cxx | 3 +-
.../ForwardRegionProperties_entries.cxx | 4 --
.../ForwardRegionProperties_load.cxx | 3 -
.../SimulationHitAthenaPool_entries.cxx | 4 --
.../SimulationHitAthenaPool_load.cxx | 2 -
...ulationHitCollectionAthenaPool_entries.cxx | 4 --
...SimulationHitCollectionAthenaPool_load.cxx | 2 -
.../components/SimulationHitTPCnv_entries.cxx | 9 ---
.../components/SimulationHitTPCnv_load.cxx | 2 -
.../src/components/SimulationHit_entries.cxx | 6 --
.../src/components/SimulationHit_load.cxx | 3 -
.../components/ForwardTransport_entries.cxx | 5 --
.../src/components/ForwardTransport_load.cxx | 2 -
.../ForwardTransportFast_entries.cxx | 5 --
.../components/ForwardTransportFast_load.cxx | 3 -
.../ForwardTransportSvc_entries.cxx | 5 --
.../components/ForwardTransportSvc_load.cxx | 4 --
.../LUCID_RawDataByteStreamCnv_entries.cxx | 7 ---
.../LUCID_RawDataByteStreamCnv_load.cxx | 2 -
.../components/LUCID_Digitization_entries.cxx | 6 --
.../components/LUCID_Digitization_load.cxx | 3 -
.../src/components/LUCID_G4_SD_entries.cxx | 4 --
.../src/components/LUCID_G4_SD_load.cxx | 2 -
.../src/components/LUCID_GeoModel_entries.cxx | 1 +
.../components/LUCID_Monitoring_entries.cxx | 6 --
.../src/components/LUCID_Monitoring_load.cxx | 4 --
.../components/LUCID_OpProcess_entries.cxx | 6 --
.../src/components/LUCID_OpProcess_load.cxx | 2 -
.../src/components/ZDC_GeoM_entries.cxx | 1 +
.../ZDC_SD/src/components/ZDC_SD_entries.cxx | 6 --
.../ZDC/ZDC_SD/src/components/ZDC_SD_load.cxx | 2 -
.../ZDC_SimuDigitization_entries.cxx | 7 ---
.../components/ZDC_SimuDigitization_load.cxx | 2 -
.../src/components/ZdcAnalysis_entries.cxx | 9 +--
.../src/components/ZdcByteStream_entries.cxx | 13 ----
.../src/components/ZdcByteStream_load.cxx | 3 -
.../ZdcRec/src/components/ZdcRec_entries.cxx | 11 ----
.../ZDC/ZdcRec/src/components/ZdcRec_load.cxx | 2 -
.../components/ByteStreamEmonSvc_entries.cxx | 7 ---
.../src/components/ByteStreamEmonSvc_load.cxx | 6 --
.../src/components/L2muCalibTest_entries.cxx | 5 --
.../src/components/L2muCalibTest_load.cxx | 4 --
.../src/components/MTHelloWorld_entries.cxx | 4 --
.../src/components/MTHelloWorld_load.cxx | 4 --
.../components/MTHelloWorldLvl1_entries.cxx | 4 --
.../src/components/MTHelloWorldLvl1_load.cxx | 4 --
.../components/TrigExMTHistNtup_entries.cxx | 6 --
.../src/components/TrigExMTHistNtup_load.cxx | 4 --
.../components/TrigExPartialEB_entries.cxx | 4 --
.../src/components/TrigExPartialEB_load.cxx | 3 -
.../src/components/TrigServices_entries.cxx | 12 ----
.../src/components/TrigServices_load.cxx | 3 -
.../components/TrigOnlineMonitor_entries.cxx | 7 ---
.../src/components/TrigOnlineMonitor_load.cxx | 3 -
.../src/components/LumiBlockComps_entries.cxx | 17 -----
.../src/components/LumiBlockComps_load.cxx | 3 -
.../components/MagFieldServices_entries.cxx | 5 --
.../src/components/MagFieldServices_load.cxx | 4 --
.../src/components/MagFieldUtils_entries.cxx | 6 --
.../src/components/MagFieldUtils_load.cxx | 5 --
.../src/components/OffloadSvc_entries.cxx | 4 --
.../src/components/OffloadSvc_load.cxx | 3 -
.../src/components/TBCaloGeometry_entries.cxx | 8 ---
.../src/components/TBCaloGeometry_load.cxx | 5 --
.../TBCnv/src/components/TBCnv_entries.cxx | 18 ------
TestBeam/TBCnv/src/components/TBCnv_load.cxx | 3 -
.../components/TBCaloConditions_entries.cxx | 8 ---
.../src/components/TBCaloConditions_load.cxx | 3 -
.../src/components/TBCondRunPar_entries.cxx | 5 --
.../src/components/TBCondRunPar_load.cxx | 3 -
.../src/components/TBDetDescrAlg_entries.cxx | 4 --
.../src/components/TBDetDescrAlg_load.cxx | 3 -
.../src/TBDetDescrCnv_entries.cxx | 10 ---
.../TBDetDescrCnv/src/TBDetDescrCnv_load.cxx | 9 ---
.../src/components/TBMonitoring_entries.cxx | 15 -----
.../src/components/TBMonitoring_load.cxx | 3 -
.../TBRec/src/components/TBRec_entries.cxx | 51 ---------------
TestBeam/TBRec/src/components/TBRec_load.cxx | 3 -
.../components/AthExHelloWorld_entries.cxx | 5 --
.../src/components/AthExHelloWorld_load.cxx | 4 --
.../components/ValgrindRTTJobs_entries.cxx | 4 --
.../src/components/ValgrindRTTJobs_load.cxx | 2 -
.../EventDisplayFilters_entries.cxx | 6 +-
.../components/EventDisplayFilters_load.cxx | 2 -
.../components/GeometryJiveXML_entries.cxx | 5 --
.../src/components/GeometryJiveXML_load.cxx | 3 -
.../src/components/JiveXML_entries.cxx | 12 ----
.../JiveXML/src/components/JiveXML_load.cxx | 4 --
.../src/components/VP1Algs_entries.cxx | 5 --
.../VP1Algs/src/components/VP1Algs_load.cxx | 3 -
.../src/components/VP1AlgsBatch_entries.cxx | 4 --
.../src/components/VP1AlgsBatch_load.cxx | 3 -
.../components/VP1AlgsEventProd_entries.cxx | 5 --
.../src/components/VP1AlgsEventProd_load.cxx | 3 -
.../src/components/VP1TrkAuxAlgs_entries.cxx | 5 --
.../src/components/VP1TrkAuxAlgs_load.cxx | 3 -
236 files changed, 14 insertions(+), 1543 deletions(-)
delete mode 100644 AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx
mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx
delete mode 100755 AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_load.cxx
mode change 100755 => 100644 AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx
delete mode 100755 AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_load.cxx
mode change 100755 => 100644 AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
delete mode 100755 AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_load.cxx
mode change 100755 => 100644 Commission/CommissionRec/src/components/CommissionRec_entries.cxx
delete mode 100755 Commission/CommissionRec/src/components/CommissionRec_load.cxx
delete mode 100644 Commission/CommissionUtils/src/components/CommissionUtils_load.cxx
delete mode 100644 DataQuality/DataQualityTools/src/components/DataQualityTools_load.cxx
delete mode 100644 DataQuality/GoodRunsLists/src/components/GoodRunsLists_load.cxx
delete mode 100644 DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_load.cxx
delete mode 100644 Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_load.cxx
mode change 100755 => 100644 Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx
delete mode 100755 Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_load.cxx
mode change 100755 => 100644 Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx
delete mode 100755 Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_load.cxx
mode change 100755 => 100644 Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx
delete mode 100755 Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_load.cxx
delete mode 100644 Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_load.cxx
mode change 100755 => 100644 Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx
delete mode 100755 Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_load.cxx
delete mode 100644 Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_load.cxx
delete mode 100644 Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_load.cxx
mode change 100755 => 100644 Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx
delete mode 100755 Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_load.cxx
delete mode 100644 Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_load.cxx
delete mode 100644 Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_load.cxx
mode change 100755 => 100644 Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx
delete mode 100755 Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_load.cxx
delete mode 100644 Database/CoolLumiUtilities/src/components/CoolLumiUtilities_load.cxx
delete mode 100644 Database/FileStager/src/components/FileStager_load.cxx
mode change 100755 => 100644 Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx
delete mode 100755 Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_load.cxx
delete mode 100644 Database/IOVDbSvc/src/components/IOVDbSvc_load.cxx
mode change 100755 => 100644 Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
delete mode 100755 Database/RegistrationServices/src/components/RegistrationServices_load.cxx
delete mode 100644 DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_load.cxx
mode change 100755 => 100644 DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx
delete mode 100755 DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_load.cxx
mode change 100755 => 100644 DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx
delete mode 100755 DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_load.cxx
mode change 100755 => 100644 DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx
delete mode 100755 DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_load.cxx
mode change 100755 => 100644 DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx
delete mode 100755 DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_load.cxx
mode change 100755 => 100644 DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx
mode change 100755 => 100644 DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx
delete mode 100755 DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_load.cxx
delete mode 100644 DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_load.cxx
mode change 100755 => 100644 DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
delete mode 100755 DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_load.cxx
mode change 100755 => 100644 DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx
delete mode 100755 DetectorDescription/RegionSelector/src/components/RegionSelector_load.cxx
delete mode 100644 ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_load.cxx
delete mode 100644 ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_load.cxx
delete mode 100644 ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_load.cxx
delete mode 100644 ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_load.cxx
delete mode 100644 ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_load.cxx
delete mode 100644 ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_load.cxx
mode change 100755 => 100644 ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx
delete mode 100644 ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_load.cxx
delete mode 100644 ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_load.cxx
delete mode 100644 ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_load.cxx
delete mode 100644 ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_load.cxx
delete mode 100644 ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_load.cxx
delete mode 100644 ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_load.cxx
delete mode 100644 ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_load.cxx
mode change 100755 => 100644 ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx
delete mode 100755 ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_load.cxx
mode change 100755 => 100644 ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_load.cxx
mode change 100755 => 100644 ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx
delete mode 100755 ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_load.cxx
delete mode 100644 ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_load.cxx
delete mode 100644 ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_load.cxx
mode change 100755 => 100644 ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx
delete mode 100644 ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_load.cxx
delete mode 100644 ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_load.cxx
delete mode 100644 ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_load.cxx
delete mode 100644 ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_load.cxx
delete mode 100644 ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_load.cxx
delete mode 100644 ForwardDetectors/ForwardTransport/src/components/ForwardTransport_load.cxx
delete mode 100644 ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_load.cxx
mode change 100755 => 100644 ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx
delete mode 100755 ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_load.cxx
delete mode 100644 ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_load.cxx
delete mode 100644 ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_load.cxx
delete mode 100644 ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_load.cxx
mode change 100755 => 100644 ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx
mode change 100755 => 100644 ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx
delete mode 100755 ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_load.cxx
delete mode 100644 ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_load.cxx
delete mode 100644 ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_load.cxx
delete mode 100644 ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_load.cxx
delete mode 100644 ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_load.cxx
delete mode 100644 ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_load.cxx
delete mode 100644 HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_load.cxx
mode change 100755 => 100644 HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx
delete mode 100755 HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_load.cxx
mode change 100755 => 100644 HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
delete mode 100755 HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_load.cxx
mode change 100755 => 100644 HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx
delete mode 100755 HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_load.cxx
mode change 100755 => 100644 HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx
delete mode 100755 HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_load.cxx
mode change 100755 => 100644 HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx
delete mode 100755 HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_load.cxx
delete mode 100644 HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_load.cxx
delete mode 100644 HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_load.cxx
delete mode 100644 LumiBlock/LumiBlockComps/src/components/LumiBlockComps_load.cxx
delete mode 100644 MagneticField/MagFieldServices/src/components/MagFieldServices_load.cxx
delete mode 100644 MagneticField/MagFieldUtils/src/components/MagFieldUtils_load.cxx
delete mode 100644 Offloading/OffloadSvc/src/components/OffloadSvc_load.cxx
mode change 100755 => 100644 TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx
delete mode 100755 TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_load.cxx
delete mode 100644 TestBeam/TBCnv/src/components/TBCnv_load.cxx
mode change 100755 => 100644 TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx
delete mode 100755 TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_load.cxx
mode change 100755 => 100644 TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx
delete mode 100755 TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_load.cxx
mode change 100755 => 100644 TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx
delete mode 100755 TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_load.cxx
mode change 100755 => 100644 TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
delete mode 100755 TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_load.cxx
mode change 100755 => 100644 TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx
delete mode 100755 TestBeam/TBMonitoring/src/components/TBMonitoring_load.cxx
mode change 100755 => 100644 TestBeam/TBRec/src/components/TBRec_entries.cxx
delete mode 100755 TestBeam/TBRec/src/components/TBRec_load.cxx
mode change 100755 => 100644 Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx
delete mode 100755 Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_load.cxx
delete mode 100644 Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_load.cxx
delete mode 100644 graphics/EventDisplayFilters/src/components/EventDisplayFilters_load.cxx
mode change 100755 => 100644 graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx
delete mode 100755 graphics/GeometryJiveXML/src/components/GeometryJiveXML_load.cxx
mode change 100755 => 100644 graphics/JiveXML/src/components/JiveXML_entries.cxx
delete mode 100755 graphics/JiveXML/src/components/JiveXML_load.cxx
mode change 100755 => 100644 graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx
delete mode 100755 graphics/VP1/VP1Algs/src/components/VP1Algs_load.cxx
mode change 100755 => 100644 graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx
delete mode 100755 graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_load.cxx
mode change 100755 => 100644 graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx
delete mode 100755 graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_load.cxx
delete mode 100644 graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_load.cxx
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx
index 7283eff42ad..95f998da367 100644
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx
+++ b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AthenaDBTestRec/TestCoolRecRead.h"
#include "AthenaDBTestRec/DetStoreDump.h"
DECLARE_ALGORITHM_FACTORY( TestCoolRecRead )
DECLARE_ALGORITHM_FACTORY( DetStoreDump )
-DECLARE_FACTORY_ENTRIES( AthenaDBTestRec )
-{
- DECLARE_ALGORITHM( TestCoolRecRead )
- DECLARE_ALGORITHM( DetStoreDump )
-}
-
diff --git a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx b/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx
deleted file mode 100644
index f9c746beb1e..00000000000
--- a/AtlasTest/DatabaseTest/AthenaDBTestRec/src/components/AthenaDBTestRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AthenaDBTestRec )
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx
old mode 100755
new mode 100644
index ff3540db7af..2ed3f375b2c
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_entries.cxx
@@ -1,8 +1,3 @@
-/**
- * @file AthenaPoolMultiTest_entries.cxx
- * @brief Required by Gaudi class factory
- */
-
#include "../StoreDump.h"
#include "../PassAllFilter.h"
#include "../PassNoneFilter.h"
@@ -14,7 +9,6 @@
#include "../RunEventTagWriter.h"
#include "../RunEventMetaWriter.h"
#include "../DummyLumirangeTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(StoreDump)
DECLARE_ALGORITHM_FACTORY(PassAllFilter)
@@ -28,16 +22,3 @@ DECLARE_ALGORITHM_FACTORY(RunEventTagWriter)
DECLARE_ALGORITHM_FACTORY(RunEventMetaWriter)
DECLARE_ALGORITHM_FACTORY(DummyLumirangeTool)
-DECLARE_FACTORY_ENTRIES(AthenaPoolMultiTest) {
- DECLARE_ALGORITHM(StoreDump)
- DECLARE_ALGORITHM(PassAllFilter)
- DECLARE_ALGORITHM(PassNoneFilter)
- DECLARE_ALGORITHM(AddTrigMap)
- DECLARE_ALGORITHM(EventSplit)
- DECLARE_ALGORITHM(EventTagReader)
- DECLARE_ALGORITHM(EventTagWriter)
- DECLARE_ALGORITHM(TagEventTagWriter)
- DECLARE_ALGORITHM(RunEventTagWriter)
- DECLARE_ALGORITHM(RunEventMetaWriter)
- DECLARE_ALGORITHM(DummyLumirangeTool)
-}
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_load.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_load.cxx
deleted file mode 100755
index b8a9a7543b8..00000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/components/AthenaPoolMultiTest_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @file AthenaPoolMultiTest_load.cxx
- * @brief Required by Gaudi class factory
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaPoolMultiTest)
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx
old mode 100755
new mode 100644
index c141052555e..bbe912f5a33
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_entries.cxx
@@ -1,15 +1,3 @@
-/**
- * @file AthenaPoolTest_entries.cxx
- *
- * @brief Declaration of component entry points
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Id: AthenaPoolTest_entries.cxx,v 1.25 2007-12-05 15:47:15 emoyse Exp $
- *
- */
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../InDetRawDataFakeWriter.h"
#include "../InDetRawDataFakeReader.h"
#include "../TrkTrackFakeWriter.h"
@@ -44,21 +32,3 @@ DECLARE_ALGORITHM_FACTORY(EventInfoReader)
DECLARE_ALGORITHM_FACTORY(PileUpEventInfoWriter)
DECLARE_ALGORITHM_FACTORY(PileUpEventInfoReader)
-DECLARE_FACTORY_ENTRIES(AthenaPoolTest) {
- DECLARE_ALGORITHM(AthenaPoolTestDataWriter)
- DECLARE_ALGORITHM(AthenaPoolTestDataReader)
- DECLARE_ALGORITHM(AthenaPoolTestAttrWriter)
- DECLARE_ALGORITHM(AthenaPoolTestAttrReader)
- // DECLARE_ALGORITHM(CaloClusterFakeWriter)
- // DECLARE_ALGORITHM(CaloClusterFakeReader)
- DECLARE_ALGORITHM(InDetRawDataFakeWriter)
- DECLARE_ALGORITHM(InDetRawDataFakeReader)
- DECLARE_ALGORITHM(LArCellContFakeWriter)
- DECLARE_ALGORITHM(LArCellContFakeReader)
- DECLARE_ALGORITHM(TrkTrackFakeWriter)
- DECLARE_ALGORITHM(TrkTrackFakeReader)
- DECLARE_ALGORITHM(EventInfoWriter)
- DECLARE_ALGORITHM(EventInfoReader)
- DECLARE_ALGORITHM(PileUpEventInfoWriter)
- DECLARE_ALGORITHM(PileUpEventInfoReader)
-}
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_load.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_load.cxx
deleted file mode 100755
index 1a1fbfa8708..00000000000
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/components/AthenaPoolTest_load.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @file AthenaPoolTest_load.cxx
- *
- * @brief Declaration of component factory
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Id: AthenaPoolTest_load.cxx,v 1.2 2005-01-10 18:05:52 schaffer Exp $
- *
- */
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AthenaPoolTest )
-
-
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
old mode 100755
new mode 100644
index ba1fa047e93..276c8e99560
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
@@ -1,16 +1,6 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "IOVDbTestAlg/IOVDbTestAlg.h"
#include "IOVDbTestAlg/IOVDbTestCoolDCS.h"
DECLARE_ALGORITHM_FACTORY(IOVDbTestAlg)
DECLARE_ALGORITHM_FACTORY(IOVDbTestCoolDCS)
-DECLARE_FACTORY_ENTRIES(IOVDbTestAlg) {
- DECLARE_ALGORITHM( IOVDbTestAlg );
- DECLARE_ALGORITHM( IOVDbTestCoolDCS );
-}
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_load.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_load.cxx
deleted file mode 100755
index a372dda99f6..00000000000
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_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(IOVDbTestAlg)
diff --git a/Commission/CommissionRec/src/components/CommissionRec_entries.cxx b/Commission/CommissionRec/src/components/CommissionRec_entries.cxx
old mode 100755
new mode 100644
index d40f6354196..81fe3179ba5
--- a/Commission/CommissionRec/src/components/CommissionRec_entries.cxx
+++ b/Commission/CommissionRec/src/components/CommissionRec_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "CommissionRec/ComTimeRec.h"
DECLARE_ALGORITHM_FACTORY( ComTimeRec )
-DECLARE_FACTORY_ENTRIES( CommissionRec ) {
- DECLARE_ALGORITHM( ComTimeRec )
-}
+
diff --git a/Commission/CommissionRec/src/components/CommissionRec_load.cxx b/Commission/CommissionRec/src/components/CommissionRec_load.cxx
deleted file mode 100755
index fdd38cd8473..00000000000
--- a/Commission/CommissionRec/src/components/CommissionRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CommissionRec)
diff --git a/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx b/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx
index 5d9f6c906c2..487c86e6069 100644
--- a/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx
+++ b/Commission/CommissionUtils/src/components/CommissionUtils_entries.cxx
@@ -1,9 +1,5 @@
#include "CommissionUtils/CosmicTriggerTimeTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( CosmicTriggerTimeTool )
-DECLARE_FACTORY_ENTRIES( CommissionUtils ) {
- DECLARE_TOOL( CosmicTriggerTimeTool )
-}
diff --git a/Commission/CommissionUtils/src/components/CommissionUtils_load.cxx b/Commission/CommissionUtils/src/components/CommissionUtils_load.cxx
deleted file mode 100644
index 52de3df7519..00000000000
--- a/Commission/CommissionUtils/src/components/CommissionUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(CommissionUtils)
-
diff --git a/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx b/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
index 08c8caf585d..f27315aa7cf 100644
--- a/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
+++ b/DataQuality/DataQualityTools/src/components/DataQualityTools_entries.cxx
@@ -11,7 +11,6 @@
#include "DataQualityTools/DQTDataFlowMonTool.h"
//#include "DataQualityTools/DQTTopLeptonJetsFinderTool.h"
//#include "DataQualityTools/DQTGlobalTopDilFinderTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DataQualityTools/DQTGlobalWZFinderTool.h"
#include "DataQualityTools/DQTLumiMonTool.h"
@@ -31,20 +30,3 @@ DECLARE_TOOL_FACTORY(DQTDataFlowMonTool)
DECLARE_TOOL_FACTORY(DQTGlobalWZFinderTool)
DECLARE_TOOL_FACTORY(DQTLumiMonTool)
-DECLARE_FACTORY_ENTRIES(DataQualityTools) {
- DECLARE_ALGTOOL(DataQualityFatherMonTool);
-// DECLARE_ALGTOOL(DQTMuTrkEff);
- DECLARE_ALGTOOL(DQTDetSynchMonTool);
-// DECLARE_ALGTOOL(DQTCaloClusterTool);
- DECLARE_ALGTOOL(DQTMuonIDTrackTool);
-// DECLARE_ALGTOOL(DQTElectronQualityTool);
-// DECLARE_ALGTOOL(DQTGlobalWFinderTool);
-// DECLARE_ALGTOOL(DQTRateMonTool);
- // DECLARE_ALGTOOL(DQTNonCollBkg_ZDC);
- DECLARE_ALGTOOL(DQTBackgroundMon);
- DECLARE_ALGTOOL(DQTDataFlowMonTool);
-// DECLARE_ALGTOOL(DQTGlobalTopDilFinderTool);
-// DECLARE_ALGTOOL(DQTTopLeptonJetsFinderTool);
- DECLARE_ALGTOOL(DQTGlobalWZFinderTool);
- DECLARE_ALGTOOL(DQTLumiMonTool);
-}
diff --git a/DataQuality/DataQualityTools/src/components/DataQualityTools_load.cxx b/DataQuality/DataQualityTools/src/components/DataQualityTools_load.cxx
deleted file mode 100644
index 5cc61823798..00000000000
--- a/DataQuality/DataQualityTools/src/components/DataQualityTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(DataQualityTools)
diff --git a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx b/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
index 1f47e66d5bc..d1cb525abc8 100644
--- a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
+++ b/DataQuality/GoodRunsLists/src/components/GoodRunsLists_entries.cxx
@@ -1,6 +1,5 @@
#include "GoodRunsLists/GoodRunsListSelectorTool.h"
#include "GoodRunsLists/TriggerRegistryTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "GoodRunsLists/GoodRunsListSelectionTool.h"
DECLARE_TOOL_FACTORY( GoodRunsListSelectorTool )
@@ -11,11 +10,3 @@ DECLARE_TOOL_FACTORY( TriggerRegistryTool )
#include "../GRLSelectorAlg.h"
DECLARE_ALGORITHM_FACTORY( GRLSelectorAlg )
-DECLARE_FACTORY_ENTRIES( GoodRunsLists ) {
- DECLARE_ALGORITHM( GRLSelectorAlg );
- //DECLARE_ALGTOOL( GoodRunsListSelectorTool )
- DECLARE_TOOL( GoodRunsListSelectorTool )
- DECLARE_TOOL( GoodRunsListSelectionTool )
- DECLARE_ALGTOOL( TriggerRegistryTool )
-}
-
diff --git a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_load.cxx b/DataQuality/GoodRunsLists/src/components/GoodRunsLists_load.cxx
deleted file mode 100644
index 262e455eaef..00000000000
--- a/DataQuality/GoodRunsLists/src/components/GoodRunsLists_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GoodRunsLists)
-
diff --git a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx b/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx
index 4eae3c17e5b..d5cb1991e9e 100644
--- a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx
+++ b/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_entries.cxx
@@ -2,17 +2,9 @@
#include "GoodRunsListsUser/TriggerSelectorAlg.h"
#include "GoodRunsListsUser/GoodRunsListSelectorAlg.h"
#include "GoodRunsListsUser/GRLTriggerSelectorAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( DummyDumperAlg )
DECLARE_ALGORITHM_FACTORY( TriggerSelectorAlg )
DECLARE_ALGORITHM_FACTORY( GoodRunsListSelectorAlg )
DECLARE_ALGORITHM_FACTORY( GRLTriggerSelectorAlg )
-DECLARE_FACTORY_ENTRIES( GoodRunsListsUser ) {
- DECLARE_ALGORITHM( DummyDumperAlg )
- DECLARE_ALGORITHM( TriggerSelectorAlg )
- DECLARE_ALGORITHM( GoodRunsListSelectorAlg )
- DECLARE_ALGORITHM( GRLTriggerSelectorAlg )
-}
-
diff --git a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_load.cxx b/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_load.cxx
deleted file mode 100644
index 9b9d393fcfa..00000000000
--- a/DataQuality/GoodRunsListsUser/src/components/GoodRunsListsUser_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GoodRunsListsUser)
-
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
index f5f46df7784..9f9ca68a431 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_entries.cxx
@@ -1,11 +1,3 @@
-/** @file AthenaPoolCnvSvc_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: AthenaPoolCnvSvc_entries.cxx,v 1.14 2006-10-20 14:18:13 hawkings Exp $
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../AthenaPoolCnvSvc.h"
#include "../AthenaRootSerializeSvc.h"
#include "../AthenaAttributeListCnv.h"
@@ -18,10 +10,3 @@ DECLARE_CONVERTER_FACTORY(AthenaAttributeListCnv)
DECLARE_CONVERTER_FACTORY(CondAttrListCollCnv)
DECLARE_CONVERTER_FACTORY(CondAttrListVecCnv)
-DECLARE_FACTORY_ENTRIES(AthenaPoolCnvSvc) {
- DECLARE_SERVICE(AthenaPoolCnvSvc);
- DECLARE_SERVICE(AthenaRootSerializeSvc);
- DECLARE_CONVERTER(AthenaAttributeListCnv);
- DECLARE_CONVERTER(CondAttrListCollCnv);
- DECLARE_CONVERTER(CondAttrListVecCnv);
-}
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_load.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_load.cxx
deleted file mode 100644
index 13f284587bc..00000000000
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/components/AthenaPoolCnvSvc_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file AthenaPoolCnvSvc_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: AthenaPoolCnvSvc_load.cxx,v 1.5 2005-01-10 18:11:16 gemmeren Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaPoolCnvSvc)
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx
old mode 100755
new mode 100644
index 44643cd207b..105b23b442e
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_entries.cxx
@@ -1,9 +1,3 @@
-/** @file AthenaPoolExampleAlgorithms_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@anl.gov>
- * $Id: AthenaPoolExampleAlgorithms_entries.cxx,v 1.16 2008-12-10 21:28:12 gemmeren Exp $
- **/
-
#include "../WriteData.h"
#include "../ReWriteData.h"
#include "../ReadData.h"
@@ -14,7 +8,6 @@
#include "../WriteTag.h"
#include "../QueryTag.h"
#include "../PassNoneFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, WriteData)
DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, ReWriteData)
@@ -27,15 +20,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPoolEx, PassNoneFilter)
DECLARE_NAMESPACE_TOOL_FACTORY(AthPoolEx, ReadMeta)
DECLARE_NAMESPACE_TOOL_FACTORY(AthPoolEx, QueryTag)
-DECLARE_FACTORY_ENTRIES(AthenaPoolExampleAlgorithms) {
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, WriteData);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, ReWriteData);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, ReadData);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, ReadBs);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, WriteCond);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, ReadCond);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, WriteTag);
- DECLARE_NAMESPACE_ALGORITHM(AthPoolEx, PassNoneFilter);
- DECLARE_NAMESPACE_ALGTOOL(AthPoolEx, ReadMeta);
- DECLARE_NAMESPACE_ALGTOOL(AthPoolEx, QueryTag);
-}
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_load.cxx b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_load.cxx
deleted file mode 100755
index bfbc5258f89..00000000000
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/src/components/AthenaPoolExampleAlgorithms_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file AthenaPoolExampleAlgorithms_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: AthenaPoolExampleAlgorithms_load.cxx,v 1.3 2005-01-10 22:50:31 gemmeren Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaPoolExampleAlgorithms)
diff --git a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx b/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx
old mode 100755
new mode 100644
index 960ec5fba43..dd6a8edb698
--- a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_entries.cxx
@@ -1,17 +1,4 @@
-/** @file AthenaPoolServices_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Marcin Nowak
- * $Id:
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../AthenaRootStreamerSvc.h"
DECLARE_SERVICE_FACTORY(AthenaRootStreamerSvc)
-DECLARE_FACTORY_ENTRIES(AthenaRootStreamerSvc) {
- DECLARE_SERVICE(AthenaRootStreamerSvc)
-}
-
-
diff --git a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_load.cxx b/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_load.cxx
deleted file mode 100755
index e93b68220f9..00000000000
--- a/Database/AthenaPOOL/AthenaPoolServices/src/components/AthenaPoolServices_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file AthenaPoolServices_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Marcin Nowak
- * $Id:
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaRootStreamerSvc)
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx
old mode 100755
new mode 100644
index 7f36b76a6ef..6cbdf8f8980
--- a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_entries.cxx
@@ -1,19 +1,8 @@
-/**
- * @file AthenaPoolTools_entries.cxx
- * @brief Required by Gaudi class factory
- */
-
#include "../EventCount.h"
#include "../MetadataTest.h"
#include "../RequireUniqueEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(EventCount)
DECLARE_ALGORITHM_FACTORY(MetadataTest)
DECLARE_ALGORITHM_FACTORY(RequireUniqueEvent)
-DECLARE_FACTORY_ENTRIES(AthenaPoolTools) {
- DECLARE_ALGORITHM(EventCount)
- DECLARE_ALGORITHM(MetadataTest)
- DECLARE_ALGORITHM(RequireUniqueEvent)
-}
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_load.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_load.cxx
deleted file mode 100755
index b892f59a2e8..00000000000
--- a/Database/AthenaPOOL/AthenaPoolTools/src/components/AthenaPoolTools_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @file AthenaPoolTools_load.cxx
- * @brief Required by Gaudi class factory
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaPoolTools)
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_entries.cxx b/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_entries.cxx
index d22892e11de..8003f67b454 100644
--- a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_entries.cxx
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_entries.cxx
@@ -1,14 +1,2 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file ExamplePackageCnv_entries.cxx
- * @brief Declares component instantiation factories for an example POOL converter
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * $Id: ExamplePackageCnv_entries.cxx,v 1.3 2005-01-12 20:46:47 kkarr Exp $
- */
-
#include "${package}Cnv_entries.h"
-DECLARE_FACTORY_ENTRIES(${package}PoolCnv) {
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_load.cxx b/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_load.cxx
deleted file mode 100644
index 5a1106217b5..00000000000
--- a/Database/AthenaPOOL/AthenaPoolUtilities/cmt/fragments/ExamplePackageCnv_load.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file ExamplePackageCnv_load.cxx
- * @brief Loads component instantiation factories for an example POOL converter
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * $Id: ExamplePackageCnv_load.cxx,v 1.3 2005-01-12 20:47:08 kkarr Exp $
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(${package}PoolCnv)
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx b/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx
old mode 100755
new mode 100644
index d9990bf9cef..6d267acc6ca
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_entries.cxx
@@ -1,10 +1,3 @@
-/** @file EventSelectorAthenaPool_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: EventSelectorAthenaPool_entries.cxx,v 1.6 2007-07-25 07:14:28 schaffer Exp $
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../AthenaPoolAddressProviderSvc.h"
#include "../EventSelectorAthenaPool.h"
#include "../CondProxyProvider.h"
@@ -13,8 +6,3 @@ DECLARE_SERVICE_FACTORY(AthenaPoolAddressProviderSvc)
DECLARE_SERVICE_FACTORY(EventSelectorAthenaPool)
DECLARE_SERVICE_FACTORY(CondProxyProvider)
-DECLARE_FACTORY_ENTRIES(EventSelectorAthenaPool) {
- DECLARE_SERVICE(AthenaPoolAddressProviderSvc)
- DECLARE_SERVICE(EventSelectorAthenaPool)
- DECLARE_SERVICE(CondProxyProvider)
-}
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_load.cxx b/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_load.cxx
deleted file mode 100755
index eb4da766cd2..00000000000
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/components/EventSelectorAthenaPool_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file EventSelectorAthenaPool_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: EventSelectorAthenaPool_load.cxx,v 1.3 2005-01-11 20:59:08 malond Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(EventSelectorAthenaPool)
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx
index abac224e77f..b06cc814393 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_entries.cxx
@@ -1,9 +1,3 @@
-/** @file OutputStreamAthenaPool_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../AthenaPoolOutputStreamTool.h"
#include "../MakeInputDataHeader.h"
#include "../MakeEventStreamInfo.h"
@@ -18,11 +12,3 @@ DECLARE_TOOL_FACTORY(EventInfoAttListTool)
DECLARE_ALGORITHM_FACTORY(MakeInputDataHeader)
DECLARE_ALGORITHM_FACTORY(EventInfoTagBuilder)
-DECLARE_FACTORY_ENTRIES(OutputStreamAthenaPool) {
- DECLARE_TOOL(AthenaPoolOutputStreamTool)
- DECLARE_TOOL(MakeEventStreamInfo)
- DECLARE_TOOL(CopyEventStreamInfo)
- DECLARE_TOOL(EventInfoAttListTool)
- DECLARE_ALGORITHM(MakeInputDataHeader)
- DECLARE_ALGORITHM(EventInfoTagBuilder)
-}
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_load.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_load.cxx
deleted file mode 100644
index c4741910c1b..00000000000
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/components/OutputStreamAthenaPool_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file OutputStreamAthenaPool_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@bnl.gov>
- * $Id: OutputStreamAthenaPool_load.cxx,v 1.1.1.1 2006-08-16 20:59:21 gemmeren Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(OutputStreamAthenaPool)
diff --git a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx b/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx
index afccf7708fe..f369ec52245 100644
--- a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx
+++ b/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_entries.cxx
@@ -1,13 +1,4 @@
-/** @file PoolSvc_entries.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@anl.gov>
- * $Id: PoolSvc_entries.cxx,v 1.8 2007-02-27 16:38:54 gemmeren Exp $
- **/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../PoolSvc.h"
DECLARE_SERVICE_FACTORY(PoolSvc)
-DECLARE_FACTORY_ENTRIES(PoolSvc) {
- DECLARE_SERVICE(PoolSvc);
-}
+
diff --git a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_load.cxx b/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_load.cxx
deleted file mode 100644
index 92ae8b29adb..00000000000
--- a/Database/AthenaPOOL/PoolSvc/src/components/PoolSvc_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/** @file PoolSvc_load.cxx
- * @brief This file is needed for linker to load all the components of the library.
- * @author Peter van Gemmeren <gemmeren@anl.gov>
- * $Id: PoolSvc_load.cxx,v 1.6 2007-02-27 16:38:54 gemmeren Exp $
- **/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(PoolSvc)
diff --git a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx b/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx
old mode 100755
new mode 100644
index f89f4ce48e1..25f8b314511
--- a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx
+++ b/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_entries.cxx
@@ -1,22 +1,6 @@
-/**
- * @file RDBAccessSvc_entries.cxx
- *
- * @brief Required by Gaudi class factory
- *
- * @author Vakho Tsulaia <Vakhtang.Tsulaia@cern.ch>
- *
- * $Id: RDBAccessSvc_entries.cxx,v 1.4 2005-07-22 15:56:45 obreshko Exp $
- */
-
#include "../RDBAccessSvc.h"
#include "../SourceCompAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY(RDBAccessSvc)
DECLARE_ALGORITHM_FACTORY(SourceCompAlg)
-DECLARE_FACTORY_ENTRIES(RDBAccessSvc) {
- DECLARE_SERVICE ( RDBAccessSvc );
- DECLARE_ALGORITHM ( SourceCompAlg );
-}
-
diff --git a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_load.cxx b/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_load.cxx
deleted file mode 100755
index 8ddc8264f05..00000000000
--- a/Database/AthenaPOOL/RDBAccessSvc/src/components/RDBAccessSvc_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @file RDBAccessSvc_load.cxx
- *
- * @brief Required by Gaudi class factory
- *
- * @author Vakho Tsulaia <Vakhtang.Tsulaia@cern.ch>
- *
- * $Id: RDBAccessSvc_load.cxx,v 1.2 2005-01-14 10:41:42 tsulaia Exp $
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RDBAccessSvc)
diff --git a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx b/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx
index e35332e8af0..e134dbb2639 100644
--- a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx
+++ b/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_entries.cxx
@@ -1,8 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../RootFileTransformationsTool.h"
-DECLARE_FACTORY_ENTRIES(RootFileTransformations) {
- DECLARE_TOOL(RootFileTransformationsTool)
-}
DECLARE_TOOL_FACTORY(RootFileTransformationsTool)
+
diff --git a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_load.cxx b/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_load.cxx
deleted file mode 100644
index 128cccc39bb..00000000000
--- a/Database/AthenaPOOL/RootFileTools/src/components/RootFileTransformations_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RootFileTransformationsTool)
diff --git a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx b/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx
index 088d2609450..b94fed8000c 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../NtupleCnvSvc.h"
//#include "../LeafCnv.h"
#include "../RootOutputStreamTool.h"
@@ -42,25 +41,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( Athena, RootAsciiDumperAlgHandle )
DECLARE_SERVICE_FACTORY( IoSvc )
-DECLARE_FACTORY_ENTRIES( AthenaRootComps ) {
- DECLARE_NAMESPACE_SERVICE(Athena, NtupleCnvSvc)
- DECLARE_NAMESPACE_CONVERTER(Athena, LeafCnv)
- DECLARE_NAMESPACE_CONVERTER(Athena, xAODCnv)
-
- DECLARE_NAMESPACE_CONVERTER(Athena, RootCnv)
- DECLARE_NAMESPACE_SERVICE( Athena, RootCnvSvc )
- DECLARE_NAMESPACE_CONVERTER(Athena, RootCnv)
- DECLARE_NAMESPACE_SERVICE( Athena, xAODCnvSvc )
- DECLARE_NAMESPACE_TOOL(Athena, RootOutputStreamTool)
-
- DECLARE_NAMESPACE_SERVICE(Athena, RootNtupleEventSelector)
- DECLARE_NAMESPACE_SERVICE(Athena, xAODEventSelector)
- DECLARE_NAMESPACE_ALGORITHM(Athena, RootNtupleOutputStream)
- DECLARE_NAMESPACE_TOOL(Athena, RootNtupleOutputMetadataTool)
-
- DECLARE_NAMESPACE_ALGORITHM(Athena, RootAsciiDumperAlg)
- DECLARE_NAMESPACE_ALGORITHM(Athena, RootAsciiDumperAlgHandle)
-
-
- DECLARE_SERVICE( IoSvc )
-}
diff --git a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_load.cxx b/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_load.cxx
deleted file mode 100644
index 4410a0acf9c..00000000000
--- a/Database/AthenaRoot/AthenaRootComps/src/components/AthenaRootComps_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( AthenaRootComps )
diff --git a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx b/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx
old mode 100755
new mode 100644
index f95eeb0b2c0..e783176a34d
--- a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx
+++ b/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../DBReplicaSvc.h"
DECLARE_SERVICE_FACTORY( DBReplicaSvc )
-DECLARE_FACTORY_ENTRIES( DBReplicaSvc ) {
- DECLARE_SERVICE( DBReplicaSvc )
-}
diff --git a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_load.cxx b/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_load.cxx
deleted file mode 100755
index 9eb365d9a61..00000000000
--- a/Database/ConnectionManagement/DBReplicaSvc/src/components/DBReplicaSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DBReplicaSvc )
diff --git a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx b/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx
index 43bfb2e1299..56f2dbf59ff 100644
--- a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx
+++ b/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CoolLumiUtilities/FillParamsTool.h"
#include "CoolLumiUtilities/BunchGroupTool.h"
#include "CoolLumiUtilities/BunchLumisTool.h"
@@ -9,9 +8,3 @@ DECLARE_TOOL_FACTORY( BunchGroupTool )
DECLARE_TOOL_FACTORY( BunchLumisTool )
DECLARE_TOOL_FACTORY( OnlineLumiCalibrationTool )
-DECLARE_FACTORY_ENTRIES( CoolLumiUtilities ) {
- DECLARE_ALGTOOL( FillParamsTool )
- DECLARE_ALGTOOL( BunchGroupTool )
- DECLARE_ALGTOOL( BunchLumisTool )
- DECLARE_ALGTOOL( OnlineLumiCalibrationTool )
-}
diff --git a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_load.cxx b/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_load.cxx
deleted file mode 100644
index e0a2173aedf..00000000000
--- a/Database/CoolLumiUtilities/src/components/CoolLumiUtilities_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CoolLumiUtilities)
diff --git a/Database/FileStager/src/components/FileStager_entries.cxx b/Database/FileStager/src/components/FileStager_entries.cxx
index d273f237c44..b784249f8b7 100644
--- a/Database/FileStager/src/components/FileStager_entries.cxx
+++ b/Database/FileStager/src/components/FileStager_entries.cxx
@@ -1,10 +1,5 @@
#include "FileStager/FileStagerAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( FileStagerAlg )
-DECLARE_FACTORY_ENTRIES(FileStager) {
- DECLARE_ALGORITHM( FileStagerAlg )
-}
-
diff --git a/Database/FileStager/src/components/FileStager_load.cxx b/Database/FileStager/src/components/FileStager_load.cxx
deleted file mode 100644
index 3cb8371756f..00000000000
--- a/Database/FileStager/src/components/FileStager_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(FileStager)
-
diff --git a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx b/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx
old mode 100755
new mode 100644
index 3ac2a7778da..11168740737
--- a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx
+++ b/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx
@@ -1,19 +1,4 @@
-/**
- * @file IOVDbMetaDataTool_entries.cxx
- *
- * @brief Declaration of entry points for Gaudi tool
- *
- * @author Antoine Pérus <perus@lal.in2p3.fr>
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Header: /build/atlas/cvs/atlas/offline/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_entries.cxx,v 1.1 2007-06-18 09:52:00 schaffer Exp $
- */
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../IOVDbMetaDataTool.h"
DECLARE_TOOL_FACTORY( IOVDbMetaDataTool )
-DECLARE_FACTORY_ENTRIES(IOVDbMetaDataTool) {
- DECLARE_TOOL( IOVDbMetaDataTool )
-}
diff --git a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_load.cxx b/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_load.cxx
deleted file mode 100755
index 6bc0e49409b..00000000000
--- a/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @file IOVDbTool_load.cxx
- *
- * @brief Declaration of factory for Gaudi tool
- *
- * @author Antoine Pérus <perus@lal.in2p3.fr>
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Header: /build/atlas/cvs/atlas/offline/Database/IOVDbMetaDataTools/src/components/IOVDbMetaDataTool_load.cxx,v 1.1 2007-06-18 09:52:00 schaffer Exp $
- */
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(IOVDbMetaDataTool)
diff --git a/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx b/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx
index 22ac418d75c..b7305b8b218 100644
--- a/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx
+++ b/Database/IOVDbSvc/src/components/IOVDbSvc_entries.cxx
@@ -1,7 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../IOVDbSvc.h"
DECLARE_SERVICE_FACTORY(IOVDbSvc)
-DECLARE_FACTORY_ENTRIES(IOVDbSvc) {
- DECLARE_SERVICE( IOVDbSvc );
-}
+
diff --git a/Database/IOVDbSvc/src/components/IOVDbSvc_load.cxx b/Database/IOVDbSvc/src/components/IOVDbSvc_load.cxx
deleted file mode 100644
index 68d93359bdd..00000000000
--- a/Database/IOVDbSvc/src/components/IOVDbSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(IOVDbSvc)
diff --git a/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx b/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
old mode 100755
new mode 100644
index 170dc5f485c..d579ef1d510
--- a/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
+++ b/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
@@ -1,17 +1,4 @@
-/**
- * @file RegistrationServices_entries.cxx
- *
- * @brief Declaration of component entry points
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * @author Kristo Karr <kkarr@hep.anl.gov>
- *
- * $Id: RegistrationServices_entries.cxx,v 1.16 2009-04-28 19:04:07 cranshaw Exp $
- *
- */
-
#include <stdint.h>
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../OutputConditionsAlg.h"
#include "../InputCollectionMetadataCopy.h"
#include "../RegistrationStream.h"
@@ -26,10 +13,3 @@ DECLARE_TOOL_FACTORY(InputCollectionMetadataCopy)
DECLARE_TOOL_FACTORY(RegistrationStreamLCGTool)
DECLARE_TOOL_FACTORY(RegistrationStreamTagTool)
-DECLARE_FACTORY_ENTRIES(RegistrationServices) {
- DECLARE_ALGORITHM(RegistrationStream)
- DECLARE_ALGORITHM(RegistrationStreamDefMeta)
- DECLARE_ALGORITHM(OutputConditionsAlg)
- DECLARE_TOOL(RegistrationStreamLCGTool)
- DECLARE_TOOL(RegistrationStreamTagTool)
-}
diff --git a/Database/RegistrationServices/src/components/RegistrationServices_load.cxx b/Database/RegistrationServices/src/components/RegistrationServices_load.cxx
deleted file mode 100755
index 940adb9bc24..00000000000
--- a/Database/RegistrationServices/src/components/RegistrationServices_load.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @file RegistrationServices_load.cxx
- *
- * @brief Declaration of component factory
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- * @author Kristo Karr <kkarr@hep.anl.gov>
- *
- * $Id: RegistrationServices_load.cxx,v 1.2 2005-01-07 10:44:07 schaffer Exp $
- *
- */
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( RegistrationServices )
-
-
diff --git a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx b/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx
index def27b6fb48..4d659704f56 100644
--- a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx
+++ b/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_entries.cxx
@@ -1,12 +1,6 @@
#include "AGDD2GeoSvc/AGDD2GeoSvc.h"
#include "AGDD2GeoSvc/DefaultAGDDTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY(AGDDtoGeoSvc)
DECLARE_TOOL_FACTORY(DefaultAGDDTool)
-DECLARE_FACTORY_ENTRIES(AGDDtoGeoSvc) {
- DECLARE_SERVICE ( AGDDtoGeoSvc )
- DECLARE_ALGTOOL ( DefaultAGDDTool )
-}
-
diff --git a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_load.cxx b/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_load.cxx
deleted file mode 100644
index 191abb6d277..00000000000
--- a/DetectorDescription/AGDD/AGDD2GeoSvc/src/components/AGDD2GeoSvc_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AGDDtoGeoSvc)
-
diff --git a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx b/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx
old mode 100755
new mode 100644
index e234f514134..88e534944bb
--- a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx
+++ b/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_entries.cxx
@@ -1,12 +1,4 @@
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DetDescrCnvSvc/DetDescrCnvSvc.h"
DECLARE_SERVICE_FACTORY( DetDescrCnvSvc )
-DECLARE_FACTORY_ENTRIES ( DetDescrCnvSvc ) {
- DECLARE_SERVICE ( DetDescrCnvSvc )
-}
-
-
diff --git a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_load.cxx b/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_load.cxx
deleted file mode 100755
index c919d44cb43..00000000000
--- a/DetectorDescription/DetDescrCnvSvc/src/components/DetDescrCnvSvc_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DetDescrCnvSvc )
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx b/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx
old mode 100755
new mode 100644
index d4f3d22997c..745646995a9
--- a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DetDescrCondExample/ReadAlignTrans.h"
#include "DetDescrCondExample/ReadTopTrans.h"
#include "DetDescrCondExample/ReadWriteCoolStrFile.h"
@@ -9,10 +8,3 @@ DECLARE_ALGORITHM_FACTORY( ReadTopTrans )
DECLARE_ALGORITHM_FACTORY( ReadWriteCoolStrFile )
DECLARE_ALGORITHM_FACTORY( CoolHistExample )
-DECLARE_FACTORY_ENTRIES( DetDescrCondExample )
-{
- DECLARE_ALGORITHM( ReadAlignTrans )
- DECLARE_ALGORITHM( ReadTopTrans )
- DECLARE_ALGORITHM( ReadWriteCoolStrFile )
- DECLARE_ALGORITHM( CoolHistExample )
-}
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_load.cxx b/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_load.cxx
deleted file mode 100755
index 962a743d35b..00000000000
--- a/DetectorDescription/DetDescrCond/DetDescrCondExample/src/components/DetDescrCondExample_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DetDescrCondExample )
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx
old mode 100755
new mode 100644
index b1224faf5d5..e8f449519b2
--- a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_entries.cxx
@@ -1,14 +1,8 @@
#include "DetDescrCondTools/AlignTransTool.h"
#include "../CoolStrFileSvc.h"
#include "../CoolHistSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( AlignTransTool )
DECLARE_SERVICE_FACTORY( CoolStrFileSvc )
DECLARE_SERVICE_FACTORY( CoolHistSvc )
-DECLARE_FACTORY_ENTRIES(DetDescrCondTools) {
- DECLARE_TOOL( AlignTransTool )
- DECLARE_SERVICE( CoolStrFileSvc )
- DECLARE_SERVICE( CoolHistSvc )
-}
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_load.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_load.cxx
deleted file mode 100755
index c865c1aeaad..00000000000
--- a/DetectorDescription/DetDescrCond/DetDescrCondTools/src/components/DetDescrCondTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(DetDescrCondTools)
-
diff --git a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx b/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx
old mode 100755
new mode 100644
index eef308e1dd3..a5f3487bc5f
--- a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx
+++ b/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../DetStatusSvc.h"
#include "DetectorStatus/DetStatusAlg.h"
DECLARE_SERVICE_FACTORY(DetStatusSvc)
DECLARE_ALGORITHM_FACTORY(DetStatusAlg)
-DECLARE_FACTORY_ENTRIES(DetectorStatus) {
- DECLARE_SERVICE( DetStatusSvc );
- DECLARE_ALGORITHM( DetStatusAlg );
-}
diff --git a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_load.cxx b/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_load.cxx
deleted file mode 100755
index 4c70a109937..00000000000
--- a/DetectorDescription/DetDescrCond/DetectorStatus/src/components/DetectorStatus_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(DetectorStatus)
diff --git a/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx b/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx
old mode 100755
new mode 100644
index 80e2e029331..1070c344bfc
--- a/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx
+++ b/DetectorDescription/GeoModel/GeoModelExamples/src/components/GeoModelExamples_entries.cxx
@@ -1,3 +1,4 @@
#include "..//ToyDetectorTool.h"
DECLARE_TOOL_FACTORY(ToyDetectorTool)
+
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx b/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx
old mode 100755
new mode 100644
index aba3755acb7..962f94839b2
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx
+++ b/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_entries.cxx
@@ -1,12 +1,6 @@
#include "../GeoModelSvc.h"
#include "../GeoDbTagSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY(GeoModelSvc)
DECLARE_SERVICE_FACTORY(GeoDbTagSvc)
-DECLARE_FACTORY_ENTRIES(GeoModelSvc) {
- DECLARE_SERVICE ( GeoModelSvc )
- DECLARE_SERVICE ( GeoDbTagSvc )
-}
-
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_load.cxx b/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_load.cxx
deleted file mode 100755
index 55e69c557a9..00000000000
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/components/GeoModelSvc_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GeoModelSvc)
-
diff --git a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx b/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx
index fd77c5ed2e3..17d72309c07 100644
--- a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx
+++ b/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../GeometryDBSvc.h"
DECLARE_SERVICE_FACTORY(GeometryDBSvc)
-DECLARE_FACTORY_ENTRIES(GeometryDBSvc) {
- DECLARE_SERVICE(GeometryDBSvc)
-}
-
diff --git a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_load.cxx b/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_load.cxx
deleted file mode 100644
index cd3880632cd..00000000000
--- a/DetectorDescription/GeometryDBSvc/src/components/GeometryDBSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GeometryDBSvc)
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
old mode 100755
new mode 100644
index 621fb397f78..e76f1c33b80
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
+++ b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
@@ -1,10 +1,3 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "IdDictDetDescrCnv.h"
#include "AtlasIDDetDescrCnv.h"
#include "IdDictCnvTest.h"
@@ -13,10 +6,3 @@ DECLARE_CONVERTER_FACTORY( AtlasIDDetDescrCnv )
DECLARE_CONVERTER_FACTORY( IdDictDetDescrCnv )
DECLARE_ALGORITHM_FACTORY( IdDictCnvTest )
-DECLARE_FACTORY_ENTRIES ( IdDictDetDescrCnv ) {
- DECLARE_CONVERTER ( IdDictDetDescrCnv )
- DECLARE_CONVERTER ( AtlasIDDetDescrCnv )
- DECLARE_ALGORITHM ( IdDictCnvTest )
-}
-
-
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_load.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_load.cxx
deleted file mode 100755
index 2dbc2d196b5..00000000000
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_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( IdDictDetDescrCnv )
diff --git a/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx b/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx
old mode 100755
new mode 100644
index 3c0e961d049..83c73996683
--- a/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx
+++ b/DetectorDescription/RegionSelector/src/components/RegionSelector_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
// #include "RegionSelector/RegSelSvc.h"
#include "../RegSelSvc.h"
// #include "../NewRegSelSvc.h"
@@ -6,7 +5,3 @@
DECLARE_SERVICE_FACTORY( RegSelSvc )
// DECLARE_SERVICE_FACTORY( NewRegSelSvc )
-DECLARE_FACTORY_ENTRIES(RegionSelector) {
- DECLARE_SERVICE( RegSelSvc )
- // DECLARE_SERVICE( NewRegSelSvc )
-}
diff --git a/DetectorDescription/RegionSelector/src/components/RegionSelector_load.cxx b/DetectorDescription/RegionSelector/src/components/RegionSelector_load.cxx
deleted file mode 100755
index 97e1e64cd19..00000000000
--- a/DetectorDescription/RegionSelector/src/components/RegionSelector_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RegionSelector)
-
diff --git a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx
index a8b45aea656..856ff7d745b 100644
--- a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_entries.cxx
@@ -1,6 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "AFP_ByteStream2RawCnv/RawDataProvider.h"
DECLARE_ALGORITHM_FACTORY( RawDataProvider )
@@ -17,10 +14,3 @@ DECLARE_TOOL_FACTORY( AFP_RawDataProviderTool )
#include "AFP_ByteStream2RawCnv/AFP_RawDataProvider.h"
DECLARE_ALGORITHM_FACTORY( AFP_RawDataProvider )
-DECLARE_FACTORY_ENTRIES( AFP_ByteStream2RawCnv )
-{
- DECLARE_ALGORITHM( AFP_RawDataProvider );
- DECLARE_TOOL( AFP_RawDataProviderTool );
- DECLARE_TOOL( AFP_ByteStream2RawCnv );
- DECLARE_ALGORITHM( RawDataProvider );
-}
diff --git a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_load.cxx b/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_load.cxx
deleted file mode 100644
index 125337d5cc6..00000000000
--- a/ForwardDetectors/AFP/AFP_ByteStream2RawCnv/src/components/Decoder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_ByteStream2RawCnv)
diff --git a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx b/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx
index 575fc986dc9..c9d4eca02fc 100644
--- a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AFP_Digitization/AFP_DigiTop.h"
#include "AFP_Digitization/AFP_PileUpTool.h"
@@ -6,9 +5,3 @@ DECLARE_ALGORITHM_FACTORY(AFP_DigiTop)
DECLARE_TOOL_FACTORY( AFP_PileUpTool )
-DECLARE_FACTORY_ENTRIES (AFP_Digitization)
-{
- DECLARE_ALGORITHM(AFP_DigiTop)
- DECLARE_TOOL( AFP_PileUpTool )
-}
-
diff --git a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_load.cxx b/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_load.cxx
deleted file mode 100644
index fc0ce4471af..00000000000
--- a/ForwardDetectors/AFP/AFP_Digitization/src/components/AFP_Digitization_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_Digitization)
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx
index 5ebe500891d..a35d1ed844c 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_entries.cxx
@@ -15,13 +15,5 @@ DECLARE_ALGORITHM_FACTORY( AFP_SiDigiCollectionCnv )
DECLARE_ALGORITHM_FACTORY( AFP_TDLocRecoEvCollectionCnv )
DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvCollectionCnv )
-DECLARE_FACTORY_ENTRIES(AFP_EventAthenaPool) {
- DECLARE_ALGORITHM( AFP_TDSimHitCollectionCnv )
- DECLARE_ALGORITHM( AFP_TDDigiCollectionCnv )
- DECLARE_ALGORITHM( AFP_SIDSimHitCollectionCnv )
- DECLARE_ALGORITHM( AFP_SiDigiCollectionCnv )
- DECLARE_ALGORITHM( AFP_TDLocRecoEvCollectionCnv )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEvCollectionCnv )
-}
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_load.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_load.cxx
deleted file mode 100644
index f033e1200e6..00000000000
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_EventAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_EventAthenaPool)
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx
index d1f56ba0863..6e448fd44fc 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_entries.cxx
@@ -6,9 +6,3 @@ DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCollectionCnv )
DECLARE_ALGORITHM_FACTORY( AFP_TDSimDigiCollectionCnv )
DECLARE_ALGORITHM_FACTORY( AFP_SIDSimHitCollectionCnv )
-DECLARE_FACTORY_ENTRIES(AFP_EventAthenaPool) {
- DECLARE_ALGORITHM( AFP_TDSimHitCollectionCnv )
- DECLARE_ALGORITHM( AFP_TDDigiCollectionCnv )
- DECLARE_ALGORITHM( AFP_SIDSimHitCollectionCnv )
-}
-
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_load.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_load.cxx
deleted file mode 100644
index 48d322a4456..00000000000
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventAthenaPool/src/components/AFP_SimEvEventAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_SimEvEventAthenaPool)
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx
index 293b9ae6a71..b0205cc929f 100644
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_entries.cxx
@@ -38,7 +38,6 @@
#include "AFP_EventTPCnv/AFP_SIDLocRecoEvCollection_p1.h"
#include "AFP_EventTPCnv/AFP_SIDLocRecoEvCollectionCnv_p1.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( AFP_TDSimHit_p1 )
DECLARE_ALGORITHM_FACTORY( AFP_TDSimHitCnv_p1 )
@@ -79,43 +78,11 @@ DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvCollection_p1 )
DECLARE_ALGORITHM_FACTORY( AFP_SIDLocRecoEvCollectionCnv_p1 )
-DECLARE_FACTORY_ENTRIES(AFP_EventTPCnv) {
- DECLARE_ALGORITHM( AFP_TDSimHit_p1 )
- DECLARE_ALGORITHM( AFP_TDSimHitCnv_p1 )
- DECLARE_ALGORITHM( AFP_TDSimHitCollection_p1 )
- DECLARE_ALGORITHM( AFP_TDSimHitCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_TDDigi_p1 )
- DECLARE_ALGORITHM( AFP_TDDigiCnv_p1 )
- DECLARE_ALGORITHM( AFP_TDDigiCollection_p1 )
- DECLARE_ALGORITHM( AFP_TDDigiCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_RawData_p1 )
- DECLARE_ALGORITHM( AFP_RawDataCnv_p1 )
- DECLARE_ALGORITHM( AFP_RawDataCollection_p1 )
- DECLARE_ALGORITHM( AFP_RawDataCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_RawDataContainer_p1 )
- DECLARE_ALGORITHM( AFP_RawDataContainerCnv_p1 )
- DECLARE_ALGORITHM( AFP_SIDSimHit_p1 )
- DECLARE_ALGORITHM( AFP_SIDSimHitCnv_p1 )
- DECLARE_ALGORITHM( AFP_SIDSimHitCollection_p1 )
- DECLARE_ALGORITHM( AFP_SIDSimHitCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_SiDigi_p1 )
- DECLARE_ALGORITHM( AFP_SiDigiCnv_p1 )
- DECLARE_ALGORITHM( AFP_SiDigiCollection_p1 )
- DECLARE_ALGORITHM( AFP_SiDigiCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_TDLocRecoEvent_p1 )
- DECLARE_ALGORITHM( AFP_TDLocRecoEventCnv_p1 )
- DECLARE_ALGORITHM( AFP_TDLocRecoEvCollection_p1 )
- DECLARE_ALGORITHM( AFP_TDLocRecoEvCollectionCnv_p1 )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEvent_p1 )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEventCnv_p1 )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEvCollection_p1 )
- DECLARE_ALGORITHM( AFP_SIDLocRecoEvCollectionCnv_p1 )
-}
diff --git a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_load.cxx b/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_load.cxx
deleted file mode 100644
index d2b461b6de9..00000000000
--- a/ForwardDetectors/AFP/AFP_EventCnv/AFP_EventTPCnv/src/components/AFP_SimEvTPCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_EventTPCnv)
diff --git a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx b/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx
index 03452ff73c1..6a7e0de75d3 100644
--- a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_entries.cxx
@@ -1,14 +1,8 @@
#include "../AFP_SensitiveDetectorTool.h" //TODO remove once separate versions tested
#include "../AFP_SiDSensitiveDetectorTool.h"
#include "../AFP_TDSensitiveDetectorTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(AFP_SensitiveDetectorTool) //TODO remove once separate versions tested
DECLARE_TOOL_FACTORY(AFP_SiDSensitiveDetectorTool)
DECLARE_TOOL_FACTORY(AFP_TDSensitiveDetectorTool)
-DECLARE_FACTORY_ENTRIES(AFP_G4_SD) {
- DECLARE_TOOL(AFP_SensitiveDetectorTool); //TODO remove once separate versions tested
- DECLARE_TOOL(AFP_SiDSensitiveDetectorTool);
- DECLARE_TOOL(AFP_TDSensitiveDetectorTool);
-}
diff --git a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_load.cxx b/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_load.cxx
deleted file mode 100644
index ef16ed74aac..00000000000
--- a/ForwardDetectors/AFP/AFP_G4_SD/src/components/AFP_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_G4_SD)
diff --git a/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx b/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx
old mode 100755
new mode 100644
index ba820e084fa..c974462d74f
--- a/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_GeoModel/src/components/AFP_GeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "../AFP_GeoModelTool.h"
DECLARE_TOOL_FACTORY(AFP_GeoModelTool)
+
diff --git a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx b/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx
index 5627aa47f98..4950c86fc9e 100644
--- a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_entries.cxx
@@ -1,8 +1,4 @@
#include "AFP_Geometry/AFP_Geometry.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(AFP_Geometry)
-DECLARE_FACTORY_ENTRIES(AFP_Geometry) {
- DECLARE_ALGORITHM(AFP_Geometry)
-}
diff --git a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_load.cxx b/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_load.cxx
deleted file mode 100644
index b41680a6b23..00000000000
--- a/ForwardDetectors/AFP/AFP_Geometry/src/components/AFP_Geometry_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_Geometry)
-
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx
index bb80b2b500e..914dd313d51 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AFP_Monitoring/AFPHitsMonitorTool.h"
#include "AFP_Monitoring/AFPTechnicalMonitorTool.h"
DECLARE_TOOL_FACTORY(AFPHitsMonitorTool)
DECLARE_TOOL_FACTORY(AFPTechnicalMonitorTool)
-DECLARE_FACTORY_ENTRIES(AFP_Monitoring) {
- DECLARE_ALGTOOL(AFPHitsMonitorTool)
- DECLARE_ALGTOOL(AFPTechnicalMonitorTool)
-}
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_load.cxx b/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_load.cxx
deleted file mode 100644
index 2a70da3e08a..00000000000
--- a/ForwardDetectors/AFP/AFP_Monitoring/src/components/AFP_Monitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_Monitoring)
-
diff --git a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx b/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx
index 63e4326359f..96caea07ca0 100644
--- a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_entries.cxx
@@ -1,16 +1,6 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include <AFP_Raw2Digi/AFP_Raw2Digi.h>
#include "../AFP_Raw2DigiTool.h"
DECLARE_ALGORITHM_FACTORY( AFP_Raw2Digi )
DECLARE_TOOL_FACTORY( AFP_Raw2DigiTool )
-DECLARE_FACTORY_ENTRIES( AFP_Raw2Digi )
-{
- DECLARE_ALGORITHM( AFP_Raw2Digi );
-}
diff --git a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_load.cxx b/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_load.cxx
deleted file mode 100644
index c9da8049692..00000000000
--- a/ForwardDetectors/AFP/AFP_Raw2Digi/src/components/Raw2Digi_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AFP_Raw2Digi)
diff --git a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx b/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx
index 28bb55fe5ab..95a54569013 100644
--- a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_entries.cxx
@@ -1,11 +1,6 @@
#include "AFP_LocRecoEv/AFP_SIDLocRecoEvent.h"
#include "AFP_LocRecoEv/AFP_TDLocRecoEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(AFP_SIDLocRecoEvent)
DECLARE_ALGORITHM_FACTORY(AFP_TDLocRecoEvent)
-DECLARE_FACTORY_ENTRIES(AFP_LocRecoEv) {
-DECLARE_ALGORITHM(AFP_SIDLocRecoEvent)
-DECLARE_ALGORITHM(AFP_TDLocRecoEvent)
-}
diff --git a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_load.cxx b/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_load.cxx
deleted file mode 100644
index 77f98155686..00000000000
--- a/ForwardDetectors/AFP/AFP_RecoEv/AFP_LocRecoEv/src/components/AFP_LocRecoEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_LocRecoEv)
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx
index fd35ccf81e6..d50a52695e4 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_entries.cxx
@@ -1,11 +1,6 @@
#include "AFP_LocReco/AFP_TDLocReco.h"
#include "AFP_LocReco/AFP_SIDLocReco.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(AFP_TDLocReco)
DECLARE_ALGORITHM_FACTORY(AFP_SIDLocReco)
-DECLARE_FACTORY_ENTRIES(AFP_LocReco) {
- DECLARE_ALGORITHM (AFP_TDLocReco)
- DECLARE_ALGORITHM (AFP_SIDLocReco)
-}
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_load.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_load.cxx
deleted file mode 100644
index a6bf7959e18..00000000000
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/src/components/AFP_LocReco_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_LocReco)
-
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx
index 9f66a5151d9..c0c50354528 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_entries.cxx
@@ -1,8 +1,3 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../AFPSiClusterTool.h"
#include "../AFPSiClusterSingleHitTool.h"
#include "../AFPSiRowColToLocalCSTool.h"
@@ -13,5 +8,3 @@ DECLARE_TOOL_FACTORY(AFPSiClusterSingleHitTool)
DECLARE_TOOL_FACTORY(AFPSiRowColToLocalCSTool)
DECLARE_TOOL_FACTORY(AFPSiClusterBasicNearestNeighbour)
-DECLARE_FACTORY_ENTRIES(AFP_SiClusterTools) {
-}
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_load.cxx b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_load.cxx
deleted file mode 100644
index 4b08aade033..00000000000
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/components/AFP_SiClusterTools_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(AFP_SiClusterTools)
diff --git a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx b/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx
index 2c4386e0817..4b7f8c4af6a 100644
--- a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx
+++ b/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_entries.cxx
@@ -2,15 +2,9 @@
#include "AFP_SimEv/AFP_TDSimHit.h"
#include "AFP_SimEv/AFP_SIDSimHitCollection.h"
#include "AFP_SimEv/AFP_SIDSimHit.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(AFP_TDSimHit)
DECLARE_ALGORITHM_FACTORY(AFP_TDSimHitCollection)
DECLARE_ALGORITHM_FACTORY(AFP_SIDSimHit)
DECLARE_ALGORITHM_FACTORY(AFP_SIDSimHitCollection)
-DECLARE_FACTORY_ENTRIES(AFP_SimEv) {
- DECLARE_ALGORITHM(AFP_SIDSimHit)
- DECLARE_ALGORITHM(AFP_SIDSimHitCollection)
-}
-
\ No newline at end of file
diff --git a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_load.cxx b/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_load.cxx
deleted file mode 100644
index 6d7f76fb429..00000000000
--- a/ForwardDetectors/AFP/AFP_SimEv/src/components/AFP_SimEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AFP_SimEv)
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx
index 04ad492f1a3..0aefecdbc52 100644
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_entries.cxx
@@ -1,22 +1,6 @@
-//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
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-//#include "GaudiKernel/ITHistSvc.h"
-
#include "ALFA_BeamTransport/ALFA_BeamTransport.h"
DECLARE_ALGORITHM_FACTORY( ALFA_BeamTransport )
-DECLARE_FACTORY_ENTRIES( ALFA_BeamTransport ) {
- DECLARE_ALGORITHM( ALFA_BeamTransport )
-}
//DECLARE_ALGORITHM_FACTORY( THistSvc )
+
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_load.cxx b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_load.cxx
deleted file mode 100644
index 55c83023c47..00000000000
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/components/ALFA_BeamTransport_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-//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
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-//#include "GaudiKernel/ITHistSvc.h"
-
-LOAD_FACTORY_ENTRIES( ALFA_BeamTransport )
-
- //LOAD_FACTORY_ENTRIES( THistSvc )
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx
index 7a15b6af95c..0979b76dc91 100644
--- a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_CLinkAlg/ALFA_CLinkAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_CLinkAlg)
-DECLARE_FACTORY_ENTRIES(ALFA_CLinkAlg) {
- DECLARE_ALGORITHM (ALFA_CLinkAlg)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_load.cxx b/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_load.cxx
deleted file mode 100644
index acf4fe98c84..00000000000
--- a/ForwardDetectors/ALFA/ALFA_CLinkAlg/src/components/ALFA_CLinkAlg_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_CLinkAlg)
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx
index 3df686209d7..d0ecf2c9a19 100644
--- a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_CLinkEv/ALFA_CLinkEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_CLinkEvent)
-DECLARE_FACTORY_ENTRIES(ALFA_CLinkEv) {
- DECLARE_ALGORITHM(ALFA_CLinkEvent)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_load.cxx b/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_load.cxx
deleted file mode 100644
index 8c8c268d5f6..00000000000
--- a/ForwardDetectors/ALFA/ALFA_CLinkEv/src/components/ALFA_CLinkEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_CLinkEv)
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx b/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx
old mode 100755
new mode 100644
index f5ea6e64676..69060ffbc07
--- a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ALFA_Digitization/ALFA_DigiAlg.h"
#include "ALFA_Digitization/ALFA_PileUpTool.h"
@@ -6,8 +5,3 @@
DECLARE_ALGORITHM_FACTORY(ALFA_DigiAlg)
DECLARE_TOOL_FACTORY(ALFA_PileUpTool)
-DECLARE_FACTORY_ENTRIES(ALFA_Digitization)
-{
- DECLARE_ALGORITHM(ALFA_DigiAlg)
- DECLARE_TOOL(ALFA_PileUpTool)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_load.cxx b/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_load.cxx
deleted file mode 100755
index 1629dfcbc85..00000000000
--- a/ForwardDetectors/ALFA/ALFA_Digitization/src/components/ALFA_Digitization_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_Digitization)
-
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx
index 4ed8e590760..6376da7e76d 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_entries.cxx
@@ -20,18 +20,3 @@ DECLARE_ALGORITHM_FACTORY( ALFA_LocRecODEvCollectionCnv )
DECLARE_ALGORITHM_FACTORY( ALFA_GloRecEvCollectionCnv )
DECLARE_ALGORITHM_FACTORY( ALFA_CLinkEventCnv )
-DECLARE_FACTORY_ENTRIES(ALFA_EventAthenaPool) {
-
-DECLARE_ALGORITHM( ALFA_HitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_DigitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_ODHitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_ODDigitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_RawDataContainerCnv )
-DECLARE_ALGORITHM( ALFA_RawDataContainerCnv_charge )
-DECLARE_ALGORITHM( ALFA_LocRecEvCollectionCnv )
-DECLARE_ALGORITHM( ALFA_LocRecODEvCollectionCnv )
-DECLARE_ALGORITHM( ALFA_GloRecEvCollectionCnv )
-DECLARE_ALGORITHM( ALFA_CLinkEventCnv )
-
-}
-
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_load.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_load.cxx
deleted file mode 100644
index fdc94c2adb5..00000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_EventAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_EventAthenaPool)
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx
index 3d240cc0117..236c96135e9 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_entries.cxx
@@ -6,11 +6,3 @@ DECLARE_ALGORITHM_FACTORY( ALFA_HitCollectionCnv )
DECLARE_ALGORITHM_FACTORY( ALFA_DigitCollectionCnv )
DECLARE_ALGORITHM_FACTORY( ALFA_ODHitCollectionCnv )
-DECLARE_FACTORY_ENTRIES(ALFA_EventAthenaPool) {
-
-DECLARE_ALGORITHM( ALFA_HitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_DigitCollectionCnv )
-DECLARE_ALGORITHM( ALFA_ODHitCollectionCnv )
-
-}
-
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_load.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_load.cxx
deleted file mode 100644
index f9af3d78cf4..00000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventAthenaPool/src/components/ALFA_SimEvEventAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_SimEvEventAthenaPool)
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx
index 40cba7e8e6e..d263b8d1e14 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_entries.cxx
@@ -54,7 +54,6 @@
#include "ALFA_EventTPCnv/ALFA_LocRecCorrODEvCollectionCnv_p1.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( ALFA_Hit_p1 )
DECLARE_ALGORITHM_FACTORY( ALFA_HitCnv_p1 )
@@ -110,64 +109,3 @@ DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEventCnv_p1 )
DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEvCollection_p1 )
DECLARE_ALGORITHM_FACTORY( ALFA_LocRecCorrODEvCollectionCnv_p1 )
-
-
-DECLARE_FACTORY_ENTRIES(ALFA_EventTPCnv) {
-
-DECLARE_ALGORITHM( ALFA_Hit_p1 )
-DECLARE_ALGORITHM( ALFA_HitCnv_p1 )
-DECLARE_ALGORITHM( ALFA_HitCollection_p1 )
-DECLARE_ALGORITHM( ALFA_HitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_Digit_p1 )
-DECLARE_ALGORITHM( ALFA_DigitCnv_p1 )
-DECLARE_ALGORITHM( ALFA_DigitCollection_p1 )
-DECLARE_ALGORITHM( ALFA_DigitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_ODHit_p1 )
-DECLARE_ALGORITHM( ALFA_ODHitCnv_p1 )
-DECLARE_ALGORITHM( ALFA_ODHitCollection_p1 )
-DECLARE_ALGORITHM( ALFA_ODHitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_ODDigit_p1 )
-DECLARE_ALGORITHM( ALFA_ODDigitCnv_p1 )
-DECLARE_ALGORITHM( ALFA_ODDigitCollection_p1 )
-DECLARE_ALGORITHM( ALFA_ODDigitCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_RawData_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCnv_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCollection_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCollectionCnv_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataContainer_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataContainerCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_RawData_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCnv_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCollection_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataCollectionCnv_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataContainer_charge_p1 )
-DECLARE_ALGORITHM( ALFA_RawDataContainerCnv_charge_p1 )
-
-DECLARE_ALGORITHM( ALFA_LocRecEvent_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecEventCnv_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecEvCollection_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_LocRecODEvent_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecODEventCnv_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecODEvCollection_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecODEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_LocRecCorrEvent_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrEventCnv_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrEvCollection_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrEvCollectionCnv_p1 )
-
-DECLARE_ALGORITHM( ALFA_LocRecCorrODEvent_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrODEventCnv_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrODEvCollection_p1 )
-DECLARE_ALGORITHM( ALFA_LocRecCorrODEvCollectionCnv_p1 )
-
-
-}
-
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_load.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_load.cxx
deleted file mode 100644
index 0ff21e2e937..00000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_EventTPCnv/src/components/ALFA_SimEvTPCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
- #include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_EventTPCnv)
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx
index dce43fadc3c..5ac67e6da18 100644
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ALFA_RawDataByteStreamCnv/ALFA_RawDataProvider.h"
DECLARE_ALGORITHM_FACTORY( ALFA_RawDataProvider)
@@ -18,13 +16,3 @@ DECLARE_TOOL_FACTORY( ALFA_Decoder )
#include "ALFA_RawDataByteStreamCnv/ALFA_Decoder_charge.h"
DECLARE_TOOL_FACTORY( ALFA_Decoder_charge )
-DECLARE_FACTORY_ENTRIES( ALFA_RawDataByteStreamCnv ) {
-DECLARE_ALGORITHM ( ALFA_RawDataProvider )
-DECLARE_ALGORITHM ( ALFA_RawDataProvider_charge )
-DECLARE_TOOL ( ALFA_RawDataProviderTool )
-DECLARE_TOOL ( ALFA_RawDataProviderTool_charge )
-DECLARE_TOOL ( ALFA_Decoder )
-DECLARE_TOOL ( ALFA_Decoder_charge )
-}
-
-
diff --git a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_load.cxx b/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_load.cxx
deleted file mode 100644
index fa54d7913b2..00000000000
--- a/ForwardDetectors/ALFA/ALFA_EventCnv/ALFA_RawDataByteStreamCnv/src/components/ALFA_RawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_RawDataByteStreamCnv)
diff --git a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx b/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx
index 43477b12532..3addc70f77f 100644
--- a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_entries.cxx
@@ -1,9 +1,4 @@
#include "../ALFA_SensitiveDetectorTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(ALFA_SensitiveDetectorTool)
-DECLARE_FACTORY_ENTRIES(ALFA_G4_SD) {
- DECLARE_TOOL(ALFA_SensitiveDetectorTool);
-}
-
diff --git a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_load.cxx b/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_load.cxx
deleted file mode 100644
index 7046e6766e2..00000000000
--- a/ForwardDetectors/ALFA/ALFA_G4_SD/src/components/ALFA_G4_SD_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_G4_SD)
diff --git a/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx b/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx
old mode 100755
new mode 100644
index 103c3d42fcc..b00ecacc988
--- a/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_GeoModel/src/components/ALFA_GeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "../ALFA_DetectorTool.h"
DECLARE_TOOL_FACTORY(ALFA_DetectorTool)
+
diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx b/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx
index 5f763a8a3c1..701c7300ddd 100644
--- a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_Geometry/ALFA_GeometryReader.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(ALFA_GeometryReader)
-DECLARE_FACTORY_ENTRIES(ALFA_Geometry) {
- DECLARE_ALGORITHM(ALFA_GeometryReader)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_load.cxx b/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_load.cxx
deleted file mode 100644
index 1309eca148e..00000000000
--- a/ForwardDetectors/ALFA/ALFA_Geometry/src/components/ALFA_Geometry_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_Geometry)
-
diff --git a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx b/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx
index 9c5819c5316..9e30925a2d5 100644
--- a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_entries.cxx
@@ -1,10 +1,5 @@
#include "ALFA_Ntuple/ALFA_Ntuple.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( ALFA_Ntuple )
-DECLARE_FACTORY_ENTRIES( ALFA_Ntuple ) {
- DECLARE_ALGORITHM( ALFA_Ntuple )
-}
-
diff --git a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_load.cxx b/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_load.cxx
deleted file mode 100644
index 55ecb3c7c48..00000000000
--- a/ForwardDetectors/ALFA/ALFA_Ntuple/src/components/ALFA_Ntuple_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ALFA_Ntuple)
-
diff --git a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx
old mode 100755
new mode 100644
index 17654997713..e53e081db74
--- a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_Raw2Digit/ALFA_Raw2Digit.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_Raw2Digit)
-DECLARE_FACTORY_ENTRIES(ALFA_Raw2Digit) {
-DECLARE_ALGORITHM(ALFA_Raw2Digit)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_load.cxx b/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_load.cxx
deleted file mode 100755
index 2dd02721407..00000000000
--- a/ForwardDetectors/ALFA/ALFA_Raw2Digit/src/components/ALFA_Raw2Digit_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_Raw2Digit)
-
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx
index 078b0b60548..2c78f1d7ec8 100644
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_entries.cxx
@@ -1,11 +1,6 @@
#include "ALFA_GloRecEv/ALFA_GloRecEvent.h"
#include "ALFA_GloRecEv/ALFA_GloRecODEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_GloRecEvent)
DECLARE_ALGORITHM_FACTORY(ALFA_GloRecODEvent)
-DECLARE_FACTORY_ENTRIES(ALFA_GloRecEv) {
-DECLARE_ALGORITHM(ALFA_GloRecEvent)
-DECLARE_ALGORITHM(ALFA_GloRecODEvent)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_load.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_load.cxx
deleted file mode 100644
index 1a3ad1820cf..00000000000
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_GloRecEv/src/components/ALFA_GloRecEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_GloRecEv)
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx
index 7ba7b3edbc6..ffc7e4c208d 100644
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_entries.cxx
@@ -1,11 +1,6 @@
#include "ALFA_LocRecCorrEv/ALFA_LocRecCorrEvent.h"
#include "ALFA_LocRecCorrEv/ALFA_LocRecCorrODEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_LocRecCorrEvent)
DECLARE_ALGORITHM_FACTORY(ALFA_LocRecCorrODEvent)
-DECLARE_FACTORY_ENTRIES(ALFA_LocRecCorrEv) {
-DECLARE_ALGORITHM(ALFA_LocRecCorrEvent)
-DECLARE_ALGORITHM(ALFA_LocRecCorrODEvent)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_load.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_load.cxx
deleted file mode 100644
index 6aceb3a4446..00000000000
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecCorrEv/src/components/ALFA_LocRecCorrEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_LocRecCorrEv)
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx
index 18b74f10d5a..6e5b11330ce 100644
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_entries.cxx
@@ -1,11 +1,6 @@
#include "ALFA_LocRecEv/ALFA_LocRecEvent.h"
#include "ALFA_LocRecEv/ALFA_LocRecODEvent.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_LocRecEvent)
DECLARE_ALGORITHM_FACTORY(ALFA_LocRecODEvent)
-DECLARE_FACTORY_ENTRIES(ALFA_LocRecEv) {
-DECLARE_ALGORITHM(ALFA_LocRecEvent)
-DECLARE_ALGORITHM(ALFA_LocRecODEvent)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_load.cxx b/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_load.cxx
deleted file mode 100644
index 5210dcdfc55..00000000000
--- a/ForwardDetectors/ALFA/ALFA_RecEv/ALFA_LocRecEv/src/components/ALFA_LocRecEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_LocRecEv)
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx
index d1730066dbd..31bc4ee6962 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_GloRec/ALFA_GloRec.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_GloRec)
-DECLARE_FACTORY_ENTRIES(ALFA_GloRec) {
- DECLARE_ALGORITHM (ALFA_GloRec)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_load.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_load.cxx
deleted file mode 100644
index 5042e5e63e3..00000000000
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/components/ALFA_GloRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_GloRec)
\ No newline at end of file
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx
index fe8453e3e7b..ddbbb0a951c 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_LocRec/ALFA_LocRec.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_LocRec)
-DECLARE_FACTORY_ENTRIES(ALFA_LocRec) {
- DECLARE_ALGORITHM (ALFA_LocRec)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_load.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_load.cxx
deleted file mode 100644
index 78ea028d649..00000000000
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRec/src/components/ALFA_LocRec_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_LocRec)
-
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx
index fa0ed74b61d..41031b248c4 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_entries.cxx
@@ -1,8 +1,4 @@
#include "ALFA_LocRecCorr/ALFA_LocRecCorr.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_LocRecCorr)
-DECLARE_FACTORY_ENTRIES(ALFA_LocRecCorr) {
- DECLARE_ALGORITHM (ALFA_LocRecCorr)
-}
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_load.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_load.cxx
deleted file mode 100644
index 141f6ff370a..00000000000
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_LocRecCorr/src/components/ALFA_LocRecCorr_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_LocRecCorr)
-
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx b/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx
index b72851e6917..da0ca27bad6 100644
--- a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx
+++ b/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_entries.cxx
@@ -2,17 +2,9 @@
#include "ALFA_SimEv/ALFA_Hit.h"
#include "ALFA_SimEv/ALFA_ODHitCollection.h"
#include "ALFA_SimEv/ALFA_ODHit.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(ALFA_Hit)
DECLARE_ALGORITHM_FACTORY(ALFA_HitCollection)
DECLARE_ALGORITHM_FACTORY(ALFA_ODHit)
DECLARE_ALGORITHM_FACTORY(ALFA_ODHitCollection)
-DECLARE_FACTORY_ENTRIES(ALFA_SimEv) {
-DECLARE_ALGORITHM(ALFA_Hit)
-DECLARE_ALGORITHM(ALFA_HitCollection)
-DECLARE_ALGORITHM(ALFA_ODHit)
-DECLARE_ALGORITHM(ALFA_ODHitCollection)
-}
-
\ No newline at end of file
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_load.cxx b/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_load.cxx
deleted file mode 100644
index 8c459bcba72..00000000000
--- a/ForwardDetectors/ALFA/ALFA_SimEv/src/components/ALFA_SimEv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ALFA_SimEv)
diff --git a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
index 56a1277d683..891ab838adf 100644
--- a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
+++ b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_entries.cxx
@@ -1,14 +1,4 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ZdcIDDetDescrCnv.h"
DECLARE_CONVERTER_FACTORY(ZdcIDDetDescrCnv)
-DECLARE_FACTORY_ENTRIES ( ForwardIdCnv ) {
- DECLARE_CONVERTER ( ZdcIDDetDescrCnv );
-}
diff --git a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_load.cxx b/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_load.cxx
deleted file mode 100644
index 5d5b203351f..00000000000
--- a/ForwardDetectors/ForwardIdCnv/src/ForwardIdCnv_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( ForwardIdCnv )
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx
old mode 100755
new mode 100644
index 800a8383cc3..1f597ddd1c3
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/components/ForwardRegionGeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "../ForwardRegionGeoModelTool.h"
DECLARE_TOOL_FACTORY(ForwardRegionGeoModelTool)
+
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx
index 3ddf0598b70..5bbd79dc61b 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionMgField/src/components/ForwardRegionMgField_entries.cxx
@@ -1,5 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../ForwardRegionFieldSvc.h"
DECLARE_NAMESPACE_SERVICE_FACTORY( MagField, ForwardRegionFieldSvc )
+
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
index 28d734a21fd..56d1d2046cb 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_entries.cxx
@@ -1,8 +1,4 @@
#include "ForwardRegionProperties/ForwardRegionProperties.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(ForwardRegionProperties)
-DECLARE_FACTORY_ENTRIES(ForwardRegionProperties) {
- DECLARE_TOOL (ForwardRegionProperties)
-}
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_load.cxx
deleted file mode 100644
index 72b310a56ba..00000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionProperties/src/components/ForwardRegionProperties_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ForwardRegionProperties)
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx
index 88a6bc2e7a7..16f6435edb4 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_entries.cxx
@@ -2,7 +2,3 @@
DECLARE_ALGORITHM_FACTORY( SimulationHitCollectionCnv )
-DECLARE_FACTORY_ENTRIES(ForwardRegion_EventAthenaPool) {
- DECLARE_ALGORITHM( SimulationHitCollectionCnv )
-}
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_load.cxx
deleted file mode 100644
index 96701a70690..00000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(SimulationHitAthenaPool)
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx
index 88a6bc2e7a7..16f6435edb4 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_entries.cxx
@@ -2,7 +2,3 @@
DECLARE_ALGORITHM_FACTORY( SimulationHitCollectionCnv )
-DECLARE_FACTORY_ENTRIES(ForwardRegion_EventAthenaPool) {
- DECLARE_ALGORITHM( SimulationHitCollectionCnv )
-}
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_load.cxx
deleted file mode 100644
index c9d5f712bf8..00000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventAthenaPool/src/components/SimulationHitCollectionAthenaPool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(SimulationHitCollectionAthenaPool)
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx
index 7a38ce6151c..010cba068ee 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_entries.cxx
@@ -3,18 +3,9 @@
#include "ForwardRegion_EventTPCnv/SimulationHitHitCollection_p1.h"
#include "ForwardRegion_EventTPCnv/SimulationHitHitCollectionCnv_p1.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( SimulationHit_p1 )
DECLARE_ALGORITHM_FACTORY( SimulationHitHitCnv_p1 )
DECLARE_ALGORITHM_FACTORY( SimulationHitHitCollection_p1 )
DECLARE_ALGORITHM_FACTORY( SimulationHitHitCollectionCnv_p1 )
-DECLARE_FACTORY_ENTRIES(ForwardRegion_EventTPCnv) {
-
- DECLARE_ALGORITHM( SimulationHit_p1 )
- DECLARE_ALGORITHM( SimulationHitHitCnv_p1 )
- DECLARE_ALGORITHM( SimulationHitHitCollection_p1 )
- DECLARE_ALGORITHM( SimulationHitHitCollectionCnv_p1 )
-}
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_load.cxx
deleted file mode 100644
index 1c975e468a7..00000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_EventCnv/ForwardRegion_EventTPCnv/src/components/SimulationHitTPCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ForwardRegion_EventTPCnv)
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx
index 493189cb760..e6abdc58d06 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_entries.cxx
@@ -1,12 +1,6 @@
#include "ForwardRegion_SimEv/SimulationHitCollection.h"
#include "ForwardRegion_SimEv/SimulationHit.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(SimulationHit)
DECLARE_ALGORITHM_FACTORY(SimulationHitCollection)
-DECLARE_FACTORY_ENTRIES(ForwardRegion_SimEv) {
- DECLARE_ALGORITHM(SimulationHit)
- DECLARE_ALGORITHM(SimulationHitCollection)
-}
-
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_load.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_load.cxx
deleted file mode 100644
index 35f50691f0a..00000000000
--- a/ForwardDetectors/ForwardSimulation/ForwardRegion_SimEv/src/components/SimulationHit_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ForwardRegion_SimEv)
diff --git a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx b/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx
index d2bb6f27606..affd320a0cf 100644
--- a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx
+++ b/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../ForwardTransportModelTool.h"
DECLARE_TOOL_FACTORY( ForwardTransportModelTool )
-DECLARE_FACTORY_ENTRIES( ForwardTransport ) {
- DECLARE_TOOL( ForwardTransportModelTool )
-}
diff --git a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_load.cxx b/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_load.cxx
deleted file mode 100644
index b65f64dee1b..00000000000
--- a/ForwardDetectors/ForwardTransport/src/components/ForwardTransport_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( ForwardTransport )
diff --git a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx b/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx
index 7116f227176..d8e79953d4e 100644
--- a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx
+++ b/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ForwardTransportFast/ForwardTransportFast.h"
DECLARE_ALGORITHM_FACTORY( ForwardTransportFast )
-DECLARE_FACTORY_ENTRIES( ForwardTransportFast ) {
- DECLARE_ALGORITHM( ForwardTransportFast )
-}
-
diff --git a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_load.cxx b/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_load.cxx
deleted file mode 100644
index 85b5acb7cfa..00000000000
--- a/ForwardDetectors/ForwardTransportFast/src/components/ForwardTransportFast_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ForwardTransportFast )
diff --git a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx b/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx
old mode 100755
new mode 100644
index edcd20d31c0..deec131c08c
--- a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx
+++ b/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_entries.cxx
@@ -1,9 +1,4 @@
#include "../ForwardTransportSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY(ForwardTransportSvc)
-DECLARE_FACTORY_ENTRIES(ForwardTransportSvc) {
- DECLARE_SERVICE ( ForwardTransportSvc )
-}
-
diff --git a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_load.cxx b/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_load.cxx
deleted file mode 100755
index 06c6bf686fa..00000000000
--- a/ForwardDetectors/ForwardTransportSvc/src/components/ForwardTransportSvc_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(ForwardTransportSvc)
-
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
index 0abda3d71f9..15f50575e9e 100644
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LUCID_RawDataByteStreamCnv/LUCID_ByteStreamRawDataCnv.h"
DECLARE_ALGORITHM_FACTORY ( LUCID_ByteStreamRawDataCnv )
@@ -9,8 +7,3 @@ DECLARE_ALGORITHM_FACTORY ( LUCID_DigitRawDataCnv )
#include "LUCID_RawDataByteStreamCnv/LUCID_DigitByteStreamCnv.h"
DECLARE_CONVERTER_FACTORY ( LUCID_DigitByteStreamCnv )
-DECLARE_FACTORY_ENTRIES( LUCID_RawDataByteStreamCnv ) {
- DECLARE_ALGORITHM ( LUCID_ByteStreamRawDataCnv )
- DECLARE_ALGORITHM ( LUCID_DigitRawDataCnv )
- DECLARE_CONVERTER ( LUCID_DigitByteStreamCnv )
-}
diff --git a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_load.cxx b/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_load.cxx
deleted file mode 100644
index 19522f12a3a..00000000000
--- a/ForwardDetectors/LUCID/LUCID_Cnv/LUCID_RawDataByteStreamCnv/src/components/LUCID_RawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES ( LUCID_RawDataByteStreamCnv )
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx b/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx
index 570952a908e..8f82570f7d2 100644
--- a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../LUCID_Digitization.h"
#include "../LUCID_PileUpTool.h"
@@ -6,9 +5,4 @@
DECLARE_ALGORITHM_FACTORY( LUCID_DigiTop )
DECLARE_TOOL_FACTORY( LUCID_PileUpTool )
-DECLARE_FACTORY_ENTRIES(LUCID_Digitization) {
- DECLARE_ALGORITHM(LUCID_DigiTop)
- DECLARE_ALGTOOL(LUCID_PileUpTool)
-
-}
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_load.cxx b/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_load.cxx
deleted file mode 100644
index f5a77b63552..00000000000
--- a/ForwardDetectors/LUCID/LUCID_Digitization/src/components/LUCID_Digitization_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LUCID_Digitization)
diff --git a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx b/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx
index a0caf13f3be..42524996f88 100644
--- a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_entries.cxx
@@ -1,8 +1,4 @@
#include "../LUCID_SensitiveDetectorTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(LUCID_SensitiveDetectorTool)
-DECLARE_FACTORY_ENTRIES(LUCID_G4_SD) {
- DECLARE_TOOL(LUCID_SensitiveDetectorTool);
-}
diff --git a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_load.cxx b/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_load.cxx
deleted file mode 100644
index e384ef3e7ac..00000000000
--- a/ForwardDetectors/LUCID/LUCID_G4_SD/src/components/LUCID_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(LUCID_G4_SD)
diff --git a/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx b/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx
old mode 100755
new mode 100644
index 77cfd83493d..70751bacfa9
--- a/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_GeoModel/src/components/LUCID_GeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "../LUCID_DetectorTool.h"
DECLARE_TOOL_FACTORY(LUCID_DetectorTool)
+
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx b/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx
old mode 100755
new mode 100644
index 632c2545927..6ed27c9c003
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_entries.cxx
@@ -1,9 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LUCID_Monitoring/LUCID_HitsMoniTool.h"
DECLARE_TOOL_FACTORY(LUCID_HitsMoniTool)
-DECLARE_FACTORY_ENTRIES(LUCID_Monitoring) {
- DECLARE_ALGTOOL(LUCID_HitsMoniTool);
-}
-
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_load.cxx b/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_load.cxx
deleted file mode 100755
index 4128a760385..00000000000
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/src/components/LUCID_Monitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LUCID_Monitoring)
diff --git a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx
index 214a43812d3..20fc7ae00ff 100644
--- a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx
+++ b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../LucidPhysicsTool.h"
DECLARE_TOOL_FACTORY( LucidPhysicsTool )
-DECLARE_FACTORY_ENTRIES( LUCID_OpProcess ) {
- DECLARE_TOOL( LucidPhysicsTool )
-
-}
diff --git a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_load.cxx b/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_load.cxx
deleted file mode 100644
index 2753400e6b4..00000000000
--- a/ForwardDetectors/LUCID/LUCID_SimUtils/LUCID_OpProcess/src/components/LUCID_OpProcess_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( LUCID_OpProcess )
diff --git a/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx b/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx
index 9351a1fddd0..bcc6aec7d96 100644
--- a/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx
+++ b/ForwardDetectors/ZDC/ZDC_GeoM/src/components/ZDC_GeoM_entries.cxx
@@ -1,3 +1,4 @@
#include "../ZDC_DetTool.h"
DECLARE_TOOL_FACTORY(ZDC_DetTool)
+
diff --git a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx b/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx
index 0a80f51dfcc..dabf8912e7e 100644
--- a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx
+++ b/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../ZDC_PixelSDTool.h"
#include "../ZDC_StripSDTool.h"
DECLARE_TOOL_FACTORY( ZDC_PixelSDTool )
DECLARE_TOOL_FACTORY( ZDC_StripSDTool )
-DECLARE_FACTORY_ENTRIES( ZDC_SD ){
- DECLARE_TOOL( ZDC_PixelSDTool );
- DECLARE_TOOL( ZDC_StripSDTool );
-}
diff --git a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_load.cxx b/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_load.cxx
deleted file mode 100644
index 1c865a97f78..00000000000
--- a/ForwardDetectors/ZDC/ZDC_SD/src/components/ZDC_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ZDC_SD)
diff --git a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx b/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx
index ec2e7c4ec2a..6d8873ed6de 100644
--- a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx
+++ b/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ZDC_SimuDigitization/ZDC_DigiTop.h"
#include "ZDC_SimuDigitization/ZDC_PileUpTool.h"
@@ -6,9 +5,3 @@ DECLARE_ALGORITHM_FACTORY(ZDC_DigiTop)
DECLARE_TOOL_FACTORY( ZDC_PileUpTool )
-DECLARE_FACTORY_ENTRIES (ZDC_SimuDigitization)
-{
- DECLARE_ALGORITHM(ZDC_DigiTop)
- DECLARE_TOOL( ZDC_PileUpTool )
-}
-
diff --git a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_load.cxx b/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_load.cxx
deleted file mode 100644
index 0263473c4db..00000000000
--- a/ForwardDetectors/ZDC/ZDC_SimuDigitization/src/components/ZDC_SimuDigitization_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ZDC_SimuDigitization)
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx b/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx
index ff4c36e6867..aadd4198703 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/src/components/ZdcAnalysis_entries.cxx
@@ -1,16 +1,9 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
#ifndef XAOD_STANDALONE
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ZdcAnalysis/ZdcAnalysisTool.h"
DECLARE_TOOL_FACTORY (ZDC::ZdcAnalysisTool)
-DECLARE_FACTORY_ENTRIES (ZdcAnalysis) {
- DECLARE_TOOL (ZDC::ZdcAnalysisTool)
-}
#endif
+
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
index 8136e4b66f1..10a0c8ad477 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ZdcByteStream/ZdcByteStreamCnv.h"
#include "ZdcByteStream/ZdcByteStreamTool.h"
#include "ZdcByteStream/ZdcDataAccessV2.h"
@@ -25,14 +23,3 @@ DECLARE_ALGORITHM_FACTORY (ZdcByteStreamTester)
DECLARE_ALGORITHM_FACTORY (ZdcByteStreamRawData)
DECLARE_ALGORITHM_FACTORY (ZdcByteStreamRawDataV2)
-DECLARE_FACTORY_ENTRIES (ZdcByteStream) {
- DECLARE_CONVERTER (ZdcByteStreamCnv)
- DECLARE_TOOL (ZdcByteStreamTool)
- DECLARE_TOOL (ZdcByteStreamReadV1V2Tool)
- DECLARE_TOOL (ZdcL1CaloErrorByteStreamTool)
- DECLARE_TOOL (ZdcDataAccessV2)
- DECLARE_ALGORITHM (ZdcByteStreamTester)
- DECLARE_ALGORITHM (ZdcByteStreamRawData)
- DECLARE_ALGORITHM (ZdcByteStreamRawDataV2)
-}
-
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_load.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_load.cxx
deleted file mode 100644
index d56f4874854..00000000000
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/components/ZdcByteStream_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ZdcByteStream)
-
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx b/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx
index 8498383ce6d..a016c68e141 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ZdcRec/ZdcRec.h"
#include "ZdcRec/ZdcRecV2.h"
#include "ZdcRec/ZdcRecV3.h"
@@ -15,12 +13,3 @@ DECLARE_TOOL_FACTORY (ZdcRecChannelTool)
DECLARE_TOOL_FACTORY (ZdcRecChannelToolV2)
DECLARE_TOOL_FACTORY (ZdcRecNoiseTool)
-DECLARE_FACTORY_ENTRIES (ZdcRec) {
- DECLARE_TOOL (ZdcRecChannelTool)
- DECLARE_TOOL (ZdcRecChannelToolV2)
- DECLARE_TOOL (ZdcRecNoiseTool)
- DECLARE_ALGORITHM (ZdcRec)
- DECLARE_ALGORITHM (ZdcRecV2)
- DECLARE_ALGORITHM (ZdcRecV3)
-}
-
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_load.cxx b/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_load.cxx
deleted file mode 100644
index ba0976fe9b4..00000000000
--- a/ForwardDetectors/ZDC/ZdcRec/src/components/ZdcRec_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ZdcRec)
diff --git a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx b/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
index fa0f327bb63..3125915a1fb 100644
--- a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
+++ b/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
@@ -1,11 +1,4 @@
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ByteStreamEmonSvc/ByteStreamEmonInputSvc.h"
DECLARE_SERVICE_FACTORY( ByteStreamEmonInputSvc )
-DECLARE_FACTORY_ENTRIES( ByteStreamEmonSvc ) {
- DECLARE_SERVICE ( ByteStreamEmonInputSvc )
-}
diff --git a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_load.cxx b/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_load.cxx
deleted file mode 100644
index e9c746b8205..00000000000
--- a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ByteStreamEmonSvc )
-
-
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx
old mode 100755
new mode 100644
index b4011fd41ea..5d3673d0a98
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_entries.cxx
@@ -1,11 +1,6 @@
#include "TrigExL2muCalibTest/L2muCalibTest.h"
#include "TrigExL2muCalibTest/TrigPartialEBFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( L2muCalibTest )
DECLARE_ALGORITHM_FACTORY( TrigPartialEBFilter )
-DECLARE_FACTORY_ENTRIES(TrigExL2muCalibTest) {
- DECLARE_ALGORITHM( L2muCalibTest );
- DECLARE_ALGORITHM( TrigPartialEBFilter );
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_load.cxx
deleted file mode 100755
index bf06fa07714..00000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/components/L2muCalibTest_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExL2muCalibTest)
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
old mode 100755
new mode 100644
index 5d34ad59de6..d640228f125
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_entries.cxx
@@ -1,8 +1,4 @@
#include "TrigExMTHelloWorld/MTHelloWorld.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( MTHelloWorld )
-DECLARE_FACTORY_ENTRIES(TrigExMTHelloWorld) {
- DECLARE_ALGORITHM( MTHelloWorld );
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_load.cxx
deleted file mode 100755
index ac59b379182..00000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorld/src/components/MTHelloWorld_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExMTHelloWorld)
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx
old mode 100755
new mode 100644
index 8ee95c20f06..56f6895d0d8
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_entries.cxx
@@ -1,8 +1,4 @@
#include "TrigExMTHelloWorldLvl1/MTHelloWorldLvl1.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( MTHelloWorldLvl1 )
-DECLARE_FACTORY_ENTRIES(TrigExMTHelloWorldLvl1) {
- DECLARE_ALGORITHM( MTHelloWorldLvl1 );
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_load.cxx
deleted file mode 100755
index 2050e7fbde0..00000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHelloWorldLvl1/src/components/MTHelloWorldLvl1_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExMTHelloWorldLvl1)
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx
old mode 100755
new mode 100644
index 9895055aa01..fdc36b71831
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_entries.cxx
@@ -1,14 +1,8 @@
#include "TrigExMTHistNtup/MTHist.h"
#include "TrigExMTHistNtup/MTNtup.h"
#include "TrigExMTHistNtup/MTTHist.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( MTHist )
DECLARE_ALGORITHM_FACTORY( MTNtup )
DECLARE_ALGORITHM_FACTORY( MTTHist )
-DECLARE_FACTORY_ENTRIES(TrigExMTHistNtup) {
- DECLARE_ALGORITHM( MTHist );
- DECLARE_ALGORITHM( MTNtup );
- DECLARE_ALGORITHM( MTTHist );
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_load.cxx
deleted file mode 100755
index 014527fcb7f..00000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExMTHistNtup/src/components/TrigExMTHistNtup_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExMTHistNtup)
-
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx
old mode 100755
new mode 100644
index 7455949fcf5..5f5c3b20102
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrigExPartialEB/MTCalibPeb.h"
DECLARE_ALGORITHM_FACTORY( MTCalibPeb )
-DECLARE_FACTORY_ENTRIES(TrigExPartialEB) {
- DECLARE_ALGORITHM( MTCalibPeb )
-}
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_load.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_load.cxx
deleted file mode 100755
index 2b23ed31f05..00000000000
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/src/components/TrigExPartialEB_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigExPartialEB)
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx b/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
index cde6e20dfa0..a20b96713c6 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrigServices/TrigMessageSvc.h"
#include "../TrigMonTHistSvc.h"
#include "TrigServices/HltEventLoopMgr.h"
@@ -17,14 +16,3 @@ DECLARE_TOOL_FACTORY( TrigISHelper )
DECLARE_TOOL_FACTORY( TrigPreFlightCheck )
DECLARE_TOOL_FACTORY( TrigCOOLUpdateHelper )
-
-DECLARE_FACTORY_ENTRIES( TrigServices ) {
- DECLARE_SERVICE( TrigMessageSvc );
- DECLARE_SERVICE( TrigMonTHistSvc );
- DECLARE_SERVICE( TrigIS );
- DECLARE_SERVICE( HltEventLoopMgr );
- DECLARE_SERVICE( HltROBDataProviderSvc );
- DECLARE_TOOL( TrigISHelper );
- DECLARE_TOOL( TrigPreFlightCheck );
- DECLARE_TOOL( TrigCOOLUpdateHelper );
-}
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_load.cxx b/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_load.cxx
deleted file mode 100644
index 0e7b58ee4de..00000000000
--- a/HLT/Trigger/TrigControl/TrigServices/src/components/TrigServices_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrigServices )
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
index f9201f2fd9d..97ce6fab731 100644
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrigOnlineMonitor/TrigROBMonitor.h"
#include "TrigOnlineMonitor/TrigMuCTPiROBMonitor.h"
#include "src/TrigALFAROBMonitor.h"
@@ -9,9 +8,3 @@ DECLARE_ALGORITHM_FACTORY( TrigMuCTPiROBMonitor )
DECLARE_ALGORITHM_FACTORY( TrigALFAROBMonitor )
DECLARE_ALGORITHM_FACTORY( TrigL1TopoROBMonitor )
-DECLARE_FACTORY_ENTRIES(TrigOnlineMonitor) {
- DECLARE_ALGORITHM( TrigROBMonitor )
- DECLARE_ALGORITHM( TrigMuCTPiROBMonitor )
- DECLARE_ALGORITHM( TrigALFAROBMonitor )
- DECLARE_ALGORITHM( TrigL1TopoROBMonitor )
-}
diff --git a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_load.cxx b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_load.cxx
deleted file mode 100644
index 1ba3f653356..00000000000
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/src/components/TrigOnlineMonitor_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigOnlineMonitor)
diff --git a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx b/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
index 0f9873e8865..984ab30cb5c 100644
--- a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
+++ b/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "LumiBlockComps/CreateLumiBlockCollectionFromFile.h"
//#include "LumiBlockComps/CreateAANTFromLumiBlockCollection.h"
#include "LumiBlockComps/LumiBlockMetaDataTool.h"
@@ -28,19 +27,3 @@ DECLARE_TOOL_FACTORY( LumiBlockMetaDataTool )
#include "../xAOD2NtupLumiSvc.h"
DECLARE_SERVICE_FACTORY( xAOD2NtupLumiSvc )
-DECLARE_FACTORY_ENTRIES(LumiBlockComps) {
- DECLARE_ALGORITHM( CreateLumiBlockCollectionFromFile );
- // DECLARE_ALGORITHM( CreateAANTFromLumiBlockCollection );
- DECLARE_ALGTOOL( LumiBlockMetaDataTool);
- DECLARE_SERVICE( xAOD2NtupLumiSvc );
-
-#ifndef XAOD_ANALYSIS
- DECLARE_ALGORITHM( LumiBlockMuWriter );
- DECLARE_ALGORITHM( LumiBlockTester );
- DECLARE_ALGTOOL( LumiBlockMuTool);
- DECLARE_ALGTOOL( LuminosityTool);
- DECLARE_ALGTOOL( TrigLivefractionTool);
- DECLARE_SERVICE( LumiCalcSvc );
-#endif
-}
-
diff --git a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_load.cxx b/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_load.cxx
deleted file mode 100644
index d63dc04f581..00000000000
--- a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LumiBlockComps)
diff --git a/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx b/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx
index 0df26cdfe47..f6080515697 100644
--- a/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx
+++ b/MagneticField/MagFieldServices/src/components/MagFieldServices_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MagFieldServices/AtlasFieldSvc.h"
#include "MagFieldServices/H8FieldSvc.h"
DECLARE_NAMESPACE_SERVICE_FACTORY( MagField , AtlasFieldSvc )
DECLARE_NAMESPACE_SERVICE_FACTORY( MagField , H8FieldSvc )
-DECLARE_FACTORY_ENTRIES( MagFieldServices ) {
- DECLARE_NAMESPACE_SERVICE( MagField , AtlasFieldSvc )
- DECLARE_NAMESPACE_SERVICE( MagField , H8FieldSvc )
-}
diff --git a/MagneticField/MagFieldServices/src/components/MagFieldServices_load.cxx b/MagneticField/MagFieldServices/src/components/MagFieldServices_load.cxx
deleted file mode 100644
index 014766ae523..00000000000
--- a/MagneticField/MagFieldServices/src/components/MagFieldServices_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MagFieldServices )
diff --git a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx b/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
index a7386487a70..7423a4f612a 100644
--- a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
+++ b/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MagFieldUtils/MagFieldTestbedAlg.h"
#include "MagFieldUtils/SolenoidTest.h"
#include "MagFieldUtils/IdentityManipulator.h"
@@ -7,8 +6,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( MagField , MagFieldTestbedAlg )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( MagField , SolenoidTest )
DECLARE_NAMESPACE_TOOL_FACTORY( MagField , IdentityManipulator )
-DECLARE_FACTORY_ENTRIES( MagFieldUtils ) {
- DECLARE_NAMESPACE_ALGORITHM( MagField , MagFieldTestbedAlg )
- DECLARE_NAMESPACE_ALGORITHM( MagField , SolenoidTest )
- DECLARE_NAMESPACE_TOOL( MagField , IdentityManipulator )
-}
diff --git a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_load.cxx b/MagneticField/MagFieldUtils/src/components/MagFieldUtils_load.cxx
deleted file mode 100644
index 5b3493ffa1c..00000000000
--- a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MagFieldUtils )
-
diff --git a/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx b/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx
index 06c86f4e0bd..d5d368981b1 100644
--- a/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx
+++ b/Offloading/OffloadSvc/src/components/OffloadSvc_entries.cxx
@@ -1,9 +1,5 @@
#include "OffloadSvc/OffloadSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY( OffloadSvc )
-DECLARE_FACTORY_ENTRIES( OffloadSvc ) {
- DECLARE_SERVICE( OffloadSvc )
-}
diff --git a/Offloading/OffloadSvc/src/components/OffloadSvc_load.cxx b/Offloading/OffloadSvc/src/components/OffloadSvc_load.cxx
deleted file mode 100644
index 623ff1d7aef..00000000000
--- a/Offloading/OffloadSvc/src/components/OffloadSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(OffloadSvc)
diff --git a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx b/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx
old mode 100755
new mode 100644
index 996a0479907..89a53c727c7
--- a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx
+++ b/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_entries.cxx
@@ -1,12 +1,4 @@
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TBCaloGeometry/TBCaloCoordinate.h"
DECLARE_TOOL_FACTORY( TBCaloCoordinate )
-DECLARE_FACTORY_ENTRIES ( TBCaloGeometry ) {
- DECLARE_TOOL( TBCaloCoordinate )
-}
-
-
diff --git a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_load.cxx b/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_load.cxx
deleted file mode 100755
index 7178221997c..00000000000
--- a/TestBeam/TBCaloGeometry/src/components/TBCaloGeometry_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TBCaloGeometry )
diff --git a/TestBeam/TBCnv/src/components/TBCnv_entries.cxx b/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
index 0d4e523f8a2..1b685183bee 100644
--- a/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
+++ b/TestBeam/TBCnv/src/components/TBCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TBCnv/TBDataCnv.h"
#include "TBCnv/TBByteStreamCnvTool.h"
#include "TBCnv/ReadTBLArDigits.h"
@@ -45,19 +43,3 @@ DECLARE_ALGORITHM_FACTORY( ReadTBLArCalibDigits )
DECLARE_ALGORITHM_FACTORY( TBCheckBCIDs )
-DECLARE_FACTORY_ENTRIES( TBCnv ) {
- DECLARE_TOOL( TBByteStreamCnvTool )
- DECLARE_CONVERTER( TBTDCCnv )
- DECLARE_CONVERTER( TBTDCRawContCnv )
- DECLARE_CONVERTER( TBLArDigitContainerCnv )
- DECLARE_CONVERTER( TBLArCalibDigitContainerCnv )
- DECLARE_CONVERTER( TBADCRawContCnv )
- DECLARE_CONVERTER( TBBPCRawContCnv )
- DECLARE_CONVERTER( TBScintillatorRawContCnv )
- DECLARE_CONVERTER( TBTriggerPatternUnitCnv )
- DECLARE_CONVERTER( TBTailCatcherRawCnv )
- DECLARE_CONVERTER( TBEventInfoCnv )
- DECLARE_ALGORITHM( ReadTBLArDigits )
- DECLARE_ALGORITHM( ReadTBLArCalibDigits )
- DECLARE_ALGORITHM( TBCheckBCIDs )
-}
diff --git a/TestBeam/TBCnv/src/components/TBCnv_load.cxx b/TestBeam/TBCnv/src/components/TBCnv_load.cxx
deleted file mode 100644
index 9ed0e0b3c32..00000000000
--- a/TestBeam/TBCnv/src/components/TBCnv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBCnv)
diff --git a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx b/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx
old mode 100755
new mode 100644
index 24a9975504d..edd669498cd
--- a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx
+++ b/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_entries.cxx
@@ -1,13 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Tool
#include "../TBCaloPosTool.h"
#include "../TBCaloCoolPosTool.h"
DECLARE_TOOL_FACTORY( TBCaloPosTool )
DECLARE_TOOL_FACTORY( TBCaloCoolPosTool )
-DECLARE_FACTORY_ENTRIES(TBCaloConditions) {
- DECLARE_TOOL ( TBCaloPosTool )
- DECLARE_TOOL ( TBCaloCoolPosTool )
-}
-
diff --git a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_load.cxx b/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_load.cxx
deleted file mode 100755
index 7df8173324f..00000000000
--- a/TestBeam/TBConditions/TBCaloConditions/src/components/TBCaloConditions_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBCaloConditions)
diff --git a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx b/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx
old mode 100755
new mode 100644
index e07e8e0c92d..ee72e1c097a
--- a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx
+++ b/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TBCondRunPar/TBCondRunParTool.h"
DECLARE_TOOL_FACTORY( TBCondRunParTool )
-DECLARE_FACTORY_ENTRIES( TBCondRunPar )
-{
- DECLARE_TOOL( TBCondRunParTool )
-}
diff --git a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_load.cxx b/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_load.cxx
deleted file mode 100755
index f6e529a4058..00000000000
--- a/TestBeam/TBConditions/TBCondRunPar/src/components/TBCondRunPar_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TBCondRunPar )
diff --git a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx b/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx
old mode 100755
new mode 100644
index 32c854e0617..fa95bc5dec3
--- a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx
+++ b/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_entries.cxx
@@ -1,9 +1,5 @@
#include "TBDetDescrAlg/TBDetDescrLoader.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( TBDetDescrLoader )
-DECLARE_FACTORY_ENTRIES(TBDetDescrAlg) {
- DECLARE_ALGORITHM( TBDetDescrLoader )
-}
diff --git a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_load.cxx b/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_load.cxx
deleted file mode 100755
index 9a1357b73f0..00000000000
--- a/TestBeam/TBDetDescrAlg/src/components/TBDetDescrAlg_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBDetDescrAlg)
diff --git a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
old mode 100755
new mode 100644
index 202160b08f2..76f0282c5b0
--- a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
+++ b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
@@ -1,14 +1,4 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TBDetDescrCnv/TBDetDescrCnv.h"
DECLARE_CONVERTER_FACTORY(TBDetDescrCnv)
-DECLARE_FACTORY_ENTRIES ( TBDetDescrCnv ) {
- DECLARE_CONVERTER ( TBDetDescrCnv );
-}
diff --git a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_load.cxx b/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_load.cxx
deleted file mode 100755
index c581626d732..00000000000
--- a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_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( TBDetDescrCnv )
diff --git a/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx b/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx
old mode 100755
new mode 100644
index f28646be713..dc42f8393dd
--- a/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx
+++ b/TestBeam/TBMonitoring/src/components/TBMonitoring_entries.cxx
@@ -1,5 +1,3 @@
-
-
#include "TBMonitoring/TBBPCMonTool.h"
#include "TBMonitoring/TBMWPCMonTool.h"
#include "TBMonitoring/TBPhaseMonTool.h"
@@ -11,7 +9,6 @@
#include "TBMonitoring/TBCaloResponseMonTool.h"
#include "TBMonitoring/TBBeamQualityDoubleHitsMonTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(TBBPCMonTool)
@@ -25,15 +22,3 @@ DECLARE_TOOL_FACTORY(TBADCRawMonTool)
DECLARE_TOOL_FACTORY(TBCaloResponseMonTool)
DECLARE_TOOL_FACTORY(TBBeamQualityDoubleHitsMonTool)
-DECLARE_FACTORY_ENTRIES(TBMonitoring) {
- DECLARE_ALGTOOL(TBBPCMonTool)
- DECLARE_ALGTOOL(TBMWPCMonTool)
- DECLARE_ALGTOOL(TBPhaseMonTool)
- DECLARE_ALGTOOL(TBScintillatorMonTool)
- DECLARE_ALGTOOL(TBTailCatcherRawMonTool)
- DECLARE_ALGTOOL(TBTriggerPatternUnitMonTool)
- DECLARE_ALGTOOL(TBTDCRawMonTool)
- DECLARE_ALGTOOL(TBADCRawMonTool)
- DECLARE_ALGTOOL(TBCaloResponseMonTool)
- DECLARE_ALGTOOL(TBBeamQualityDoubleHitsMonTool)
-}
diff --git a/TestBeam/TBMonitoring/src/components/TBMonitoring_load.cxx b/TestBeam/TBMonitoring/src/components/TBMonitoring_load.cxx
deleted file mode 100755
index 623ee234bfb..00000000000
--- a/TestBeam/TBMonitoring/src/components/TBMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBMonitoring)
diff --git a/TestBeam/TBRec/src/components/TBRec_entries.cxx b/TestBeam/TBRec/src/components/TBRec_entries.cxx
old mode 100755
new mode 100644
index 1cc3aa758fd..1c368c9837c
--- a/TestBeam/TBRec/src/components/TBRec_entries.cxx
+++ b/TestBeam/TBRec/src/components/TBRec_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TBRec/TBAlgoSequencer.h"
#include "TBRec/TBXMLWriter.h"
@@ -104,52 +102,3 @@ DECLARE_TOOL_FACTORY( TBEMECXTalkToyModel )
DECLARE_TOOL_FACTORY( TBExtrapolTrackToCaloTool )
-DECLARE_FACTORY_ENTRIES( TBRec ) {
- DECLARE_ALGORITHM( TBXMLWriter )
- DECLARE_ALGORITHM( TBAlgoSequencer )
- DECLARE_ALGORITHM( TBBPCRec )
- DECLARE_ALGORITHM( TBMWPCRec )
- DECLARE_ALGORITHM( TBScintillatorRec )
- DECLARE_ALGORITHM( TBTailCatcherRec )
- DECLARE_ALGORITHM( TBPlaneTrackingAlgo )
- DECLARE_ALGORITHM( TBPhaseRec )
- DECLARE_ALGORITHM( TBLArRawChannelBuilder )
- DECLARE_ALGORITHM( TBECLArRawChannelBuilder )
- DECLARE_ALGORITHM( TBEventStreamer )
- DECLARE_ALGORITHM( CBNTAA_BeamInstrumentation )
- DECLARE_ALGORITHM( CBNTAA_TBADCRaw )
- DECLARE_ALGORITHM( CBNTAA_TBTDCRaw )
- DECLARE_ALGORITHM( CBNTAA_TBInfo )
- DECLARE_ALGORITHM( CBNTAA_TBTrack )
- DECLARE_ALGORITHM( CBNTAA_TBScint )
- DECLARE_ALGORITHM( CBNT_Timing )
- DECLARE_ALGORITHM( CBNT_CaloH6 )
- DECLARE_ALGORITHM( CBNT_UpstreamMat )
- DECLARE_ALGORITHM( TBPartIDCherenkovMuTag )
- DECLARE_ALGORITHM( TBBeamQuality )
- DECLARE_ALGORITHM( TBTree_CaloClusterH6 )
- DECLARE_ALGORITHM( TBNoiseWrite )
- DECLARE_ALGORITHM( TBBeamQualityMC )
- DECLARE_ALGORITHM( TBXCryYTableRead )
- DECLARE_ALGORITHM( TBDMContainerSplitter )
- DECLARE_ALGORITHM( CBNTAA_TBTPValidation )
- DECLARE_ALGORITHM( TBTrackInfoFromTag )
- DECLARE_ALGORITHM( TBTrackToCaloAlg )
- DECLARE_TOOL( TBXMLEventWriterTool )
- DECLARE_TOOL( TBXMLCaloCellWriterTool )
- DECLARE_TOOL( TBPatternUnitStreamerTool )
- DECLARE_TOOL( TBPatternUnitStreamerToolH8 )
- DECLARE_TOOL( TBEventInfoStreamerTool )
- DECLARE_TOOL( TBPreScalerStreamerTool )
- DECLARE_TOOL( TBBeamQualityDoubleHitsTool )
- DECLARE_TOOL( TBBeamQualityMuonToolH6 )
- DECLARE_TOOL( TBBeamQualityEMFractionTool )
- DECLARE_TOOL( TBBeamQualityTrackingTool )
- DECLARE_TOOL( TBPhaseStreamerTool )
- DECLARE_TOOL( TBEMECCellEtaCorrection )
- DECLARE_TOOL( TBClusterMaker )
- DECLARE_TOOL( TBCellNoiseCorrection )
- DECLARE_TOOL( TBCellContainerFillerTool )
- DECLARE_TOOL( TBEMECXTalkToyModel )
- DECLARE_TOOL( TBExtrapolTrackToCaloTool )
-}
diff --git a/TestBeam/TBRec/src/components/TBRec_load.cxx b/TestBeam/TBRec/src/components/TBRec_load.cxx
deleted file mode 100755
index a017f5d2d43..00000000000
--- a/TestBeam/TBRec/src/components/TBRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TBRec)
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx
old mode 100755
new mode 100644
index 69b515ac8c5..78973664d58
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx
+++ b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_entries.cxx
@@ -1,12 +1,7 @@
#include "../HelloAlg.h"
#include "../HelloTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( HelloAlg )
DECLARE_TOOL_FACTORY( HelloTool )
-DECLARE_FACTORY_ENTRIES(AthExHelloWorld) {
- DECLARE_ALGORITHM( HelloAlg )
- DECLARE_TOOL( HelloTool )
-}
diff --git a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_load.cxx b/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_load.cxx
deleted file mode 100755
index b4329e73aea..00000000000
--- a/Tools/RunTimeTester/testsuite/testsuites/linuxinteractive/Control/AthenaExamples/AthExHelloWorld/src/components/AthExHelloWorld_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthExHelloWorld)
-
diff --git a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx b/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx
index 29de337628d..73b1c60846f 100644
--- a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx
+++ b/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_entries.cxx
@@ -1,9 +1,5 @@
#include "../ValgrindHelperAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( ValgrindHelperAlg )
-DECLARE_FACTORY_ENTRIES( ValgrindRTTJobs ) {
- DECLARE_ALGORITHM( ValgrindHelperAlg ) ;
-}
diff --git a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_load.cxx b/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_load.cxx
deleted file mode 100644
index 47092cf5754..00000000000
--- a/Tools/ValgrindRTTJobs/src/components/ValgrindRTTJobs_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ValgrindRTTJobs)
diff --git a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx b/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx
index 8bb72a9eee1..ea62ba2b71f 100644
--- a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx
+++ b/graphics/EventDisplayFilters/src/components/EventDisplayFilters_entries.cxx
@@ -1,11 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "EventDisplayFilters/FilterUsingMBTS.h"
#include "EventDisplayFilters/FilterUsingMBTSTiming.h"
#include "EventDisplayFilters/FilterUsingSpacePoints.h"
DECLARE_ALGORITHM_FACTORY( FilterUsingMBTS )
DECLARE_ALGORITHM_FACTORY( FilterUsingMBTSTiming )
DECLARE_ALGORITHM_FACTORY( FilterUsingSpacePoints )
-DECLARE_FACTORY_ENTRIES( EventDisplayFilters ) {
- DECLARE_ALGORITHM( FilterUsingMBTSTiming )
- DECLARE_ALGORITHM( FilterUsingSpacePoints )
-}
+
diff --git a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_load.cxx b/graphics/EventDisplayFilters/src/components/EventDisplayFilters_load.cxx
deleted file mode 100644
index c83aa3a0c56..00000000000
--- a/graphics/EventDisplayFilters/src/components/EventDisplayFilters_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(EventDisplayFilters)
diff --git a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx b/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx
old mode 100755
new mode 100644
index 47a2075ad8d..6e8448a951d
--- a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx
+++ b/graphics/GeometryJiveXML/src/components/GeometryJiveXML_entries.cxx
@@ -1,13 +1,8 @@
#include "GeometryJiveXML/GeometryWriter.h"
#include "GeometryJiveXML/MuonGeometryWriter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace JiveXML;
DECLARE_TOOL_FACTORY(GeometryWriter)
DECLARE_TOOL_FACTORY(MuonGeometryWriter)
-DECLARE_FACTORY_ENTRIES(GeometryJiveXML) {
- DECLARE_ALGTOOL(GeometryWriter)
- DECLARE_ALGTOOL(MuonGeometryWriter)
-}
diff --git a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_load.cxx b/graphics/GeometryJiveXML/src/components/GeometryJiveXML_load.cxx
deleted file mode 100755
index 0552edae887..00000000000
--- a/graphics/GeometryJiveXML/src/components/GeometryJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(GeometryJiveXML)
diff --git a/graphics/JiveXML/src/components/JiveXML_entries.cxx b/graphics/JiveXML/src/components/JiveXML_entries.cxx
old mode 100755
new mode 100644
index 9eb325bf0ac..2ff8b52f1a6
--- a/graphics/JiveXML/src/components/JiveXML_entries.cxx
+++ b/graphics/JiveXML/src/components/JiveXML_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "JiveXML/AlgoJiveXML.h"
#include "JiveXML/StreamToFileTool.h"
#include "JiveXML/StreamToServerTool.h"
@@ -17,14 +16,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( JiveXML , StreamToServerTool )
DECLARE_NAMESPACE_TOOL_FACTORY( JiveXML , XMLFormatTool )
#endif
-DECLARE_FACTORY_ENTRIES( JiveXML ) {
- DECLARE_NAMESPACE_ALGORITHM( JiveXML , AlgoJiveXML)
- DECLARE_NAMESPACE_SERVICE( JiveXML, ONCRPCServerSvc )
- DECLARE_NAMESPACE_SERVICE( JiveXML, ExternalONCRPCServerSvc )
- DECLARE_NAMESPACE_TOOL ( JiveXML , StreamToFileTool )
- DECLARE_NAMESPACE_TOOL ( JiveXML , StreamToServerTool )
-#ifndef __APPLE__
- DECLARE_NAMESPACE_TOOL ( JiveXML , XMLFormatTool )
-#endif
-}
-
diff --git a/graphics/JiveXML/src/components/JiveXML_load.cxx b/graphics/JiveXML/src/components/JiveXML_load.cxx
deleted file mode 100755
index 15d999fc278..00000000000
--- a/graphics/JiveXML/src/components/JiveXML_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JiveXML)
-
diff --git a/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx b/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx
old mode 100755
new mode 100644
index 87fc0ce11e3..1812e53189f
--- a/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx
+++ b/graphics/VP1/VP1Algs/src/components/VP1Algs_entries.cxx
@@ -4,7 +4,6 @@
// 22 May Riccardo-Maria BIANCHI <rbianchi@cern.ch>
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "VP1Algs/VP1Alg.h"
//#include "VP1Algs/VP1EventProd.h"
@@ -12,7 +11,3 @@
DECLARE_ALGORITHM_FACTORY(VP1Alg)
//DECLARE_ALGORITHM_FACTORY(VP1EventProd)
-DECLARE_FACTORY_ENTRIES(VP1Algs) {
- DECLARE_ALGORITHM( VP1Alg );
- //DECLARE_ALGORITHM( VP1EventProd );
-}
diff --git a/graphics/VP1/VP1Algs/src/components/VP1Algs_load.cxx b/graphics/VP1/VP1Algs/src/components/VP1Algs_load.cxx
deleted file mode 100755
index b0d1e5e2286..00000000000
--- a/graphics/VP1/VP1Algs/src/components/VP1Algs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(VP1Algs)
diff --git a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx b/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx
old mode 100755
new mode 100644
index 11cd0e7cf0e..103f01a86c3
--- a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx
+++ b/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_entries.cxx
@@ -1,9 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "VP1AlgsBatch/VP1BatchOnLatestEvent.h"
DECLARE_ALGORITHM_FACTORY(VP1BatchOnLatestEvent)
-DECLARE_FACTORY_ENTRIES(VP1AlgsBatch) {
- DECLARE_ALGORITHM( VP1BatchOnLatestEvent );
-}
diff --git a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_load.cxx b/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_load.cxx
deleted file mode 100755
index 3eb732217ba..00000000000
--- a/graphics/VP1/VP1AlgsBatch/src/components/VP1AlgsBatch_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(VP1AlgsBatch)
diff --git a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx b/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx
old mode 100755
new mode 100644
index 94e1d6f5294..6ce98bcc93b
--- a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx
+++ b/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "VP1AlgsEventProd/VP1EventProd.h"
DECLARE_ALGORITHM_FACTORY(VP1EventProd)
-DECLARE_FACTORY_ENTRIES(VP1AlgsEventProd) {
- DECLARE_ALGORITHM( VP1EventProd );
-}
diff --git a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_load.cxx b/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_load.cxx
deleted file mode 100755
index 4a56002be0f..00000000000
--- a/graphics/VP1/VP1AlgsEventProd/src/components/VP1AlgsEventProd_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(VP1AlgsEventProd)
diff --git a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx b/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx
index f3d5b9e559f..8ffcc394fa1 100644
--- a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx
+++ b/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "VP1TrkAuxAlgs/VP1TrkInitializer.h"
DECLARE_ALGORITHM_FACTORY(VP1TrkInitializer)
-DECLARE_FACTORY_ENTRIES(VP1TrkAuxAlgs) {
- DECLARE_ALGORITHM( VP1TrkInitializer );
-}
diff --git a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_load.cxx b/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_load.cxx
deleted file mode 100644
index 7fd141963a3..00000000000
--- a/graphics/VP1/VP1TrkAuxAlgs/src/components/VP1TrkAuxAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(VP1TrkAuxAlgs)
--
GitLab