diff --git a/Calorimeter/CaloBadChannelTool/src/components/CaloBadChannelTool_entries.cxx b/Calorimeter/CaloBadChannelTool/src/components/CaloBadChannelTool_entries.cxx
index 2898ad7ca50d570d827487c2ff077aa6afddccf1..3bd9ca7cbe15e938741ef89d00ece7525ed43465 100644
--- a/Calorimeter/CaloBadChannelTool/src/components/CaloBadChannelTool_entries.cxx
+++ b/Calorimeter/CaloBadChannelTool/src/components/CaloBadChannelTool_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "CaloBadChannelTool/CaloBadChanTool.h"
DECLARE_TOOL_FACTORY( CaloBadChanTool )
-DECLARE_FACTORY_ENTRIES(CaloBadChannelTool) {
- DECLARE_TOOL( CaloBadChanTool )
-}
diff --git a/Calorimeter/CaloBadChannelTool/src/components/CaloBadChannelTool_load.cxx b/Calorimeter/CaloBadChannelTool/src/components/CaloBadChannelTool_load.cxx
deleted file mode 100644
index 3d213f70a96dc081f1e6dd3eb1e08e38270f62e8..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloBadChannelTool/src/components/CaloBadChannelTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloBadChannelTool)
diff --git a/Calorimeter/CaloCalibHitRec/src/components/CaloCalibHitRec_entries.cxx b/Calorimeter/CaloCalibHitRec/src/components/CaloCalibHitRec_entries.cxx
old mode 100755
new mode 100644
index 240815bc395922779bfefe27c689a0593c1c52bf..7c071417242ef46edad9143471c54c7d768e0e17
--- a/Calorimeter/CaloCalibHitRec/src/components/CaloCalibHitRec_entries.cxx
+++ b/Calorimeter/CaloCalibHitRec/src/components/CaloCalibHitRec_entries.cxx
@@ -3,7 +3,6 @@
#include "CaloCalibHitRec/CaloCalibClusterMomentsMaker.h"
#include "CaloCalibHitRec/CaloCalibClusterMomentsMaker2.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( CalibHitToCaloCell )
DECLARE_ALGORITHM_FACTORY( CalibHitIDCheck )
@@ -11,9 +10,3 @@ DECLARE_ALGORITHM_FACTORY( CalibHitIDCheck )
DECLARE_TOOL_FACTORY( CaloCalibClusterMomentsMaker )
DECLARE_TOOL_FACTORY( CaloCalibClusterMomentsMaker2 )
-DECLARE_FACTORY_ENTRIES(CaloCalibHitRec) {
- DECLARE_ALGORITHM( CalibHitToCaloCell )
- DECLARE_ALGORITHM( CalibHitIDCheck )
- DECLARE_TOOL( CaloCalibClusterMomentsMaker )
- DECLARE_TOOL( CaloCalibClusterMomentsMaker2 )
-}
diff --git a/Calorimeter/CaloCalibHitRec/src/components/CaloCalibHitRec_load.cxx b/Calorimeter/CaloCalibHitRec/src/components/CaloCalibHitRec_load.cxx
deleted file mode 100755
index 01f0c94a4be2e678c15432335a51f2de39d970f7..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCalibHitRec/src/components/CaloCalibHitRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloCalibHitRec)
diff --git a/Calorimeter/CaloCellCorrection/src/components/CaloCellCorrection_entries.cxx b/Calorimeter/CaloCellCorrection/src/components/CaloCellCorrection_entries.cxx
old mode 100755
new mode 100644
index ed80fa95b1888a03404d3d48df03abfd854302c1..186ebb83b31dc033e4e22869954e32efc1df10c7
--- a/Calorimeter/CaloCellCorrection/src/components/CaloCellCorrection_entries.cxx
+++ b/Calorimeter/CaloCellCorrection/src/components/CaloCellCorrection_entries.cxx
@@ -6,7 +6,6 @@
#include "CaloCellCorrection/CaloCellEnergyRescaler.h"
#include "CaloCellCorrection/CaloCellTimeCorrTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( CaloCellPedestalCorr )
DECLARE_TOOL_FACTORY( CaloCellMBAverageCorr )
@@ -16,13 +15,3 @@ DECLARE_TOOL_FACTORY( CaloCellRescaler )
DECLARE_TOOL_FACTORY( CaloCellEnergyRescaler )
DECLARE_TOOL_FACTORY ( CaloCellTimeCorrTool )
-
-DECLARE_FACTORY_ENTRIES(CaloCellCorrection) {
- DECLARE_TOOL( CaloCellPedestalCorr )
- DECLARE_TOOL( CaloCellMBAverageCorr )
- DECLARE_TOOL( CaloCellNeighborsAverageCorr )
- DECLARE_TOOL( CalloCellRandomizer )
- DECLARE_TOOL( CaloCellRescaler )
- DECLARE_TOOL( CaloCellEnergyRescaler )
- DECLARE_TOOL ( CaloCellTimeCorrTool )
-}
diff --git a/Calorimeter/CaloCellCorrection/src/components/CaloCellCorrection_load.cxx b/Calorimeter/CaloCellCorrection/src/components/CaloCellCorrection_load.cxx
deleted file mode 100755
index 792d08ed79edd6f752cd201afc04226d14effd6a..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCellCorrection/src/components/CaloCellCorrection_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloCellCorrection)
-
diff --git a/Calorimeter/CaloClusterCorrection/src/components/CaloClusterCorrection_entries.cxx b/Calorimeter/CaloClusterCorrection/src/components/CaloClusterCorrection_entries.cxx
old mode 100755
new mode 100644
index be6aaac3526a6b0aa0b1daec0ecc6faf8c8eb5e4..535397e351c0116865f8dbbb29e99f6187952ac7
--- a/Calorimeter/CaloClusterCorrection/src/components/CaloClusterCorrection_entries.cxx
+++ b/Calorimeter/CaloClusterCorrection/src/components/CaloClusterCorrection_entries.cxx
@@ -54,7 +54,6 @@
#include "../CaloClusterTimeTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( CaloClusterLocalCalibCone )
DECLARE_TOOL_FACTORY( CaloClusterLocalCalib )
diff --git a/Calorimeter/CaloClusterCorrection/src/components/CaloClusterCorrection_load.cxx b/Calorimeter/CaloClusterCorrection/src/components/CaloClusterCorrection_load.cxx
deleted file mode 100755
index 063521d6b80a79f0412fd9686f2257abd4087e41..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloClusterCorrection/src/components/CaloClusterCorrection_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloClusterCorrection)
-
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
old mode 100755
new mode 100644
index 464a3c475f298fafa9193174cebaf8d649ae0af7..1389dba8d87be7d9c0b5b9725ff2f067b053a056
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
@@ -1,14 +1,3 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-//<doc><file> $Id: CaloDetMgrDetDescrCnv_entries.cxx,v 1.6 2007-01-11 14:53:05 tsulaia Exp $
-//<version> $Name: not supported by cvs2svn $
-
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h"
#include "CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h"
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_load.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_load.cxx
deleted file mode 100755
index b6234b45b396ebce61fcc6844ed63f15af5f8481..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_load.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-//<doc><file> $Id: CaloDetMgrDetDescrCnv_load.cxx,v 1.1 2003-04-18 17:07:53 schaffer Exp $
-//<version> $Name: not supported by cvs2svn $
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CaloDetMgrDetDescrCnv )
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
old mode 100755
new mode 100644
index 0c8238f9e9aea783ea9460a9b97683759411cd9e..aa78272234f2cd7dc2a4279ad5881134184e0441
--- a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
@@ -1,14 +1,3 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-//<doc><file> $Id: CaloIdCnv_entries.cxx,v 1.4 2009-05-14 16:35:13 solodkov Exp $
-//<version> $Name: not supported by cvs2svn $
-
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CaloIdCnv/CaloIdMgrDetDescrCnv.h"
#include "CaloIdCnv/CaloCell_IDDetDescrCnv.h"
#include "CaloIdCnv/CaloCell_SuperCell_IDDetDescrCnv.h"
@@ -43,21 +32,3 @@ DECLARE_CONVERTER_FACTORY(Tile_SuperCell_IDDetDescrCnv)
DECLARE_CONVERTER_FACTORY(TileTBIDDetDescrCnv)
DECLARE_CONVERTER_FACTORY(TTOnlineIDDetDescrCnv)
-DECLARE_FACTORY_ENTRIES ( CaloIdCnv ) {
- DECLARE_CONVERTER ( CaloIdMgrDetDescrCnv );
- DECLARE_CONVERTER ( CaloCell_IDDetDescrCnv );
- DECLARE_CONVERTER ( CaloCell_SuperCell_IDDetDescrCnv );
- DECLARE_CONVERTER ( CaloDM_IDDetDescrCnv );
- DECLARE_CONVERTER ( CaloLVL1_IDDetDescrCnv );
- DECLARE_CONVERTER ( LArEM_IDDetDescrCnv );
- DECLARE_CONVERTER ( LArEM_SuperCell_IDDetDescrCnv );
- DECLARE_CONVERTER ( LArFCAL_IDDetDescrCnv );
- DECLARE_CONVERTER ( LArFCAL_SuperCell_IDDetDescrCnv );
- DECLARE_CONVERTER ( LArMiniFCAL_IDDetDescrCnv );
- DECLARE_CONVERTER ( LArHEC_IDDetDescrCnv );
- DECLARE_CONVERTER ( LArHEC_SuperCell_IDDetDescrCnv );
- DECLARE_CONVERTER ( TileIDDetDescrCnv );
- DECLARE_CONVERTER ( Tile_SuperCell_IDDetDescrCnv );
- DECLARE_CONVERTER ( TileTBIDDetDescrCnv );
- DECLARE_CONVERTER ( TTOnlineIDDetDescrCnv );
-}
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_load.cxx b/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_load.cxx
deleted file mode 100755
index 480774b9321af32d45f368958d6c8019a13a66c1..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_load.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-//<doc><file> $Id: CaloIdCnv_load.cxx,v 1.1 2004-02-09 18:14:43 cbourdar Exp $
-//<version> $Name: not supported by cvs2svn $
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CaloIdCnv )
diff --git a/Calorimeter/CaloCnv/CaloJiveXML/src/components/CaloJiveXML_entries.cxx b/Calorimeter/CaloCnv/CaloJiveXML/src/components/CaloJiveXML_entries.cxx
old mode 100755
new mode 100644
index 0183d0b14514683496f521218a717adc1f491202..c0b3925b324033ca90824ec1c5013e013347445b
--- a/Calorimeter/CaloCnv/CaloJiveXML/src/components/CaloJiveXML_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloJiveXML/src/components/CaloJiveXML_entries.cxx
@@ -7,7 +7,6 @@
#include "CaloJiveXML/LArDigitRetriever.h"
#include "CaloJiveXML/BadTileRetriever.h"
#include "CaloJiveXML/BadLArRetriever.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace JiveXML;
@@ -21,14 +20,3 @@ DECLARE_TOOL_FACTORY(LArDigitRetriever)
DECLARE_TOOL_FACTORY(BadTileRetriever)
DECLARE_TOOL_FACTORY(BadLArRetriever)
-DECLARE_FACTORY_ENTRIES(CaloJiveXML) {
- DECLARE_ALGTOOL(CaloTileRetriever)
- DECLARE_ALGTOOL(CaloMBTSRetriever)
- DECLARE_ALGTOOL(CaloLArRetriever)
- DECLARE_ALGTOOL(CaloHECRetriever)
- DECLARE_ALGTOOL(CaloFCalRetriever)
- DECLARE_ALGTOOL(CaloClusterRetriever)
- DECLARE_ALGTOOL(LArDigitRetriever)
- DECLARE_ALGTOOL(BadTileRetriever)
- DECLARE_ALGTOOL(BadLArRetriever)
-}
diff --git a/Calorimeter/CaloCnv/CaloJiveXML/src/components/CaloJiveXML_load.cxx b/Calorimeter/CaloCnv/CaloJiveXML/src/components/CaloJiveXML_load.cxx
deleted file mode 100755
index 8974b79f8ccfe20dbb9af1b54d872df83bf60759..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCnv/CaloJiveXML/src/components/CaloJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloJiveXML)
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
old mode 100755
new mode 100644
index b3a2d2bda444b48848b649f96d46098ddc337f07..055edb867de2e2e8287884da0f6026ca814b93f9
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
@@ -1,14 +1,4 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-//<doc><file> $Id: CaloDetMgrDetDescrCnv_entries.cxx,v 1.6 2007-01-11 14:53:05 tsulaia Exp $
-//<version> $Name: not supported by cvs2svn $
-
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CaloTTMgrDetDescrCnv.h"
DECLARE_CONVERTER_FACTORY(CaloTTMgrDetDescrCnv)
+
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_load.cxx b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_load.cxx
deleted file mode 100755
index 430570d812044d8bc245fb1f98b9c83a323bad93..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_load.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-//<doc><file> $Id: CaloDetMgrDetDescrCnv_load.cxx,v 1.1 2003-04-18 17:07:53 schaffer Exp $
-//<version> $Name: not supported by cvs2svn $
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CaloTTDetDescrCnv )
diff --git a/Calorimeter/CaloCondBlobAlgs/src/components/CaloCondBlobAlgs_entries.cxx b/Calorimeter/CaloCondBlobAlgs/src/components/CaloCondBlobAlgs_entries.cxx
old mode 100755
new mode 100644
index eb0db6b5dde8402190afa9abc8183b6aebbdfafd..9ebeaed90e9ebcc0de8282cb24327d16aa363677
--- a/Calorimeter/CaloCondBlobAlgs/src/components/CaloCondBlobAlgs_entries.cxx
+++ b/Calorimeter/CaloCondBlobAlgs/src/components/CaloCondBlobAlgs_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CaloCondBlobAlgs/CaloNoiseDbExample.h"
#include "CaloCondBlobAlgs/CaloCoolIdTool.h"
DECLARE_ALGORITHM_FACTORY( CaloNoiseDbExample )
DECLARE_TOOL_FACTORY( CaloCoolIdTool )
-DECLARE_FACTORY_ENTRIES(CaloTools) {
- DECLARE_ALGORITHM( CaloNoiseDbExample )
- DECLARE_TOOL( CaloCoolIdTool )
-}
-
diff --git a/Calorimeter/CaloCondBlobAlgs/src/components/CaloCondBlobAlgs_load.cxx b/Calorimeter/CaloCondBlobAlgs/src/components/CaloCondBlobAlgs_load.cxx
deleted file mode 100755
index 8dbabe4d0be4ea78071992b9a49e97ecf27a0422..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondBlobAlgs/src/components/CaloCondBlobAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloCondBlobAlgs)
diff --git a/Calorimeter/CaloCondPhysAlgs/src/components/CaloCondPhysAlgs_entries.cxx b/Calorimeter/CaloCondPhysAlgs/src/components/CaloCondPhysAlgs_entries.cxx
old mode 100755
new mode 100644
index 7bbc6ac963f71283f5bed5bfb81fdfe95384f70b..8b9b6f535b5f66ac181a0cf9a22632de894094e0
--- a/Calorimeter/CaloCondPhysAlgs/src/components/CaloCondPhysAlgs_entries.cxx
+++ b/Calorimeter/CaloCondPhysAlgs/src/components/CaloCondPhysAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CaloCondPhysAlgs/CaloCellNoiseAlg.h"
#include "CaloCondPhysAlgs/CaloNoise2Ntuple.h"
#include "CaloCondPhysAlgs/CaloRescaleNoise.h"
@@ -21,16 +20,4 @@ DECLARE_ALGORITHM_FACTORY( CaloCellCalcEnergyCorr )
DECLARE_ALGORITHM_FACTORY( CaloCellEnergyCorr2Ntuple )
DECLARE_ALGORITHM_FACTORY( LArMinBiasAlg)
-DECLARE_FACTORY_ENTRIES(CaloCondPhysAlgs) {
- DECLARE_ALGORITHM( CaloCellNoiseAlg )
- DECLARE_ALGORITHM( CaloNoise2Ntuple )
- DECLARE_ALGORITHM( CaloRescaleNoise )
- DECLARE_ALGORITHM( CaloFillCellPositionShift )
- DECLARE_ALGORITHM( CaloCellPosition2Ntuple )
- DECLARE_ALGORITHM( CaloAddCellPedShift )
- DECLARE_ALGORITHM( FCAL_HV_Energy_Rescale )
- DECLARE_ALGORITHM( CaloCellCalcEnergyCorr )
- DECLARE_ALGORITHM( CaloCellEnergyCorr2Ntuple )
- DECLARE_ALGORITHM( LArMinBiasAlg)
-}
diff --git a/Calorimeter/CaloCondPhysAlgs/src/components/CaloCondPhysAlgs_load.cxx b/Calorimeter/CaloCondPhysAlgs/src/components/CaloCondPhysAlgs_load.cxx
deleted file mode 100755
index fb8c7c5671f47fe477fb637e9898fd7d326d0df6..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/src/components/CaloCondPhysAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloCondPhysAlgs)
diff --git a/Calorimeter/CaloDetDescr/src/components/CaloDetDescr_entries.cxx b/Calorimeter/CaloDetDescr/src/components/CaloDetDescr_entries.cxx
old mode 100755
new mode 100644
index 4fcd3eac7fd29050e18525f19342ad5ed94966d2..b74bcf7b671643df0f447615c00ed098fe16b8c6
--- a/Calorimeter/CaloDetDescr/src/components/CaloDetDescr_entries.cxx
+++ b/Calorimeter/CaloDetDescr/src/components/CaloDetDescr_entries.cxx
@@ -1,6 +1,3 @@
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CaloDetDescr/CaloDepthTool.h"
#include "CaloDetDescr/CaloAlignTool.h"
#include "CaloDetDescr/CaloSuperCellAlignTool.h"
@@ -11,4 +8,3 @@ DECLARE_TOOL_FACTORY( CaloAlignTool )
DECLARE_TOOL_FACTORY( CaloSuperCellAlignTool )
DECLARE_TOOL_FACTORY( CaloSuperCellIDTool )
-
diff --git a/Calorimeter/CaloDetDescr/src/components/CaloDetDescr_load.cxx b/Calorimeter/CaloDetDescr/src/components/CaloDetDescr_load.cxx
deleted file mode 100755
index cae1c10c5c0aa8084c82ac246bb58203248787d4..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloDetDescr/src/components/CaloDetDescr_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CaloDetDescr )
diff --git a/Calorimeter/CaloExample/CaloTests/src/components/CaloTests_entries.cxx b/Calorimeter/CaloExample/CaloTests/src/components/CaloTests_entries.cxx
index 00f519f7e814ed87414439b302ab2f5271a0c8a5..6c367cbc1388f1b455306dac9bfba6628a20763c 100644
--- a/Calorimeter/CaloExample/CaloTests/src/components/CaloTests_entries.cxx
+++ b/Calorimeter/CaloExample/CaloTests/src/components/CaloTests_entries.cxx
@@ -1,26 +1,7 @@
#include "CaloTests/Analysis.h"
#include "CaloTests/AnalysisCal.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( MyAnalysis, Analysis )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( MyAnalysisCal, AnalysisCal )
-
-DECLARE_FACTORY_ENTRIES(CaloTests) {
- DECLARE_NAMESPACE_ALGORITHM( MyAnalysis, Analysis )
- DECLARE_NAMESPACE_ALGORITHM( MyAnalysisCal, AnalysisCal )
-}
-
-//Notes:
-//
-//1. The argument to the DECLARE_FACTORY_ENTRIES(XXX) is the name of the
-// component library (libXXX.so).
-//2. Each Algorithm that is contained in the library should be declared
-// by the DECLARE_ALGORITHM() statement.
-//3. Each Service that is contained in the library should be declared
-// by the DECLARE_SERVICE() statement.
-//
-// See Athena User Guide for more information
-
-
diff --git a/Calorimeter/CaloExample/CaloTests/src/components/CaloTests_load.cxx b/Calorimeter/CaloExample/CaloTests/src/components/CaloTests_load.cxx
deleted file mode 100644
index 53d2eca7cfa3e1edd06ff0c2a2e3c73fa945a933..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloExample/CaloTests/src/components/CaloTests_load.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloTests)
-
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
diff --git a/Calorimeter/CaloG4Sim/src/components/CaloG4Sim_entries.cxx b/Calorimeter/CaloG4Sim/src/components/CaloG4Sim_entries.cxx
index 14048bdb6bff1eb819d884f76780a1b367373ad7..4be3f2af85be428e30828e7b819d252f17c08ad0 100644
--- a/Calorimeter/CaloG4Sim/src/components/CaloG4Sim_entries.cxx
+++ b/Calorimeter/CaloG4Sim/src/components/CaloG4Sim_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "CaloG4Sim/CalibrationDefaultProcessingTool.h"
DECLARE_TOOL_FACTORY( G4UA::CaloG4::CalibrationDefaultProcessingTool )
-DECLARE_FACTORY_ENTRIES( CaloG4 ) {
- DECLARE_TOOL( G4UA::CaloG4::CalibrationDefaultProcessingTool )
-
-}
diff --git a/Calorimeter/CaloG4Sim/src/components/CaloG4Sim_load.cxx b/Calorimeter/CaloG4Sim/src/components/CaloG4Sim_load.cxx
deleted file mode 100644
index cb47c15d5d3998f80d0d45851f319bbd342bac16..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloG4Sim/src/components/CaloG4Sim_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( CaloG4 )
diff --git a/Calorimeter/CaloLocalHadCalib/src/components/CaloLocalHadCalib_entries.cxx b/Calorimeter/CaloLocalHadCalib/src/components/CaloLocalHadCalib_entries.cxx
index a67d95f1e0b1711f6ed1dc26528daf534f87105d..c8457159c99c791d3a205d2236789d6196676daa 100644
--- a/Calorimeter/CaloLocalHadCalib/src/components/CaloLocalHadCalib_entries.cxx
+++ b/Calorimeter/CaloLocalHadCalib/src/components/CaloLocalHadCalib_entries.cxx
@@ -8,7 +8,6 @@
#include "CaloLocalHadCalib/CaloReadLCClassificationFile.h"
#include "CaloLocalHadCalib/CaloReadLCOutOfClusterFile.h"
#include "CaloLocalHadCalib/CaloReadLCJetEnergyScaleFile.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( GetLCClassification )
DECLARE_ALGORITHM_FACTORY( GetLCWeights )
DECLARE_ALGORITHM_FACTORY( GetLCOutOfCluster )
@@ -19,15 +18,4 @@ DECLARE_ALGORITHM_FACTORY( CaloReadLCWeightsFile )
DECLARE_ALGORITHM_FACTORY( CaloReadLCClassificationFile )
DECLARE_ALGORITHM_FACTORY( CaloReadLCOutOfClusterFile )
DECLARE_ALGORITHM_FACTORY( CaloReadLCJetEnergyScaleFile )
-DECLARE_FACTORY_ENTRIES(CaloLocalHadCalib) {
- DECLARE_ALGORITHM( GetLCClassification );
- DECLARE_ALGORITHM( GetLCWeights );
- DECLARE_ALGORITHM( GetLCOutOfCluster );
- DECLARE_ALGORITHM( GetLCDeadMaterial );
- DECLARE_ALGORITHM( GetLCDeadMaterialTree );
- DECLARE_ALGORITHM( GetLCSinglePionsPerf );
- DECLARE_ALGORITHM( CaloReadLCWeightsFile );
- DECLARE_ALGORITHM( CaloReadLCClassificationFile );
- DECLARE_ALGORITHM( CaloReadLCOutOfClusterFile );
- DECLARE_ALGORITHM( CaloReadLCJetEnergyScaleFile );
-}
+
diff --git a/Calorimeter/CaloLocalHadCalib/src/components/CaloLocalHadCalib_load.cxx b/Calorimeter/CaloLocalHadCalib/src/components/CaloLocalHadCalib_load.cxx
deleted file mode 100644
index 6a80b6fe1966ec893e5725754fbb42dae5515b60..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloLocalHadCalib/src/components/CaloLocalHadCalib_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloLocalHadCalib)
diff --git a/Calorimeter/CaloMonitoring/src/components/CaloMonitoring_entries.cxx b/Calorimeter/CaloMonitoring/src/components/CaloMonitoring_entries.cxx
old mode 100755
new mode 100644
index 7b04437e7727fb885952459284b8dd5e2ff304b2..2bd8dc2110398b242e4d8ef4e69a589d6f22277e
--- a/Calorimeter/CaloMonitoring/src/components/CaloMonitoring_entries.cxx
+++ b/Calorimeter/CaloMonitoring/src/components/CaloMonitoring_entries.cxx
@@ -7,7 +7,6 @@
//#include "CaloMonitoring/CaloClusterTimeMon.h"
//#include "CaloMonitoring/CaloCosmicsClusterMon.h"
#include "CaloMonitoring/CaloTowerVecMon.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CaloMonitoring/CaloTransverseBalanceVecMon.h"
//DECLARE_TOOL_FACTORY(CaloCellMonitoringTool )
DECLARE_TOOL_FACTORY(CaloCellVecMon)
@@ -21,15 +20,3 @@ DECLARE_TOOL_FACTORY(CaloTowerVecMon)
DECLARE_TOOL_FACTORY(CaloTransverseBalanceVecMon)
-DECLARE_FACTORY_ENTRIES(CaloMonitoring) {
- // DECLARE_ALGTOOL(CaloCellMonitoringTool )
- DECLARE_ALGTOOL(CaloCellVecMon)
- // DECLARE_ALGTOOL(CaloCellTimeMon)
- // DECLARE_ALGTOOL(CaloClusterMon)
- DECLARE_ALGTOOL(CaloClusterVecMon)
- // DECLARE_ALGTOOL(CaloClusterShwrMon)
- // DECLARE_ALGTOOL(CaloClusterTimeMon)
- // DECLARE_ALGTOOL(CaloCosmicsClusterMon)
- DECLARE_ALGTOOL(CaloTowerVecMon)
- DECLARE_ALGTOOL(CaloTransverseBalanceVecMon)
-}
diff --git a/Calorimeter/CaloMonitoring/src/components/CaloMonitoring_load.cxx b/Calorimeter/CaloMonitoring/src/components/CaloMonitoring_load.cxx
deleted file mode 100755
index ef5d12c36f19951ec124bf4d6409d3074af48a8e..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloMonitoring/src/components/CaloMonitoring_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(CaloMonitoring)
diff --git a/Calorimeter/CaloRec/src/components/CaloRec_entries.cxx b/Calorimeter/CaloRec/src/components/CaloRec_entries.cxx
index 86098c29a8d60a99c6ffe0ec872715e961c2a0a9..ae556e84c44a4f63381946776e30dc5e621c5889 100644
--- a/Calorimeter/CaloRec/src/components/CaloRec_entries.cxx
+++ b/Calorimeter/CaloRec/src/components/CaloRec_entries.cxx
@@ -30,7 +30,6 @@
#include "../CaloClusterSnapshot.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( CaloTowerMonitor )
DECLARE_ALGORITHM_FACTORY( CaloTowerAlgorithm )
diff --git a/Calorimeter/CaloRec/src/components/CaloRec_load.cxx b/Calorimeter/CaloRec/src/components/CaloRec_load.cxx
deleted file mode 100644
index 5c3f6f2d299515143c1feb8bcf566ded9e39a62e..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloRec/src/components/CaloRec_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloRec)
-
diff --git a/Calorimeter/CaloTools/src/components/CaloTools_entries.cxx b/Calorimeter/CaloTools/src/components/CaloTools_entries.cxx
index b34e307b5c8b94b73a062c72ee4793b62bce1e15..934ebbdbe6625fabad6ee62d80ea97271b2364c4 100644
--- a/Calorimeter/CaloTools/src/components/CaloTools_entries.cxx
+++ b/Calorimeter/CaloTools/src/components/CaloTools_entries.cxx
@@ -5,7 +5,6 @@
#include "CaloTools/SimpleNoiseToolFromTextFile.h"
#include "CaloTools/CaloAffectedTool.h"
#include "CaloTools/CaloLumiBCIDTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( CaloNoiseTool )
DECLARE_TOOL_FACTORY( CaloMBAverageTool )
@@ -14,3 +13,4 @@ DECLARE_TOOL_FACTORY( SimpleNoiseTool )
DECLARE_TOOL_FACTORY( SimpleNoiseToolFromTextFile )
DECLARE_TOOL_FACTORY( CaloAffectedTool )
DECLARE_TOOL_FACTORY( CaloLumiBCIDTool )
+
diff --git a/Calorimeter/CaloTrackUtils/src/components/CaloTrackUtils_entries.cxx b/Calorimeter/CaloTrackUtils/src/components/CaloTrackUtils_entries.cxx
old mode 100755
new mode 100644
index e0b286b227081c0fc97cf9cbcc20d4e64aba479c..969f8e395d70b2ba190560e993472c4212963819
--- a/Calorimeter/CaloTrackUtils/src/components/CaloTrackUtils_entries.cxx
+++ b/Calorimeter/CaloTrackUtils/src/components/CaloTrackUtils_entries.cxx
@@ -1,9 +1,5 @@
#include "CaloTrackUtils/CaloClusterVertexFractionMaker.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY ( CaloClusterVertexFractionMaker )
-DECLARE_FACTORY_ENTRIES(CaloTrackUtils) {
- DECLARE_TOOL( CaloClusterVertexFractionMaker )
-}
diff --git a/Calorimeter/CaloTrackUtils/src/components/CaloTrackUtils_load.cxx b/Calorimeter/CaloTrackUtils/src/components/CaloTrackUtils_load.cxx
deleted file mode 100755
index f34d46658a8d4114f2a55fdd998e1264f62d7ca1..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloTrackUtils/src/components/CaloTrackUtils_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloTrackUtils)
-
diff --git a/Calorimeter/CaloTrackingGeometry/src/components/CaloTrackingGeometry_entries.cxx b/Calorimeter/CaloTrackingGeometry/src/components/CaloTrackingGeometry_entries.cxx
old mode 100755
new mode 100644
index da61d3c079dc8e6661be33b2ec8020bba466cace..b9fdf1201da44b3eae0f38773e8ec6c3ee35642b
--- a/Calorimeter/CaloTrackingGeometry/src/components/CaloTrackingGeometry_entries.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/components/CaloTrackingGeometry_entries.cxx
@@ -1,19 +1,10 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CaloTrackingGeometry/CaloTrackingGeometryBuilder.h"
#include "CaloTrackingGeometry/CaloSurfaceBuilder.h"
#include "CaloTrackingGeometry/CaloSurfaceHelper.h"
-//
+
using namespace Calo;
-//
+
DECLARE_TOOL_FACTORY( CaloTrackingGeometryBuilder )
DECLARE_TOOL_FACTORY( CaloSurfaceBuilder )
DECLARE_TOOL_FACTORY( CaloSurfaceHelper )
-//
-DECLARE_FACTORY_ENTRIES( CaloTrackingGeometry )
-{
- DECLARE_TOOL( CaloTrackingGeometryBuilder );
- DECLARE_TOOL( CaloSurfaceBuilder );
- DECLARE_TOOL( CaloSurfaceHelper );
-}
-
diff --git a/Calorimeter/CaloTrackingGeometry/src/components/CaloTrackingGeometry_load.cxx b/Calorimeter/CaloTrackingGeometry/src/components/CaloTrackingGeometry_load.cxx
deleted file mode 100755
index b9651d660e4b6768045a88e47c1e504723b4a6ba..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloTrackingGeometry/src/components/CaloTrackingGeometry_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-//#include "GaudiKernel/LoadFactoryEntries.h"
-//
-//LOAD_FACTORY_ENTRIES( CaloTrackingGeometry )
-//
diff --git a/Calorimeter/CaloTriggerTool/src/components/CaloTriggerTool_entries.cxx b/Calorimeter/CaloTriggerTool/src/components/CaloTriggerTool_entries.cxx
old mode 100755
new mode 100644
index 1129aa6bcfe7cbdea5cc0def8360d3620ac8bfb3..f199cfcc53096d104f96f1f83a749440638995de
--- a/Calorimeter/CaloTriggerTool/src/components/CaloTriggerTool_entries.cxx
+++ b/Calorimeter/CaloTriggerTool/src/components/CaloTriggerTool_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "CaloTriggerTool/CaloTriggerTowerService.h"
DECLARE_TOOL_FACTORY( CaloTriggerTowerService )
diff --git a/Calorimeter/CaloTriggerTool/src/components/CaloTriggerTool_load.cxx b/Calorimeter/CaloTriggerTool/src/components/CaloTriggerTool_load.cxx
deleted file mode 100755
index 5487c286114827bb8c8e1114f10a6714f84f7cbc..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloTriggerTool/src/components/CaloTriggerTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloTriggerTool)
-
-
diff --git a/Calorimeter/CaloUtils/src/components/CaloUtils_entries.cxx b/Calorimeter/CaloUtils/src/components/CaloUtils_entries.cxx
index 16bedcad21b2014d15b3edf515c866f83bf48cce..6f22796a7f8eadfcaebd789d28357295b800a721 100644
--- a/Calorimeter/CaloUtils/src/components/CaloUtils_entries.cxx
+++ b/Calorimeter/CaloUtils/src/components/CaloUtils_entries.cxx
@@ -11,7 +11,6 @@
#include "../CaloTowerStoreTestAlg.h"
#include "../CaloTowerBuilderToolTestAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( CaloCellWeightCorrection )
DECLARE_TOOL_FACTORY( LocalNoiseSuppressionTool )
@@ -27,17 +26,3 @@ DECLARE_TOOL_FACTORY( xAODClusterCompressor )
DECLARE_ALGORITHM_FACTORY( CaloTowerStoreTestAlg )
DECLARE_ALGORITHM_FACTORY( CaloTowerBuilderToolTestAlg )
-DECLARE_FACTORY_ENTRIES(CaloUtils) {
- DECLARE_TOOL( CaloCellWeightCorrection )
- DECLARE_TOOL( LocalNoiseSuppressionTool )
- DECLARE_TOOL( CaloLCClassificationTool )
- DECLARE_TOOL( EstimEMClusterClassificationTool )
- DECLARE_TOOL( CaloLCWeightTool )
- DECLARE_TOOL( CaloLCOutOfClusterTool )
- DECLARE_TOOL( CaloLCDeadMaterialTool )
- DECLARE_TOOL( CaloTopoTowerBuilderTool )
- DECLARE_TOOL( CaloTowerBuilderTool )
- DECLARE_TOOL( xAODClusterCompressor )
- DECLARE_ALGORITHM( CaloTowerStoreTestAlg )
- DECLARE_ALGORITHM( CaloTowerBuilderToolTestAlg )
-}
diff --git a/Calorimeter/CaloUtils/src/components/CaloUtils_load.cxx b/Calorimeter/CaloUtils/src/components/CaloUtils_load.cxx
deleted file mode 100644
index 717a3f53f0d8527cb662f4351c424b467bfade27..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloUtils/src/components/CaloUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloUtils)
diff --git a/LArCalorimeter/LArAffectedRegion/src/components/LArAffectedRegionTool_entries.cxx b/LArCalorimeter/LArAffectedRegion/src/components/LArAffectedRegionTool_entries.cxx
index 4981d7e2d32f7dc1a07ed802d21accfdbf83169e..ae9607c7564a0db8c27375271641e2aaf3da65f7 100644
--- a/LArCalorimeter/LArAffectedRegion/src/components/LArAffectedRegionTool_entries.cxx
+++ b/LArCalorimeter/LArAffectedRegion/src/components/LArAffectedRegionTool_entries.cxx
@@ -1,9 +1,5 @@
#include "LArAffectedRegion/LArAffectedRegionAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( LArAffectedRegionAlg )
-DECLARE_FACTORY_ENTRIES(LArAffectedRegion) {
- DECLARE_ALGORITHM( LArAffectedRegionAlg )
-}
diff --git a/LArCalorimeter/LArAffectedRegion/src/components/LArAffectedRegionTool_load.cxx b/LArCalorimeter/LArAffectedRegion/src/components/LArAffectedRegionTool_load.cxx
deleted file mode 100644
index 7c8457647c31dc95efea2b92207e8b878315d830..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArAffectedRegion/src/components/LArAffectedRegionTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArAffectedRegionTool)
diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx
old mode 100755
new mode 100644
index 4957d0ab1e1bc9d4552f210a123beb0e822e943b..0d65216554a30cd5ef1d505bfa89e17d88b43d79
--- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx
+++ b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LArAlignmentAlgs/LArAlignDbAlg.h"
DECLARE_ALGORITHM_FACTORY(LArAlignDbAlg)
-DECLARE_FACTORY_ENTRIES(LArAlignmentAlgs) {
- DECLARE_ALGORITHM( LArAlignDbAlg );
-}
diff --git a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_load.cxx b/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_load.cxx
deleted file mode 100755
index 01336304f3976ef2db31beab7387b35b4fbf52b3..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArAlignment/LArAlignmentAlgs/src/components/LArAlignmentAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArAlignmentAlgs)
diff --git a/LArCalorimeter/LArBadChannelTool/src/components/LArBadChannelTool_entries.cxx b/LArCalorimeter/LArBadChannelTool/src/components/LArBadChannelTool_entries.cxx
index 082107be450dc0d998d374975a3d2a2f0e99da2b..e85c125742995056c6471c48dbc655d051e759d8 100644
--- a/LArCalorimeter/LArBadChannelTool/src/components/LArBadChannelTool_entries.cxx
+++ b/LArCalorimeter/LArBadChannelTool/src/components/LArBadChannelTool_entries.cxx
@@ -1,6 +1,5 @@
#include "../LArBadChannelToolTest.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "LArBadChannelTool/LArBadChannelMasker.h"
#include "LArBadChannelTool/LArBadChanTool.h"
@@ -21,4 +20,3 @@ DECLARE_ALGORITHM_FACTORY( LArBadFeb2Ascii )
DECLARE_ALGORITHM_FACTORY( LArBadChannelCondAlg )
DECLARE_ALGORITHM_FACTORY( LArBadFebCondAlg )
-
diff --git a/LArCalorimeter/LArBadChannelTool/src/components/LArBadChannelTool_load.cxx b/LArCalorimeter/LArBadChannelTool/src/components/LArBadChannelTool_load.cxx
deleted file mode 100644
index dfca8a01bdc4a12be8f1c374f9415b5bd3d7c489..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArBadChannelTool/src/components/LArBadChannelTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArBadChannelTool)
diff --git a/LArCalorimeter/LArCabling/src/components/LArCabling_entries.cxx b/LArCalorimeter/LArCabling/src/components/LArCabling_entries.cxx
old mode 100755
new mode 100644
index a5989336f5c5aa6918664be50a0ca7b0d6dd2ff2..545078c01a4d76e8cce6c0ca425f283073968c6a
--- a/LArCalorimeter/LArCabling/src/components/LArCabling_entries.cxx
+++ b/LArCalorimeter/LArCabling/src/components/LArCabling_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LArCabling/LArCablingService.h"
#include "LArCabling/LArHVCablingTool.h"
#include "LArCabling/LArSuperCellCablingTool.h"
diff --git a/LArCalorimeter/LArCabling/src/components/LArCabling_load.cxx b/LArCalorimeter/LArCabling/src/components/LArCabling_load.cxx
deleted file mode 100755
index cdf04672eaf2d1d2d40dd197c63a8cb1f1b3504f..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArCabling/src/components/LArCabling_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArCabling)
-
-
diff --git a/LArCalorimeter/LArCafJobs/src/components/LArCafJobs_entries.cxx b/LArCalorimeter/LArCafJobs/src/components/LArCafJobs_entries.cxx
old mode 100755
new mode 100644
index 6492aa3975ca7de94f199bf9b8878c6ca0342ae1..8b11dafb8553f14913859ef5da0b406e53a55922
--- a/LArCalorimeter/LArCafJobs/src/components/LArCafJobs_entries.cxx
+++ b/LArCalorimeter/LArCafJobs/src/components/LArCafJobs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "LArCafJobs/LArShapeDumperTool.h"
#include "LArCafJobs/LArShapeDumper.h"
#include "LArCafJobs/LArSimpleShapeDumper.h"
@@ -11,11 +10,3 @@ DECLARE_ALGORITHM_FACTORY(LArNoiseBursts)
DECLARE_ALGORITHM_FACTORY(LArHECNoise)
DECLARE_TOOL_FACTORY(LArShapeDumperTool)
-DECLARE_FACTORY_ENTRIES(LArCafJobs) {
- DECLARE_ALGORITHM(LArShapeDumper)
- DECLARE_ALGORITHM(LArSimpleShapeDumper)
- DECLARE_ALGORITHM(LArNoiseBursts)
- DECLARE_ALGORITHM(LArHECNoise)
- DECLARE_TOOL(LArShapeDumperTool)
-}
-
diff --git a/LArCalorimeter/LArCafJobs/src/components/LArCafJobs_load.cxx b/LArCalorimeter/LArCafJobs/src/components/LArCafJobs_load.cxx
deleted file mode 100755
index cc5728d63eec1a57197f70f4937025ede503b655..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArCafJobs/src/components/LArCafJobs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArCafJobs)
diff --git a/LArCalorimeter/LArCalibDataQuality/src/components/LArCalibDataQuality_entries.cxx b/LArCalorimeter/LArCalibDataQuality/src/components/LArCalibDataQuality_entries.cxx
index 022e4d0eaa8a145aa85894961156fd09d85f0f12..f9a723f4b36b4537a8fc9c2148423b27620273b1 100644
--- a/LArCalorimeter/LArCalibDataQuality/src/components/LArCalibDataQuality_entries.cxx
+++ b/LArCalorimeter/LArCalibDataQuality/src/components/LArCalibDataQuality_entries.cxx
@@ -5,7 +5,6 @@
#include "LArCalibDataQuality/LArBadChannelHunter.h"
#include "LArCalibDataQuality/LArBadEventCatcher.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( LArRampValidationAlg )
@@ -15,11 +14,3 @@ DECLARE_ALGORITHM_FACTORY( LArAutoCorrValidationAlg )
DECLARE_ALGORITHM_FACTORY( LArBadChannelHunter )
DECLARE_ALGORITHM_FACTORY( LArBadEventCatcher )
-DECLARE_FACTORY_ENTRIES(LArCalibDataQuality) {
-DECLARE_ALGORITHM( LArRampValidationAlg )
-DECLARE_ALGORITHM( LArPedestalValidationAlg )
-DECLARE_ALGORITHM( LArAutoCorrValidationAlg )
-DECLARE_ALGORITHM( LArCaliWaveDataQuality )
-DECLARE_ALGORITHM( LArBadChannelHunter )
-DECLARE_ALGORITHM (LArBadEventCatcher)
-}
diff --git a/LArCalorimeter/LArCalibDataQuality/src/components/LArCalibDataQuality_load.cxx b/LArCalorimeter/LArCalibDataQuality/src/components/LArCalibDataQuality_load.cxx
deleted file mode 100644
index 8023bf28c604d087c5d857886f66ed71306a7621..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArCalibDataQuality/src/components/LArCalibDataQuality_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArCalibDataQuality)
diff --git a/LArCalorimeter/LArCalibTools/src/components/LArCalibTools_entries.cxx b/LArCalorimeter/LArCalibTools/src/components/LArCalibTools_entries.cxx
old mode 100755
new mode 100644
index 6049f6cc4446c15fc22ca338a661b8523c624682..e96aab27f91abb2c3539c4a29bb1aba27b98fd3f
--- a/LArCalorimeter/LArCalibTools/src/components/LArCalibTools_entries.cxx
+++ b/LArCalorimeter/LArCalibTools/src/components/LArCalibTools_entries.cxx
@@ -39,7 +39,6 @@
#include "LArCalibTools/LArDSPConfig2Ntuple.h"
//#include "LArCalibTools/LArSFcalFromFcalFromStdNtuple.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
typedef LArReadParamsFromFile<LArCaliPulseParamsComplete> LArReadCaliPulseParams ;
typedef LArReadParamsFromFile<LArDetCellParamsComplete> LArReadDetCellParams ;
@@ -108,61 +107,3 @@ DECLARE_ALGORITHM_FACTORY( LArDSPConfig2Ntuple )
DECLARE_ALGORITHM_FACTORY( LArMinBias2Ntuple )
//DECLARE_ALGORITHM_FACTORY( LArSFcalFromFcalFromStdNtuple )
-
-
-DECLARE_FACTORY_ENTRIES( LArCalibTools ) {
- DECLARE_ALGORITHM( LArAutoCorr2Ntuple )
- DECLARE_ALGORITHM( LArAverages2Ntuple )
- DECLARE_ALGORITHM( LArAccumulatedDigits2Ntuple )
- DECLARE_ALGORITHM( LArDigits2Ntuple )
- DECLARE_ALGORITHM( LArAutoCorr2Ntuple )
- DECLARE_ALGORITHM( LArOFC2Ntuple )
- DECLARE_ALGORITHM( LArShape2Ntuple )
- DECLARE_ALGORITHM( LArPedestals2Ntuple )
- DECLARE_ALGORITHM( LAruA2MeV2Ntuple )
- DECLARE_ALGORITHM( LArRamps2Ntuple )
- DECLARE_ALGORITHM( LArReadCaliPulseParams )
- DECLARE_ALGORITHM( LArReadCaliPulseParams_Calib )
- DECLARE_ALGORITHM( LArReadDetCellParams )
- DECLARE_ALGORITHM( LArReadPhysCaliTdiff )
- DECLARE_ALGORITHM( LArReadTdrift )
- DECLARE_ALGORITHM( LArReadMphysOverMcal )
- DECLARE_ALGORITHM( LArReadRinj )
- DECLARE_ALGORITHM( LArReadTshaper )
- DECLARE_ALGORITHM( LArReadEMEC_Cphi )
- DECLARE_ALGORITHM( LArReadEMEC_HValpha )
- DECLARE_ALGORITHM( LArReadEMEC_HVbeta )
- DECLARE_ALGORITHM( LArReadCableLength )
- DECLARE_ALGORITHM( LArReadCableAttenuation )
- DECLARE_ALGORITHM( LAruA2MeV2Ntuple )
- DECLARE_ALGORITHM( LArCaliWaves2Ntuple )
- DECLARE_ALGORITHM( LArPhysWaves2Ntuple )
- DECLARE_ALGORITHM( LArWFParams2Ntuple )
- DECLARE_ALGORITHM( LArParams2Ntuple )
- DECLARE_ALGORITHM( LArPhysWaveFromTuple )
- DECLARE_ALGORITHM( LArPhysWaveFromStdNtuple )
- DECLARE_ALGORITHM( LArShapeFromStdNtuple )
- DECLARE_ALGORITHM( LArAutoCorrFromStdNtuple )
- DECLARE_ALGORITHM( LArParamsFromStdNtuple )
- DECLARE_ALGORITHM( LArOFCBin_PhysCaliTdiffFromStdNtuple )
- DECLARE_ALGORITHM( LArMphysOverMcalFromTuple )
- DECLARE_ALGORITHM( LArMphysOverMcal2Ntuple)
- DECLARE_ALGORITHM( LArHVScaleCorr2Ntuple)
- DECLARE_ALGORITHM( LArBlockCorrections )
- DECLARE_ALGORITHM (CaloCellGroup2Ntuple )
- DECLARE_ALGORITHM (LArFEBTemp2Ntuple )
- DECLARE_ALGORITHM (ForceLoadCondObj )
- DECLARE_ALGORITHM ( LArFebTimeOffset2Ntuple )
- DECLARE_ALGORITHM ( LArGainThresholds2Ntuple)
- DECLARE_ALGORITHM ( LArDSPThresholds2Ntuple)
- DECLARE_ALGORITHM ( LArPhysCaliTDiffAlg )
- DECLARE_ALGORITHM ( LArOFCBinAlg )
- DECLARE_ALGORITHM ( CaloCondBlob2Ntuple )
- DECLARE_ALGORITHM ( LArCompleteToFlat )
- DECLARE_ALGORITHM ( LArNoise2Ntuple)
- DECLARE_ALGORITHM ( LArfSampl2Ntuple)
- DECLARE_ALGORITHM ( LArFillDSPConfig )
- DECLARE_ALGORITHM ( LArDSPConfig2Ntuple )
- DECLARE_ALGORITHM( LArMinBias2Ntuple)
-// DECLARE_ALGORITHM( LArSFcalFromFcalFromStdNtuple )
-}
diff --git a/LArCalorimeter/LArCalibTools/src/components/LArCalibTools_load.cxx b/LArCalorimeter/LArCalibTools/src/components/LArCalibTools_load.cxx
deleted file mode 100755
index 79764d3757b4f75c368e1e4bbbbf62ee0dfd3102..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArCalibTools/src/components/LArCalibTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArCalibTools)
diff --git a/LArCalorimeter/LArCalibUtils/src/components/LArCalibUtils_entries.cxx b/LArCalorimeter/LArCalibUtils/src/components/LArCalibUtils_entries.cxx
old mode 100755
new mode 100644
index 362873b3f4e03dea56bc640357d47f5bb3d6a5f2..659e72a4e62a7172c61aae66cd816fce14999b72
--- a/LArCalorimeter/LArCalibUtils/src/components/LArCalibUtils_entries.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/components/LArCalibUtils_entries.cxx
@@ -49,7 +49,6 @@
#include "LArCalibUtils/LArCalibPatchingAlg.h"
#include "LArCalibUtils/LArCalibCopyAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
typedef LArCalibPatchingAlg<LArRampComplete> LArRampPatcher;
@@ -121,61 +120,3 @@ DECLARE_TOOL_FACTORY( LArPhaseToolConst )
DECLARE_TOOL_FACTORY( LArPhaseToolMC )
DECLARE_TOOL_FACTORY( LArPhaseToolTB )
-
-DECLARE_FACTORY_ENTRIES(LArCalibUtils) {
- DECLARE_ALGORITHM( LArAutoCorrMaker )
- DECLARE_ALGORITHM( LArAutoCorrExtrapolate )
- DECLARE_ALGORITHM( LArAutoCorrBuilder )
- DECLARE_ALGORITHM( LArCalibDigitMaker )
- DECLARE_ALGORITHM( LArCaliWaveAverage )
- DECLARE_ALGORITHM( LArCaliWaveBuilder )
- DECLARE_ALGORITHM( LArCaliWaveBuilderXtalk )
- DECLARE_ALGORITHM( LArCaliWaveMerger )
- DECLARE_ALGORITHM( LArCaliWaveSelector )
- DECLARE_ALGORITHM( LArDeltaRespPredictor )
- DECLARE_ALGORITHM( LArFill )
- DECLARE_ALGORITHM( LArMasterWaveBuilder )
- DECLARE_ALGORITHM( LArOFCAlg )
- DECLARE_ALGORITHM( LArPedestalInPhysicsMaker )
- DECLARE_ALGORITHM( LArPedestalMaker )
- DECLARE_ALGORITHM( LArPedestalBuilder )
- DECLARE_ALGORITHM( LArPedestalAutoCorrBuilder )
- DECLARE_ALGORITHM( LArPhysWaveBuilder )
- DECLARE_ALGORITHM( LArPhysWaveShifter )
- DECLARE_ALGORITHM( LArRampBuilder )
- DECLARE_ALGORITHM( LArRTMParamExtractor )
- DECLARE_ALGORITHM( LArTCMPhysWavePredictor )
- DECLARE_ALGORITHM( LArStripsCrossTalkCorrector )
- DECLARE_ALGORITHM( LArPhysWavePredictor )
- DECLARE_ALGORITHM( LArTimeTuning )
- DECLARE_ALGORITHM( LArTimeTuningNtuple )
- DECLARE_ALGORITHM (LArRampCorr )
- DECLARE_ALGORITHM( LArDumpShapes )
- DECLARE_ALGORITHM( LArAccumulatedCalibDigitContSplitter)
- DECLARE_ALGORITHM( LArRampPatcher)
- DECLARE_ALGORITHM( LArOFPhaseFill )
- DECLARE_ALGORITHM( LArOFPhasePicker )
- DECLARE_ALGORITHM (LArCaliWavePatcher)
- DECLARE_ALGORITHM (LArHVCorrMaker )
- DECLARE_ALGORITHM (LArCalibShortCorrector )
- DECLARE_ALGORITHM (LArTimePhysPrediction)
- DECLARE_ALGORITHM( LArRampAdHocPatchingAlg )
- //DECLARE_ALGORITHM( LArPedestalCopyAlg )
- DECLARE_ALGORITHM( LArPhysWaveCopyAlg )
- DECLARE_ALGORITHM( LArDAC2uAMCCopyAlg )
- DECLARE_ALGORITHM( LArTdriftCompleteCopyAlg )
- DECLARE_ALGORITHM( LArShapeCorrector )
- DECLARE_ALGORITHM( LArAutoCorrToolToDB )
- DECLARE_ALGORITHM( LArDuplicateConstants )
- //DECLARE_ALGORITHM( LArOFCPatcher)
- DECLARE_TOOL( LArAutoCorrDecoderTool )
- DECLARE_TOOL( LArDigitOscillationCorrTool )
- DECLARE_TOOL( LArDeltaRespTool )
- DECLARE_TOOL( LArPhysWaveTool )
- DECLARE_TOOL( LArPhysWaveHECTool )
- DECLARE_TOOL( LArTCMFitterTool )
- DECLARE_TOOL( LArWFParamTool )
- DECLARE_TOOL( LArPhaseToolConst )
- DECLARE_TOOL( LArPhaseToolTB )
- DECLARE_TOOL( LArPhaseToolMC )
-}
diff --git a/LArCalorimeter/LArCalibUtils/src/components/LArCalibUtils_load.cxx b/LArCalorimeter/LArCalibUtils/src/components/LArCalibUtils_load.cxx
deleted file mode 100755
index 2a7b9f76928285fb87a1850f687ecb3a6d369654..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArCalibUtils/src/components/LArCalibUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArCalibUtils)
diff --git a/LArCalorimeter/LArCellRec/src/components/LArCellRec_entries.cxx b/LArCalorimeter/LArCellRec/src/components/LArCellRec_entries.cxx
old mode 100755
new mode 100644
index 1e3d26605af0a0d1a55df058403762b26f69fb24..b56be310e8209bccf9eaa69ec773d73fae5166dd
--- a/LArCalorimeter/LArCellRec/src/components/LArCellRec_entries.cxx
+++ b/LArCalorimeter/LArCellRec/src/components/LArCellRec_entries.cxx
@@ -17,7 +17,6 @@
#include "LArCellRec/LArNoisyROTool.h"
#include "LArCellRec/LArCollisionTimeAlg.h"
#include "LArCellRec/LArTimeVetoAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( LArNoisyROAlg )
@@ -40,28 +39,3 @@ DECLARE_TOOL_FACTORY (LArNoisyROTool)
DECLARE_ALGORITHM_FACTORY ( LArCollisionTimeAlg )
DECLARE_ALGORITHM_FACTORY ( LArTimeVetoAlg )
-
-
-DECLARE_FACTORY_ENTRIES(LArCellRec) {
- DECLARE_ALGORITHM( LArNoisyROAlg )
- DECLARE_TOOL( LArG3Escale_TDR )
- DECLARE_TOOL( LArG3Escale )
- DECLARE_TOOL( LArNonLinearity)
- DECLARE_TOOL( LArCellBuilderFromLArHitTool )
- DECLARE_TOOL( LArCellBuilderFromLArRawChannelTool )
- DECLARE_TOOL( LArCellEmMiscalib )
- DECLARE_TOOL( LArCellRescaler )
- DECLARE_TOOL( LArCellMaskingTool )
- DECLARE_TOOL( LArCellHVCorr )
- DECLARE_TOOL( LArCellRecalibration)
- DECLARE_TOOL( LArCellNoiseMaskingTool)
- DECLARE_TOOL( LArBadFebMaskingTool)
- DECLARE_TOOL( LArCellGainPathology)
- DECLARE_TOOL( LArCellMerger)
- DECLARE_TOOL( LArCellDeadOTXCorr)
- DECLARE_TOOL( LArNoisyROTool)
- DECLARE_ALGORITHM (LArCollisionTimeAlg )
- DECLARE_ALGORITHM (LArTimeVetoAlg )
-
-
-}
diff --git a/LArCalorimeter/LArCellRec/src/components/LArCellRec_load.cxx b/LArCalorimeter/LArCellRec/src/components/LArCellRec_load.cxx
deleted file mode 100755
index 93bc2187a81d986b91bd22c6a08abb7d768e50bd..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArCellRec/src/components/LArCellRec_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArCellRec)
-
diff --git a/LArCalorimeter/LArClusterRec/src/components/LArClusterRec_entries.cxx b/LArCalorimeter/LArClusterRec/src/components/LArClusterRec_entries.cxx
old mode 100755
new mode 100644
index b3a37ade664101142a2203c8388d77ef3f5ec2e9..c62bdb8e1ca518d13c718155e23dc246a4ef6e41
--- a/LArCalorimeter/LArClusterRec/src/components/LArClusterRec_entries.cxx
+++ b/LArCalorimeter/LArClusterRec/src/components/LArClusterRec_entries.cxx
@@ -1,15 +1,9 @@
#include "LArClusterRec/LArTBClusterBuilder.h"
#include "LArClusterRec/LArDigitThinnerFromEMClust.h"
#include "LArClusterRec/LArClusterCollisionTimeAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( LArTBClusterBuilder )
DECLARE_ALGORITHM_FACTORY( LArDigitThinnerFromEMClust )
DECLARE_ALGORITHM_FACTORY( LArClusterCollisionTimeAlg )
-DECLARE_FACTORY_ENTRIES(LArClusterRec) {
- DECLARE_TOOL( LArTBClusterBuilder )
- DECLARE_ALGORITHM( LArDigitThinnerFromEMClust )
- DECLARE_ALGORITHM( LArClusterCollisionTimeAlg )
-}
diff --git a/LArCalorimeter/LArClusterRec/src/components/LArClusterRec_load.cxx b/LArCalorimeter/LArClusterRec/src/components/LArClusterRec_load.cxx
deleted file mode 100755
index 0921a60de5a85ae27972c802797148b3a29298cb..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArClusterRec/src/components/LArClusterRec_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArClusterRec)
-
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx
index 95a79f1aa6cd175a09243d884d59ccfe5237e6e8..503b07543a18aa8f9ec3ad5fddf02c01e605d38d 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx
+++ b/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LArByteStream/LArRawChannelContByteStreamCnv.h"
#include "LArByteStream/LArDigitContByteStreamCnv.h"
#include "LArByteStream/LArCalibDigitContByteStreamCnv.h"
@@ -30,18 +28,3 @@ DECLARE_CONVERTER_FACTORY( LArFebHeaderContByteStreamCnv )
//DECLARE_TOOL_FACTORY( LARCELLTOOL)
//DECLARE_CONVERTER_FACTORY( LArCellCollByteStreamCnv )
-DECLARE_FACTORY_ENTRIES(LArByteStream) {
- DECLARE_CONVERTER( LArRawChannelContByteStreamCnv )
- DECLARE_CONVERTER( LArDigitContByteStreamCnv )
- DECLARE_CONVERTER( LArCalibDigitContByteStreamCnv )
- DECLARE_CONVERTER( LArAccumulatedCalibDigitContByteStreamCnv )
- DECLARE_CONVERTER( LArAccumulatedDigitContByteStreamCnv )
- DECLARE_CONVERTER( LArFebHeaderContByteStreamCnv )
- DECLARE_TOOL ( LArRawDataContByteStreamTool )
- DECLARE_TOOL ( LArRodDecoder)
-
-// DECLARE_CONVERTER( LArRawChannelCollByteStreamCnv )
-// DECLARE_CONVERTER( LArCellCollByteStreamCnv )
-// DECLARE_TOOL( LARRAWTOOL)
-// DECLARE_TOOL( LARCELLTOOL)
-}
diff --git a/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_load.cxx b/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_load.cxx
deleted file mode 100644
index 140a2700fc93a67d263c2bbb2d23ff6387043f8c..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArCnv/LArByteStream/src/components/LArByteStream_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArByteStream)
-
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
old mode 100755
new mode 100644
index e7beb3ca9dc3a6611e2037d73993d82deeeed76d..1f7e1fd20775342d21be0ed24b694abcc2319e01
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
@@ -1,14 +1,3 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-//<doc><file> $Id: LArIdCnv_entries.cxx,v 1.6 2007-03-05 09:15:09 fledroit Exp $
-//<version> $Name: not supported by cvs2svn $
-
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "LArIdCnv/LArIdMgrDetDescrCnv.h"
#include "LArIdCnv/LArOnlineIDDetDescrCnv.h"
#include "LArIdCnv/LArOnline_SuperCellIDDetDescrCnv.h"
@@ -21,10 +10,3 @@ DECLARE_CONVERTER_FACTORY(LArIdMgrDetDescrCnv)
DECLARE_CONVERTER_FACTORY(LArOnlineIDDetDescrCnv)
DECLARE_CONVERTER_FACTORY(LArOnline_SuperCellIDDetDescrCnv)
-DECLARE_FACTORY_ENTRIES ( LArIdCnv ) {
- DECLARE_CONVERTER ( LArIdMgrDetDescrCnv );
- DECLARE_CONVERTER ( LArOnlineIDDetDescrCnv );
- DECLARE_CONVERTER ( LArHVLineIDDetDescrCnv );
- DECLARE_CONVERTER ( LArElectrodeIDDetDescrCnv );
- DECLARE_CONVERTER ( LArOnline_SuperCellIDDetDescrCnv );
-}
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_load.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_load.cxx
deleted file mode 100755
index e985b86c8d24b9aa5f2451a8ff3e2e897d7e883b..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_load.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-//<doc><file> $Id: LArIdCnv_load.cxx,v 1.1 2004-02-16 17:04:34 cbourdar Exp $
-//<version> $Name: not supported by cvs2svn $
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( LArIdCnv )
diff --git a/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_entries.cxx b/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_entries.cxx
old mode 100755
new mode 100644
index cd4d02d1ef6a0efed26520e2b830ac76cbae627b..ead55cd544d93d321b2e476ae6a63fb47f6d9843
--- a/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_entries.cxx
+++ b/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_entries.cxx
@@ -5,7 +5,6 @@
#include "LArCondUtils/LArHVPathologyDbAlg.h"
#include "LArCondUtils/LArHV2Ntuple.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( LArFecLvTempDcsTool )
@@ -15,11 +14,3 @@ DECLARE_TOOL_FACTORY( LArFEBTempTool )
DECLARE_ALGORITHM_FACTORY( LArHVPathologyDbAlg )
DECLARE_ALGORITHM_FACTORY( LArHV2Ntuple )
-DECLARE_FACTORY_ENTRIES(LArCondUtils) {
- DECLARE_TOOL( LArFecLvTempDcsTool )
- DECLARE_TOOL( LArHVToolMC )
- DECLARE_TOOL( LArHVToolDB )
- DECLARE_TOOL( LArFEBTempTool )
- DECLARE_ALGORITHM( LArHVPathologyDbAlg )
- DECLARE_ALGORITHM( LArHV2Ntuple )
-}
diff --git a/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_load.cxx b/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_load.cxx
deleted file mode 100755
index 783462151e0bdb9aabdf06064db01fb9b0098b56..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArCondUtils)
diff --git a/LArCalorimeter/LArDetDescr/src/components/LArDetDescr_entries.cxx b/LArCalorimeter/LArDetDescr/src/components/LArDetDescr_entries.cxx
old mode 100755
new mode 100644
index dbb459233af92f5c1148d956946dcd13a37beca9..3dfe9bcc45df936e82ab90413c15a0d089cabfe2
--- a/LArCalorimeter/LArDetDescr/src/components/LArDetDescr_entries.cxx
+++ b/LArCalorimeter/LArDetDescr/src/components/LArDetDescr_entries.cxx
@@ -1,15 +1,6 @@
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "LArDetDescr/LArRecoMaterialTool.h"
#include "LArDetDescr/LArRecoSimpleGeomTool.h"
DECLARE_TOOL_FACTORY( LArRecoMaterialTool )
DECLARE_TOOL_FACTORY( LArRecoSimpleGeomTool )
-DECLARE_FACTORY_ENTRIES ( LArDetDescr ) {
- DECLARE_TOOL( LArRecoMaterialTool );
- DECLARE_TOOL( LArRecoSimpleGeomTool );
-}
-
-
diff --git a/LArCalorimeter/LArDetDescr/src/components/LArDetDescr_load.cxx b/LArCalorimeter/LArDetDescr/src/components/LArDetDescr_load.cxx
deleted file mode 100755
index 30f3df44beb86fd4bf5cf20c3fb727abd08cef35..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArDetDescr/src/components/LArDetDescr_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( LArDetDescr )
diff --git a/LArCalorimeter/LArDigitization/src/components/LArDigitization_entries.cxx b/LArCalorimeter/LArDigitization/src/components/LArDigitization_entries.cxx
old mode 100755
new mode 100644
index 7dbf13c5b9e95f0aba71d1847b385e0e51e41b9c..a5c3f9362112fb3cfa7f20740c2296641e3902cf
--- a/LArCalorimeter/LArDigitization/src/components/LArDigitization_entries.cxx
+++ b/LArCalorimeter/LArDigitization/src/components/LArDigitization_entries.cxx
@@ -1,23 +1,10 @@
-//
-// Entry file for ATHENA component libraries
-//
-
#include "LArDigitization/LArDigitMaker.h"
#include "LArDigitization/LArHitMerger.h"
#include "LArDigitization/LArHitFilter.h"
#include "LArDigitization/LArPileUpTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( LArDigitMaker )
DECLARE_ALGORITHM_FACTORY( LArHitMerger )
DECLARE_ALGORITHM_FACTORY( LArHitFilter )
DECLARE_TOOL_FACTORY( LArPileUpTool )
-DECLARE_FACTORY_ENTRIES(LArDigitization) {
-
- DECLARE_ALGORITHM(LArDigitMaker)
- DECLARE_ALGORITHM(LArHitMerger)
- DECLARE_ALGORITHM(LArHitFilter)
- DECLARE_TOOL(LArPileUpTool)
-
-}
diff --git a/LArCalorimeter/LArDigitization/src/components/LArDigitization_load.cxx b/LArCalorimeter/LArDigitization/src/components/LArDigitization_load.cxx
deleted file mode 100755
index d282025f6849570c9480d650c042a93764edd88e..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArDigitization/src/components/LArDigitization_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Load file for ATHENA component library
-//
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArDigitization)
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/src/components/TestLArDetDescr_entries.cxx b/LArCalorimeter/LArExample/TestLArDetDescr/src/components/TestLArDetDescr_entries.cxx
old mode 100755
new mode 100644
index 1164b3b270fc9fac00d2321fb6858d2514ba7a94..53260ef8d7ec504c9f12d844ddab751e22e707fa
--- a/LArCalorimeter/LArExample/TestLArDetDescr/src/components/TestLArDetDescr_entries.cxx
+++ b/LArCalorimeter/LArExample/TestLArDetDescr/src/components/TestLArDetDescr_entries.cxx
@@ -2,16 +2,9 @@
#include "TestLArDetDescr/TestCaloGeom.h"
#include "TestLArDetDescr/TestLArTT.h"
#include "TestLArDetDescr/TestLArMaterial.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( TestCaloDDE )
DECLARE_ALGORITHM_FACTORY( TestCaloGeom )
DECLARE_ALGORITHM_FACTORY( TestLArTT )
DECLARE_ALGORITHM_FACTORY( TestLArMaterial )
-DECLARE_FACTORY_ENTRIES(TestLArDetDescr) {
- DECLARE_ALGORITHM( TestCaloDDE );
- DECLARE_ALGORITHM( TestCaloGeom );
- DECLARE_ALGORITHM( TestLArTT );
- DECLARE_ALGORITHM( TestLArMaterial );
-}
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/src/components/TestLArDetDescr_load.cxx b/LArCalorimeter/LArExample/TestLArDetDescr/src/components/TestLArDetDescr_load.cxx
deleted file mode 100755
index f147e43fc3e88c70daff20fe11c4351d1802333e..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArExample/TestLArDetDescr/src/components/TestLArDetDescr_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TestLArDetDescr)
-
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/components/TestLArHardwareID_entries.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/components/TestLArHardwareID_entries.cxx
old mode 100755
new mode 100644
index c6eb6749e9a82a7dfd0c3dfc4231789b5b13209b..982c2462251b54f38edc32cbfccb3040baea4139
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/components/TestLArHardwareID_entries.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/components/TestLArHardwareID_entries.cxx
@@ -1,9 +1,3 @@
-//
-// Entry file for ATHENA component libraries
-//
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TestLArHardwareID/TestLArHWID_Algo.h"
#include "TestLArHardwareID/initTTMap_Algo.h"
#include "TestLArHardwareID/reinitTTMap_Algo.h"
@@ -17,10 +11,3 @@ DECLARE_ALGORITHM_FACTORY( reinitTTMap_Algo )
DECLARE_ALGORITHM_FACTORY( testTTMap_Algo )
DECLARE_ALGORITHM_FACTORY( updateTTMap_Algo )
-DECLARE_FACTORY_ENTRIES(TestLArHardwareID) {
- DECLARE_ALGORITHM( TestLArHWID_Algo )
- DECLARE_ALGORITHM( initTTMap_Algo )
- DECLARE_ALGORITHM( reinitTTMap_Algo )
- DECLARE_ALGORITHM( testTTMap_Algo )
- DECLARE_ALGORITHM( updateTTMap_Algo )
-}
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/components/TestLArHardwareID_load.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/components/TestLArHardwareID_load.cxx
deleted file mode 100755
index 8272297e1ba92cd45ec969a574a42d03143d6464..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/components/TestLArHardwareID_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Load file for ATHENA component library
-//
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TestLArHardwareID)
diff --git a/LArCalorimeter/LArG4/LArG4Barrel/src/components/LArG4Barrel_entries.cxx b/LArCalorimeter/LArG4/LArG4Barrel/src/components/LArG4Barrel_entries.cxx
index 5fa494d657b7eda9cdcb36de971c2f689b83941b..577e484990cc768630f3f335582816cea3ad69ea 100644
--- a/LArCalorimeter/LArG4/LArG4Barrel/src/components/LArG4Barrel_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4Barrel/src/components/LArG4Barrel_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../CryostatCalibrationCalculator.h"
#include "../CryostatCalibrationMixedCalculator.h"
#include "../LArBarrelCalculator.h"
@@ -21,3 +19,4 @@ DECLARE_SERVICE_FACTORY(LArG4::Barrel::CalibrationCalculator)
DECLARE_SERVICE_FACTORY(LArG4::BarrelPresampler::CalibrationCalculator)
DECLARE_SERVICE_FACTORY(LArG4::Barrel::Geometry)
DECLARE_SERVICE_FACTORY(LArG4::BarrelPresampler::Geometry)
+
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/components/LArG4EC_entries.cxx b/LArCalorimeter/LArG4/LArG4EC/src/components/LArG4EC_entries.cxx
index ac9966e6114ec6bfca4448392672508b895c1d1b..b60195cd07cbe0a6081874a59c70921e7fdac469 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/components/LArG4EC_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4EC/src/components/LArG4EC_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../CalibrationCalculator.h"
#include "../CryostatCalibrationLArCalculator.h"
#include "../EMECSupportCalibrationCalculator.h"
@@ -17,3 +15,4 @@ DECLARE_SERVICE_FACTORY(LArG4::EndcapCryostat::CalibrationCalculator)
DECLARE_SERVICE_FACTORY(LArG4::EndcapCryostat::CalibrationMixedCalculator)
DECLARE_SERVICE_FACTORY(LArG4::EC::EnergyCalculator)
DECLARE_SERVICE_FACTORY(LArG4::EC::PresamplerCalibrationCalculator)
+
diff --git a/LArCalorimeter/LArG4/LArG4FCAL/src/components/LArG4FCAL_entries.cxx b/LArCalorimeter/LArG4/LArG4FCAL/src/components/LArG4FCAL_entries.cxx
index 935550b81f097ffb2f292bc869c40e212700182b..994da9325f7288839cb4949e8279baf82959720a 100644
--- a/LArCalorimeter/LArG4/LArG4FCAL/src/components/LArG4FCAL_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4FCAL/src/components/LArG4FCAL_entries.cxx
@@ -1,7 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../LArFCALCalculatorBase.h"
#include "../LArFCALCalibCalculatorBase.h"
DECLARE_SERVICE_FACTORY(LArG4::FCAL::LArFCALCalibCalculatorBase)
DECLARE_SERVICE_FACTORY(LArFCALCalculatorBase)
+
diff --git a/LArCalorimeter/LArG4/LArG4FastSimSvc/src/components/LArG4FastSimSvc_entries.cxx b/LArCalorimeter/LArG4/LArG4FastSimSvc/src/components/LArG4FastSimSvc_entries.cxx
index 4ca2f8ee51dae7ba47806a74968e79d5e0bea025..35f7113bf70ef8c81bbb1a7eaa62a0c0bfdc1dda 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimSvc/src/components/LArG4FastSimSvc_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4FastSimSvc/src/components/LArG4FastSimSvc_entries.cxx
@@ -1,10 +1,4 @@
#include "LArG4FastSimSvc/LArG4FastSimSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY(LArG4FastSimSvc)
-DECLARE_FACTORY_ENTRIES(LArG4FastSimSvc) {
- DECLARE_SERVICE ( LArG4FastSimSvc )
-}
-
-
diff --git a/LArCalorimeter/LArG4/LArG4FastSimSvc/src/components/LArG4FastSimSvc_load.cxx b/LArCalorimeter/LArG4/LArG4FastSimSvc/src/components/LArG4FastSimSvc_load.cxx
deleted file mode 100644
index 8753acd773002b9308b6f452274f9a75c0bd87e5..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArG4/LArG4FastSimSvc/src/components/LArG4FastSimSvc_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArG4FastSimSvc)
-
diff --git a/LArCalorimeter/LArG4/LArG4FastSimulation/src/components/LArG4FastSimulation_entries.cxx b/LArCalorimeter/LArG4/LArG4FastSimulation/src/components/LArG4FastSimulation_entries.cxx
index 69189307ac84393d7c57dc6b724d6db71722b22a..99465018711cf1536fb8820d42a4ad130f6a50f9 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimulation/src/components/LArG4FastSimulation_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4FastSimulation/src/components/LArG4FastSimulation_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
// #include "../DeadMaterialShower.h"
#include "../LArFastShowerTool.h"
// DECLARE_TOOL_FACTORY( DeadMaterialShower )
DECLARE_TOOL_FACTORY( LArFastShowerTool )
-DECLARE_FACTORY_ENTRIES( LArG4FastSimulation ) {
- // DECLARE_TOOL( DeadMaterialShower )
- DECLARE_TOOL( LArFastShowerTool )
-}
diff --git a/LArCalorimeter/LArG4/LArG4FastSimulation/src/components/LArG4FastSimulation_load.cxx b/LArCalorimeter/LArG4/LArG4FastSimulation/src/components/LArG4FastSimulation_load.cxx
deleted file mode 100644
index 92bbd85a89ad3027067bb2e5e92abbabcc5a0ed4..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArG4/LArG4FastSimulation/src/components/LArG4FastSimulation_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( LArG4FastSimulation )
\ No newline at end of file
diff --git a/LArCalorimeter/LArG4/LArG4GenShowerLib/src/components/LArG4GenShowerLib_entries.cxx b/LArCalorimeter/LArG4/LArG4GenShowerLib/src/components/LArG4GenShowerLib_entries.cxx
index 878dc85cd415e878c096cc4b6becd4c6d0d30caf..dff151066c81267574d9590839a8a69dc8ad4321 100644
--- a/LArCalorimeter/LArG4/LArG4GenShowerLib/src/components/LArG4GenShowerLib_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4GenShowerLib/src/components/LArG4GenShowerLib_entries.cxx
@@ -1,23 +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 "LArG4GenShowerLib/LArG4GenShowerLib.h"
#include "LArG4GenShowerLib/TestActionShowerLibTool.h"
DECLARE_ALGORITHM_FACTORY( LArG4GenShowerLib )
DECLARE_TOOL_FACTORY( G4UA::TestActionShowerLibTool )
-DECLARE_FACTORY_ENTRIES( LArG4GenShowerLib ) {
- DECLARE_TOOL( G4UA::TestActionShowerLibTool )
- DECLARE_ALGORITHM( LArG4GenShowerLib )
-}
diff --git a/LArCalorimeter/LArG4/LArG4GenShowerLib/src/components/LArG4GenShowerLib_load.cxx b/LArCalorimeter/LArG4/LArG4GenShowerLib/src/components/LArG4GenShowerLib_load.cxx
deleted file mode 100644
index 63fc9d92f6892a667ce712e7a42cd86d38344837..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArG4/LArG4GenShowerLib/src/components/LArG4GenShowerLib_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArG4GenShowerLib)
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx b/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx
index f7a11c6c88f10e5f422eca0341f0596f2f1376c9..d1f891607e7f62b5d3216e18df06b8327e35407c 100644
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../LArTBH6TriggerTimeTool.h"
#include "../LArTBH6BeamInfo.h"
#include "../LArGeoH62004EventActionTool.h"
@@ -72,3 +70,4 @@ DECLARE_SERVICE_FACTORY(LArG4H6COLDTCMod0Calculator)
DECLARE_SERVICE_FACTORY(LArG4H6WarmTCCalculator)
DECLARE_SERVICE_FACTORY(LArG4H62004DeadCalibrationCalculator)
DECLARE_SERVICE_FACTORY(LArG4H6COLDTCMod0CalibCalculator)
+
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_load.cxx b/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_load.cxx
deleted file mode 100644
index 65fd712972ad21c2676cf6b6d6b532e56032f151..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArG4H6SDTools)
-
diff --git a/LArCalorimeter/LArG4/LArG4H8SD/src/components/LArG4H8SD_entries.cxx b/LArCalorimeter/LArG4/LArG4H8SD/src/components/LArG4H8SD_entries.cxx
index 18e8f8f61512d940c3ce87a25cdd2d2cd6ba63b3..b3cd32c26ffcb09f594a80c5715bf5720f035888 100644
--- a/LArCalorimeter/LArG4/LArG4H8SD/src/components/LArG4H8SD_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4H8SD/src/components/LArG4H8SD_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../LArG4H8CalibSDTool.h"
#include "../H8CalibSDTool.h"
@@ -11,3 +9,4 @@ DECLARE_TOOL_FACTORY( LArG4H8CalibSDTool )
DECLARE_SERVICE_FACTORY(LArTBCryostatCalibrationCalculator)
DECLARE_SERVICE_FACTORY(H8CalibrationDefaultCalculator)
+
diff --git a/LArCalorimeter/LArG4/LArG4H8SD/src/components/LArG4H8SD_load.cxx b/LArCalorimeter/LArG4/LArG4H8SD/src/components/LArG4H8SD_load.cxx
deleted file mode 100644
index 78d6459ca4b4795e76ff7284288795346521f087..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArG4/LArG4H8SD/src/components/LArG4H8SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( LArG4H8SD )
\ No newline at end of file
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/components/LArG4HEC_entries.cxx b/LArCalorimeter/LArG4/LArG4HEC/src/components/LArG4HEC_entries.cxx
index 75fd9aaf1ce761469a47587c8ea13fa45d2951cb..c069b69c9bf57035ad9e6f1980f09bc664f3ce2c 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/components/LArG4HEC_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/components/LArG4HEC_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../LArHECLocalCalculator.h"
#include "../LocalCalibrationCalculator.h"
#include "LArG4HEC/LocalGeometry.h"
@@ -13,3 +11,4 @@ DECLARE_SERVICE_FACTORY(LArG4::HEC::LocalGeometry)
DECLARE_SERVICE_FACTORY(LArHECWheelCalculator)
DECLARE_SERVICE_FACTORY(LArG4::HEC::LArHECCalibrationWheelCalculator)
DECLARE_SERVICE_FACTORY(LArG4::HEC::HECGeometry)
+
diff --git a/LArCalorimeter/LArG4/LArG4MiniFCAL/src/components/LArG4MiniFCAL_entries.cxx b/LArCalorimeter/LArG4/LArG4MiniFCAL/src/components/LArG4MiniFCAL_entries.cxx
index c230b209fdbd4ac08b5782c0ab2c4ab11c3513f8..85d6c3ef28315fef0cf1903235ec6ab6ae2ff28f 100644
--- a/LArCalorimeter/LArG4/LArG4MiniFCAL/src/components/LArG4MiniFCAL_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4MiniFCAL/src/components/LArG4MiniFCAL_entries.cxx
@@ -1,7 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../MiniFCALCalculator.h"
#include "../MiniFCALCalibrationCalculator.h"
DECLARE_SERVICE_FACTORY(LArG4::MiniFCAL::MiniFCALCalibrationCalculator)
DECLARE_SERVICE_FACTORY(MiniFCALCalculator)
+
diff --git a/LArCalorimeter/LArG4/LArG4SD/src/components/LArG4SD_entries.cxx b/LArCalorimeter/LArG4/LArG4SD/src/components/LArG4SD_entries.cxx
index 6ca192b78f7343690627e57de01f86c8fb74d019..6924739efce88702ac7e7d13a36892e7c232251e 100644
--- a/LArCalorimeter/LArG4/LArG4SD/src/components/LArG4SD_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4SD/src/components/LArG4SD_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
// MT-friendly LAr SD tools
#include "../EMBSDTool.h"
#include "../EMECSDTool.h"
@@ -22,3 +20,4 @@ DECLARE_TOOL_FACTORY( LArG4::InactiveSDTool )
DECLARE_TOOL_FACTORY( LArG4::DeadSDTool )
DECLARE_SERVICE_FACTORY( LArG4::CalibrationDefaultCalculator )
+
diff --git a/LArCalorimeter/LArG4/LArG4SD/src/components/LArG4SD_load.cxx b/LArCalorimeter/LArG4/LArG4SD/src/components/LArG4SD_load.cxx
deleted file mode 100644
index 89d9b04d1ae75b52873f513e20b4b0efa7e539d2..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArG4/LArG4SD/src/components/LArG4SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( LArG4SD )
\ No newline at end of file
diff --git a/LArCalorimeter/LArG4/LArG4ShowerLibSvc/src/components/LArG4ShowerLibSvc_entries.cxx b/LArCalorimeter/LArG4/LArG4ShowerLibSvc/src/components/LArG4ShowerLibSvc_entries.cxx
old mode 100755
new mode 100644
index 7df6aabce6168b075c492347c5ffdff5de65321f..1fc72223dd72e9a9890c3a1f107dc474e8e7bfec
--- a/LArCalorimeter/LArG4/LArG4ShowerLibSvc/src/components/LArG4ShowerLibSvc_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4ShowerLibSvc/src/components/LArG4ShowerLibSvc_entries.cxx
@@ -1,12 +1,7 @@
#include "LArG4ShowerLibSvc/LArG4ShowerLibSvcTest.h"
#include "LArG4ShowerLibSvc/LArG4ShowerLibSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY ( LArG4ShowerLibSvcTest )
DECLARE_SERVICE_FACTORY ( LArG4ShowerLibSvc )
-DECLARE_FACTORY_ENTRIES( LArG4ShowerLibSvc ) {
- DECLARE_SERVICE ( LArG4ShowerLibSvc )
- DECLARE_ALGORITHM ( LArG4ShowerLibSvcTest )
-}
diff --git a/LArCalorimeter/LArG4/LArG4ShowerLibSvc/src/components/LArG4ShowerLibSvc_load.cxx b/LArCalorimeter/LArG4/LArG4ShowerLibSvc/src/components/LArG4ShowerLibSvc_load.cxx
deleted file mode 100755
index 79bc915357674b88c46aaea5acddccd524a4761a..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArG4/LArG4ShowerLibSvc/src/components/LArG4ShowerLibSvc_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArG4ShowerLibSvc)
-
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_entries.cxx b/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_entries.cxx
old mode 100755
new mode 100644
index 1f9d94b3fbdf30258a50d093251693a5c3495061..da93092ff6b90f12d841ed333d78b8235d9e15fe
--- a/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_entries.cxx
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_entries.cxx
@@ -1,15 +1,7 @@
#include "LArG4Validation/SingleTrackValidation.h"
#include "LArG4Validation/AODReader.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( SingleTrackValidation )
DECLARE_ALGORITHM_FACTORY( AODReader )
-DECLARE_FACTORY_ENTRIES(LArG4Validation) {
- DECLARE_ALGORITHM( SingleTrackValidation )
- DECLARE_ALGORITHM( AODReader )
-}
-
-
-
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_load.cxx b/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_load.cxx
deleted file mode 100755
index 8f23e057336fdb8d6e3f4ce3ece4d3b73840d02c..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArG4/LArG4Validation/src/components/LArG4Validation_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( LArG4Validation )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/components/LArGeoAlgs_entries.cxx b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/components/LArGeoAlgs_entries.cxx
old mode 100755
new mode 100644
index 5c421b05396561b1e43e230c0ab6203f48e0aa09..76e4335f668ed98bdc43b865a6fba2c4b33d7ce8
--- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/components/LArGeoAlgs_entries.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/components/LArGeoAlgs_entries.cxx
@@ -1,3 +1,4 @@
#include "../LArDetectorToolNV.h"
DECLARE_TOOL_FACTORY(LArDetectorToolNV)
+
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/components/LArGeoH62002Alg_entries.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/components/LArGeoH62002Alg_entries.cxx
old mode 100755
new mode 100644
index d4cd87fc634fcc0a5213cf031407902466ae2a18..bf8f3932e55b6fbe3ef54563793cce6a5c9e1cb9
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/components/LArGeoH62002Alg_entries.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/components/LArGeoH62002Alg_entries.cxx
@@ -1,3 +1,4 @@
#include "../LArDetectorToolH62002.h"
DECLARE_TOOL_FACTORY(LArDetectorToolH62002)
+
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/components/LArGeoAlgs_entries.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/components/LArGeoAlgs_entries.cxx
old mode 100755
new mode 100644
index 19d6781cb152bac93fe2335f0bd607dd66fc4a9c..917f4d3a4b38f5f082a38d6ee45831896ed238ae
--- a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/components/LArGeoAlgs_entries.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/components/LArGeoAlgs_entries.cxx
@@ -1,3 +1,4 @@
#include "../LArDetectorToolH62003.h"
DECLARE_TOOL_FACTORY(LArDetectorToolH62003)
+
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/components/LArGeoH62004Alg_entries.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/components/LArGeoH62004Alg_entries.cxx
old mode 100755
new mode 100644
index 67935103ed14c4e67763a7a8769327d2752cab7a..637732580e09ccedaebe3531e93f090f380a7c01
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/components/LArGeoH62004Alg_entries.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/components/LArGeoH62004Alg_entries.cxx
@@ -1,3 +1,4 @@
#include "../LArDetectorToolH62004.h"
DECLARE_TOOL_FACTORY(LArDetectorToolH62004)
+
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/components/LArGeoAlgs_entries.cxx b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/components/LArGeoAlgs_entries.cxx
old mode 100755
new mode 100644
index 9170af7e67e35f53e73b8edabd8993c6ff23e11f..6969fc68d072825f83538a14cdd43736297594aa
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/components/LArGeoAlgs_entries.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/components/LArGeoAlgs_entries.cxx
@@ -1,3 +1,4 @@
#include "../LArDetectorToolTBEC.h"
DECLARE_TOOL_FACTORY(LArDetectorToolTBEC)
+
diff --git a/LArCalorimeter/LArL1Sim/src/components/LArL1Sim_entries.cxx b/LArCalorimeter/LArL1Sim/src/components/LArL1Sim_entries.cxx
old mode 100755
new mode 100644
index 12d72f169a21c7e54a1bfbb452d69140a8f2b9eb..cd2d5e1dffe61acbaa2927265a5f86b417b7bc7b
--- a/LArCalorimeter/LArL1Sim/src/components/LArL1Sim_entries.cxx
+++ b/LArCalorimeter/LArL1Sim/src/components/LArL1Sim_entries.cxx
@@ -1,8 +1,3 @@
-//
-// Entry file for ATHENA component libraries
-//
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LArL1Sim/LArTTL1Maker.h"
#include "LArL1Sim/LArSCL1Maker.h"
#include "LArL1Sim/LArTTL1Calib.h"
@@ -13,11 +8,3 @@ DECLARE_ALGORITHM_FACTORY( LArSCL1Maker )
DECLARE_ALGORITHM_FACTORY( LArTTL1Calib )
DECLARE_ALGORITHM_FACTORY( LArSCSimpleMaker )
-DECLARE_FACTORY_ENTRIES(LArL1Sim) {
-
- DECLARE_ALGORITHM(LArTTL1Maker)
- DECLARE_ALGORITHM(LArSCL1Maker)
- DECLARE_ALGORITHM(LArTTL1Calib)
- DECLARE_ALGORITHM(LArSCSimpleMaker)
-
-}
diff --git a/LArCalorimeter/LArL1Sim/src/components/LArL1Sim_load.cxx b/LArCalorimeter/LArL1Sim/src/components/LArL1Sim_load.cxx
deleted file mode 100755
index f9afc8aceed2e91774622b983de02e7d38bf19cb..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArL1Sim/src/components/LArL1Sim_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Load file for ATHENA component library
-//
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArL1Sim)
diff --git a/LArCalorimeter/LArMonTools/src/components/LArMonTools_entries.cxx b/LArCalorimeter/LArMonTools/src/components/LArMonTools_entries.cxx
old mode 100755
new mode 100644
index 99b2388f95aae1e38897ded9fd0cb9aba26f317b..c6780f60b55530f7c9a6e01b2e0190493d963aae
--- a/LArCalorimeter/LArMonTools/src/components/LArMonTools_entries.cxx
+++ b/LArCalorimeter/LArMonTools/src/components/LArMonTools_entries.cxx
@@ -9,7 +9,6 @@
#include "LArMonTools/LArHVCorrectionMonTool.h"
#include "LArMonTools/LArNoisyROMon.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(LArFEBMon)
DECLARE_TOOL_FACTORY(LArRawChannelMonTool)
@@ -22,16 +21,3 @@ DECLARE_TOOL_FACTORY(LArAffectedRegions)
DECLARE_TOOL_FACTORY(LArHVCorrectionMonTool)
DECLARE_TOOL_FACTORY(LArNoisyROMon)
-
-DECLARE_FACTORY_ENTRIES(LArMonTools) {
- DECLARE_ALGTOOL(LArFEBMon)
- DECLARE_ALGTOOL(LArRawChannelMonTool)
- DECLARE_ALGTOOL(LArCollisionTimeMonTool)
- DECLARE_ALGTOOL(LArCosmicsMonTool)
- DECLARE_ALGTOOL(LArCoverage)
- DECLARE_ALGTOOL(LArDigitMon)
- DECLARE_ALGTOOL(LArRODMonTool)
- DECLARE_ALGTOOL(LArAffectedRegions)
- DECLARE_ALGTOOL(LArHVCorrectionMonTool)
- DECLARE_ALGTOOL(LArNoisyROMon)
-}
diff --git a/LArCalorimeter/LArMonTools/src/components/LArMonTools_load.cxx b/LArCalorimeter/LArMonTools/src/components/LArMonTools_load.cxx
deleted file mode 100755
index 71866578062e4d996d302b7d2aa78b1017139e1e..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArMonTools/src/components/LArMonTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArMonTools)
diff --git a/LArCalorimeter/LArOnlDbPrep/src/components/LArOnlDbPrep_entries.cxx b/LArCalorimeter/LArOnlDbPrep/src/components/LArOnlDbPrep_entries.cxx
old mode 100755
new mode 100644
index 83212ad832d28dd142cb47a8a49f83ee89d2cd45..5d3b2fddef82636da68f15843150cbd81c6c5078
--- a/LArCalorimeter/LArOnlDbPrep/src/components/LArOnlDbPrep_entries.cxx
+++ b/LArCalorimeter/LArOnlDbPrep/src/components/LArOnlDbPrep_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "LArOnlDbPrep/LArDSPThresholdFillInline.h"
#include "LArOnlDbPrep/LArGeoWeightsFill.h"
DECLARE_ALGORITHM_FACTORY ( LArDSPThresholdFillInline )
DECLARE_ALGORITHM_FACTORY ( LArGeoWeightsFill )
-DECLARE_FACTORY_ENTRIES(LArOnlDbPrep) {
- DECLARE_ALGORITHM ( LArDSPThresholdFillInline )
- DECLARE_ALGORITHM ( LArGeoWeightsFill )
-}
diff --git a/LArCalorimeter/LArOnlDbPrep/src/components/LArOnlDbPrep_load.cxx b/LArCalorimeter/LArOnlDbPrep/src/components/LArOnlDbPrep_load.cxx
deleted file mode 100755
index 8191f0b7315083c0286a371db01f0fbde47dc139..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArOnlDbPrep/src/components/LArOnlDbPrep_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(LArOnlDbPrep)
diff --git a/LArCalorimeter/LArROD/src/components/LArROD_entries.cxx b/LArCalorimeter/LArROD/src/components/LArROD_entries.cxx
old mode 100755
new mode 100644
index 837791bdcdc2804f9b0610678fcb69aefc8f6190..421507de8320887538bdef47fc0acae265faeb08
--- a/LArCalorimeter/LArROD/src/components/LArROD_entries.cxx
+++ b/LArCalorimeter/LArROD/src/components/LArROD_entries.cxx
@@ -25,7 +25,6 @@
#include "LArROD/LArFebErrorSummaryMaker.h"
#include "LArROD/LArCalibDigitsAccumulatorFreeGain.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
typedef LArDigitPreProcessor<LArDigitContainer> LArDigProcessor;
typedef LArDigitPreProcessor<TBLArDigitContainer> TBLArDigProcessor;
@@ -64,34 +63,3 @@ DECLARE_TOOL_FACTORY( LArRawChannelBuilderToolTileInfo )
#include "../tests/SuperCellVsCaloCellTestAlg.h"
DECLARE_ALGORITHM_FACTORY( SuperCellVsCaloCellTestAlg )
-DECLARE_FACTORY_ENTRIES(LArROD) {
- DECLARE_ALGORITHM( SuperCellVsCaloCellTestAlg );
- DECLARE_ALGORITHM(LArRawChannelBuilder )
- DECLARE_ALGORITHM(ReadLArRaw )
- DECLARE_ALGORITHM(ReadLArDigits )
- DECLARE_ALGORITHM(LArDigProcessor )
- DECLARE_ALGORITHM(TBLArDigProcessor )
- DECLARE_ALGORITHM(TBLArCalDigProcessor )
- DECLARE_ALGORITHM(LArRawChannelSimpleBuilder )
- DECLARE_ALGORITHM(LArTimeChecker )
- DECLARE_ALGORITHM(LArCalibDigitsAccumulator )
- DECLARE_ALGORITHM(LArDigitsAccumulator )
- DECLARE_ALGORITHM(LArRawChannelBuilderDriver)
- DECLARE_ALGORITHM(LArDigitThinner)
- DECLARE_ALGORITHM(LArFebErrorSummaryMaker)
- DECLARE_ALGORITHM(LArCalibDigitsAccumulatorFreeGain)
- DECLARE_ALGORITHM( LArSuperCellBuilderDriver)
- DECLARE_TOOL( LArCellBuilderDriver)
- DECLARE_TOOL( LArRawChannelBuilderToolOFC )
- DECLARE_TOOL( LArRawChannelBuilderToolOFCIter )
- DECLARE_TOOL( LArRawChannelBuilderToolParabola )
- DECLARE_TOOL( LArRawChannelBuilderToolCubic )
- DECLARE_TOOL( LArRawChannelBuilderToolAverage )
- DECLARE_TOOL( LArRawChannelBuilderToolBadChannelTool )
- DECLARE_TOOL( LArRawChannelBuilderADC2EDataBase )
- DECLARE_TOOL( LArRawChannelBuilderADC2EConstants )
- DECLARE_TOOL( LArRawChannelBuilderPedestalDataBase )
- DECLARE_TOOL( LArRawChannelBuilderPedestalSampleZero )
- DECLARE_TOOL( LArRawChannelBuilderToolTileInfo )
-}
-
diff --git a/LArCalorimeter/LArROD/src/components/LArROD_load.cxx b/LArCalorimeter/LArROD/src/components/LArROD_load.cxx
deleted file mode 100755
index 0f8a052831584e78ed3f997c17d6486d8a1ad7b9..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArROD/src/components/LArROD_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArROD)
-
-
diff --git a/LArCalorimeter/LArRawUtils/src/components/LArRawUtils_entries.cxx b/LArCalorimeter/LArRawUtils/src/components/LArRawUtils_entries.cxx
old mode 100755
new mode 100644
index 5313d11888e154c463172ae3c1b7152d6688542d..4aa7c2cbdbba7e044510a766a51ef7501725074f
--- a/LArCalorimeter/LArRawUtils/src/components/LArRawUtils_entries.cxx
+++ b/LArCalorimeter/LArRawUtils/src/components/LArRawUtils_entries.cxx
@@ -1,8 +1,4 @@
#include "LArRawUtils/LArRoI_Map.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( LArRoI_Map )
-DECLARE_FACTORY_ENTRIES(LArRawUtils) {
- DECLARE_TOOL( LArRoI_Map )
-}
diff --git a/LArCalorimeter/LArRawUtils/src/components/LArRawUtils_load.cxx b/LArCalorimeter/LArRawUtils/src/components/LArRawUtils_load.cxx
deleted file mode 100755
index 95cee8e5e6e5b8fe50ac04ce91639bde07253e8f..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArRawUtils/src/components/LArRawUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArRawUtils)
diff --git a/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_entries.cxx b/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_entries.cxx
old mode 100755
new mode 100644
index 09034674bcb3d58ac3c867e0699533ce2c1bb103..a66b46b3695702054b44413f6f077ce232d011e6
--- a/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_entries.cxx
+++ b/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LArRecUtils/LArADC2MeVTool.h"
#include "LArRecUtils/LArAutoCorrNoiseTool.h"
#include "LArRecUtils/LArAutoCorrTotalTool.h"
@@ -72,32 +70,3 @@ DECLARE_ALGORITHM_FACTORY( LArfSamplSymCondAlg )
DECLARE_ALGORITHM_FACTORY( LArMinBiasSymCondAlg )
DECLARE_ALGORITHM_FACTORY( LArNoiseSymCondAlg )
-/*
-DECLARE_FACTORY_ENTRIES(LArRecUtils) {
- DECLARE_TOOL( LArADC2MeVTool )
- DECLARE_TOOL( LArAutoCorrNoiseTool )
- DECLARE_TOOL( LArAutoCorrTotalTool )
- DECLARE_TOOL( LArCellFakeProbElectronics )
- // DECLARE_TOOL( LArCellFakeProbHV )
- DECLARE_TOOL( LArHVCorrTool )
- // DECLARE_TOOL( LArHVGeometryTool )
- DECLARE_TOOL( LArOFCTool )
- DECLARE_TOOL( LArOFPeakRecoTool )
- DECLARE_TOOL( LArParabolaPeakRecoTool )
- DECLARE_TOOL( LArShapePeakRecoTool )
- DECLARE_TOOL( LArTowerBuilderTool )
- DECLARE_TOOL( LArFCalTowerBuilderTool )
- DECLARE_TOOL(LArFEBConfigReader)
- DECLARE_SERVICE( LArFlatConditionSvc )
- DECLARE_ALGORITHM( LArFCalTowerBuilderToolTestAlg )
- DECLARE_TOOL( LArHVScaleRetriever )
-
- DECLARE_ALGORITHM( LArFlatCondAlgHVScale)
- DECLARE_ALGORITHM( LArFlatCondAlgPedestal)
-
-}
-*/
-
-
-//needed for LArCellCorrection, which is the base class of LArG3Escale;
-//LArG3Escale is declared as a factory in LArCellRec
diff --git a/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_load.cxx b/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_load.cxx
deleted file mode 100755
index ae55682181ed9731756de293ac1114c0ca72d639..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArRecUtils/src/components/LArRecUtils_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArRecUtils)
-
-//needed for LArCellCorrection, which is the base class of LArG3Escale;
-//LArG3Escale is declared as a factory in LArCellRec
diff --git a/LArCalorimeter/LArRegionSelector/src/components/LArRegionSelector_entries.cxx b/LArCalorimeter/LArRegionSelector/src/components/LArRegionSelector_entries.cxx
old mode 100755
new mode 100644
index 3827e61c4a8e67a557135b00f153237b88f16a72..86a5463b46521ec3f251fa956dd4bbf0258c082e
--- a/LArCalorimeter/LArRegionSelector/src/components/LArRegionSelector_entries.cxx
+++ b/LArCalorimeter/LArRegionSelector/src/components/LArRegionSelector_entries.cxx
@@ -1,11 +1,6 @@
#include "LArRegionSelector/LArRegionSelectorTable.h"
#include "LArRegionSelector/LArRegionSelectorCheckOL.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( LArRegionSelectorTable )
DECLARE_ALGORITHM_FACTORY( LArRegionSelectorCheckOL )
-DECLARE_FACTORY_ENTRIES(LArRegionSelector) {
- DECLARE_TOOL( LArRegionSelectorTable )
- DECLARE_ALGORITHM( LArRegionSelectorCheckOL )
-}
diff --git a/LArCalorimeter/LArRegionSelector/src/components/LArRegionSelector_load.cxx b/LArCalorimeter/LArRegionSelector/src/components/LArRegionSelector_load.cxx
deleted file mode 100755
index 9744c92f41b7d7ac48c180fcaf3eeb15d6e77410..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArRegionSelector/src/components/LArRegionSelector_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArRegionSelector)
-
diff --git a/LArCalorimeter/LArSim/src/components/LArSim_entries.cxx b/LArCalorimeter/LArSim/src/components/LArSim_entries.cxx
old mode 100755
new mode 100644
index aa9b3123d3cb94afefb0ea00d4f0958d9e6f0ab6..5a81bde3910d91fe1d09cb5cbabca7b93cc04be1
--- a/LArCalorimeter/LArSim/src/components/LArSim_entries.cxx
+++ b/LArCalorimeter/LArSim/src/components/LArSim_entries.cxx
@@ -1,9 +1,3 @@
-//
-// ATHENA component libraries
-//
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LArSim/LArHitMaker.h"
#include "LArSim/LArFakeClusterProducer.h"
#include "LArSim/LArFakeHitProducer.h"
@@ -14,11 +8,3 @@ DECLARE_ALGORITHM_FACTORY( LArHitReader )
DECLARE_ALGORITHM_FACTORY( LArFakeClusterProducer )
DECLARE_ALGORITHM_FACTORY( LArFakeHitProducer )
-DECLARE_FACTORY_ENTRIES(LArSim) {
-
- DECLARE_ALGORITHM( LArHitReader )
- DECLARE_ALGORITHM( LArHitMaker )
- DECLARE_ALGORITHM( LArFakeClusterProducer )
- DECLARE_ALGORITHM( LArFakeHitProducer )
-
-}
diff --git a/LArCalorimeter/LArSim/src/components/LArSim_load.cxx b/LArCalorimeter/LArSim/src/components/LArSim_load.cxx
deleted file mode 100755
index 6ba16196a4b2bed16effa33968d6187a85d3adf7..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArSim/src/components/LArSim_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Load file for ATHENA component library
-//
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArSim)
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx
old mode 100755
new mode 100644
index b811762a9c8281197f0222ed831c61d95dbd20f2..5ddd61ff577412a69a58629883d5497c7ae2d61e
--- a/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx
@@ -3,7 +3,6 @@
#include "LArCalibTest/LArReadHadDMCoeffFile.h"
#include "LArCalibTest/LArReadHadDMCoeffFile2.h"
#include "LArCalibTest/DumpCaloBadChannels.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
@@ -13,12 +12,3 @@ DECLARE_ALGORITHM_FACTORY( LArReadHadDMCoeffFile2 )
DECLARE_ALGORITHM_FACTORY( LArFakeCellFactor )
DECLARE_ALGORITHM_FACTORY( DumpCaloBadChannels )
-
-DECLARE_FACTORY_ENTRIES(LArCalibTest)
-{
- DECLARE_ALGORITHM( LArCablingChecker )
- DECLARE_ALGORITHM( LArReadHadDMCoeffFile );
- DECLARE_ALGORITHM( LArReadHadDMCoeffFile2 );
- DECLARE_ALGORITHM( LArFakeCellFactor )
- DECLARE_ALGORITHM( DumpCaloBadChannels )
-}
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_load.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_load.cxx
deleted file mode 100755
index 8ecc1d4846a2f63b27400ca5dc4a7c67234e3ddc..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( LArCalibTest )
-
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
index a237d68c15a7bc0f35dac3a26a534ef19766179a..f6385ec7e2e97ebb5734ccb5b6cd57b98db489d6 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
@@ -34,7 +34,6 @@ find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
# Component(s) in the package:
atlas_add_component( LArConditionsTest
src/LArConditionsTest_entries.cxx
- src/LArConditionsTest_load.cxx
src/TestLArConditionsTools.cxx
src/FixLArElecCalib.cxx
src/LArCondDataTest.cxx
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
old mode 100755
new mode 100644
index cd7f839668e30717b8bf5fc2a35ca4ba46df2d2e..51e1fb112229ad53f2620eb83702ffcb5b40fed7
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
+++ b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
@@ -1,8 +1,3 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "LArConditionsTest/LArConditionsTestAlg.h"
#include "LArConditionsTest/LArCondDataTest.h"
//#include "LArConditionsTest/FixLArIdMap.h"
@@ -27,17 +22,3 @@ DECLARE_ALGORITHM_FACTORY ( LArFebRodMapConvert )
DECLARE_ALGORITHM_FACTORY ( LArShapeToSCShape )
DECLARE_ALGORITHM_FACTORY ( LArOFCtoOFC )
-
-DECLARE_FACTORY_ENTRIES( LArConditionsTest ) {
- DECLARE_ALGORITHM( LArConditionsTestAlg )
- DECLARE_ALGORITHM( LArCondDataTest )
- //DECLARE_ALGORITHM( FixLArIdMap )
- DECLARE_ALGORITHM( LArFecLvTempDcsTest )
- DECLARE_ALGORITHM( FixLArElecCalib )
- DECLARE_ALGORITHM( TestLArConditionsTools )
- DECLARE_ALGORITHM (LArCablingTest )
- DECLARE_ALGORITHM (LArIdMapConvert)
- DECLARE_ALGORITHM (LArFebRodMapConvert)
- DECLARE_ALGORITHM (LArShapeToSCShape)
- DECLARE_ALGORITHM (LArOFCtoOFC)
-}
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_load.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_load.cxx
deleted file mode 100755
index 59d4e960f8d9a7af80d762343d47ce21857ff647..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_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(LArConditionsTest)
diff --git a/LArCalorimeter/LArTest/LArEventTest/src/components/LArEventTest_entries.cxx b/LArCalorimeter/LArTest/LArEventTest/src/components/LArEventTest_entries.cxx
old mode 100755
new mode 100644
index 9456669e8b02a07793e70e2d195ae1ca1209fcda..aea734f66e0b8d29a1a568b99650085c9b20119e
--- a/LArCalorimeter/LArTest/LArEventTest/src/components/LArEventTest_entries.cxx
+++ b/LArCalorimeter/LArTest/LArEventTest/src/components/LArEventTest_entries.cxx
@@ -10,7 +10,6 @@
#include "LArEventTest/FindDuplicatedLArDigits.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( CheckLArFebHeader )
DECLARE_ALGORITHM_FACTORY( DumpLArDigits )
@@ -19,20 +18,6 @@ DECLARE_ALGORITHM_FACTORY( FakeLArOFCs )
DECLARE_ALGORITHM_FACTORY( FakeLArTimeOffset )
DECLARE_ALGORITHM_FACTORY( FakeTBPhase )
DECLARE_ALGORITHM_FACTORY( LArDigitsToNtuple )
- DECLARE_ALGORITHM_FACTORY( CaloClusterNavTest )
- DECLARE_ALGORITHM_FACTORY(FindDuplicatedLArDigits)
+DECLARE_ALGORITHM_FACTORY( CaloClusterNavTest )
+DECLARE_ALGORITHM_FACTORY(FindDuplicatedLArDigits)
-
-
-DECLARE_FACTORY_ENTRIES(LArEventTest)
-{
- DECLARE_ALGORITHM( CheckLArFebHeader )
- DECLARE_ALGORITHM( DumpLArDigits )
- DECLARE_ALGORITHM( DumpLArRawChannels )
- DECLARE_ALGORITHM( FakeLArOFCs )
- DECLARE_ALGORITHM( FakeLArTimeOffset )
- DECLARE_ALGORITHM( FakeTBPhase )
- DECLARE_ALGORITHM( LArDigitsToNtuple )
- DECLARE_ALGORITHM( CaloClusterNavTest )
- DECLARE_ALGORITHM( FindDuplicatedLArDigits )
-}
diff --git a/LArCalorimeter/LArTest/LArEventTest/src/components/LArEventTest_load.cxx b/LArCalorimeter/LArTest/LArEventTest/src/components/LArEventTest_load.cxx
deleted file mode 100755
index 83fea05cdb2e0602331112e974609395e4323be3..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArTest/LArEventTest/src/components/LArEventTest_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArEventTest)
diff --git a/LArCalorimeter/LArTools/src/components/LArTools_entries.cxx b/LArCalorimeter/LArTools/src/components/LArTools_entries.cxx
old mode 100755
new mode 100644
index 352d07487dceb17deba62ea76c64b5a1ae32b3e8..0b5bb3b374c29ad1ebe3a73a3b1c551a118bc7e7
--- a/LArCalorimeter/LArTools/src/components/LArTools_entries.cxx
+++ b/LArCalorimeter/LArTools/src/components/LArTools_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LArTools/LArMCSymTool.h"
#include "LArTools/LArHVPathologyDbTool.h"
diff --git a/LArCalorimeter/LArTools/src/components/LArTools_load.cxx b/LArCalorimeter/LArTools/src/components/LArTools_load.cxx
deleted file mode 100755
index c7e0bb0c751cab48438160f6a9a84f60f0742889..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArTools/src/components/LArTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArTools)
-
-
diff --git a/LArCalorimeter/LArTrackingGeometry/src/components/LArTrackingGeometry_entries.cxx b/LArCalorimeter/LArTrackingGeometry/src/components/LArTrackingGeometry_entries.cxx
old mode 100755
new mode 100644
index c4a647ad6ec68e30fd853fc3c39a1d097f8a11fb..26d99796ad6ba2e0b2bf75b5f4ab8890786234c5
--- a/LArCalorimeter/LArTrackingGeometry/src/components/LArTrackingGeometry_entries.cxx
+++ b/LArCalorimeter/LArTrackingGeometry/src/components/LArTrackingGeometry_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "LArTrackingGeometry/LArVolumeBuilder.h"
using namespace LAr;
DECLARE_TOOL_FACTORY( LArVolumeBuilder )
-DECLARE_FACTORY_ENTRIES( LArTrackingGeometry )
-{
- DECLARE_TOOL( LArVolumeBuilder );
-}
-
-
diff --git a/LArCalorimeter/LArTrackingGeometry/src/components/LArTrackingGeometry_load.cxx b/LArCalorimeter/LArTrackingGeometry/src/components/LArTrackingGeometry_load.cxx
deleted file mode 100755
index f33e8c123411ea4b6dd2cccc600de3ce185773fe..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArTrackingGeometry/src/components/LArTrackingGeometry_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( LArTrackingGeometry )
-
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/components/TileCalibAlgs_entries.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/components/TileCalibAlgs_entries.cxx
old mode 100755
new mode 100644
index 7ba4c6aede56eb5a8449e3c481c9df013672ec0b..6457414b249b6c85179320cc7e7de1fe6d607840
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/components/TileCalibAlgs_entries.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/components/TileCalibAlgs_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TileCalibAlgs/TileDigiNoiseCalibAlg.h"
#include "TileCalibAlgs/TileRawChNoiseCalibAlg.h"
#include "TileCalibAlgs/TileTopCalibAlg.h"
@@ -31,20 +29,3 @@ DECLARE_TOOL_FACTORY( TileTriggerDefaultCalibTool )
DECLARE_TOOL_FACTORY( TileTOFTool )
DECLARE_TOOL_FACTORY( TileLaserTimingTool )
-DECLARE_FACTORY_ENTRIES(TileCalibAlgs) {
- DECLARE_ALGORITHM( TileTopCalibAlg )
- DECLARE_ALGORITHM( TileLaserCalibAlg )
- DECLARE_ALGORITHM( TileDigiNoiseCalibAlg )
- DECLARE_ALGORITHM( TileRawChNoiseCalibAlg )
- DECLARE_ALGORITHM( TileOFC2DBAlg )
- DECLARE_ALGORITHM( TileMuId2DBAlg )
- DECLARE_ALGORITHM( TileInfoDump )
- DECLARE_ALGORITHM( TileExpertDump )
- DECLARE_TOOL( TileLaserDefaultCalibTool )
- DECLARE_TOOL( TileLaserLinearityCalibTool )
- DECLARE_TOOL( TileCisDefaultCalibTool )
- DECLARE_TOOL( TileTriggerDefaultCalibTool )
- DECLARE_TOOL( TileTOFTool )
- DECLARE_TOOL( TileLaserTimingTool )
-}
-
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/components/TileCalibAlgs_load.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/components/TileCalibAlgs_load.cxx
deleted file mode 100755
index 452cb140e5e02acdd0b40d63093ec003d410b09f..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/components/TileCalibAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileCalibAlgs)
diff --git a/TileCalorimeter/TileConditions/src/components/TileConditions_entries.cxx b/TileCalorimeter/TileConditions/src/components/TileConditions_entries.cxx
index 72edeb15a0b4a60aa08ab9fbb075e162b74f50db..c1eea08bb5a44439839ee202be184c453c837aeb 100644
--- a/TileCalorimeter/TileConditions/src/components/TileConditions_entries.cxx
+++ b/TileCalorimeter/TileConditions/src/components/TileConditions_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TileConditions/TileInfoLoader.h"
#include "TileConditions/TileCablingSvc.h"
#include "TileConditions/TileCondIdTransforms.h"
@@ -47,29 +46,3 @@ DECLARE_TOOL_FACTORY( TileCondProxyCoolOfc )
DECLARE_TOOL_FACTORY( TileCondProxyFileFlt )
DECLARE_TOOL_FACTORY( TileCondProxyFileBch )
-DECLARE_FACTORY_ENTRIES(TileConditions) {
- DECLARE_SERVICE( TileInfoLoader )
- DECLARE_SERVICE( TileCablingSvc )
- DECLARE_SERVICE( TileDCSSvc )
- DECLARE_ALGTOOL( TileCondIdTransforms )
- DECLARE_ALGTOOL( TileBadChanTool )
- DECLARE_ALGTOOL( TileCondToolOfc )
- DECLARE_ALGTOOL( TileCondToolOfcCool )
- DECLARE_ALGTOOL( TileCellNoiseTool )
- DECLARE_ALGTOOL( TileCondToolEmscale )
- DECLARE_ALGTOOL( TileExpertToolEmscale )
- DECLARE_ALGTOOL( TileCondToolIntegrator )
- DECLARE_ALGTOOL( TileCondToolMuID )
- DECLARE_ALGTOOL( TileCondToolTiming )
- DECLARE_ALGTOOL( TileCondToolPulseShape )
- DECLARE_ALGTOOL( TileCondToolNoiseSample )
- DECLARE_ALGTOOL( TileCondToolAutoCr )
- DECLARE_ALGTOOL( TileCondToolNoiseRawChn )
- DECLARE_ALGTOOL( TileCondProxyFltCoolFlt )
- DECLARE_ALGTOOL( TileCondProxyFltCoolBch )
- DECLARE_ALGTOOL( TileCondProxyFltCoolOfc )
- DECLARE_ALGTOOL( TileCondProxyFltFileFlt )
- DECLARE_ALGTOOL( TileCondProxyFltFileBch )
-
-}
-
diff --git a/TileCalorimeter/TileConditions/src/components/TileConditions_load.cxx b/TileCalorimeter/TileConditions/src/components/TileConditions_load.cxx
deleted file mode 100644
index a72756af614fe968d162dc438c58df213599f75d..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileConditions/src/components/TileConditions_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileConditions)
diff --git a/TileCalorimeter/TileCosmicAlgs/src/components/TileCosmicAlgs_entries.cxx b/TileCalorimeter/TileCosmicAlgs/src/components/TileCosmicAlgs_entries.cxx
old mode 100755
new mode 100644
index d5cff24a556b3cc15a79c5dbe0b0a3fc026806b4..a42ce616d812e8a6912e6ae0bd3405db119b6116
--- a/TileCalorimeter/TileCosmicAlgs/src/components/TileCosmicAlgs_entries.cxx
+++ b/TileCalorimeter/TileCosmicAlgs/src/components/TileCosmicAlgs_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TileCosmicAlgs/TileMuonFitter.h"
#include "TileCosmicAlgs/TileCosmicsTrigger.h"
DECLARE_ALGORITHM_FACTORY( TileMuonFitter )
DECLARE_ALGORITHM_FACTORY( TileCosmicsTrigger )
-DECLARE_FACTORY_ENTRIES(TileCosmicAlgs) {
- DECLARE_ALGORITHM( TileMuonFitter )
- DECLARE_ALGORITHM( TileCosmicsTrigger )
-}
diff --git a/TileCalorimeter/TileCosmicAlgs/src/components/TileCosmicAlgs_load.cxx b/TileCalorimeter/TileCosmicAlgs/src/components/TileCosmicAlgs_load.cxx
deleted file mode 100755
index 9a30b938b2a8d465fe1c427ec73f1229604d4f22..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileCosmicAlgs/src/components/TileCosmicAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileCosmicAlgs)
diff --git a/TileCalorimeter/TileFastCaloSim/src/components/TileFastCaloSim_entries.cxx b/TileCalorimeter/TileFastCaloSim/src/components/TileFastCaloSim_entries.cxx
index 3d46aeb3a9a41c248dc2d156dd3becab07e22f5c..4151b3996f12e99cd3f23416501ecde90f809407 100644
--- a/TileCalorimeter/TileFastCaloSim/src/components/TileFastCaloSim_entries.cxx
+++ b/TileCalorimeter/TileFastCaloSim/src/components/TileFastCaloSim_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../TileFCSmStepToTileHitVec.h"
DECLARE_ALGORITHM_FACTORY( TileFCSmStepToTileHitVec )
-DECLARE_FACTORY_ENTRIES( TileFastCaloSim ) {
- DECLARE_ALGORITHM( TileFCSmStepToTileHitVec )
-}
diff --git a/TileCalorimeter/TileFastCaloSim/src/components/TileFastCaloSim_load.cxx b/TileCalorimeter/TileFastCaloSim/src/components/TileFastCaloSim_load.cxx
deleted file mode 100644
index 22e6d60d4bebfb585f6e73530493c35a0420da60..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileFastCaloSim/src/components/TileFastCaloSim_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileFastCaloSim)
diff --git a/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/components/CombinedScintillator_entries.cxx b/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/components/CombinedScintillator_entries.cxx
index fb73f8a4653c8cdcf50ea7329f4dff13193542a3..54ab3c6d4693f761a2e459e649f2f9622304a8be 100644
--- a/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/components/CombinedScintillator_entries.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/components/CombinedScintillator_entries.cxx
@@ -1,6 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../CombinedScintillatorSDTool.hh"
#include "../CombinedScintillatorTool.hh"
DECLARE_TOOL_FACTORY( CombinedScintillatorSDTool )
DECLARE_TOOL_FACTORY( CombinedScintillatorTool )
+
diff --git a/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/components/CombinedScintillator_load.cxx b/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/components/CombinedScintillator_load.cxx
deleted file mode 100644
index 01e637044d4e0000b4ec5b183177bda8afd2fe73..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileG4/TileAncillary/CombinedScintillator/src/components/CombinedScintillator_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CombinedScintillator)
-
diff --git a/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/components/DeadMaterial_entries.cxx b/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/components/DeadMaterial_entries.cxx
index 1f4f4ca1e748cacedeff5722c204acf40a172c6d..531442dff8a041277416129e89132576afe8ba63 100644
--- a/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/components/DeadMaterial_entries.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/components/DeadMaterial_entries.cxx
@@ -1,4 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../DeadMaterialTool.h"
DECLARE_TOOL_FACTORY( DeadMaterialTool )
+
diff --git a/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/components/DeadMaterial_load.cxx b/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/components/DeadMaterial_load.cxx
deleted file mode 100644
index 5d321db6762f93d5dc1f9a8ee55486e0dac227de..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileG4/TileAncillary/DeadMaterial/src/components/DeadMaterial_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(DeadMaterial)
-
diff --git a/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/components/LarCrate_entries.cxx b/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/components/LarCrate_entries.cxx
index cf6f393d3078a1ced4954a32b0fff138083ff75e..31ebe9e23699503735fe767cabab9f51a1df9eb5 100644
--- a/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/components/LarCrate_entries.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/components/LarCrate_entries.cxx
@@ -1,3 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../LArCrateTool.h"
DECLARE_TOOL_FACTORY( LArCrateTool )
+
diff --git a/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/components/LarCrate_load.cxx b/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/components/LarCrate_load.cxx
deleted file mode 100644
index 7f63312a6d36da55085ac9de668bf81326ed41fc..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileG4/TileAncillary/LarCrate/src/components/LarCrate_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( LArCrate )
diff --git a/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/src/components/MinBiasScintillator_entries.cxx b/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/src/components/MinBiasScintillator_entries.cxx
index ea327bf7a913a93d26ba1a18f99798997e197a2a..80ba7d176ff888105b40e891b353a6cbd96511e3 100644
--- a/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/src/components/MinBiasScintillator_entries.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/src/components/MinBiasScintillator_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MinBiasScintillatorSDTool.h"
DECLARE_TOOL_FACTORY( MinBiasScintillatorSDTool )
-DECLARE_FACTORY_ENTRIES( MinBiasScintillator ) {
- DECLARE_TOOL( MinBiasScintillatorSDTool )
-}
diff --git a/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/src/components/MinBiasScintillator_load.cxx b/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/src/components/MinBiasScintillator_load.cxx
deleted file mode 100644
index c972903e71896db07d8f2cbb2591ce8667e267ba..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileG4/TileAncillary/MinBiasScintillator/src/components/MinBiasScintillator_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MinBiasScintillator)
diff --git a/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/components/MuonWall_entries.cxx b/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/components/MuonWall_entries.cxx
index 5d2e964cdae2cf5f7d921aff05cea6a448a928b0..1a230adf9006acfb1fbba8afd732d529ccf36a65 100644
--- a/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/components/MuonWall_entries.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/components/MuonWall_entries.cxx
@@ -1,6 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../MuonWallSDTool.h"
#include "../MuonWallTool.h"
DECLARE_TOOL_FACTORY( MuonWallSDTool )
DECLARE_TOOL_FACTORY( MuonWallTool )
+
diff --git a/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/components/MuonWall_load.cxx b/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/components/MuonWall_load.cxx
deleted file mode 100644
index 2e3e9ca22fcc7c2d962735f1b4641bbca80d3db0..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileG4/TileAncillary/MuonWall/src/components/MuonWall_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonWall)
-
diff --git a/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/components/PhantomCalorimeter_entries.cxx b/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/components/PhantomCalorimeter_entries.cxx
index 44e3bbf65856548f0abe5f8c28c54f35bb0921f2..3970185dc3ec977d9ab5f2e1282a19b252b73236 100644
--- a/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/components/PhantomCalorimeter_entries.cxx
+++ b/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/components/PhantomCalorimeter_entries.cxx
@@ -1,6 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../PhantomBarrelSDTool.hh"
#include "../PhantomBarrelTool.hh"
DECLARE_TOOL_FACTORY( PhantomBarrelSDTool )
DECLARE_TOOL_FACTORY( PhantomBarrelTool )
+
diff --git a/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/components/PhantomCalorimeter_load.cxx b/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/components/PhantomCalorimeter_load.cxx
deleted file mode 100644
index 68581e9fabbeee6bca0a403dc39107662bab2dad..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileG4/TileAncillary/PhantomCalorimeter/src/components/PhantomCalorimeter_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(PhantomCalorimeter)
-
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/components/TileGeoG4Calib_entries.cxx b/TileCalorimeter/TileG4/TileGeoG4Calib/src/components/TileGeoG4Calib_entries.cxx
index e43f336974559ab30198a5719b6253b06f3ca3a9..531d65287ab549d43861af06821468b4a64ea1a6 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/components/TileGeoG4Calib_entries.cxx
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/components/TileGeoG4Calib_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../TileGeoG4CalibSDTool.h"
DECLARE_TOOL_FACTORY( TileGeoG4CalibSDTool )
-DECLARE_FACTORY_ENTRIES( TileGeoG4Calib ) {
- DECLARE_TOOL( TileGeoG4CalibSDTool )
-}
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/components/TileGeoG4Calib_load.cxx b/TileCalorimeter/TileG4/TileGeoG4Calib/src/components/TileGeoG4Calib_load.cxx
deleted file mode 100644
index b2b6c010d2cd57f91579ad05c003db1e937095c6..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/components/TileGeoG4Calib_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileGeoG4Calib)
diff --git a/TileCalorimeter/TileG4/TileGeoG4SD/src/components/TileGeoG4SD_entries.cxx b/TileCalorimeter/TileG4/TileGeoG4SD/src/components/TileGeoG4SD_entries.cxx
index d8c63c5cd42facd000cd6d4e20fb8f7481c0fc3c..55250b66fcfb05aadf9429c0e559f72770d7de23 100644
--- a/TileCalorimeter/TileG4/TileGeoG4SD/src/components/TileGeoG4SD_entries.cxx
+++ b/TileCalorimeter/TileG4/TileGeoG4SD/src/components/TileGeoG4SD_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../TileGeoG4SDTool.h"
#include "../TileGeoG4SDCalc.hh"
DECLARE_TOOL_FACTORY( TileGeoG4SDTool )
DECLARE_SERVICE_FACTORY( TileGeoG4SDCalc )
-DECLARE_FACTORY_ENTRIES( TileGeoG4SD ) {
- DECLARE_TOOL( TileGeoG4SDTool )
- DECLARE_SERVICE( TileGeoG4SDCalc )
-}
diff --git a/TileCalorimeter/TileG4/TileGeoG4SD/src/components/TileGeoG4SD_load.cxx b/TileCalorimeter/TileG4/TileGeoG4SD/src/components/TileGeoG4SD_load.cxx
deleted file mode 100644
index 4c5519d219db38d5a55dde42cc37037ba895e85a..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileG4/TileGeoG4SD/src/components/TileGeoG4SD_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileGeoG4SD)
diff --git a/TileCalorimeter/TileGeoModel/src/components/TileGeoModel_entries.cxx b/TileCalorimeter/TileGeoModel/src/components/TileGeoModel_entries.cxx
old mode 100755
new mode 100644
index 80cef831f051012911955bdf006538f3dfd3c8cb..646e9c85a4ca183b89689ff28eb128719960448c
--- a/TileCalorimeter/TileGeoModel/src/components/TileGeoModel_entries.cxx
+++ b/TileCalorimeter/TileGeoModel/src/components/TileGeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "TileGeoModel/TileDetectorTool.h"
DECLARE_TOOL_FACTORY(TileDetectorTool)
+
diff --git a/TileCalorimeter/TileL2Algs/src/components/TileL2Algs_entries.cxx b/TileCalorimeter/TileL2Algs/src/components/TileL2Algs_entries.cxx
old mode 100755
new mode 100644
index db10f955cc5737236f99a12b0be25bf15cf8b887..6ad6fca61ebd4e709a9092fe5da73cf88f1602bc
--- a/TileCalorimeter/TileL2Algs/src/components/TileL2Algs_entries.cxx
+++ b/TileCalorimeter/TileL2Algs/src/components/TileL2Algs_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TileL2Algs/TileRawChannelToL2.h"
#include "TileL2Algs/TileMuRODToNtuple.h"
#include "TileL2Algs/TileL2Builder.h"
@@ -8,8 +6,3 @@ DECLARE_ALGORITHM_FACTORY( TileRawChannelToL2 )
DECLARE_ALGORITHM_FACTORY( TileMuRODToNtuple )
DECLARE_TOOL_FACTORY( TileL2Builder )
-DECLARE_FACTORY_ENTRIES(TileL2Algs) {
- DECLARE_ALGORITHM( TileRawChannelToL2 )
- DECLARE_ALGORITHM( TileMuRODToNtuple )
- DECLARE_TOOL( TileL2Builder )
-}
diff --git a/TileCalorimeter/TileL2Algs/src/components/TileL2Algs_load.cxx b/TileCalorimeter/TileL2Algs/src/components/TileL2Algs_load.cxx
deleted file mode 100755
index 8a730a1d396124c14eeb7187081a0ec0f93c436e..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileL2Algs/src/components/TileL2Algs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileL2Algs)
diff --git a/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_entries.cxx b/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_entries.cxx
index 30f4560367384d0d269a58011b838ea04ed5667b..8a45664b10cecb75549ef60d3bf6237213bd3ed8 100644
--- a/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_entries.cxx
+++ b/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TileMonitoring/TilePaterMonTool.h"
#include "TileMonitoring/TileFatherMonTool.h"
#include "TileMonitoring/TileCellMonTool.h"
@@ -49,25 +48,3 @@ DECLARE_TOOL_FACTORY(TileTBBeamMonTool )
DECLARE_TOOL_FACTORY(TileTBMonTool )
DECLARE_TOOL_FACTORY(TileTBCellMonTool )
-DECLARE_FACTORY_ENTRIES(TileMonitoring) {
- DECLARE_ALGTOOL(TileFatherMonTool )
- DECLARE_ALGTOOL(TilePaterMonTool )
- DECLARE_ALGTOOL(TileCellMonTool )
- DECLARE_ALGTOOL(TileTowerMonTool )
- DECLARE_ALGTOOL(TileClusterMonTool )
- DECLARE_ALGTOOL(TileMuIdMonTool )
- DECLARE_ALGTOOL(TileL2MonTool )
- DECLARE_ALGTOOL(TileMuonFitMonTool )
- DECLARE_ALGTOOL(TileDigitsMonTool )
- DECLARE_ALGTOOL(TileRawChannelMonTool )
- DECLARE_ALGTOOL(TileMBTSMonTool )
- DECLARE_ALGTOOL(TileDQFragMonTool )
- DECLARE_ALGTOOL(TileRODMonTool )
- DECLARE_ALGTOOL(TileJetMonTool )
- DECLARE_ALGTOOL(TileDigiNoiseMonTool )
- DECLARE_ALGTOOL(TileTMDBDigitsMonTool )
- DECLARE_ALGTOOL(TileTMDBRawChannelMonTool )
- DECLARE_ALGTOOL(TileCellNoiseMonTool )
- DECLARE_ALGTOOL(TileRawChannelTimeMonTool )
- DECLARE_ALGTOOL(TileRawChannelNoiseMonTool )
-}
diff --git a/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_load.cxx b/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_load.cxx
deleted file mode 100644
index 00c4aae4d5eeac715d0944a26da157bea859c98d..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileMonitoring/src/components/TileMonitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileMonitoring)
diff --git a/TileCalorimeter/TileMuId/src/components/TileMuId_entries.cxx b/TileCalorimeter/TileMuId/src/components/TileMuId_entries.cxx
old mode 100755
new mode 100644
index 85370dd90dfa31278b049371ef0dd042ef563cb7..6a2492c65b043cbf0766a181b15711edf1d2ce2c
--- a/TileCalorimeter/TileMuId/src/components/TileMuId_entries.cxx
+++ b/TileCalorimeter/TileMuId/src/components/TileMuId_entries.cxx
@@ -1,23 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TileMuId/TileLookForMuAlg.h"
#include "TileMuId/TileMuToNtuple.h"
DECLARE_ALGORITHM_FACTORY( TileLookForMuAlg )
DECLARE_ALGORITHM_FACTORY( TileMuToNtuple )
-DECLARE_FACTORY_ENTRIES(TileMuId) {
- DECLARE_ALGORITHM( TileLookForMuAlg )
- DECLARE_ALGORITHM( TileMuToNtuple )
-}
-//Notes:
-//
-//1. The argument to the DECLARE_FACTORY_ENTRIES(XXX) is the name of the
-// component library (libXXX.so).
-//2. Each Algorithm that is contained in the library should be declared
-// by the DECLARE_ALGORITHM() statement.
-//3. Each Service that is contained in the library should be declared
-// by the DECLARE_SERVICE() statement.
-//
-// See Athena User Guide for more information
-
-
diff --git a/TileCalorimeter/TileMuId/src/components/TileMuId_load.cxx b/TileCalorimeter/TileMuId/src/components/TileMuId_load.cxx
deleted file mode 100755
index 645995ea7e4d2ee73bea34cfcee5fcb59927712f..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileMuId/src/components/TileMuId_load.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileMuId)
-
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
-
-
diff --git a/TileCalorimeter/TileRawUtils/src/components/TileRawUtils_entries.cxx b/TileCalorimeter/TileRawUtils/src/components/TileRawUtils_entries.cxx
old mode 100755
new mode 100644
index 57c375f8bda5becd7b5546368aa3c98ea92143ba..1bcf2cd363ed532ba1ade59e1e3c0cea22638aa6
--- a/TileCalorimeter/TileRawUtils/src/components/TileRawUtils_entries.cxx
+++ b/TileCalorimeter/TileRawUtils/src/components/TileRawUtils_entries.cxx
@@ -1,10 +1,6 @@
#include "TileRawUtils/TileRoI_Map.h"
#include "TileRawUtils/TileRegionSelectorTable.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( TileRoI_Map )
DECLARE_TOOL_FACTORY( TileRegionSelectorTable )
-DECLARE_FACTORY_ENTRIES(TileRawUtils) {
- DECLARE_TOOL( TileRegionSelectorTable )
-}
diff --git a/TileCalorimeter/TileRawUtils/src/components/TileRawUtils_load.cxx b/TileCalorimeter/TileRawUtils/src/components/TileRawUtils_load.cxx
deleted file mode 100755
index 04473673262d5fb225298586570b4dd4734781b8..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileRawUtils/src/components/TileRawUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileRawUtils)
diff --git a/TileCalorimeter/TileRec/src/components/TileRec_entries.cxx b/TileCalorimeter/TileRec/src/components/TileRec_entries.cxx
old mode 100755
new mode 100644
index 9de8d8e57c944b3136f5e9433c9e46a5e1a3fc42..e18b993b213a79684487e64af0a98e499c79b8e6
--- a/TileCalorimeter/TileRec/src/components/TileRec_entries.cxx
+++ b/TileCalorimeter/TileRec/src/components/TileRec_entries.cxx
@@ -8,7 +8,6 @@
#include "TileRec/TileDigitsToNtuple.h"
#include "TileRec/TileTTL1ToNtuple.h"
#include "TileRec/TileEventFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TileRec/TileMuonReceiverDecisionToNtuple.h"
DECLARE_ALGORITHM_FACTORY( TileAANtuple )
@@ -23,16 +22,3 @@ DECLARE_ALGORITHM_FACTORY( TileTTL1ToNtuple )
DECLARE_ALGORITHM_FACTORY( TileEventFilter )
DECLARE_ALGORITHM_FACTORY( TileMuonReceiverDecisionToNtuple )
-DECLARE_FACTORY_ENTRIES(TileRec) {
- DECLARE_ALGORITHM( TileAANtuple )
- DECLARE_ALGORITHM( TileRawChannelToNtuple )
- DECLARE_ALGORITHM( TileCellIDCToNtuple )
- DECLARE_ALGORITHM( TileCellToNtuple )
- DECLARE_ALGORITHM( TileHitToNtuple )
- DECLARE_ALGORITHM( TileTBHitToNtuple )
- DECLARE_ALGORITHM( TileHitVecToNtuple )
- DECLARE_ALGORITHM( TileDigitsToNtuple )
- DECLARE_ALGORITHM( TileTTL1ToNtuple )
- DECLARE_ALGORITHM( TileEventFilter )
- DECLARE_ALGORITHM( TileMuonReceiverDecisionToNtuple )
-}
diff --git a/TileCalorimeter/TileRec/src/components/TileRec_load.cxx b/TileCalorimeter/TileRec/src/components/TileRec_load.cxx
deleted file mode 100755
index 4632688d09d929990d931107b563c355b6f544c8..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileRec/src/components/TileRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileRec)
diff --git a/TileCalorimeter/TileRecAlgs/src/components/TileRecAlgs_entries.cxx b/TileCalorimeter/TileRecAlgs/src/components/TileRecAlgs_entries.cxx
index 7a70e8bdd36591b5b99bba6bd648e4c8236fa927..70cafee934db88e16b6f81e459c927e7099f33a3 100644
--- a/TileCalorimeter/TileRecAlgs/src/components/TileRecAlgs_entries.cxx
+++ b/TileCalorimeter/TileRecAlgs/src/components/TileRecAlgs_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TileConditions/TileCondToolEmscale.h"
#include "TileConditions/TileCondToolNoiseSample.h"
#include "TileRecUtils/TileCellMaskingTool.h"
@@ -32,17 +30,3 @@ DECLARE_ALGORITHM_FACTORY( TileCellToTTL1 )
DECLARE_ALGORITHM_FACTORY( MBTSTimeDiffEventInfoAlg )
DECLARE_ALGORITHM_FACTORY( TileMuonReceiverReadCnt )
-DECLARE_FACTORY_ENTRIES(TileRecAlgs) {
- DECLARE_SERVICE( TileCellCorrection )
- DECLARE_ALGORITHM( TileCellSelector )
- DECLARE_ALGORITHM( TileCellIDCToCell )
- DECLARE_ALGORITHM( TileCellVerify )
- DECLARE_ALGORITHM( TileBeamElemToCell )
- DECLARE_ALGORITHM( TileRawChannelToTTL1 )
- DECLARE_ALGORITHM( TileDigitsToTTL1 )
- DECLARE_ALGORITHM( TileRawChannelToHit )
- DECLARE_ALGORITHM( TileDigitsFilter )
- DECLARE_ALGORITHM( TileCellToTTL1 )
- DECLARE_ALGORITHM( MBTSTimeDiffEventInfoAlg )
- DECLARE_ALGORITHM( TileMuonReceiverReadCnt )
-}
diff --git a/TileCalorimeter/TileRecAlgs/src/components/TileRecAlgs_load.cxx b/TileCalorimeter/TileRecAlgs/src/components/TileRecAlgs_load.cxx
deleted file mode 100644
index fcf3acc76dd5dc612c8fe9d1cacb2a7a5cef4bcf..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileRecAlgs/src/components/TileRecAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileRecAlgs)
diff --git a/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx b/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
index e6c2246ceb01e125f197f791ac6723cba9d6f374..da463b361e76344b1a93bcee783d10d1c128b08e 100644
--- a/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
+++ b/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TileRecUtils/TileRawChannelBuilderFlatFilter.h"
#include "TileRecUtils/TileRawChannelBuilderFitFilter.h"
#include "TileRecUtils/TileRawChannelBuilderFitFilterCool.h"
@@ -42,24 +40,3 @@ DECLARE_ALGORITHM_FACTORY( TileRawChannelMaker )
DECLARE_ALGORITHM_FACTORY( TileRawChannelVerify )
DECLARE_ALGORITHM_FACTORY( TileRawCorrelatedNoise )
-DECLARE_FACTORY_ENTRIES(TileRecUtils) {
- DECLARE_TOOL( TileRawChannelBuilderFlatFilter )
- DECLARE_TOOL( TileRawChannelBuilderFitFilter )
- DECLARE_TOOL( TileRawChannelBuilderFitFilterCool )
- DECLARE_TOOL( TileRawChannelBuilderOptFilter )
- DECLARE_TOOL( TileRawChannelBuilderOpt2Filter )
- DECLARE_TOOL( TileRawChannelBuilderQIEFilter )
- DECLARE_TOOL( TileRawChannelBuilderManyAmps )
- DECLARE_TOOL( TileRawChannelBuilderMF )
- DECLARE_TOOL( TileBeamInfoProvider )
- DECLARE_TOOL( TileCellBuilder )
- DECLARE_TOOL( TileCellBuilderFromHit )
- DECLARE_TOOL( TileCellFakeProb )
- DECLARE_TOOL( TileCellMaskingTool )
- DECLARE_TOOL( TileTowerBuilderTool )
- DECLARE_TOOL( TileCellNoiseFilter )
- DECLARE_TOOL( TileRawChannelNoiseFilter )
- DECLARE_ALGORITHM( TileRawChannelMaker )
- DECLARE_ALGORITHM( TileRawChannelVerify )
- DECLARE_ALGORITHM( TileRawCorrelatedNoise )
-}
diff --git a/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_load.cxx b/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_load.cxx
deleted file mode 100644
index 508906269ee69b2ed633ab069ceadcc048a8fbd8..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileRecUtils)
diff --git a/TileCalorimeter/TileSimAlgs/src/components/TileSimAlgs_entries.cxx b/TileCalorimeter/TileSimAlgs/src/components/TileSimAlgs_entries.cxx
index 58e23fed902a4239913e6215be4a5d9928c629b7..e8bf20517d56446098f403ff6eb57025323b8534 100644
--- a/TileCalorimeter/TileSimAlgs/src/components/TileSimAlgs_entries.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/components/TileSimAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TileSimAlgs/TileHitVecToCnt.h"
#include "TileSimAlgs/TileHitVecToCntTool.h"
#include "TileSimAlgs/TileHitToRawChannel.h"
@@ -21,15 +20,3 @@ DECLARE_ALGORITHM_FACTORY( TileDigitsFromPulse )
DECLARE_ALGORITHM_FACTORY( TilePulseForTileMuonReceiver )
DECLARE_ALGORITHM_FACTORY( TileMuonReceiverDecision )
-DECLARE_FACTORY_ENTRIES(TileSimAlgs) {
- DECLARE_ALGORITHM( TileHitVecToCnt )
- DECLARE_TOOL( TileHitVecToCntTool )
- DECLARE_ALGORITHM( TileHitToRawChannel )
- DECLARE_ALGORITHM( TileHitToCell )
- DECLARE_ALGORITHM( TileHitToTTL1 )
- DECLARE_ALGORITHM( TileTBHitToBeamElem )
- DECLARE_ALGORITHM( TileDigitsMaker )
- DECLARE_ALGORITHM( TileDigitsFromPulse )
- DECLARE_ALGORITHM( TilePulseForTileMuonReceiver )
- DECLARE_ALGORITHM( TileMuonReceiverDecision )
-}
diff --git a/TileCalorimeter/TileSimAlgs/src/components/TileSimAlgs_load.cxx b/TileCalorimeter/TileSimAlgs/src/components/TileSimAlgs_load.cxx
deleted file mode 100644
index c31853c59d2a18f05ef2ffcd26624dc60d1ed143..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileSimAlgs/src/components/TileSimAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileSimAlgs)
diff --git a/TileCalorimeter/TileSimUtils/src/components/TileSimUtils_entries.cxx b/TileCalorimeter/TileSimUtils/src/components/TileSimUtils_entries.cxx
old mode 100755
new mode 100644
index de11fa80f165370136186c0cc93d26d3aa2b6a00..98d475ea85890bd635a8f59ca1504f8130401eeb
--- a/TileCalorimeter/TileSimUtils/src/components/TileSimUtils_entries.cxx
+++ b/TileCalorimeter/TileSimUtils/src/components/TileSimUtils_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TileSimUtils/TileCalibHitNtuple.h"
#include "TileSimUtils/TileCalibHitCntNtup.h"
DECLARE_TOOL_FACTORY( TileCalibHitNtuple )
DECLARE_TOOL_FACTORY( TileCalibHitCntNtup )
-DECLARE_FACTORY_ENTRIES(TileSimUtils) {
- DECLARE_TOOL( TileCalibHitNtuple )
- DECLARE_TOOL( TileCalibHitCntNtup )
-}
diff --git a/TileCalorimeter/TileSimUtils/src/components/TileSimUtils_load.cxx b/TileCalorimeter/TileSimUtils/src/components/TileSimUtils_load.cxx
deleted file mode 100755
index a5e302706073d2d56264210316922119911f79d7..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileSimUtils/src/components/TileSimUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileSimUtils)
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx
index c6d01b113de9013760547cd6fc3545d65eb4d830..34b85c68b976f4c506913d0343b1561ebf4a2dff 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TileByteStream/TileRawChannelContByteStreamCnv.h"
#include "TileByteStream/TileBeamElemContByteStreamCnv.h"
#include "TileByteStream/TileDigitsContByteStreamCnv.h"
@@ -27,17 +25,3 @@ DECLARE_CONVERTER_FACTORY( TileL2ContByteStreamCnv )
DECLARE_CONVERTER_FACTORY( TileLaserObjByteStreamCnv )
DECLARE_CONVERTER_FACTORY( TileMuRcvContByteStreamCnv )
-DECLARE_FACTORY_ENTRIES(TileByteStream) {
- DECLARE_CONVERTER( TileRawChannelContByteStreamCnv )
- DECLARE_CONVERTER( TileBeamElemContByteStreamCnv )
- DECLARE_CONVERTER( TileDigitsContByteStreamCnv )
- DECLARE_CONVERTER( TileL2ContByteStreamCnv )
- DECLARE_CONVERTER( TileLaserObjByteStreamCnv )
- DECLARE_CONVERTER( TileMuRcvContByteStreamCnv )
- DECLARE_TOOL( TileDigitsContByteStreamTool )
- DECLARE_TOOL( TileRawChannelContByteStreamTool )
- DECLARE_TOOL( TileL2ContByteStreamTool )
- DECLARE_TOOL( TileLaserObjByteStreamTool )
- DECLARE_TOOL( TileMuRcvContByteStreamTool )
- DECLARE_TOOL( TileROD_Decoder )
-}
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_load.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_load.cxx
deleted file mode 100644
index 26a04eb77f45d6cc35bb573689ced85abc036435..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileSvc/TileByteStream/src/components/TileByteStream_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileByteStream)
-
diff --git a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx b/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
old mode 100755
new mode 100644
index cbc3d6c152b7b37667cbc3a2e5b2fd65c6c54494..bc2644e4b5dd3d2c81122cfa880d2fd57d26a395
--- a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
+++ b/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
@@ -1,15 +1,4 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TileIdCnv/TileHWIDDetDescrCnv.h"
DECLARE_CONVERTER_FACTORY(TileHWIDDetDescrCnv)
-DECLARE_FACTORY_ENTRIES ( TileIdCnv ) {
- DECLARE_CONVERTER ( TileHWIDDetDescrCnv );
-}
-
diff --git a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_load.cxx b/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_load.cxx
deleted file mode 100755
index 507267c1d212aa98bc87c2c7cbd3e4486651ef5c..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_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( TileIdCnv )
diff --git a/TileCalorimeter/TileTBRec/src/components/TileTBRec_entries.cxx b/TileCalorimeter/TileTBRec/src/components/TileTBRec_entries.cxx
old mode 100755
new mode 100644
index aa2c3d14653a1379e66cb2c36ef13b3a9cbb0884..1ce51e114044e084ac39815949f273354acc2462
--- a/TileCalorimeter/TileTBRec/src/components/TileTBRec_entries.cxx
+++ b/TileCalorimeter/TileTBRec/src/components/TileTBRec_entries.cxx
@@ -6,7 +6,6 @@
#include "TileTBRec/TileTBOldNtupleWrite.h"
#include "TileTBRec/TileDigitsGainFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( TileTBNtuple )
DECLARE_ALGORITHM_FACTORY( TileTBAANtuple )
@@ -16,11 +15,3 @@ DECLARE_ALGORITHM_FACTORY( TileTBOldNtupleRead )
DECLARE_ALGORITHM_FACTORY( TileTBOldNtupleWrite )
DECLARE_ALGORITHM_FACTORY( TileDigitsGainFilter )
-DECLARE_FACTORY_ENTRIES(TileTBRec) {
- DECLARE_ALGORITHM( TileTBNtuple )
- DECLARE_ALGORITHM( TileTBAANtuple )
- DECLARE_ALGORITHM( TileTBStat )
- DECLARE_ALGORITHM( TileTBDump )
- DECLARE_ALGORITHM( TileTBOldNtupleRead )
- DECLARE_ALGORITHM( TileTBOldNtupleWrite )
-}
diff --git a/TileCalorimeter/TileTBRec/src/components/TileTBRec_load.cxx b/TileCalorimeter/TileTBRec/src/components/TileTBRec_load.cxx
deleted file mode 100755
index e5318355c798a62d7b675c7956d09811a4b6a296..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileTBRec/src/components/TileTBRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileTBRec)
diff --git a/TileCalorimeter/TileTrackingGeometry/src/components/TileTrackingGeometry_entries.cxx b/TileCalorimeter/TileTrackingGeometry/src/components/TileTrackingGeometry_entries.cxx
old mode 100755
new mode 100644
index 36c3de89cd40c2e4d831f921d369433e314880e5..40ea57c560cafa4429788e561e45a8d1955b7b9b
--- a/TileCalorimeter/TileTrackingGeometry/src/components/TileTrackingGeometry_entries.cxx
+++ b/TileCalorimeter/TileTrackingGeometry/src/components/TileTrackingGeometry_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TileTrackingGeometry/TileVolumeBuilder.h"
using namespace Tile;
DECLARE_TOOL_FACTORY( TileVolumeBuilder )
-DECLARE_FACTORY_ENTRIES( TileTrackingGeometry )
-{
- DECLARE_TOOL( TileVolumeBuilder );
-}
-
-
diff --git a/TileCalorimeter/TileTrackingGeometry/src/components/TileTrackingGeometry_load.cxx b/TileCalorimeter/TileTrackingGeometry/src/components/TileTrackingGeometry_load.cxx
deleted file mode 100755
index b67084bb7a8628253320d5afe65f49f49461112e..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileTrackingGeometry/src/components/TileTrackingGeometry_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TileTrackingGeometry )
-