diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/components/AnalysisExamples_entries.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/components/AnalysisExamples_entries.cxx
index e5fc5c88559a4de9f0fc21e16b3b163d29588fb7..1d477872409ff162b30e6f241bf453d245b16ad0 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/components/AnalysisExamples_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/components/AnalysisExamples_entries.cxx
@@ -10,7 +10,6 @@
#include "../AthExReadD3pdEvtStore.h"
#include "../AthExReadD3pdNtuple.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( MiscellaneousExamples )
DECLARE_ALGORITHM_FACTORY( WriteTruthParticles )
@@ -24,18 +23,3 @@ DECLARE_ALGORITHM_FACTORY( TrigAnalysisExample )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( AthEx, ReadD3pdNtuple )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( AthEx, ReadD3pdEvtStore )
-DECLARE_FACTORY_ENTRIES( AnalysisExamples ) {
- DECLARE_ALGORITHM( MiscellaneousExamples )
- DECLARE_ALGORITHM( WriteTruthParticles )
- DECLARE_ALGORITHM( ReadTruthParticles )
- DECLARE_ALGORITHM( TrackExample )
- DECLARE_ALGORITHM( ZeeOnESD )
- DECLARE_ALGORITHM( VFitZmmOnAOD )
- DECLARE_ALGORITHM( JetTagAna )
- DECLARE_ALGORITHM( PileUpTruthExample )
- DECLARE_ALGORITHM( TrigAnalysisExample )
- DECLARE_NAMESPACE_ALGORITHM( AthEx, ReadD3pdNtuple )
- DECLARE_NAMESPACE_ALGORITHM( AthEx, ReadD3pdEvtStore )
-
-}
-
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/components/AnalysisExamples_load.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/components/AnalysisExamples_load.cxx
deleted file mode 100644
index 7b636e5cecb78cdcb97c0b529661cff14f8459e1..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/components/AnalysisExamples_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AnalysisExamples)
-
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/components/AnalysisTest_entries.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/components/AnalysisTest_entries.cxx
index 7bb2311188a03e7ec7d409f2d0f0a1427087129b..20cbadc1e83573b6eb5dbd1d88a64a2021d943b1 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/components/AnalysisTest_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/components/AnalysisTest_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "AnalysisTest/ReadMuon.h"
#include "AnalysisTest/ReadElectron.h"
#include "AnalysisTest/ReadPhoton.h"
@@ -29,22 +27,3 @@ DECLARE_ALGORITHM_FACTORY ( NavTest )
DECLARE_ALGORITHM_FACTORY ( WriteINav4MomAssocs )
DECLARE_ALGORITHM_FACTORY ( ReadINav4MomAssocs )
-DECLARE_FACTORY_ENTRIES (AnalysisTest) {
-
- DECLARE_ALGORITHM ( ReadMuon )
- DECLARE_ALGORITHM ( ReadElectron )
- DECLARE_ALGORITHM ( ReadPhoton )
- DECLARE_ALGORITHM ( ReadTauJet )
- DECLARE_ALGORITHM ( ReadTruthParticle )
- DECLARE_ALGORITHM ( ReadTrigger )
- DECLARE_ALGORITHM ( ReadTau )
- DECLARE_ALGORITHM ( Readegamma )
- DECLARE_ALGORITHM ( ReadVxContainer )
- DECLARE_ALGORITHM ( ReadTrackParticle )
- DECLARE_ALGORITHM ( NavTest )
-
- DECLARE_ALGORITHM ( WriteINav4MomAssocs )
- DECLARE_ALGORITHM ( ReadINav4MomAssocs )
-
-}
-
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/components/AnalysisTest_load.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/components/AnalysisTest_load.cxx
deleted file mode 100644
index 6eb03bfbbd3617734004b6357ac37e32879ef2e3..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/components/AnalysisTest_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AnalysisTest)
-
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/components/AnalysisTools_entries.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/components/AnalysisTools_entries.cxx
index 8dcd12aece3e528f4fa9afe0220037c312b37875..0a082cce9f694ca1605bb390c5aa91f6b32cd88a 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/components/AnalysisTools_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/components/AnalysisTools_entries.cxx
@@ -2,16 +2,8 @@
#include "AnalysisTools/AANTupleStream.h"
#include "AnalysisTools/AANTEventSelector.h"
#include "AnalysisTools/AnalysisTools.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( AnalysisTools )
DECLARE_SERVICE_FACTORY( AANTEventSelector )
DECLARE_ALGORITHM_FACTORY( AANTupleStream )
-
-DECLARE_FACTORY_ENTRIES( AnalysisTools )
-{
- DECLARE_TOOL( AnalysisTools )
- DECLARE_ALGORITHM( AANTupleStream )
- DECLARE_SERVICE( AANTEventSelector )
-}
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/components/AnalysisTools_load.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/components/AnalysisTools_load.cxx
deleted file mode 100644
index dd6be4f037c136211349111f17762b330bbb8ec5..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/src/components/AnalysisTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( AnalysisTools )
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/components/AnalysisUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/components/AnalysisUtils_entries.cxx
index 6926f3bdf223964b3178810a460d6da9a4746050..f4514fa6d2750c5af6bd910fc463f64dd7974586 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/components/AnalysisUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/components/AnalysisUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "AnalysisUtils/KinematicSelector.h"
#include "AnalysisUtils/ElectronIDSelector.h"
#include "AnalysisUtils/ISelector.h"
@@ -13,12 +12,3 @@ DECLARE_TOOL_FACTORY( ContainerFilter )
DECLARE_ALGORITHM_FACTORY( ParticleBaseSelector )
DECLARE_ALGORITHM_FACTORY( IParticleSelector )
-DECLARE_FACTORY_ENTRIES( AnalysisUtils ) {
- DECLARE_ALGTOOL( KinematicSelector )
- DECLARE_ALGTOOL( ElectronIDSelector )
- DECLARE_ALGTOOL( ISelector )
- DECLARE_ALGTOOL( ContainerFilter )
- DECLARE_ALGORITHM( ParticleBaseSelector )
- DECLARE_ALGORITHM( IParticleSelector )
-
-}
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/components/AnalysisUtils_load.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/components/AnalysisUtils_load.cxx
deleted file mode 100644
index 6af2d3c3c2fd40444513be3d60c9eac764f96d01..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/components/AnalysisUtils_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( AnalysisUtils )
-
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/components/AssociationUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/components/AssociationUtils_entries.cxx
index ff242ec96ef25d9ecd6be65467b486d93ba57e42..b1332e59369ba493eea77cb4adaf82becf182948 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/components/AssociationUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/components/AssociationUtils_entries.cxx
@@ -1,7 +1,3 @@
-// Gaudi/Athena includes
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local includes
#include "AssociationUtils/OverlapRemovalTool.h"
#include "AssociationUtils/DeltaROverlapTool.h"
#include "AssociationUtils/EleEleOverlapTool.h"
@@ -38,24 +34,7 @@ DECLARE_TOOL_FACTORY( ORUtils::TauAntiTauJetOverlapTool )
DECLARE_ALGORITHM_FACTORY( OverlapRemovalTestAlg )
DECLARE_ALGORITHM_FACTORY( ORToolBoxTestAlg )
-DECLARE_FACTORY_ENTRIES( AssociationUtils )
-{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- DECLARE_TOOL( OverlapRemovalTool )
#pragma GCC diagnostic pop
- DECLARE_TOOL( ORUtils::OverlapRemovalTool )
- DECLARE_TOOL( ORUtils::DeltaROverlapTool )
- DECLARE_TOOL( ORUtils::EleEleOverlapTool )
- DECLARE_TOOL( ORUtils::EleJetOverlapTool )
- DECLARE_TOOL( ORUtils::EleMuSharedTrkOverlapTool )
- DECLARE_TOOL( ORUtils::MuJetOverlapTool )
- DECLARE_TOOL( ORUtils::AltMuJetOverlapTool )
- DECLARE_TOOL( ORUtils::ObjLinkOverlapTool )
- DECLARE_TOOL( ORUtils::TauLooseEleOverlapTool )
- DECLARE_TOOL( ORUtils::TauLooseMuOverlapTool )
- DECLARE_TOOL( ORUtils::TauJetOverlapTool )
- DECLARE_TOOL( ORUtils::TauAntiTauJetOverlapTool )
- DECLARE_ALGORITHM( OverlapRemovalTestAlg )
- DECLARE_ALGORITHM( ORToolBoxTestAlg )
-}
+
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/components/AssociationUtils_load.cxx b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/components/AssociationUtils_load.cxx
deleted file mode 100644
index 470c5768f4f8c98e37830b73033cbb17ebed26f4..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/src/components/AssociationUtils_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena includes
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure
-LOAD_FACTORY_ENTRIES( AssociationUtils )
diff --git a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/components/CPAnalysisExamples_entries.cxx b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/components/CPAnalysisExamples_entries.cxx
index b2761bdba10e865b08b9b9970b32aa8718da6ba4..eff6908b5cfe1b10296dee9d54875d28b94252fc 100644
--- a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/components/CPAnalysisExamples_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/components/CPAnalysisExamples_entries.cxx
@@ -1,9 +1,3 @@
-// $Id: CPAnalysisExamples_entries.cxx 299890 2014-03-29 08:54:38Z krasznaa $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "CPAnalysisExamples/MuonEfficiencyToolExample.h"
#include "CPAnalysisExamples/MuonSmearingToolExample.h"
#include "CPAnalysisExamples/MuonSelectionToolExample.h"
@@ -36,18 +30,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( Test, EgammaCalibrationAndSmearingTool )
#include "CPAnalysisExamples/MetadataToolExample.h"
DECLARE_NAMESPACE_TOOL_FACTORY( CP, MetadataToolExample )
-DECLARE_FACTORY_ENTRIES( CPAnalysisExamples ) {
- DECLARE_ALGORITHM( ToolExamplesAlg );
- DECLARE_NAMESPACE_TOOL( CP, MetadataToolExample );
- DECLARE_NAMESPACE_ALGORITHM(Test, EgammaCalibrationAndSmearingTool );
- DECLARE_NAMESPACE_ALGORITHM(Test, TrackLinkTest );
- DECLARE_ALGORITHM( xAthExample );
-
- DECLARE_NAMESPACE_TOOL( CP, MuonEfficiencyToolExample )
- DECLARE_NAMESPACE_TOOL( CP, MuonSmearingToolExample )
- DECLARE_NAMESPACE_TOOL( CP, MuonSelectionToolExample )
- DECLARE_NAMESPACE_TOOL( CP, JetCalibrationToolExample )
-
- DECLARE_NAMESPACE_ALGORITHM( CP, ToolTester )
-
-}
diff --git a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/components/CPAnalysisExamples_load.cxx b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/components/CPAnalysisExamples_load.cxx
deleted file mode 100644
index 66e60532e2c54f5e3151ea4e861a66bfb62bfd1f..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/components/CPAnalysisExamples_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id: CPAnalysisExamples_load.cxx 299890 2014-03-29 08:54:38Z krasznaa $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( CPAnalysisExamples )
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/components/EventUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/components/EventUtils_entries.cxx
index 9a2df65720a833b0de0baff277df48a20c542dba..db1d360177775a0b8f0127bfb2263df8f7023875 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/components/EventUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/components/EventUtils_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../ParticleSortingTool.h"
#include "../ParticleSortingAlg.h"
#include "../AddVarTool.h"
@@ -29,3 +27,4 @@ DECLARE_ALGORITHM_FACTORY( EventQualityFilterAlg )
DECLARE_ALGORITHM_FACTORY( ParticleRemoverAlg )
DECLARE_ALGORITHM_FACTORY( TriggerSelectionAlg )
DECLARE_ALGORITHM_FACTORY( EventDecisionAlg )
+
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/components/EventUtils_load.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/components/EventUtils_load.cxx
deleted file mode 100644
index ab3a5223455fd642a6671fcd3d2bacaea277b6d1..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/components/EventUtils_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(EventUtils)
diff --git a/PhysicsAnalysis/AnalysisCommon/FsrUtils/src/components/FsrUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/FsrUtils/src/components/FsrUtils_entries.cxx
index b67877d0c65031a6e00a72a91d5a7bcb0aff0f26..686d2f0fb40ec126ac62d2a055222aea0359588f 100644
--- a/PhysicsAnalysis/AnalysisCommon/FsrUtils/src/components/FsrUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/FsrUtils/src/components/FsrUtils_entries.cxx
@@ -1,9 +1,3 @@
-// $Id: FsrUtils_entries.cxx 2014-07-18 tcuhadar@cern.ch $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "FsrUtils/FsrPhotonTool.h"
#include "../ToolTester.h"
@@ -12,10 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( FSR, FsrPhotonTool)
DECLARE_NAMESPACE_ALGORITHM_FACTORY( FSR, ToolTester )
-DECLARE_FACTORY_ENTRIES( FsrUtils ) {
-
- DECLARE_NAMESPACE_TOOL( FSR, FsrPhotonTool )
-
- DECLARE_NAMESPACE_ALGORITHM( FSR, ToolTester )
-
-}
diff --git a/PhysicsAnalysis/AnalysisCommon/FsrUtils/src/components/FsrUtils_load.cxx b/PhysicsAnalysis/AnalysisCommon/FsrUtils/src/components/FsrUtils_load.cxx
deleted file mode 100644
index fb0eb98a86c66adff1f91d7c19c34e7de47e3974..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/FsrUtils/src/components/FsrUtils_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id: FsrUtils_load.cxx 2014-07-18 tcuhadar@cern.ch $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( FsrUtils )
diff --git a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_entries.cxx
index 17a848e257f58c2d0c9a1d4148f0089fd1b1246e..d0721f3b6013ae3b3230fdfa1c14894fb0250742 100644
--- a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../HistogramTool.h"
#include "../HistAlg.h"
@@ -11,14 +9,3 @@ DECLARE_TOOL_FACTORY( HistogramToolTH3 )
DECLARE_ALGORITHM_FACTORY( HistAlg )
-
-
-DECLARE_FACTORY_ENTRIES( HistogramUtils )
-{
- DECLARE_TOOL( HistogramToolTH1 );
- DECLARE_TOOL( HistogramToolTH2 );
- DECLARE_TOOL( HistogramToolTH3 );
-
- DECLARE_ALGORITHM( HistAlg );
-}
-
diff --git a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_load.cxx b/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_load.cxx
deleted file mode 100644
index 8efad301e29f058d06d021cf54b70a5a6a2b3e51..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/HistogramUtils/src/components/HistogramUtils_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(HistogramUtils)
diff --git a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/src/components/IsolationSelection_entries.cxx b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/src/components/IsolationSelection_entries.cxx
index 99ddf2bbc1440fae07c3a57c2a19d13f6ff45fdd..b8563e1da05c33e1a46816ab02927a09e0722c1a 100644
--- a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/src/components/IsolationSelection_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/src/components/IsolationSelection_entries.cxx
@@ -1,7 +1,3 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "IsolationSelection/IsolationSelectionTool.h"
#include "../TestIsolationAthenaAlg.h"
@@ -16,9 +12,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY(CP, TestIsolationAthenaAlg)
DECLARE_NAMESPACE_TOOL_FACTORY(CP, IsolationCloseByCorrectionTool)
DECLARE_NAMESPACE_ALGORITHM_FACTORY(CP, TestIsolationCloseByCorrAthenaAlg)
-DECLARE_FACTORY_ENTRIES(IsolationSelection) {
- DECLARE_NAMESPACE_TOOL(CP, IsolationSelectionTool)
- DECLARE_NAMESPACE_ALGORITHM(CP, TestIsolationAthenaAlg)
- DECLARE_NAMESPACE_TOOL(CP, IsolationCloseByCorrectionTool)
- DECLARE_NAMESPACE_ALGORITHM(CP, TestIsolationCloseByCorrAthenaAlg)
-}
\ No newline at end of file
diff --git a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/src/components/IsolationSelection_load.cxx b/PhysicsAnalysis/AnalysisCommon/IsolationSelection/src/components/IsolationSelection_load.cxx
deleted file mode 100644
index a2a46bf091c4804b2e217f33e65336203e8c83d3..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/IsolationSelection/src/components/IsolationSelection_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id: IsolationSelection_load.cxx 669782 2015-05-26 08:29:22Z dzhang $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( IsolationSelection )
diff --git a/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/src/components/HFORTools_entries.cxx b/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/src/components/HFORTools_entries.cxx
index 142c4db7e9a238df0cdc6293ec3499d3713e7431..09bd8a33ea42e345acd8edd5b882d9379b1d5472 100644
--- a/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/src/components/HFORTools_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/src/components/HFORTools_entries.cxx
@@ -1,6 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "HFORTools/HFORSelectionTool.h"
#include "../HFORSelectionAlg.h"
@@ -8,8 +5,3 @@ DECLARE_ALGORITHM_FACTORY( HFORSelectionAlg )
DECLARE_TOOL_FACTORY( HFORSelectionTool )
-DECLARE_FACTORY_ENTRIES( HFORTools )
-{
- DECLARE_ALGORITHM( HFORSelectionAlg );
- DECLARE_TOOL( HFORSelectionTool );
-}
diff --git a/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/src/components/HFORTools_load.cxx b/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/src/components/HFORTools_load.cxx
deleted file mode 100644
index d101f177095d519244f37a61196acbf5163ec94c..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools/src/components/HFORTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(HFORTools)
diff --git a/PhysicsAnalysis/AnalysisCommon/PMGTools/src/components/PMGTools_entries.cxx b/PhysicsAnalysis/AnalysisCommon/PMGTools/src/components/PMGTools_entries.cxx
index f3e9e0c207ee38c803bf65a6339dba62fe6a03b5..ba06a734bef486af49ebaaab1694a3cefdc3cbcb 100644
--- a/PhysicsAnalysis/AnalysisCommon/PMGTools/src/components/PMGTools_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PMGTools/src/components/PMGTools_entries.cxx
@@ -1,6 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "PMGTools/PMGSherpa22VJetsWeightTool.h"
#include "PMGTools/PMGSherpaVjetsSysTool.h"
#include "PMGTools/PMGCrossSectionTool.h"
@@ -11,9 +8,3 @@ DECLARE_TOOL_FACTORY( PMGSherpa22VJetsWeightTool )
DECLARE_TOOL_FACTORY( PMGSherpaVjetsSysTool )
DECLARE_TOOL_FACTORY( PMGCrossSectionTool )
-DECLARE_FACTORY_ENTRIES( PMGTools )
-{
- DECLARE_TOOL( PMGSherpa22VJetsWeightTool );
- DECLARE_TOOL( PMGSherpaVjetsSysTool );
- DECLARE_TOOL( PMGCrossSectionTool );
-}
diff --git a/PhysicsAnalysis/AnalysisCommon/PMGTools/src/components/PMGTools_load.cxx b/PhysicsAnalysis/AnalysisCommon/PMGTools/src/components/PMGTools_load.cxx
deleted file mode 100644
index cec1175f2c6a4fa2044b0eb24c6aa440c489386b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/PMGTools/src/components/PMGTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( PMGTools )
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/src/components/ParticleJetTools_entries.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/src/components/ParticleJetTools_entries.cxx
index 6a9a08d9dec21d461254deb4dbdb438f6f08cb90..437e5dedf0596e7628df9ac55e67d85cc8c7a88c 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/src/components/ParticleJetTools_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/src/components/ParticleJetTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
//#include "ParticleJetTools/JetTrackTruthMatching.h"
#include "ParticleJetTools/JetQuarkLabel.h"
#include "ParticleJetTools/JetConeLabeling.h"
@@ -34,22 +33,3 @@ DECLARE_TOOL_FACTORY( JetParticleShrinkingConeAssociation )
DECLARE_TOOL_FACTORY( JetParticleCenterOfMassAssociation )
DECLARE_ALGORITHM_FACTORY( JetParticleAssociationAlg )
-/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( ParticleJetTools ) {
-/* DECLARE_NAMESPACE_TOOL( Analysis, JetTrackTruthMatching ) */
- DECLARE_NAMESPACE_TOOL( Analysis, JetQuarkLabel )
- DECLARE_NAMESPACE_TOOL( Analysis, JetConeLabeling )
- DECLARE_NAMESPACE_TOOL( Analysis, JetPartonTruthLabel )
-/* DECLARE_NAMESPACE_TOOL( Analysis, JetQGPartonLabel ) */
- DECLARE_NAMESPACE_TOOL( Analysis, ParticleToJetAssociator )
-/* DECLARE_NAMESPACE_TOOL( Analysis, FindLeptonTruth ) */
- /// @todo Convert to namespace, tool, etc?
- DECLARE_TOOL( CopyFlavorLabelTruthParticles )
- DECLARE_TOOL( CopyBosonTopLabelTruthParticles )
- DECLARE_TOOL( CopyTruthPartons )
- DECLARE_TOOL( CopyTruthJetParticles )
- DECLARE_TOOL( ParticleJetDeltaRLabelTool )
- DECLARE_TOOL( JetParticleShrinkingConeAssociation )
- DECLARE_TOOL( JetParticleCenterOfMassAssociation )
- DECLARE_ALGORITHM( JetParticleAssociationAlg )
-}
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/src/components/ParticleJetTools_load.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/src/components/ParticleJetTools_load.cxx
deleted file mode 100644
index 1bc90e260d0313c769c8ad73d6095e03b54a748d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/src/components/ParticleJetTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ParticleJetTools )
-
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/components/PileupReweighting_entries.cxx b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/components/PileupReweighting_entries.cxx
index 7df3b156f7e007e30a8db33ab230b70310075cd8..728933e92fe47e1e3565d4f238d8c3bea2c4337b 100644
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/components/PileupReweighting_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/components/PileupReweighting_entries.cxx
@@ -1,6 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-
#include "PileupReweighting/PileupReweightingTool.h"
#include "../PileupReweightingProvider.h"
@@ -8,10 +5,3 @@
DECLARE_NAMESPACE_TOOL_FACTORY( CP, PileupReweightingTool )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, PileupReweightingProvider )
-DECLARE_FACTORY_ENTRIES( PileupReweighting )
-{
- DECLARE_NAMESPACE_TOOL( CP, PileupReweightingTool )
- DECLARE_NAMESPACE_ALGORITHM( CP, PileupReweightingProvider )
-}
-
-
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/components/PileupReweighting_load.cxx b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/components/PileupReweighting_load.cxx
deleted file mode 100644
index 495e5d711c614ad0ddc69d810d991ff3197a494b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/src/components/PileupReweighting_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(PileupReweighting)
diff --git a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/src/components/ReweightUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/src/components/ReweightUtils_entries.cxx
index 64de53fdffdc0374f729180c26dd6b513534b944..13852849aad23dea6e0c2654fed26649d107e5e7 100644
--- a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/src/components/ReweightUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/src/components/ReweightUtils_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ReweightUtils/McEventWeight.h"
#include "ReweightUtils/PDFWeight.h"
#include "ReweightUtils/WeightsAgregator.h"
@@ -16,11 +14,3 @@ DECLARE_ALGORITHM_FACTORY( SumOfWeightsAlg )
#include "ReweightUtils/ParticleScaleFactorTool.h"
DECLARE_TOOL_FACTORY( ParticleScaleFactorTool )
-DECLARE_FACTORY_ENTRIES( ReweightUtils )
-{
- DECLARE_TOOL( ParticleScaleFactorTool );
- DECLARE_TOOL( McEventWeight );
- DECLARE_TOOL( PDFWeight );
- DECLARE_TOOL( WeightsAgregator );
- DECLARE_ALGORITHM( SumOfWeightsAlg );
-}
diff --git a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/src/components/ReweightUtils_load.cxx b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/src/components/ReweightUtils_load.cxx
deleted file mode 100644
index 503fd5eec70f1102a7065b1f0c228f972989f06d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/src/components/ReweightUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ReweightUtils)
-
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_entries.cxx
index cb3b41c15a63bb58ba230372b6385a84293194e6..1bd4a07a61ffb737c75071b809eafaed6aeaf6f3 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../ReducePileUpEventInfoAlg.h"
#include "../ThinIParticlesAlg.h"
#include "../ThinIParticlesTool.h"
@@ -34,22 +32,3 @@ DECLARE_TOOL_FACTORY( ThinCaloClustersTool )
DECLARE_ALGORITHM_FACTORY( ThinTrackParticlesAlg )
DECLARE_TOOL_FACTORY( ThinTrackParticlesTool )
-DECLARE_FACTORY_ENTRIES( ThinningUtils )
-{
- DECLARE_ALGORITHM( ThinGeantTruthAlg );
- DECLARE_ALGORITHM( ThinNegativeEnergyCaloClustersAlg);
- DECLARE_ALGORITHM( ThinNegativeEnergyNeutralPFOsAlg);
- DECLARE_ALGORITHM( ReducePileUpEventInfoAlg );
- DECLARE_ALGORITHM( ThinIParticlesAlg );
- DECLARE_TOOL( ThinIParticlesTool );
- DECLARE_ALGORITHM( ThinCaloCellsAlg );
-// AthAnalysisBase doesn't know about calo cells (geometry would be needed)
-#ifndef XAOD_ANALYSIS
- DECLARE_TOOL( ThinCaloCellsTool );
- DECLARE_ALGORITHM ( ThinTrkTrackAlg );
-#endif
- DECLARE_ALGORITHM( ThinCaloClustersAlg );
- DECLARE_TOOL( ThinCaloClustersTool );
- DECLARE_ALGORITHM( ThinTrackParticlesAlg );
- DECLARE_TOOL( ThinTrackParticlesTool );
-}
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_load.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_load.cxx
deleted file mode 100644
index c5251be1fe30c2601623ed96756971b558fb5b72..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ThinningUtils)
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/components/UserAnalysis_entries.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/components/UserAnalysis_entries.cxx
old mode 100755
new mode 100644
index 7e7726630b3797fb0bd25aa542c49480cf1514ad..6ec77f5ec949cd8e766fba8fbb505a81433544ab
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/components/UserAnalysis_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/components/UserAnalysis_entries.cxx
@@ -1,10 +1,5 @@
#include "UserAnalysis/AnalysisSkeleton.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( AnalysisSkeleton )
-DECLARE_FACTORY_ENTRIES( UserAnalysis ) {
- DECLARE_ALGORITHM( AnalysisSkeleton )
-}
-
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/components/UserAnalysis_load.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/components/UserAnalysis_load.cxx
deleted file mode 100755
index 26d90d8820a879200e1bb84a8d5570c4c702013b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/src/components/UserAnalysis_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(UserAnalysis)
-
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/components/UserAnalysisUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/components/UserAnalysisUtils_entries.cxx
index bb0c34b9cd852c557bf6f455a6be84a687de934c..72feb904bcb3d6e257baf93a38a43262a0f3b6e0 100644
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/components/UserAnalysisUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/components/UserAnalysisUtils_entries.cxx
@@ -5,7 +5,6 @@
#include "UserAnalysisUtils/UserAnalysisOverlapCheckingTool.h"
#include "UserAnalysisUtils/UserAnalysisOverlapRemovalTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
//DECLARE_TOOL_FACTORY( UserMuonTool )
@@ -14,15 +13,3 @@ DECLARE_TOOL_FACTORY( UserAnalysisSelectionTool )
DECLARE_TOOL_FACTORY( UserAnalysisOverlapCheckingTool )
DECLARE_TOOL_FACTORY( UserAnalysisOverlapRemovalTool )
-DECLARE_FACTORY_ENTRIES( UserAnalysisUtils )
-{
- // DECLARE_TOOL( UserMuonTool )
-
- DECLARE_TOOL( UserAnalysisPreparationTool )
- DECLARE_TOOL( UserAnalysisSelectionTool )
- DECLARE_TOOL( UserAnalysisOverlapCheckingTool )
- DECLARE_TOOL( UserAnalysisOverlapRemovalTool )
-
-}
-
-
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/components/UserAnalysisUtils_load.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/components/UserAnalysisUtils_load.cxx
deleted file mode 100644
index 019c6fa400336347a7b02b68acb0d569bc31ead0..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/components/UserAnalysisUtils_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( UserAnalysisUtils )
-
-
-
-
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/components/AnalysisJiveXML_entries.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/components/AnalysisJiveXML_entries.cxx
old mode 100755
new mode 100644
index df5c5cd0c993c20fb8d4db001b5764925f8c37c3..27a06c55026a889787ca1b914dc78561780f9d25
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/components/AnalysisJiveXML_entries.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/components/AnalysisJiveXML_entries.cxx
@@ -10,7 +10,6 @@
#include "AnalysisJiveXML/TruthParticleRetriever.h"
#include "AnalysisJiveXML/TrigEMClusterRetriever.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace JiveXML;
@@ -26,16 +25,3 @@ DECLARE_TOOL_FACTORY(CompositeParticleRetriever)
DECLARE_TOOL_FACTORY(TruthParticleRetriever)
DECLARE_TOOL_FACTORY(TrigEMClusterRetriever)
-DECLARE_FACTORY_ENTRIES(AnalysisJiveXML) {
- DECLARE_ALGTOOL(BJetRetriever)
- DECLARE_ALGTOOL(ElectronRetriever)
- DECLARE_ALGTOOL(MuonRetriever)
- DECLARE_ALGTOOL(AODJetRetriever)
- DECLARE_ALGTOOL(PhotonRetriever)
- DECLARE_ALGTOOL(TauJetRetriever)
- DECLARE_ALGTOOL(TrackParticleRetriever)
- DECLARE_ALGTOOL(AODCaloClusterRetriever)
- DECLARE_ALGTOOL(CompositeParticleRetriever)
- DECLARE_ALGTOOL(TruthParticleRetriever)
- DECLARE_ALGTOOL(TrigEMClusterRetriever)
-}
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/components/AnalysisJiveXML_load.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/components/AnalysisJiveXML_load.cxx
deleted file mode 100755
index 15d880882405d16b7b72a096b5cb8d161ea4c967..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/components/AnalysisJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AnalysisJiveXML)
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/components/xAODJiveXML_entries.cxx b/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/components/xAODJiveXML_entries.cxx
old mode 100755
new mode 100644
index dbcb08d09a5fdad6f65a830f028069f3ae6f2a3d..97f6f06a7cd1bb73205cfa28561a63f988a0c743
--- a/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/components/xAODJiveXML_entries.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/components/xAODJiveXML_entries.cxx
@@ -8,7 +8,6 @@
#include "xAODJiveXML/xAODTrackParticleRetriever.h"
#include "xAODJiveXML/xAODVertexRetriever.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace JiveXML;
@@ -22,14 +21,3 @@ DECLARE_TOOL_FACTORY(xAODTauRetriever)
DECLARE_TOOL_FACTORY(xAODTrackParticleRetriever)
DECLARE_TOOL_FACTORY(xAODVertexRetriever)
-DECLARE_FACTORY_ENTRIES(xAODJiveXML) {
- DECLARE_ALGTOOL(xAODCaloClusterRetriever)
- DECLARE_ALGTOOL(xAODElectronRetriever)
- DECLARE_ALGTOOL(xAODMissingETRetriever)
- DECLARE_ALGTOOL(xAODMuonRetriever)
- DECLARE_ALGTOOL(xAODPhotonRetriever)
- DECLARE_ALGTOOL(xAODJetRetriever)
- DECLARE_ALGTOOL(xAODTauRetriever)
- DECLARE_ALGTOOL(xAODTrackParticleRetriever)
- DECLARE_ALGTOOL(xAODVertexRetriever)
-}
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/components/xAODJiveXML_load.cxx b/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/components/xAODJiveXML_load.cxx
deleted file mode 100755
index 1dbfb9aedf0dcbdf54e677374d0d187a0f002fb9..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisEventDisplay/xAODJiveXML/src/components/xAODJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(xAODJiveXML)
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/components/AnalysisTriggerAlgs_entries.cxx b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/components/AnalysisTriggerAlgs_entries.cxx
index c2ef5a4e1e948fa3753dc8c9fce4c4d5b908e6ac..085ef9a60aef281da78b20f740436445b820b14f 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/components/AnalysisTriggerAlgs_entries.cxx
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/components/AnalysisTriggerAlgs_entries.cxx
@@ -1,25 +1,8 @@
-// $Id: AnalysisTriggerAlgs_entries.cxx 587265 2014-03-12 09:45:45Z krasznaa $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "../RoIBResultToAOD.h"
#include "../RoIBResultToxAOD.h"
#include "../MuCTPI_RDOToRoIBResult.h"
-//
-// Declare the algorithm(s):
-//
DECLARE_ALGORITHM_FACTORY( RoIBResultToxAOD )
DECLARE_ALGORITHM_FACTORY( RoIBResultToAOD )
DECLARE_ALGORITHM_FACTORY( MuCTPI_RDOToRoIBResult )
-
-DECLARE_FACTORY_ENTRIES( AnalysisTriggerAlgs ) {
-
- DECLARE_ALGORITHM( RoIBResultToAOD )
- DECLARE_ALGORITHM( RoIBResultToxAOD )
- DECLARE_ALGORITHM( MuCTPI_RDOToRoIBResult )
-
-}
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/components/AnalysisTriggerAlgs_load.cxx b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/components/AnalysisTriggerAlgs_load.cxx
deleted file mode 100644
index 5db77df46b54931d5d7355bc5b0b2a4db15ce3de..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/src/components/AnalysisTriggerAlgs_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AnalysisTriggerAlgs)
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/components/AnalysisTriggerTools_entries.cxx b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/components/AnalysisTriggerTools_entries.cxx
old mode 100755
new mode 100644
index 0b745873724c4fa0c2f2d6f58091c28f31fc93d2..11e251922d0334a30e020f9acc8ca981500d797e
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/components/AnalysisTriggerTools_entries.cxx
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/components/AnalysisTriggerTools_entries.cxx
@@ -1,10 +1,4 @@
#include "AnalysisTriggerTools/MuonTriggerAnalysisTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(MuonTriggerAnalysisTool)
-DECLARE_FACTORY_ENTRIES(AnalysisTriggerTools) {
-
- DECLARE_TOOL(MuonTriggerAnalysisTool)
-
-}
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/components/AnalysisTriggerTools_load.cxx b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/components/AnalysisTriggerTools_load.cxx
deleted file mode 100755
index b2a92537ba5fbcac739608e6b98b3ca29160f4b9..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerTools/src/components/AnalysisTriggerTools_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AnalysisTriggerTools)
diff --git a/PhysicsAnalysis/AraToolExample/src/components/AraToolExample_entries.cxx b/PhysicsAnalysis/AraToolExample/src/components/AraToolExample_entries.cxx
old mode 100755
new mode 100644
index d6eff63eac2344d4c6073f808188f1774a5a298b..a0b5816b27fec8a42ee3037b5e0f2ce39387ccf6
--- a/PhysicsAnalysis/AraToolExample/src/components/AraToolExample_entries.cxx
+++ b/PhysicsAnalysis/AraToolExample/src/components/AraToolExample_entries.cxx
@@ -4,7 +4,6 @@
#include "AraToolExample/AnExampleAraToolWrapper.h"
#include "AraToolExample/AraToolUsingToolWrapper.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( AnExampleAraToolWrapper )
DECLARE_TOOL_FACTORY( AraToolUsingToolWrapper )
@@ -12,9 +11,3 @@ DECLARE_TOOL_FACTORY( AraToolUsingToolWrapper )
DECLARE_ALGORITHM_FACTORY( AraToolExampleAlg )
DECLARE_ALGORITHM_FACTORY( AraToolUsingToolAlg )
-DECLARE_FACTORY_ENTRIES( AraToolExample ) {
- DECLARE_ALGORITHM( AraToolExampleAlg )
- DECLARE_ALGORITHM( AraToolUsingToolAlg )
- DECLARE_ALGTOOL( AnExampleAraToolWrapper )
- DECLARE_ALGTOOL( AraToolUsingToolWrapper )
-}
diff --git a/PhysicsAnalysis/AraToolExample/src/components/AraToolExample_load.cxx b/PhysicsAnalysis/AraToolExample/src/components/AraToolExample_load.cxx
deleted file mode 100755
index 0b895f2608fbae26c8c1296457c5d43cf6fbf8b9..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AraToolExample/src/components/AraToolExample_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AraToolExample)
-
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/components/AssociationComps_entries.cxx b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/components/AssociationComps_entries.cxx
index 03c0cafe5686bfa703b5b6ade2cd906060c590d1..1e32a1e5900c38ea606a620d0dc6e29f62262a9b 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/components/AssociationComps_entries.cxx
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/components/AssociationComps_entries.cxx
@@ -7,7 +7,6 @@
#include "../TriggerAssociationTool.h"
#include "../AssociationAlgorithm.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( AssocBuilder )
DECLARE_ALGORITHM_FACTORY( AssocDumper )
@@ -18,14 +17,3 @@ DECLARE_TOOL_FACTORY( AthenaBarCodeAssociationTool )
DECLARE_TOOL_FACTORY( TriggerAssociationTool )
DECLARE_ALGORITHM_FACTORY( AssociationAlgorithm )
-
-DECLARE_FACTORY_ENTRIES(AssociationComps) {
- DECLARE_ALGORITHM( AssocBuilder )
- DECLARE_ALGORITHM( AssocDumper )
- DECLARE_TOOL( DeltaROverlapTool )
- DECLARE_TOOL( AssocBuilderTool )
- DECLARE_TOOL( DeltaRAssociationTool )
- DECLARE_TOOL( AthenaBarCodeAssociationTool )
- DECLARE_TOOL( TriggerAssociationTool )
- DECLARE_ALGORITHM( AssociationAlgorithm )
-}
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/components/AssociationComps_load.cxx b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/components/AssociationComps_load.cxx
deleted file mode 100644
index 055c978dc4d85783f954df372215ec51f6d24e9b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/components/AssociationComps_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(AssociationComps)
-
-
diff --git a/PhysicsAnalysis/BPhys/BPhysTagTools/src/components/BPhysTagTools_entries.cxx b/PhysicsAnalysis/BPhys/BPhysTagTools/src/components/BPhysTagTools_entries.cxx
old mode 100755
new mode 100644
index 785467c67878317027d90893ebada82692f5a8b3..12062fdac7ca0f0a51e0714c8657976e64b75210
--- a/PhysicsAnalysis/BPhys/BPhysTagTools/src/components/BPhysTagTools_entries.cxx
+++ b/PhysicsAnalysis/BPhys/BPhysTagTools/src/components/BPhysTagTools_entries.cxx
@@ -1,12 +1,6 @@
#include "BPhysTagTools/BPhysTagTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( BPhysTagTool )
-DECLARE_FACTORY_ENTRIES( BPhysTagTools ) {
- DECLARE_TOOL( BPhysTagTool )
-}
-
-
diff --git a/PhysicsAnalysis/BPhys/BPhysTagTools/src/components/BPhysTagTools_load.cxx b/PhysicsAnalysis/BPhys/BPhysTagTools/src/components/BPhysTagTools_load.cxx
deleted file mode 100755
index 23d439ebef4d25919265bb78ffce6b7544299292..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/BPhys/BPhysTagTools/src/components/BPhysTagTools_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( BPhysTagTools )
-
-
-
-
diff --git a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/components/ExpressionEvaluation_entries.cxx b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/components/ExpressionEvaluation_entries.cxx
index defa68091a7974ccb95baa7944d68a2bd9f4514b..8b137891791fe96927ad78e64b0aad7bded08bdc 100644
--- a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/components/ExpressionEvaluation_entries.cxx
+++ b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/components/ExpressionEvaluation_entries.cxx
@@ -1,5 +1 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-DECLARE_FACTORY_ENTRIES( ExpressionEvaluation ) {
-}
diff --git a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/components/ExpressionEvaluation_load.cxx b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/components/ExpressionEvaluation_load.cxx
deleted file mode 100644
index 736e9f6f83c5d289ecae611a057039341cabc928..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/components/ExpressionEvaluation_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ExpressionEvaluation )
diff --git a/PhysicsAnalysis/D2PDMaker/src/components/D2PDMaker_entries.cxx b/PhysicsAnalysis/D2PDMaker/src/components/D2PDMaker_entries.cxx
index 0f678b5556b69b51df6de5878b74dc52424cb5bb..18cf77bf893f7ff0e6c0477eed0262f11d944258 100644
--- a/PhysicsAnalysis/D2PDMaker/src/components/D2PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D2PDMaker/src/components/D2PDMaker_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "D2PDMaker/D2PDINavigable4MomentumSelector.h"
#include "D2PDMaker/D2PDParticleCombiner.h"
#include "D2PDMaker/D2PDElectronSelector.h"
@@ -30,22 +28,3 @@ DECLARE_ALGORITHM_FACTORY( CreateControlPlots )
DECLARE_TOOL_FACTORY( UserDataHelperTool )
DECLARE_TOOL_FACTORY( FilterTool )
-DECLARE_FACTORY_ENTRIES( D2PDMaker )
-{
- DECLARE_ALGORITHM( D2PDINavigable4MomentumSelector );
- DECLARE_ALGORITHM( D2PDParticleCombiner );
- DECLARE_ALGORITHM( D2PDElectronSelector );
- DECLARE_ALGORITHM( D2PDPhotonSelector );
- DECLARE_ALGORITHM( D2PDMuonSelector );
- DECLARE_ALGORITHM( D2PDTauSelector );
- DECLARE_ALGORITHM( D2PDJetSelector );
- DECLARE_ALGORITHM( D2PDTrackParticleSelector );
- DECLARE_ALGORITHM( D2PDVertexSelector );
- DECLARE_ALGORITHM( D2PDTruthParticleSelector );
- DECLARE_ALGORITHM( CheckD2PD );
- DECLARE_ALGORITHM( CreateControlPlots );
- DECLARE_TOOL( UserDataHelperTool );
- DECLARE_TOOL( FilterTool );
-}
-
-
diff --git a/PhysicsAnalysis/D2PDMaker/src/components/D2PDMaker_load.cxx b/PhysicsAnalysis/D2PDMaker/src/components/D2PDMaker_load.cxx
deleted file mode 100644
index df26182ea3f6d76ea1d1694721ddf96b6bc76cff..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D2PDMaker/src/components/D2PDMaker_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(D2PDMaker)
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_entries.cxx
index d4789dfcda42827f4179e535bdc6a571d072dab1..2e0889333e54a69956dd9df4d3f413adfd43b8e1 100644
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_entries.cxx
@@ -1,12 +1,3 @@
-// $Id: BackgroundD3PDMaker_entries.cxx 461566 2011-10-05 11:39:02Z salekd $
-/**
- * @file BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_entries.cxx
- * @author Mark Tibbetts <mark.james.tibbetts@cern.ch>
- * @date Feb, 2011
- * @brief List Gaudi components.
- */
-
-
#include "../LucidPMTHitFillerTool.h"
#include "../RawTagInDetSPFillerTool.h"
#include "../BackgroundWordFillerTool.h"
@@ -15,7 +6,6 @@
#include "../BeamBackgroundClusterAssociationTool.h"
#include "../BeamBackgroundJetFillerTool.h"
#include "../BeamBackgroundJetAssociationTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LucidPMTHitFillerTool)
@@ -27,13 +17,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, BeamBackgroundClusterAssociationTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, BeamBackgroundJetFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, BeamBackgroundJetAssociationTool)
-DECLARE_FACTORY_ENTRIES(BackgroundD3PDMaker) {
- DECLARE_NAMESPACE_TOOL (D3PD, LucidPMTHitFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, RawTagInDetSPFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, BackgroundWordFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, BeamBackgroundDecisionFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, BeamBackgroundClusterFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, BeamBackgroundClusterAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, BeamBackgroundJetFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, BeamBackgroundJetAssociationTool)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_load.cxx
deleted file mode 100644
index b943a0049abb9d1f8986e93abae2355350af46f5..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_load.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id: BackgroundD3PDMaker_load.cxx 351806 2011-03-15 10:05:36Z krasznaa $
-/**
- * @file BackgroundD3PDMaker/src/components/BackgroundD3PDMaker_load.cxx
- * @author Mark Tibbetts <mark.james.tibbetts@cern.ch>
- * @date Feb, 2011
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(BackgroundD3PDMaker)
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/src/components/CaloD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/src/components/CaloD3PDMaker_entries.cxx
index 5b6a9e58b0e95cab62be89efaf65cedcca9d97c7..3bcb78428cf5c40c859f89f3ea638528bd145fff 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/src/components/CaloD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/src/components/CaloD3PDMaker_entries.cxx
@@ -1,12 +1,3 @@
-// $Id$
-/**
- * @file CaloD3PDMaker/src/components/CaloD3PDMaker_entries.cxx
- * @author maarten boonekamp <maarten.boonekamp@cea.fr>
- * @date Sep, 2009
- * @brief List Gaudi components.
- */
-
-
#include "../ClusterSamplingFillerTool.h"
#include "../ClusterEMSamplingFillerTool.h"
#include "../ClusterTimeFillerTool.h"
@@ -49,7 +40,6 @@
#include "../TileCosmicMuonTileCellAssociationTool.h"
#include "../JetTileAssociationTool.h"
#include "../CaloCalibHitFillerTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../SCFillerTool.h"
#include "../LArSCHitFillerTool.h"
@@ -104,54 +94,3 @@ DECLARE_ALGORITHM_FACTORY (ClusterFilter)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SCFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LArSCHitFillerTool)
-
-DECLARE_FACTORY_ENTRIES(CaloD3PDMaker) {
- DECLARE_NAMESPACE_TOOL (D3PD, ClusterSamplingFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ClusterEMSamplingFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ClusterTimeFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ClusterMomentFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ClusterPositionInCaloFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MBTSFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MBTSTimeFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, CellFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, CaloCellDetailsFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, CaloCellRawFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileCellDetailsFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileModuleBitsFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SGTileModuleBitsGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileDigitFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SGTileDigitsGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileRawChannelFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTileAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileCellRawAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileCellDigitAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SGTileRawChannelGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileCosmicMuonFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileCosmicMuonTileCellAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileMuFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileL2FillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileTTL1FillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileTriggerFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileHitFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TileHitInfoFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SGTileHitGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TowerFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, CaloInfoFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, LArDigitFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, LArCollisionTimeFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, LArNoisyROFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, LArRawChannelFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, LArRawChannelContainerGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, CaloClusterCellAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, CaloClusterExtendedCellAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, LArHitFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, LArHitContainerGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, CaloCalibHitFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, CaloCalibrationHitContainerGetterTool)
- DECLARE_ALGORITHM (CaloCellFilterAlg)
- DECLARE_ALGORITHM (ClusterFilter)
-
- DECLARE_NAMESPACE_TOOL (D3PD, SCFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, LArSCHitFillerTool)
-
-}
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/src/components/CaloD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/src/components/CaloD3PDMaker_load.cxx
deleted file mode 100644
index 7f29d0542d9a473b3d11a599abc6cdffbab104e4..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/src/components/CaloD3PDMaker_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-/**
- * @file CaloD3PDMaker/src/components/CaloD3PDMaker_load.cxx
- * @author maarten boonekamp <maarten.boonekamp@cea.fr>
- * @date Aug, 2009
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloD3PDMaker)
-
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/components/D3PDMakerCoreComps_entries.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/components/D3PDMakerCoreComps_entries.cxx
index 2406d4e7fc4f03e8e9f7450c400fbe88ef51d204..cab142812e2a95fe7abfcee1d82a0a088d7d5dde 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/components/D3PDMakerCoreComps_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/components/D3PDMakerCoreComps_entries.cxx
@@ -1,12 +1,3 @@
-// $Id$
-/**
- * @file D3PDMakerCoreComps/src/components/D3PDMakerCoreComps_entries.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Aug, 2009
- * @brief List Gaudi components.
- */
-
-
#include "../MakerAlg.h"
#include "../DummyInitAlg.h"
#include "../DummyVarFillerTool.h"
@@ -28,7 +19,6 @@
#include "../ContainerFlagFillerTool.h"
#include "../IdentityAssociationTool.h"
#include "../FirstAssociationTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, MakerAlg)
@@ -53,27 +43,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ContainerFlagFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, IdentityAssociationTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, FirstAssociationTool)
-
-DECLARE_FACTORY_ENTRIES(D3PDMakerCoreComps) {
- DECLARE_NAMESPACE_ALGORITHM (D3PD, MakerAlg)
- DECLARE_NAMESPACE_ALGORITHM (D3PD, DummyInitAlg)
- DECLARE_NAMESPACE_TOOL (D3PD, DummyVarFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, CollectionGetterRegistryTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ObjFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, VoidObjFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, VectorFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ContainedAssociationFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, IndexAssociationFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, IndexFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ContainedMultiAssociationFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ContainedVectorMultiAssociationFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, IndexMultiAssociationFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SGObjGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SGDataVectorGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, UserDataFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, AuxDataFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SelectedParticlesFilterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ContainerFlagFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, IdentityAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, FirstAssociationTool)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/components/D3PDMakerCoreComps_load.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/components/D3PDMakerCoreComps_load.cxx
deleted file mode 100644
index 9ecad9333aec85c069e7e327b995aa615c9f0147..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/components/D3PDMakerCoreComps_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-/**
- * @file D3PDMakerCoreComps/src/components/D3PDMakerCoreComps_entries.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Aug, 2009
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(D3PDMakerCoreComps)
-
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/components/D3PDMakerReader_entries.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/components/D3PDMakerReader_entries.cxx
index 43f5faddd785b8cc7701ada4e37d3fcba499e309..cbf2bb6fb5092b417e9fc3d47ec5bc6f5a4aeda0 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/components/D3PDMakerReader_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/components/D3PDMakerReader_entries.cxx
@@ -1,9 +1,3 @@
-// $Id: D3PDMakerReader_entries.cxx 348546 2011-03-01 15:09:56Z krasznaa $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "../ReaderAlg.h"
#include "../MultiReaderAlg.h"
#include "../RootReaderD3PDSvc.h"
@@ -12,10 +6,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( D3PD, ReaderAlg )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( D3PD, MultiReaderAlg )
DECLARE_NAMESPACE_SERVICE_FACTORY( D3PD, RootReaderD3PDSvc )
-DECLARE_FACTORY_ENTRIES( D3PDMakerReader ) {
-
- DECLARE_NAMESPACE_ALGORITHM( D3PD, ReaderAlg )
- DECLARE_NAMESPACE_ALGORITHM( D3PD, MultiReaderAlg )
- DECLARE_NAMESPACE_SERVICE( D3PD, RootReaderD3PDSvc )
-
-}
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/components/D3PDMakerReader_load.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/components/D3PDMakerReader_load.cxx
deleted file mode 100644
index 630b47333a43fde0f5009ad91d411065008ee001..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/src/components/D3PDMakerReader_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id: D3PDMakerReader_load.cxx 348546 2011-03-01 15:09:56Z krasznaa $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( D3PDMakerReader )
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/components/D3PDMakerRoot_entries.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/components/D3PDMakerRoot_entries.cxx
index 5cf07f8e02d89f1a371500cf9142e66484bdfee0..4db21de3963b32dd879dc1982953cfcd3e9748bd 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/components/D3PDMakerRoot_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/components/D3PDMakerRoot_entries.cxx
@@ -1,19 +1,5 @@
-// $Id$
-/**
- * @file D3PDMakerRoot/src/components/D3PDMakerRoot_entries.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Aug, 2009
- * @brief List Gaudi components.
- */
-
-
#include "../RootD3PDSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_SERVICE_FACTORY (D3PD, RootD3PDSvc)
-
-DECLARE_FACTORY_ENTRIES(D3PDMakerRoot) {
- DECLARE_NAMESPACE_SERVICE (D3PD, RootD3PDSvc)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/components/D3PDMakerRoot_load.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/components/D3PDMakerRoot_load.cxx
deleted file mode 100644
index 1163d16eddb74cdfa3fe23c6842b1f5aabfaa2eb..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/src/components/D3PDMakerRoot_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-/**
- * @file D3PDMakerRoot/src/components/D3PDMakerRoot_entries.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Aug, 2009
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(D3PDMakerRoot)
-
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/src/components/D3PDMakerTest_entries.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/src/components/D3PDMakerTest_entries.cxx
index 882fdd76de7f68bb0dae25b1462bb4056e14f3cf..ab229a2543d8d446f2f495cdc4a107df6b3567e1 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/src/components/D3PDMakerTest_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/src/components/D3PDMakerTest_entries.cxx
@@ -1,12 +1,3 @@
-// $Id$
-/**
- * @file D3PDMakerTest/src/components/D3PDMakerTest_entries.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Jan, 2010
- * @brief List Gaudi components.
- */
-
-
#include "../FillerAlg.h"
#include "../HitsFillerAlg.h"
#include "../Obj1FillerTool.h"
@@ -22,7 +13,6 @@
#include "../ToObj2AssociationTool.h"
#include "../ToObj2MultiAssociationTool.h"
#include "../IN4MHLVAssociationTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PDTest, FillerAlg)
@@ -41,21 +31,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, ToObj2AssociationTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, ToObj2MultiAssociationTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PDTest, IN4MHLVAssociationTool)
-
-DECLARE_FACTORY_ENTRIES(D3PDMakerTest) {
- DECLARE_NAMESPACE_ALGORITHM (D3PDTest, FillerAlg)
- DECLARE_NAMESPACE_ALGORITHM (D3PDTest, HitsFillerAlg)
- DECLARE_NAMESPACE_TOOL (D3PDTest, Obj1FillerTool)
- DECLARE_NAMESPACE_TOOL (D3PDTest, Obj2FillerTool)
- DECLARE_NAMESPACE_TOOL (D3PDTest, Obj12FillerTool)
- DECLARE_NAMESPACE_TOOL (D3PDTest, Obj4FillerTool)
- DECLARE_NAMESPACE_TOOL (D3PDTest, Obj4GetterTool)
- DECLARE_NAMESPACE_TOOL (D3PDTest, Obj5FillerTool)
- DECLARE_NAMESPACE_TOOL (D3PDTest, DefaultFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PDTest, DefaultFillerTool2)
- DECLARE_NAMESPACE_TOOL (D3PDTest, Obj1Obj2AssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PDTest, Obj1Obj2MultiAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PDTest, ToObj2AssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PDTest, ToObj2MultiAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PDTest, IN4MHLVAssociationTool)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/src/components/D3PDMakerTest_load.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/src/components/D3PDMakerTest_load.cxx
deleted file mode 100644
index 0b25cb88c9d439be3708aec0ffcba49b290eda8e..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerTest/src/components/D3PDMakerTest_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-/**
- * @file D3PDMakerTest/src/components/D3PDMakerTest_load.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Jan, 2010
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(D3PDMakerTest)
-
diff --git a/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/src/components/EventCommonD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/src/components/EventCommonD3PDMaker_entries.cxx
index 723f7eaf9fd68c654cf2d584c4d31c07cff58559..9064b09dcef6f7f8234c20380cf2d69c706883eb 100644
--- a/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/src/components/EventCommonD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/src/components/EventCommonD3PDMaker_entries.cxx
@@ -1,12 +1,3 @@
-// $Id$
-/**
- * @file EventCommonD3PDMaker/src/components/EventCommonD3PDMaker_entries.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Aug, 2009
- * @brief List Gaudi components.
- */
-
-
#include "../EventTypeFillerTool.h"
#include "../EventWeightFillerTool.h"
#include "../EventErrorStateFillerTool.h"
@@ -28,7 +19,6 @@
#include "../LumiBlockLengthFillerTool.h"
#include "../LeadingPtAssociationTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, EventTypeFillerTool)
@@ -52,25 +42,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SkimDecisionVectorFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LumiBlockLengthFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, LeadingPtAssociationTool)
-DECLARE_FACTORY_ENTRIES(EventCommonD3PDMaker) {
- DECLARE_NAMESPACE_TOOL (D3PD, EventTypeFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, EventWeightFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, EventErrorStateFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, EventTrigInfoFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ChargeFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, FourMomFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, DRAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, DRConeAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, CompositeParticleAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, NavigableConstituentAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, IN4MCollectionGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, INav4MomLinkContainerGetterTools)
- DECLARE_NAMESPACE_TOOL (D3PD, IN4MLinkContainerFlagFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, LBMetadataTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SimMetadataTool)
- DECLARE_NAMESPACE_TOOL (D3PD, IParticleLinksCollectionGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SkimDecisionFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SkimDecisionVectorFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, LumiBlockLengthFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, LeadingPtAssociationTool)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/src/components/EventCommonD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/src/components/EventCommonD3PDMaker_load.cxx
deleted file mode 100644
index b0642651e589193c51e1db771dd96e38f6e4c5a3..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/src/components/EventCommonD3PDMaker_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-/**
- * @file EventCommonD3PDMaker/src/components/EventCommonD3PDMaker_load.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Aug, 2009
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(EventCommonD3PDMaker)
-
diff --git a/PhysicsAnalysis/D3PDMaker/ExoticsD3PDMaker/src/components/ExoticsD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/ExoticsD3PDMaker/src/components/ExoticsD3PDMaker_entries.cxx
index 4e28657170436a89183cd709b057fce347226d5b..4fde1ff3481cc722b8b8f460a5a309410270cf2b 100644
--- a/PhysicsAnalysis/D3PDMaker/ExoticsD3PDMaker/src/components/ExoticsD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/ExoticsD3PDMaker/src/components/ExoticsD3PDMaker_entries.cxx
@@ -1,9 +1,5 @@
#include "../ZPrimeElectronSelector.h"
#include "../ZPrimeMuonSelector.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(D3PD, ZPrimeElectronSelector )
DECLARE_NAMESPACE_ALGORITHM_FACTORY(D3PD, ZPrimeMuonSelector )
-DECLARE_FACTORY_ENTRIES(ExoticsD3PDMaker) {
-DECLARE_NAMESPACE_ALGORITHM(D3PD, ZPrimeElectronSelector )
-DECLARE_NAMESPACE_ALGORITHM(D3PD, ZPrimeMuonSelector )
-}
+
diff --git a/PhysicsAnalysis/D3PDMaker/ExoticsD3PDMaker/src/components/ExoticsD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/ExoticsD3PDMaker/src/components/ExoticsD3PDMaker_load.cxx
deleted file mode 100644
index aea430bb2daed9e70e21d2dbeef0c3342bd7f933..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/ExoticsD3PDMaker/src/components/ExoticsD3PDMaker_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ExoticsD3PDMaker)
diff --git a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/components/ForwardDetectorsD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/components/ForwardDetectorsD3PDMaker_entries.cxx
index 35f9111177e79f2d2391e0ef96e69488d4699746..380e44b589a41b8814db229b6d8a8947ca9ee490 100644
--- a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/components/ForwardDetectorsD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/components/ForwardDetectorsD3PDMaker_entries.cxx
@@ -1,9 +1,3 @@
-// $Id: ForwardDetectorsD3PDMaker_entries.cxx 597942 2014-05-20 12:31:43Z nozka $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "../ZdcFillerTool.h"
#include "../ZdcDigitsFillerTool.h"
#include "../ZdcRecoFillerTool.h"
@@ -40,22 +34,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AfpTDDigiCollectionFillerTool )
DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AfpTDLocRecoEvCollectionFillerTool )
DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, AfpTruthInfoFillerTool )
-DECLARE_FACTORY_ENTRIES( ForwardDetectorsD3PDMaker ) {
- DECLARE_NAMESPACE_TOOL( D3PD, ZdcFillerTool )
- DECLARE_NAMESPACE_TOOL( D3PD, ZdcDigitsFillerTool )
- DECLARE_NAMESPACE_TOOL( D3PD, ZdcRecoFillerTool )
-
- DECLARE_NAMESPACE_TOOL( D3PD, AlfaHitCollectionFillerTool )
- DECLARE_NAMESPACE_TOOL( D3PD, AlfaEventHeaderFillerTool )
- DECLARE_NAMESPACE_TOOL( D3PD, AlfaTrackingDataFillerTool )
- DECLARE_NAMESPACE_TOOL( D3PD, AlfaTruthInfoFillerTool )
- DECLARE_NAMESPACE_TOOL( D3PD, AlfaMetaDataTool )
-
- DECLARE_NAMESPACE_TOOL( D3PD, AfpSIDSimHitCollectionFillerTool )
- DECLARE_NAMESPACE_TOOL( D3PD, AfpSIDDigiCollectionFillerTool )
- DECLARE_NAMESPACE_TOOL( D3PD, AfpSIDLocRecoEvCollectionFillerTool )
- DECLARE_NAMESPACE_TOOL( D3PD, AfpTDSimHitCollectionFillerTool )
- DECLARE_NAMESPACE_TOOL( D3PD, AfpTDDigiCollectionFillerTool )
- DECLARE_NAMESPACE_TOOL( D3PD, AfpTDLocRecoEvCollectionFillerTool )
- DECLARE_NAMESPACE_TOOL( D3PD, AfpTruthInfoFillerTool )
-}
diff --git a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/components/ForwardDetectorsD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/components/ForwardDetectorsD3PDMaker_load.cxx
deleted file mode 100644
index 32c6a7b8de66849afdb70cd1baef414ab8f4bd72..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/components/ForwardDetectorsD3PDMaker_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ForwardDetectorsD3PDMaker)
diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_entries.cxx
index 68431d0db3ae0315235734345bac484c184a763d..414700e1def5d5dccd550e462c319b9936b297a1 100644
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_entries.cxx
@@ -1,15 +1,3 @@
-// $Id: HiggsD3PDMaker_entries.cxx 485019 2012-02-24 16:16:04Z krasznaa $
-/**
- * @file HiggsD3PDMaker_entries.cxx
- * @author Kirill.Prokofiev@cern.ch
- * @date Feb. 2012
- * @brief List Gaudi components.
- */
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s)
#include "../QuadrupletFillerTool.h"
#include "../QuadrupletVertexAssociationTool.h"
#include "../QuadrupletCompositeParticleAssociationTool.h"
@@ -18,9 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, QuadrupletFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, QuadrupletVertexAssociationTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, QuadrupletCompositeParticleAssociationTool)
-DECLARE_FACTORY_ENTRIES(HiggsD3PDMaker)
-{
- DECLARE_NAMESPACE_TOOL (D3PD, QuadrupletFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, QuadrupletVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, QuadrupletCompositeParticleAssociationTool)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_load.cxx
deleted file mode 100644
index 3e1bfa05c32e430abeffa0bbfcce4b7109bfaa7e..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/HiggsD3PDMaker/src/components/HiggsD3PDMaker_load.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id: HiggsD3PDMaker_load.cxx 485019 2012-02-24 16:16:04Z krasznaa $
-/**
- * @file HiggsQuadrupletD3PDMaker_load.cxx
- * @author Kiril.Prokofiev@cern.ch
- * @date Feb, 2012.
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(HiggsD3PDMaker)
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDAnalysis/src/components/JetD3PDAnalysis_entries.cxx b/PhysicsAnalysis/D3PDMaker/JetD3PDAnalysis/src/components/JetD3PDAnalysis_entries.cxx
index 9387e47ccf08f54fbe2b6e964183a1c20fd3e45e..d0fdeca19794a8f42de310d18de0a4481f2cd549 100644
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDAnalysis/src/components/JetD3PDAnalysis_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/JetD3PDAnalysis/src/components/JetD3PDAnalysis_entries.cxx
@@ -1,20 +1,6 @@
-// $Id$
-/**
- * @file JetD3PDAnalysis/src/components/JetD3PDAnalysis_entries.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Jul, 2011
- * @brief List Gaudi components.
- */
-
-
#include "../JetVertexFractionAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, JetVertexFractionAlg)
-
-DECLARE_FACTORY_ENTRIES(JetD3PDAnalysis) {
- DECLARE_NAMESPACE_ALGORITHM (D3PD, JetVertexFractionAlg)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDAnalysis/src/components/JetD3PDAnalysis_load.cxx b/PhysicsAnalysis/D3PDMaker/JetD3PDAnalysis/src/components/JetD3PDAnalysis_load.cxx
deleted file mode 100644
index 10344caa0dfbc8e1c41caf1674f70fc073042429..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDAnalysis/src/components/JetD3PDAnalysis_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-/**
- * @file JetD3PDAnalysis/src/components/JetD3PDAnalysis_load.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Jul, 2011
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetD3PDAnalysis)
-
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx
index 3a1166ec446d436ee330184fafe7bfccaa11c078..42acfe57aa2abed8a942739cbe37fe4c9e318525 100644
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx
@@ -1,11 +1,3 @@
-// $Id$
-/**
- * @file JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx
- * @author Pier-Olivier DeViveiros < viveiros AT physics.utoronto.ca >
- * @date Aug, 2009
- * @brief List Gaudi components.
- */
-
#include "../JetBTagWeightFillerTool.h"
#include "../JetFlavorTagComponentsFillerTool.h"
#include "../JetVtxFillerTool.h"
@@ -29,7 +21,6 @@
#include "../JetL2TriggerObjectAssociationTool.h"
#include "../JetEFTriggerObjectAssociationTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetBTagWeightFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetFlavorTagComponentsFillerTool)
@@ -54,27 +45,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetL1TriggerObjectAssociationTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetL2TriggerObjectAssociationTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetEFTriggerObjectAssociationTool)
-DECLARE_FACTORY_ENTRIES(JetD3PDMaker) {
- DECLARE_NAMESPACE_TOOL (D3PD, JetBTagWeightFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetFlavorTagComponentsFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTrueTagFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetVtxFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetVertexFractionFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetEMFractionFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetSamplingsFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetSignalStateFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetAuthorFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetMomentFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetConstituentFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, FlavorAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetCaloUtilsFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetShapeFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTileCellFillerTool)
- DECLARE_ALGORITHM (JetTileFilterAlg)
- // DECLARE_NAMESPACE_ALGORITHM (D3PD, JetFixupAlg)
- DECLARE_NAMESPACE_TOOL (D3PD, JetROIWordFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetSamplingsFracFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetL1TriggerObjectAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetL2TriggerObjectAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetEFTriggerObjectAssociationTool)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_load.cxx
deleted file mode 100644
index 5336d02a886a904a6152f3b5d299db6a21bd17f7..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/components/JetD3PDMaker_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-/**
- * @file JetD3PDMaker/src/components/egammaD3PDMaker_entries.cxx
- * @author Pier-Olivier DeViveiros < viveiros AT physics.utoronto.ca >
- * @date Aug, 2009
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetD3PDMaker)
-
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/components/JetTagD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/components/JetTagD3PDMaker_entries.cxx
index 1d5ee25b1f3bfc65a9ab4ebee7fdf7c9c153e0cb..ab30036f5896e60b805b9ed8d5e7c81a3d649527 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/components/JetTagD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/components/JetTagD3PDMaker_entries.cxx
@@ -38,7 +38,6 @@
#include "../JetTagPixelModCondFillerTool.h"
#include "../JetTagQGPartonTruthInfoFillerTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagBTagWeightsFillerTool)
//DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagJetTrackAssociationTool)
@@ -83,46 +82,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, JetTagQGPartonTruthInfoFillerTool)
DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, JetTagJetFilterAlg)
-DECLARE_FACTORY_ENTRIES(JetTagD3PDMaker) {
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagBTagWeightsFillerTool)
- //DECLARE_NAMESPACE_TOOL (D3PD, JetTagJetTrackAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagJetNavigable4MomentumAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagMuonInJetGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagInfoBaseFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagIPInfoBaseFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagJetProbInfoBaseFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagSVInfoBaseFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagIPInfoPlusTrackAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagSVInfoPlusFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagSVInfoPlusTrackAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagJetMuonAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagJetFitterTagInfoFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagJetFitterGenericTagInfoFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagSoftMuonInfoMuonAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagJetGenSoftLeptonAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagElectronInJetGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagJetElectronAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagSoftElecInfoegammaAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagPhotonInJetGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagJetPhotonAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagVxOnJetAxisFillerTool)
- //DECLARE_NAMESPACE_TOOL (D3PD, JetTagJetJFTwoTrackVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagTwoTrackVertexFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagVxOnJetAxisTrackAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagTwoTrackVertexTrackAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagVKalVxInJetBadTrackAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagTruthInfoFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagMSVVtxInfoGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagMultiSVInfoPlusFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagMSVVtxInfoFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagMSVVtxInfoTrackAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagMultiSVInfoMSVVtxInfoAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagGbbNNInfoFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagHadFlavorTagInfoFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagQGPartonTruthInfoFillerTool)
-
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagPixelModuleGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetTagPixelModCondFillerTool)
-
- DECLARE_NAMESPACE_ALGORITHM (D3PD, JetTagJetFilterAlg)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/components/JetTagD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/components/JetTagD3PDMaker_load.cxx
deleted file mode 100644
index 2728ae085bcfa87ac521d029c760a52740a902da..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/src/components/JetTagD3PDMaker_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetTagD3PDMaker)
-
diff --git a/PhysicsAnalysis/D3PDMaker/MinBiasD3PDMaker/src/components/MinBiasD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/MinBiasD3PDMaker/src/components/MinBiasD3PDMaker_entries.cxx
index d720020d6bc4a1252edc7f9ecb6e60e2677309a3..314e4a2bb9ca886c0326a0e74b1b5651d5bd4463 100644
--- a/PhysicsAnalysis/D3PDMaker/MinBiasD3PDMaker/src/components/MinBiasD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/MinBiasD3PDMaker/src/components/MinBiasD3PDMaker_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../UnassociatedHitsFillerTool.h"
#include "../UnassociatedHitsGetterTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, UnassociatedHitsFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, UnassociatedHitsGetterTool)
-DECLARE_FACTORY_ENTRIES(MinBiasD3PDMaker) {
- DECLARE_NAMESPACE_TOOL (D3PD, UnassociatedHitsFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, UnassociatedHitsGetterTool)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/MinBiasD3PDMaker/src/components/MinBiasD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/MinBiasD3PDMaker/src/components/MinBiasD3PDMaker_load.cxx
deleted file mode 100644
index ee6bdfb18b7a4f79c475b4a9fce16b28764f4916..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MinBiasD3PDMaker/src/components/MinBiasD3PDMaker_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(MinBiasD3PD)
diff --git a/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/src/components/MissingETD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/src/components/MissingETD3PDMaker_entries.cxx
index 97a79ecacc45d0410e80d1a2bd1618c7b2ebf5f5..bcfaf0c40248db1119a895af056ee61994f9e24b 100644
--- a/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/src/components/MissingETD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/src/components/MissingETD3PDMaker_entries.cxx
@@ -1,12 +1,3 @@
-// $Id$
-/**
- * @file MissingETD3PDMaker/src/components/MissingETD3PDMaker_entries.cxx
- * @author Jet Goodson <jgoodson@cern.ch>
- * @date Oct, 2009
- * @brief List Gaudi components.
- */
-
-
#include "MissingETD3PDMaker/MissingETFillerTool.h"
#include "MissingETD3PDMaker/ScalarMissingETFillerTool.h"
#include "MissingETD3PDMaker/SumETFillerTool.h"
@@ -28,7 +19,6 @@
#include "MissingETD3PDMaker/MissingETCompAssociationTool.h"
#include "../MissingETContainerFillerTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ScalarMissingETFillerTool)
@@ -51,26 +41,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETCaloEMFracSETFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETCompAssociationTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MissingETContainerFillerTool)
-DECLARE_FACTORY_ENTRIES(MissingETD3PDMaker) {
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ScalarMissingETFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SumETFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETPhiFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETTruthNonIntFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ScalarMissingETTruthNonIntFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETTruthNonIntPhiFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SumETTruthNonIntFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ScalarMissingETTruthIntFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETTruthIntPhiFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SumETTruthIntFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETTruthIntFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETEtaRingsFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETJetsInfoFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETGoodnessFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETRegionFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETCaloSamplingFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETCaloEMFracSETFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETCompAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, MissingETContainerFillerTool)
- }
-
diff --git a/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/src/components/MissingETD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/src/components/MissingETD3PDMaker_load.cxx
deleted file mode 100644
index 4af9a1b9129b3dee975d13efe8bced18149b5909..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/src/components/MissingETD3PDMaker_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-/**
- * @file MissingETD3PDMaker/src/components/MissingETD3PDMaker_entries.cxx
- * @author J. Goodson <jgoodson@cern.ch>
- * @date Oct, 2009
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MissingETD3PDMaker)
-
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx
index 48b551e5ddf15ac40b7674adddea0965e73f93fa..a99cddf1637438d7dc231de519b6b035c623f7f1 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx
@@ -1,12 +1,3 @@
-// $Id$
-/**
- * @file MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Aug, 2009
- * @brief List Gaudi components.
- */
-
-
#include "../MuonTrkHitFillerTool.h" //Serhan
#include "../MuonNumberOfSegmentsFillerTool.h"
#include "../MuonTrackParticleAssociationTool.h"
@@ -44,7 +35,6 @@
#include "../MuonTruthHitsFillerTool.h"
#include "../TrackRecordCollectionGetterTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonTrkHitFillerTool) // Serhan
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MuonNumberOfSegmentsFillerTool)
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_load.cxx
deleted file mode 100644
index d1f5dde663e146f1da471f91208da097cb0ed963..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-/**
- * @file MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Aug, 2009
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonD3PDMaker)
-
diff --git a/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/src/components/PhysicsD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/src/components/PhysicsD3PDMaker_entries.cxx
index bca63e71bb6d6d8969453531a85cee175bfa26c1..af4a6c30fc7ecfd690c3277ec3342b5db2093883 100644
--- a/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/src/components/PhysicsD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/src/components/PhysicsD3PDMaker_entries.cxx
@@ -1,18 +1,4 @@
-/******************************************************************************
- * Entries file for SMEWTrilepSkim
- *
- * @author Steven Kaneti <StevenKanetiSPAMNOTcern.ch>
- * Nick Edwards
- *
- * @version $Id: PhysicsD3PDMaker_entries.cxx 606012 2014-07-11 09:40:36Z krasznaa $
- *
- *****************************************************************************/
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../TrileptonSkimmer.h"
DECLARE_ALGORITHM_FACTORY(TrileptonSkimmer)
-DECLARE_FACTORY_ENTRIES(PhysicsD3PDMaker) {
- DECLARE_ALGORITHM(TrileptonSkimmer)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/src/components/PhysicsD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/src/components/PhysicsD3PDMaker_load.cxx
deleted file mode 100644
index 0aee3f9d92d59e9740f13ff3761584f7841f058b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/PhysicsD3PDMaker/src/components/PhysicsD3PDMaker_load.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-/******************************************************************************
- * Load file for SMEWTrilepSkim
- *
- * authors: Steven Kaneti <StevenKanetiSPAMNOTcern.ch>
- * Nick Edwards
- *
- * version $Id: PhysicsD3PDMaker_load.cxx 531461 2012-12-20 21:43:15Z nedwards $
- *
- *****************************************************************************/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(PhysicsD3PDMaker)
-
diff --git a/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/src/components/QcdD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/src/components/QcdD3PDMaker_entries.cxx
index d6a770ad697d16a063da32024e5cf500bfef6136..74c23ffeb831fe6fc0f16cebdfeb8676f47b37e7 100644
--- a/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/src/components/QcdD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/src/components/QcdD3PDMaker_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "QcdD3PDMaker/preprocessing/QcdD3PDPreProcessing.h"
#include "QcdD3PDMaker/fillers/MuonSpShowerFillerTool.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY (QcdD3PD, QcdD3PDPreProcessing)
DECLARE_NAMESPACE_TOOL_FACTORY (QcdD3PD, MuonSpShowerFillerTool)
-DECLARE_FACTORY_ENTRIES(QcdD3PDMaker) {
- DECLARE_NAMESPACE_ALGORITHM (QcdD3PD, QcdD3PDPreProcessing)
- DECLARE_NAMESPACE_TOOL(QcdD3PD, MuonSpShowerFillerTool)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/src/components/QcdD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/src/components/QcdD3PDMaker_load.cxx
deleted file mode 100644
index c0f2dde62f21a6488cfd975683ee5455a12020a7..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/QcdD3PDMaker/src/components/QcdD3PDMaker_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(QcdD3PD)
diff --git a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/components/TileD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/components/TileD3PDMaker_entries.cxx
index bb0f835c5a92e4e2a89f9856ce299ae389921aff..9c8ef6ac7cbcddad44087d21a27ffce9596471d1 100644
--- a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/components/TileD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/components/TileD3PDMaker_entries.cxx
@@ -1,11 +1,3 @@
-// $Id$
-/**
- * @file components/TileD3PDMaker_entries.cxx
- * @author Marco van Woerden <mvanwoer@cern.ch> , Archil Durglishvili <archil.durglishvili@cern.ch>
- * @date November 2014
- * @brief List Gaudi components.
- */
-
// FILLER TOOLS
#include "../TileCellFillerTool.h"
#include "../TileTrackFillerTool.h"
@@ -26,10 +18,6 @@
#include "../TrackTools.h"
//#include "../TrackParametersIdentificationHelper.h"
-// GAUDI FACTORY
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// NAMESPACE DECLARATIONS
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileCellFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileTrackFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TileClusterFillerTool)
@@ -46,18 +34,3 @@ DECLARE_ALGORITHM_FACTORY (TileCosmicMuonFilterAlg)
DECLARE_TOOL_FACTORY (TrackTools)
//DECLARE_TOOL_FACTORY (TrackParametersIdentificationHelper)
-
-// GAUDI FACTORY ENTRIES
-DECLARE_FACTORY_ENTRIES(TileD3PDMaker) {
-DECLARE_NAMESPACE_TOOL (D3PD, TileCellFillerTool)
-DECLARE_NAMESPACE_TOOL (D3PD, TileTrackFillerTool)
-DECLARE_NAMESPACE_TOOL (D3PD, TileClusterFillerTool)
-DECLARE_NAMESPACE_TOOL (D3PD, TileMuonFillerTool)
-DECLARE_NAMESPACE_TOOL (D3PD, TileEventFillerTool)
-
-DECLARE_ALGORITHM (TileTrackFilterAlg)
-} // DECLARE_FACTORY_ENTRIES
-
-DECLARE_FACTORY_ENTRIES( TrackTools) {
- DECLARE_TOOL( TrackTools )
-} // DECLARE_FACTORY_ENTRIES
diff --git a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/components/TileD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/components/TileD3PDMaker_load.cxx
deleted file mode 100644
index c06302d5f536ca3f86a5500074a9cb94753065f9..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/components/TileD3PDMaker_load.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-/**
- * @file TileD3PDMaker_load.cxx
- * @author Marco van Woerden <mvanwoer@cern.ch>
- * @date September 2012
- * @brief Gaudi boilerplate.
- */
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TileD3PDMaker)
-
diff --git a/PhysicsAnalysis/D3PDMaker/TopD3PDMaker/BoostedTopD3PDMaker/src/components/BoostedTopD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/TopD3PDMaker/BoostedTopD3PDMaker/src/components/BoostedTopD3PDMaker_entries.cxx
index 12a454c9c2be00c44a8ac11302008ea0384b19c0..ecab1d0426b8f22e1b668389aaf51d401693f96b 100644
--- a/PhysicsAnalysis/D3PDMaker/TopD3PDMaker/BoostedTopD3PDMaker/src/components/BoostedTopD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TopD3PDMaker/BoostedTopD3PDMaker/src/components/BoostedTopD3PDMaker_entries.cxx
@@ -1,20 +1,7 @@
-// $Id: JetSubstructureD3PDMaker_entries.cxx 498297 2012-04-28 18:08:58Z chapleau $
-/**
- * @file JetD3PDMaker/src/components/JetD3PDMaker_entries.cxx
- * @author Pier-Olivier DeViveiros < viveiros AT physics.utoronto.ca >
- * @date Aug, 2009
- * @brief List Gaudi components.
- */
-
//#include "../../BoostedTopD3PDMaker/MiniIsolationElectronFillerTool.h"
//#include "../../BoostedTopD3PDMaker/MiniIsolationMuonFillerTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
//DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MiniIsolationElectronFillerTool)
//DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, MiniIsolationMuonFillerTool)
-DECLARE_FACTORY_ENTRIES(BoostedTopD3PDMaker) {
- //DECLARE_NAMESPACE_TOOL (D3PD, MiniIsolationElectronFillerTool)
- //DECLARE_NAMESPACE_TOOL (D3PD, MiniIsolationMuonFillerTool)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/TopD3PDMaker/BoostedTopD3PDMaker/src/components/BoostedTopD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/TopD3PDMaker/BoostedTopD3PDMaker/src/components/BoostedTopD3PDMaker_load.cxx
deleted file mode 100644
index f65b1509a787a01a7c88d7b5793a669972b871e0..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/TopD3PDMaker/BoostedTopD3PDMaker/src/components/BoostedTopD3PDMaker_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id: JetSubstructureD3PDMaker_load.cxx 445124 2011-06-23 15:25:39Z chapleau $
-/**
- * @file JetD3PDMaker/src/components/egammaD3PDMaker_entries.cxx
- * @author Pier-Olivier DeViveiros < viveiros AT physics.utoronto.ca >
- * @date Aug, 2009
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(BoostedTopD3PDMaker)
-
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/components/TrackD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/components/TrackD3PDMaker_entries.cxx
index ca3ccd3615ada17abd8e3347875a588a3a604892..3bcff70c888f7ffd1c52c661b64ac7a540e766c7 100644
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/components/TrackD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/components/TrackD3PDMaker_entries.cxx
@@ -1,13 +1,3 @@
-// $Id$
-/**
- * @file TrackD3PDMaker/src/components/TrackD3PDMaker_entries.cxx
- * @author maarten boonekamp <maarten.boonekamp@cea.fr>
- * @date Sep, 2009
- * @brief List Gaudi components.
- */
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
// generic fillers
#include "../TrackFitQualityFillerTool.h"
#include "../CovarianceFillerTool.h"
@@ -240,111 +230,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleToPixelClusterAssociationTo
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TrackParticleToPixelClusterAssociationToolLight)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ClusterAssocPixelFillerTool)
-
-DECLARE_FACTORY_ENTRIES(TrackD3PDMaker) {
- DECLARE_NAMESPACE_TOOL (D3PD, TrackFitQualityFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, CovarianceFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ImpactSigmaFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, PerigeeFillerTool)
- //DECLARE_NAMESPACE_TOOL (D3PD, PerigeeUnbiasedIPAtPVFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, PerigeeBLPredictionFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackStateOnSurfaceFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackTrackSummaryFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackInfoFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, PixelClusterFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackPIDFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackIsolationFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParametersFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ErrorMatrixErrorFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, ErrorMatrixCovarianceFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleChargeFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, V0CandidateFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, V0ContainerGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, VertexPositionFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, VertexTypeFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, VertexKineFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, VertexTrackAssociationFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, PerigeePairOldPerigeeAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackBeamlineParametersAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, VertexPurityFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, BeamSpotFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthTrackFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthVertexFillerTool)
- //DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleMCClassifierFillerTool)
-
- DECLARE_NAMESPACE_TOOL (D3PD, PerigeeCovarianceAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TSOFitQualityAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, VxTrackAtVertexTrackParticleAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, VxTrackAtVertexTrkTrackAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, V0CandidateVxCandidateAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrkPrepRawDataGenParticleAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TSOSPixelClusterAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParametersErrorMatrixAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleFitQualityAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticlePerigeeAtOOAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticlePerigeePairAtOOAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticlePerigeeAtPVAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticlePerigeeAtBSAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleTrackSummaryAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleInfoAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleTSOAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleTruthAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleDetailedTruthAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleLastParametersAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleParametersAtBLFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrkTrackFitQualityAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrkTrackPerigeeAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrkTrackPerigeeAtPVAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrkTrackPerigeeAtBSAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrkTrackTrackSummaryAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrkTrackInfoAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrkTrackTSOAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrkTrackVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrkTrackTruthAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrkTrackDetailedTruthAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, VertexFitQualityAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, VertexCovarianceAssociationTool)
- //DECLARE_NAMESPACE_TOOL (D3PD, VertexTrackAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, VertexTrackParticleAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrkTrackGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthTrackGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthVertexGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, PixelClusterCollectionGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, BeamSpotGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleDetailedTruthAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrkTrackParametersAtBLFillerTool)
-
-// SCT tools
- DECLARE_NAMESPACE_TOOL (D3PD, TRTPhaseFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SCTByteStreamErrorFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SCTClusterCollectionGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SCTClusterFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SCTClusterToTrackParticleAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SCTClusterSCTRDOAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SCTRDOCollectionGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SCTRDOFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SCTRDOClusterAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleToSCTClusterAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleToSCTClusterAssociationToolLight)
- DECLARE_NAMESPACE_TOOL (D3PD, ClusterAssocFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SCTTrackParticleToMuonAssociationTool)
-
- DECLARE_NAMESPACE_TOOL (D3PD, SiHitFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SiHitTruthAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SiHitContainerGetterTool)
-
-
-// Pixel tools
- DECLARE_NAMESPACE_TOOL (D3PD, PixelClusterPixelRDOAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, PixelRDOCollectionGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, PixelRDOFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, PixelRDOClusterAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, PixelClusterToTrackParticleAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleToPixelClusterAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TrackParticleToPixelClusterAssociationToolLight)
- DECLARE_NAMESPACE_TOOL (D3PD, ClusterAssocPixelFillerTool)
-
-
-}
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/components/TrackD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/components/TrackD3PDMaker_load.cxx
deleted file mode 100644
index 9614de9e697c000fff1411ea5d36a39ddabc2dfc..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/components/TrackD3PDMaker_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-/**
- * @file TrackD3PDMaker/src/components/TrackD3PDMaker_load.cxx
- * @author maarten boonekamp <maarten.boonekamp@cea.fr>
- * @date Aug, 2009
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrackD3PDMaker)
-
diff --git a/PhysicsAnalysis/D3PDMaker/TrigCostD3PDMaker/src/components/TrigCostD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/TrigCostD3PDMaker/src/components/TrigCostD3PDMaker_entries.cxx
index 3ad9261e3344e54af6685ce5e78b729b2d7fee4a..0bb39bd657aa1de368b93c700b7f4c121e0ab747 100644
--- a/PhysicsAnalysis/D3PDMaker/TrigCostD3PDMaker/src/components/TrigCostD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TrigCostD3PDMaker/src/components/TrigCostD3PDMaker_entries.cxx
@@ -1,15 +1,6 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local includes
#include "../TrigCostD3PDMakerTool.h"
#include "../TrigCostConfMetadataTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, TrigCostD3PDMakerTool )
DECLARE_NAMESPACE_TOOL_FACTORY( D3PD, TrigCostConfMetadataTool )
-DECLARE_FACTORY_ENTRIES( TrigCostD3PDMaker ) {
- DECLARE_NAMESPACE_TOOL( D3PD, TrigCostD3PDMakerTool )
- DECLARE_NAMESPACE_TOOL( D3PD, TrigCostD3PDMakerTool )
-
-}
diff --git a/PhysicsAnalysis/D3PDMaker/TrigCostD3PDMaker/src/components/TrigCostD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/TrigCostD3PDMaker/src/components/TrigCostD3PDMaker_load.cxx
deleted file mode 100644
index 3d7eb8eb3f0defd4008fb1b0f88628e93370ebd4..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/TrigCostD3PDMaker/src/components/TrigCostD3PDMaker_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrigCostD3PDMaker)
-
diff --git a/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/src/components/TriggerD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/src/components/TriggerD3PDMaker_entries.cxx
index c177e9d25aa955f834d0ce638718cab3b12501fe..3e892b578ef7790562632cb53165af636a712fcc 100644
--- a/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/src/components/TriggerD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/src/components/TriggerD3PDMaker_entries.cxx
@@ -1,16 +1,5 @@
-// $Id$
-/**
- * @file TriggerD3PDMaker/src/components/TriggerD3PDMaker_entries.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Sep, 2009
- * @brief List Gaudi components.
- */
-
#define TRIGGERD3PDMAKER_ENTRIES_FILE
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
// Local include(s):
#include "../TriggerBitFillerTool.h"
diff --git a/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/src/components/TriggerD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/src/components/TriggerD3PDMaker_load.cxx
deleted file mode 100644
index a15ebbe97a2c458cffadc959904fb3aa78c927d3..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/src/components/TriggerD3PDMaker_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-/**
- * @file TriggerD3PDMaker/src/components/TriggerD3PDMaker_load.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Sep, 2009
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TriggerD3PDMaker)
-
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/components/TruthD3PDAnalysis_entries.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/components/TruthD3PDAnalysis_entries.cxx
index 5a4e645036f38338132c08c11de32d65fbba9044..31c45c97152c24248acefdf6ade9f81c8e9c00a2 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/components/TruthD3PDAnalysis_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/components/TruthD3PDAnalysis_entries.cxx
@@ -1,9 +1,3 @@
-// $Id: TruthD3PDAnalysis_entries.cxx 551562 2013-06-18 13:13:00Z zmarshal $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "../GenObjectsFilterTool.h"
#include "../TruthParticleFilterTool.h"
#include "../SimpleTruthParticleFilterTool.h"
@@ -14,11 +8,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthParticleFilterTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, SimpleTruthParticleFilterTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, D3PDMCTruthClassifier)
-DECLARE_FACTORY_ENTRIES( TruthD3PDAnalysis ) {
-
- DECLARE_NAMESPACE_TOOL (D3PD, GenObjectsFilterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthParticleFilterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, SimpleTruthParticleFilterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, D3PDMCTruthClassifier)
-
-}
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/components/TruthD3PDAnalysis_load.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/components/TruthD3PDAnalysis_load.cxx
deleted file mode 100644
index 1db696ed9b9e1d137c6fc8a460863ef952651c02..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/components/TruthD3PDAnalysis_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id: TruthD3PDAnalysis_load.cxx 348268 2011-02-28 16:12:50Z krasznaa $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the framework:
-LOAD_FACTORY_ENTRIES( TruthD3PDAnalysis )
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/components/TruthD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/components/TruthD3PDMaker_entries.cxx
index 24a7510087c549dd69daa71775d09d0d43e57103..b896702ba023ca0685050f285b953870a599b698 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/components/TruthD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/components/TruthD3PDMaker_entries.cxx
@@ -1,17 +1,3 @@
-// $Id$
-/**
- * @file TruthD3PDMaker/src/components/TruthD3PDMaker_entries.cxx
- * @author Renaud Bruneliere <Renaud.Bruneliere@cern.ch>
- * @date Apr, 2010
- * @brief List Gaudi components.
- */
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-//
-// Local include(s):
-//
// Getter tool(s):
#include "../GenEventGetterTool.h"
#include "../GenParticleGetterTool.h"
@@ -92,44 +78,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthParticleClassificationFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, GenEventGetterFilterTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, TruthJetFilterTool)
-DECLARE_FACTORY_ENTRIES(TruthD3PDMaker) {
- // Getter tool(s):
- DECLARE_NAMESPACE_TOOL (D3PD, GenEventGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, GenParticleGetterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, GenVertexGetterTool)
- // Associator tool(s):
- DECLARE_NAMESPACE_TOOL (D3PD, GenEventGenParticleAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, GenParticleEventAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, GenParticleParticleAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, GenParticleTruthParticleAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, GenParticleVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, GenVertexParticleAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, GenVertexEventAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthParticleEtIsolationAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthParticleChildAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthParticleParentAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthParticleGenParticleAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthParticleProdVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, PileUpInfoAssociatorToor)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthTauDecayAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthLeptonParentAssociationTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthLeptonNearbyAssociationTool)
- // Filler tool(s):
- DECLARE_NAMESPACE_TOOL (D3PD, GenEventFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, GenEventPileUpFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthParticleBremFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, GenParticleFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, GenParticlePerigeeFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, GenVertexFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthEtIsolationFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthParticleFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthParticleBarcodesFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, PileUpInfoFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthParticleFakerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, JetFullTruthTag)
- DECLARE_NAMESPACE_TOOL (D3PD, HforFillerTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthParticleClassificationFillerTool)
- // Filter tool(s):
- DECLARE_NAMESPACE_TOOL (D3PD, GenEventGetterFilterTool)
- DECLARE_NAMESPACE_TOOL (D3PD, TruthJetFilterTool)
-}
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/components/TruthD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/components/TruthD3PDMaker_load.cxx
deleted file mode 100644
index ee5be768da3707ad9de610d7ff9e39aa3fba112f..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/components/TruthD3PDMaker_load.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-/**
- * @file TruthD3PDMaker/src/components/TruthD3PDMaker_load.cxx
- * @author Renaud Bruneliere <Renaud.Bruneliere@cern.ch>
- * @date Apr, 2010
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TruthD3PDMaker)
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_entries.cxx b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_entries.cxx
index c0932e84000287535073133cb61d11611222e85a..0d1cda92503c0abe0a005f07612b6c128b29ecd0 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_entries.cxx
@@ -1,12 +1,3 @@
-// $Id$
-/**
- * @file egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_entries.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Aug, 2009
- * @brief List Gaudi components.
- */
-
-
#include "../egammaDeltaEmax2Alg.h"
#include "../egammaShowerDepthAlg.h"
#include "../PhotonTruthAlg.h"
@@ -24,7 +15,6 @@
#include "../egammaTimeCorrAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, egammaDeltaEmax2Alg)
@@ -44,5 +34,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, egammaSumCellsGainAlg)
DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, egammaNbCellsGainAlg)
DECLARE_NAMESPACE_ALGORITHM_FACTORY (D3PD, egammaTimeCorrAlg)
-
-
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_load.cxx b/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_load.cxx
deleted file mode 100644
index e392cb8b7b3ea3b62a94db7685dfb78963763244..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-/**
- * @file egammaD3PDAnalysis/src/components/egammaD3PDAnalysis_load.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Nov, 2009
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaD3PDAnalysis)
-
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/components/egammaD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/components/egammaD3PDMaker_entries.cxx
index 704b383a8e4343050ad57db45bb2412c785ba08d..9f7efc725b6a66ca5d25eef0d597a41be8dc14df 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/components/egammaD3PDMaker_entries.cxx
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/components/egammaD3PDMaker_entries.cxx
@@ -1,12 +1,3 @@
-// $Id$
-/**
- * @file egammaD3PDMaker/src/components/egammaD3PDMaker_entries.cxx
- * @author Haifeng Li, scott snyder <snyder@bnl.gov>
- * @date Aug, 2009
- * @brief List Gaudi components.
- */
-
-
#include "../egammaLayer1ExtraFillerTool.h"
#include "../egammaRetaphiFillerTool.h"
#include "../egammaConversionFillerTool.h"
@@ -27,7 +18,6 @@
#include "../ConversionVertexAssociationTool.h"
#include "../egammaTraversedMaterialFillerTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaLayer1ExtraFillerTool)
@@ -50,6 +40,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, xAODPhotonObjectDecisionFillerTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, ConversionVertexAssociationTool)
DECLARE_NAMESPACE_TOOL_FACTORY (D3PD, egammaTraversedMaterialFillerTool)
-
-
-
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/components/egammaD3PDMaker_load.cxx b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/components/egammaD3PDMaker_load.cxx
deleted file mode 100644
index 0b9ae4c96108c00097ba7b451cb59c9bf1ec3437..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/components/egammaD3PDMaker_load.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-/**
- * @file egammaD3PDMaker/src/components/egammaD3PDMaker_entries.cxx
- * @author Haifeng Li, scott snyder <snyder@bnl.gov>
- * @date Aug, 2009
- * @brief Gaudi boilerplate.
- */
-
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaD3PDMaker)
-
diff --git a/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_entries.cxx b/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_entries.cxx
index bdedc555591439c508852a2f8ea51dcf0fd76882..16ab90bbece76b20acd457ddbfa78abe230327e9 100644
--- a/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_entries.cxx
+++ b/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DPDUtils/ZeeFilter.h"
#include "DPDUtils/DPDPhotonFilter.h"
#include "DPDUtils/DPDTagTool.h"
@@ -10,12 +9,3 @@ DECLARE_ALGORITHM_FACTORY( ObjectThinner )
DECLARE_TOOL_FACTORY( DPDTagTool )
-DECLARE_FACTORY_ENTRIES( DPDUtils ) {
-
- DECLARE_ALGORITHM(DPDPhotonFilter)
- DECLARE_ALGORITHM(ZeeFilter)
- DECLARE_ALGORITHM( ObjectThinner )
-
- DECLARE_TOOL( DPDTagTool )
-
-}
diff --git a/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_load.cxx b/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_load.cxx
deleted file mode 100644
index bce6894707b29cd40a9860c19e593ed3ddd26159..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DPDUtils/src/components/DPDUtils_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(DPDUtils)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCalo/src/components/DerivationFrameworkCalo_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCalo/src/components/DerivationFrameworkCalo_entries.cxx
index cbd2a99e726ef5cedf2339039d64e5820366db19..190098d81d56599d47d91b5495bef84d563c91bd 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCalo/src/components/DerivationFrameworkCalo_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCalo/src/components/DerivationFrameworkCalo_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DerivationFrameworkCalo/CaloClusterThinning.h"
#include "DerivationFrameworkCalo/JetCaloClusterThinning.h"
#include "DerivationFrameworkCalo/CellsInConeThinning.h"
@@ -15,12 +14,5 @@ DECLARE_TOOL_FACTORY( GainDecorator )
DECLARE_TOOL_FACTORY( MaxCellDecorator )
DECLARE_TOOL_FACTORY( ClusterEnergyPerLayerDecorator )
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkCalo ) {
- DECLARE_TOOL( CaloClusterThinning )
- DECLARE_TOOL( JetCaloClusterThinning )
- DECLARE_TOOL( CellsInConeThinning )
- DECLARE_TOOL( GainDecorator )
- DECLARE_TOOL( MaxCellDecorator )
- DECLARE_TOOL( ClusterEnergyPerLayerDecorator )
-}
+
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCalo/src/components/DerivationFrameworkCalo_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCalo/src/components/DerivationFrameworkCalo_load.cxx
deleted file mode 100644
index 24a78afb1270ecf1ee6326bc4c3b2f4d0617e111..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCalo/src/components/DerivationFrameworkCalo_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DerivationFrameworkCalo )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/src/components/DerivationFrameworkCore_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/src/components/DerivationFrameworkCore_entries.cxx
index fbb0dd88c3408703a8cb801aacf0fc2f33b57041..e3dd871a221582220140ae5a98e1abbc691c4168 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/src/components/DerivationFrameworkCore_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/src/components/DerivationFrameworkCore_entries.cxx
@@ -1,12 +1,6 @@
#include "DerivationFrameworkCore/DerivationKernel.h"
#include "DerivationFrameworkCore/CommonAugmentation.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( DerivationFramework , DerivationKernel )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( DerivationFramework , CommonAugmentation )
-
-DECLARE_FACTORY_ENTRIES(DerivationFrameworkCore) {
- DECLARE_NAMESPACE_ALGORITHM( DerivationFramework , DerivationKernel )
- DECLARE_NAMESPACE_ALGORITHM( DerivationFramework , CommonAugmentation )
-}
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/src/components/DerivationFrameworkCore_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/src/components/DerivationFrameworkCore_load.cxx
deleted file mode 100644
index 6a00547954ae0e6b8613492c8d0f9d89958384c2..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/src/components/DerivationFrameworkCore_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(DerivationFrameworkCore)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/components/DerivationFrameworkEGamma_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/components/DerivationFrameworkEGamma_entries.cxx
index 77814b9559db85820e2364f6da6e57ead3c2ca12..11cf5557c06ce8a8cf2d75c1a51b3315c2b8da56 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/components/DerivationFrameworkEGamma_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/components/DerivationFrameworkEGamma_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DerivationFrameworkEGamma/PhotonsDirectionTool.h"
#include "DerivationFrameworkEGamma/EGammaPassSelectionWrapper.h"
#include "DerivationFrameworkEGamma/EGInvariantMassTool.h"
@@ -15,12 +14,5 @@ DECLARE_TOOL_FACTORY( EGTransverseMassTool )
DECLARE_TOOL_FACTORY( EGSelectionToolWrapper )
DECLARE_TOOL_FACTORY( BkgElectronClassification )
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkEGamma ) {
- DECLARE_TOOL( PhotonsDirectionTool )
- DECLARE_TOOL( EGammaPassSelectionWrapper )
- DECLARE_TOOL( EGInvariantMassTool )
- DECLARE_TOOL( EGTransverseMassMassTool )
- DECLARE_TOOL( EGSelectionToolWrapper )
- DECLARE_TOOL( BkgElectronClassification )
-}
+
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/components/DerivationFrameworkEGamma_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/components/DerivationFrameworkEGamma_load.cxx
deleted file mode 100644
index d9b178feb04b0587bddd3a8f8e24e1a71b0f9fb0..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkEGamma/src/components/DerivationFrameworkEGamma_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DerivationFrameworkEGamma )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/src/components/DerivationFrameworkExamples_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/src/components/DerivationFrameworkExamples_entries.cxx
index f4a2325921fbde7675d527311cb278fc8890d374..54da8f468c5b4530a0865118e5a59c57e6fb8262 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/src/components/DerivationFrameworkExamples_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/src/components/DerivationFrameworkExamples_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DerivationFrameworkExamples/SkimmingToolExample.h"
#include "DerivationFrameworkExamples/ThinningToolExample.h"
#include "DerivationFrameworkExamples/AugmentationToolExample.h"
@@ -8,9 +7,3 @@ DECLARE_TOOL_FACTORY( SkimmingToolExample )
DECLARE_TOOL_FACTORY( ThinningToolExample )
DECLARE_TOOL_FACTORY( AugmentationToolExample )
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkExamples ) {
- DECLARE_TOOL( SkimmingToolExample )
- DECLARE_TOOL( ThinningToolExample )
- DECLARE_TOOL( AugmentationToolExample )
-}
-
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/src/components/DerivationFrameworkExamples_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/src/components/DerivationFrameworkExamples_load.cxx
deleted file mode 100644
index ac6b233cd7f1c3a9be32beb7340d0a9f5d2e78ef..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/src/components/DerivationFrameworkExamples_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DerivationFrameworkExample )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/components/DerivationFrameworkExotics_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/components/DerivationFrameworkExotics_entries.cxx
index 60abe692c6c0309260be5455ed034a85a87563db..c8c913670cc3fe4eb1ec85dc1bc4d476ccd08a08 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/components/DerivationFrameworkExotics_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/components/DerivationFrameworkExotics_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DerivationFrameworkExotics/SkimmingToolEXOT14.h"
#include "DerivationFrameworkExotics/SkimmingToolEXOT5.h"
@@ -7,8 +6,3 @@ using namespace DerivationFramework;
DECLARE_TOOL_FACTORY( SkimmingToolEXOT14 )
DECLARE_TOOL_FACTORY( SkimmingToolEXOT5 )
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkExotics ) {
- DECLARE_TOOL( SkimmingToolEXOT14 )
- DECLARE_TOOL( SkimmingToolEXOT5 )
-}
-
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/components/DerivationFrameworkExotics_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/components/DerivationFrameworkExotics_load.cxx
deleted file mode 100644
index b28b8a938d694dee7bfe0b68b77049d0179780ca..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExotics/src/components/DerivationFrameworkExotics_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DerivationFrameworkExotics )
-
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/components/DerivationFrameworkHiggs_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/components/DerivationFrameworkHiggs_entries.cxx
index d223d6f7c26c65f9569ac0ab055d458a69aa8d4a..b9a05ad0d5a2d4ace9ace3a0e94176043a3fb7b4 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/components/DerivationFrameworkHiggs_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/components/DerivationFrameworkHiggs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DerivationFrameworkHiggs/SkimmingToolHIGG1.h"
#include "DerivationFrameworkHiggs/SkimmingToolHIGG2.h"
#include "DerivationFrameworkHiggs/SkimmingToolHIGG5VBF.h"
@@ -8,9 +7,3 @@ DECLARE_TOOL_FACTORY( SkimmingToolHIGG1 )
DECLARE_TOOL_FACTORY( SkimmingToolHIGG2 )
DECLARE_TOOL_FACTORY( SkimmingToolHIGG5VBF )
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkHiggs ) {
- DECLARE_TOOL( SkimmingToolHIGG1 )
- DECLARE_TOOL( SkimmingToolHIGG2 )
- DECLARE_TOOL( SkimmingToolHIGG5VBF )
-}
-
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/components/DerivationFrameworkHiggs_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/components/DerivationFrameworkHiggs_load.cxx
deleted file mode 100644
index f1802eb1481909874b6fec533937f9ce9a20746c..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/components/DerivationFrameworkHiggs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(DerivationFrameworkHiggs)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/components/DerivationFrameworkInDet_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/components/DerivationFrameworkInDet_entries.cxx
index ff77a1bfb180a59b0b6fbb5dbef03cee1e49329f..07ba830a1388e73197e9f7d9790811184b8cbd2a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/components/DerivationFrameworkInDet_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/components/DerivationFrameworkInDet_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DerivationFrameworkInDet/TrackToVertexWrapper.h"
#include "DerivationFrameworkInDet/TrackParticleThinning.h"
#include "DerivationFrameworkInDet/MuonTrackParticleThinning.h"
@@ -39,24 +38,3 @@ DECLARE_TOOL_FACTORY( EGammaPrepRawDataThinning )
DECLARE_TOOL_FACTORY( TrackMeasurementThinning )
DECLARE_TOOL_FACTORY( EventInfoPixelDecorator )
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkInDet ) {
- DECLARE_TOOL( TrackToVertexWrapper )
- DECLARE_TOOL( TrackParticleThinning )
- DECLARE_TOOL( MuonTrackParticleThinning )
- DECLARE_TOOL( EgammaTrackParticleThinning )
- DECLARE_TOOL( TauTrackParticleThinning )
- DECLARE_TOOL( DiTauTrackParticleThinning )
- DECLARE_TOOL( JetTrackParticleThinning )
- DECLARE_TOOL( TrackParametersAtPV )
- DECLARE_TOOL( TrackStateOnSurfaceDecorator )
- DECLARE_TOOL( TrackParametersForTruthParticles )
- DECLARE_TOOL( EventInfoBSErrDecorator )
- DECLARE_TOOL( UnassociatedHitsDecorator )
- DECLARE_NAMESPACE_TOOL(DerivationFramework, UnassociatedHitsGetterTool)
- DECLARE_TOOL( LArCollisionTimeDecorator )
- DECLARE_TOOL( EGammaTracksThinning )
- DECLARE_TOOL( EGammaPrepRawDataThinning )
- DECLARE_TOOL( TrackMeasurementThinning )
- DECLARE_TOOL( EventInfoPixelDecorator )
-}
-
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/components/DerivationFrameworkInDet_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/components/DerivationFrameworkInDet_load.cxx
deleted file mode 100644
index 8d3d476abb43c3fa88b2795804d6efa74b79bdba..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/src/components/DerivationFrameworkInDet_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DerivationFrameworkInDet )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/components/DerivationFrameworkJetEtMiss_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/components/DerivationFrameworkJetEtMiss_entries.cxx
index bd71ab4683fbfae851d0cd8fcd7bb741c64e511a..8e592bf6a3221158dac7ed788a467d9c4a4bd03a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/components/DerivationFrameworkJetEtMiss_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/components/DerivationFrameworkJetEtMiss_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../JetDecorAlg.h"
#include "../JetAugmentationTool.h"
#include "../PFlowAugmentationTool.h"
@@ -15,13 +14,3 @@ DECLARE_TOOL_FACTORY( METTriggerAugmentationTool )
DECLARE_TOOL_FACTORY( ViewContainerThinning )
DECLARE_TOOL_FACTORY( JetExternalAssocTool )
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkJetEtMiss ) {
-
- DECLARE_ALGORITHM( JetDecorAlg )
- DECLARE_TOOL( JetAugmentationTool )
- DECLARE_TOOL( PFlowAugmentationTool )
- DECLARE_TOOL( METTriggerAugmentationTool )
- DECLARE_TOOL( ViewContainerThinning )
- DECLARE_TOOL( JetExternalAssocTool )
-
-}
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/components/DerivationFrameworkJetEtMiss_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/components/DerivationFrameworkJetEtMiss_load.cxx
deleted file mode 100644
index fb2e66a1a37b8a2c443116acdefe169f5fde159a..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/components/DerivationFrameworkJetEtMiss_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DerivationFrameworkJetEtMiss )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/src/components/DerivationFrameworkL1Calo_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/src/components/DerivationFrameworkL1Calo_entries.cxx
index dd572d7ef55ff084d6132d9c83111281bbdfdd8f..655e2b854eea21c85f085e0e2283cdcbf1aa82a7 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/src/components/DerivationFrameworkL1Calo_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/src/components/DerivationFrameworkL1Calo_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DerivationFrameworkL1Calo/SaturatedTriggerTower.h"
-#include "xAODTrigL1Calo/L1TopoRawDataContainer.h"
-#include "xAODTrigL1Calo/L1TopoRawDataAuxContainer.h"
-
+#include "xAODTrigL1Calo/L1TopoRawDataContainer.h"
+#include "xAODTrigL1Calo/L1TopoRawDataAuxContainer.h"
DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework , SaturatedTriggerTower )
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkL1Calo ) {
- DECLARE_NAMESPACE_TOOL( DerivationFramework , SaturatedTriggerTower )
-}
-
\ No newline at end of file
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/src/components/DerivationFrameworkL1Calo_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/src/components/DerivationFrameworkL1Calo_load.cxx
deleted file mode 100644
index 6ab3672247bf483aad72cd62f49e5e7fb29d550b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/src/components/DerivationFrameworkL1Calo_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DerivationFrameworkL1Calo )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/components/DerivationFrameworkMCTruth_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/components/DerivationFrameworkMCTruth_entries.cxx
index 7810e40a7bca7882aa45b22bd07cd2367af6bc27..5d0d7f61ed7132e72b514ddd21255635845ec814 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/components/DerivationFrameworkMCTruth_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/components/DerivationFrameworkMCTruth_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DerivationFrameworkMCTruth/TruthDressingTool.h"
#include "DerivationFrameworkMCTruth/TruthIsolationTool.h"
#include "DerivationFrameworkMCTruth/MenuTruthThinning.h"
@@ -27,20 +26,3 @@ DECLARE_TOOL_FACTORY( HardTruthThinning )
DECLARE_TOOL_FACTORY( HadronOriginDecorator )
DECLARE_TOOL_FACTORY( HadronOriginClassifier )
-
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkMCTruth) {
- DECLARE_TOOL( TruthDressingTool )
- DECLARE_TOOL( TruthIsolationTool )
- DECLARE_TOOL( MenuTruthThinning )
- DECLARE_TOOL( GenericTruthThinning )
- DECLARE_TOOL( TruthCollectionMaker )
- DECLARE_TOOL( TruthCollectionMakerTau )
- DECLARE_TOOL( TruthClassificationDecorator )
- DECLARE_ALGORITHM( CompactHardTruth )
- DECLARE_TOOL( HardTruthThinning )
- DECLARE_TOOL( HadronOriginDecorator )
- DECLARE_TOOL( HadronOriginClassifier )
-
-
-}
-
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/components/DerivationFrameworkMCTruth_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/components/DerivationFrameworkMCTruth_load.cxx
deleted file mode 100644
index 3bf8c3a7000152280e2310d247ed1c724f841daa..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/components/DerivationFrameworkMCTruth_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DerivationFrameworkMCTruth )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
index 1c46788fd00feee6981717eb23af7341e3fa9b6e..a046e393a84baf97b88e8c419db67816b422efd2 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DerivationFrameworkMuons/dimuonTaggingTool.h"
#include "DerivationFrameworkMuons/isolationDecorator.h"
#include "DerivationFrameworkMuons/mcpDecorator.h"
@@ -8,8 +7,3 @@ DECLARE_TOOL_FACTORY( dimuonTaggingTool )
DECLARE_TOOL_FACTORY( isolationDecorator )
DECLARE_TOOL_FACTORY( mcpDecorator )
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkMuons ) {
- DECLARE_TOOL( dimuonTaggingTool )
- DECLARE_TOOL( isolationDecorator )
- DECLARE_TOOL( mcpDecorator )
-}
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_load.cxx
deleted file mode 100644
index 53b825b33590ce8dab2de8e8f00036699858e014..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DerivationFrameworkMuons )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/src/components/DerivationFrameworkSUSY_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/src/components/DerivationFrameworkSUSY_entries.cxx
index 6477f481d9e3cecdfea16e6990c25ea8686fa3a9..1bf28972a8384cf14efcb725615a89e930862fb1 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/src/components/DerivationFrameworkSUSY_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/src/components/DerivationFrameworkSUSY_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "DerivationFrameworkSUSY/Truth3CollectionMaker.h"
#include "DerivationFrameworkSUSY/SUSYSignalTagger.h"
#include "DerivationFrameworkSUSY/SUSYGenFilterTool.h"
@@ -14,10 +12,3 @@ DECLARE_TOOL_FACTORY( SUSYGenFilterTool )
DECLARE_TOOL_FACTORY( TrackParticleCaloCellDecorator )
DECLARE_TOOL_FACTORY( trackIsolationDecorator )
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkSUSY ) {
- DECLARE_TOOL( Truth3CollectionMaker )
- DECLARE_TOOL( SUSYSignalTagger )
- DECLARE_TOOL( SUSYGenFilterTool )
- DECLARE_TOOL( TrackParticleCaloCellDecorator )
- DECLARE_TOOL( trackIsolationDecorator )
-}
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/src/components/DerivationFrameworkTau_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/src/components/DerivationFrameworkTau_entries.cxx
index b030e55abf783f5f0e26b901b297f01e6a9d284c..b469ff005d921c1a81909201b7a3e2bf0e217a1e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/src/components/DerivationFrameworkTau_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/src/components/DerivationFrameworkTau_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DerivationFrameworkTau/TauSelectionWrapper.h"
#include "DerivationFrameworkTau/TauTruthMatchingWrapper.h"
#include "DerivationFrameworkTau/TauPVRefitTool.h"
@@ -13,10 +12,3 @@ DECLARE_TOOL_FACTORY( TauPVRefitTool )
DECLARE_TOOL_FACTORY( TauPVTrkSelectionTool )
DECLARE_TOOL_FACTORY( TauOverlappingElectronLLHDecoratorWrapper )
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkTau ) {
- DECLARE_TOOL( TauSelectionWrapper )
- DECLARE_TOOL( TauTruthMatchingWrapper )
- DECLARE_TOOL( TauPVRefitTool )
- DECLARE_TOOL( TauPVTrkSelectionTool )
- DECLARE_TOOL( TauOverlappingElectronLLHDecoratorWrapper )
-}
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/src/components/DerivationFrameworkTau_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/src/components/DerivationFrameworkTau_load.cxx
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/components/DerivationFrameworkTools_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/components/DerivationFrameworkTools_entries.cxx
index 90f21b93252dfc5f1964d5a175abe8dc47e08d83..934902b490727ab0d057a373e394f7c089802ff6 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/components/DerivationFrameworkTools_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/components/DerivationFrameworkTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DerivationFrameworkTools/xAODStringSkimmingTool.h"
#include "DerivationFrameworkTools/NTUPStringSkimmingTool.h"
#include "DerivationFrameworkTools/InvariantMassTool.h"
@@ -23,16 +22,3 @@ DECLARE_TOOL_FACTORY( TriggerSkimmingTool )
DECLARE_TOOL_FACTORY( PrescaleTool )
DECLARE_TOOL_FACTORY( GenericObjectThinning )
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkTools ) {
- DECLARE_TOOL( xAODStringSkimmingTool )
- DECLARE_TOOL( NTUPStringSkimmingTool )
- DECLARE_TOOL( InvariantMassTool )
- DECLARE_TOOL( DeltaRTool )
- DECLARE_TOOL( AsgSelectionToolWrapper )
- DECLARE_TOOL( FilterCombinationAND )
- DECLARE_TOOL( FilterCombinationOR )
- DECLARE_TOOL( TriggerSkimmingTool )
- DECLARE_TOOL( PrescaleTool )
- DECLARE_TOOL( GenericObjectThinning )
-}
-
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/components/DerivationFrameworkTools_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/components/DerivationFrameworkTools_load.cxx
deleted file mode 100644
index 6ea6af82d57f60cea9ee62b3b67cad3fb58b2604..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/components/DerivationFrameworkTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DerivationFrameworkTools )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/src/components/DerivationFrameworkTop_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/src/components/DerivationFrameworkTop_entries.cxx
index 19abbe17d5f087760a5b482cfd3b42ba88b9620f..6f5734c5463ecbf035271b5e10d5dd27e60c8d9e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/src/components/DerivationFrameworkTop_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/src/components/DerivationFrameworkTop_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "DerivationFrameworkTop/TopHeavyFlavorFilterAugmentation.h"
#include "DerivationFrameworkTop/TTbarPlusHeavyFlavorFilterTool.h"
@@ -19,12 +17,3 @@ DECLARE_TOOL_FACTORY( BoostedHadTopAndTopPairFilterTool )
DECLARE_TOOL_FACTORY( JetMSVAugmentation )
DECLARE_TOOL_FACTORY( SV1TrackThinning )
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkTop ) {
-
- DECLARE_TOOL( TopHeavyFlavorFilterAugmentation )
- DECLARE_TOOL( BoostedHadTopAndTopPairFilterAugmentation )
- DECLARE_TOOL( DerivationFrameworkTop )
- DECLARE_TOOL( JetMSVAugmentation )
- DECLARE_TOOL( SV1TrackThinning )
-
-}
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/src/components/DerivationFrameworkTop_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/src/components/DerivationFrameworkTop_load.cxx
deleted file mode 100644
index cd84c4c1d2cbdcc9f982dadab02e1687db04b11d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkTop/src/components/DerivationFrameworkTop_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DerivationFrameworkTop )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/src/components/ElectronEfficiencyCorrection_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/src/components/ElectronEfficiencyCorrection_entries.cxx
index dc08ccb8bf3e49a51fef9f70a468e15373e33a70..0f1f13ecbc4008d95bfd0a66a36d0a2e0e95ddef 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/src/components/ElectronEfficiencyCorrection_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/src/components/ElectronEfficiencyCorrection_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ElectronEfficiencyCorrection/AsgElectronEfficiencyCorrectionTool.h"
#include "ElectronEfficiencyCorrection/ElectronChargeEfficiencyCorrectionTool.h"
#include "../testAthenaElectronAlg.h"
@@ -9,12 +7,3 @@ DECLARE_TOOL_FACTORY( CP::ElectronChargeEfficiencyCorrectionTool )
DECLARE_ALGORITHM_FACTORY( testAthenaElectronAlg )
-DECLARE_FACTORY_ENTRIES( ElectronEfficiencyCorrection )
-{
- DECLARE_ALGTOOL( AsgElectronEfficiencyCorrectionTool )
- DECLARE_ALGTOOL( CP::ElectronChargeEfficiencyCorrectionTool )
- DECLARE_ALGTOOL( testAthenaElectronAlg )
-}
-
-
-
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/src/components/ElectronEfficiencyCorrection_load.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/src/components/ElectronEfficiencyCorrection_load.cxx
deleted file mode 100644
index a276f89cdfb137d20180abb748306cf51ef2ed79..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/src/components/ElectronEfficiencyCorrection_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ElectronEfficiencyCorrection)
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/components/ElectronPhotonFourMomentumCorrection_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/components/ElectronPhotonFourMomentumCorrection_entries.cxx
index c3ee5303556ca2028386d6218a43d001eb6c6d50..18a4b975da36ce8d541c296a06b3c10ddf2a256e 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/components/ElectronPhotonFourMomentumCorrection_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/components/ElectronPhotonFourMomentumCorrection_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h"
#include "../testAthenaEgammaCalibTool.h"
#include "../CalibratedEgammaProvider.h"
@@ -12,9 +11,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY(CP,CalibratedEgammaProvider)
#include "../dumpAllSystematics.h"
DECLARE_ALGORITHM_FACTORY( DumpAllSystematics )
-DECLARE_FACTORY_ENTRIES( ElectronPhotonFourMomentumCorrection ){
- DECLARE_ALGORITHM( DumpAllSystematics );
- DECLARE_NAMESPACE_TOOL( CP, EgammaCalibrationAndSmearingTool )
- DECLARE_ALGORITHM( testAthenaEgammaCalibTool )
- DECLARE_NAMESPACE_ALGORITHM(CP, CalibratedEgammaProvider)
-}
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/components/ElectronPhotonFourMomentumCorrection_load.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/components/ElectronPhotonFourMomentumCorrection_load.cxx
deleted file mode 100644
index c5db2c71b2a1530a11e9efeec83a00c5ea89242b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/src/components/ElectronPhotonFourMomentumCorrection_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ElectronPhotonFourMomentumCorrection )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_entries.cxx
index afe525d7ed7ed9bae917ce04e974bd5d4e952f0b..c8198a406ecef6f61f52d35a5b31e038ba41df77 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ElectronPhotonSelectorTools/AsgElectronIsEMSelector.h"
#include "ElectronPhotonSelectorTools/AsgElectronMultiLeptonSelector.h"
#include "ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h"
@@ -15,14 +14,3 @@ DECLARE_TOOL_FACTORY( AsgForwardElectronIsEMSelector )
DECLARE_TOOL_FACTORY( EGammaAmbiguityTool )
DECLARE_TOOL_FACTORY( AsgElectronChargeIDSelectorTool )
-DECLARE_FACTORY_ENTRIES( ElectronPhotonSelectorTools )
-{
- DECLARE_ALGTOOL( AsgElectronIsEMSelector )
- DECLARE_ALGTOOL( AsgElectronMultiLeptonSelector )
- DECLARE_ALGTOOL( AsgElectronLikelihoodTool )
- DECLARE_ALGTOOL( AsgPhotonIsEMSelector )
- DECLARE_ALGTOOL( AsgForwardElectronIsEMSelector )
- DECLARE_ALGTOOL( EGammaAmbiguityTool )
-}
-
-
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_load.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_load.cxx
deleted file mode 100644
index c7ee36c23cb1db8fdb762663f7cb484e835e4a99..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ElectronPhotonSelectorTools)
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/src/components/ElectronPhotonShowerShapeFudgeTool_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/src/components/ElectronPhotonShowerShapeFudgeTool_entries.cxx
index 44a51c82eda47bca9afdf981351fd231d5004811..8bf6a33722421903deece8272d260759eddd3db4 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/src/components/ElectronPhotonShowerShapeFudgeTool_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/src/components/ElectronPhotonShowerShapeFudgeTool_entries.cxx
@@ -1,13 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "ElectronPhotonShowerShapeFudgeTool/ElectronPhotonShowerShapeFudgeTool.h"
DECLARE_TOOL_FACTORY( ElectronPhotonShowerShapeFudgeTool )
-
-DECLARE_FACTORY_ENTRIES( ElectronPhotonSelectorTools )
-{
- DECLARE_ALGTOOL( ElectronPhotonShowerShapeFudgeTool )
-}
-
-
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/src/components/ElectronPhotonShowerShapeFudgeTool_load.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/src/components/ElectronPhotonShowerShapeFudgeTool_load.cxx
deleted file mode 100644
index 5470e40a64fcbc7546b3e86b9ddd517bfdc8b2eb..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonShowerShapeFudgeTool/src/components/ElectronPhotonShowerShapeFudgeTool_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(ElectronPhotonShowerShapeFudgeTool)
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/components/ElectronPhotonTagTools_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/components/ElectronPhotonTagTools_entries.cxx
old mode 100755
new mode 100644
index 81e1bc14eb413a4f761166cd47f8ab32b36d029e..e09062ac92c46c4c4bf28de69f6f8e3486d7fd14
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/components/ElectronPhotonTagTools_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/components/ElectronPhotonTagTools_entries.cxx
@@ -2,16 +2,9 @@
#include "ElectronPhotonTagTools/EgammaTagTool.h"
#include "ElectronPhotonTagTools/PhotonTagTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( EgammaTagTool )
DECLARE_TOOL_FACTORY( ElectronTagTool )
DECLARE_TOOL_FACTORY( PhotonTagTool )
-DECLARE_FACTORY_ENTRIES( ElectronPhotonTagTools ) {
- DECLARE_TOOL( EgammaTagTool )
- DECLARE_TOOL( ElectronTagTool )
- DECLARE_TOOL( PhotonTagTool )
-}
-
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/components/ElectronPhotonTagTools_load.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/components/ElectronPhotonTagTools_load.cxx
deleted file mode 100755
index d14e14342bf658df53373281b253df024c393d2d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/components/ElectronPhotonTagTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( ElectronPhotonTagTools )
-
-
diff --git a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/src/components/IsolationCorrections_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/src/components/IsolationCorrections_entries.cxx
index 7b560bca8f02608d460befffb4805f5590cd42f0..9054874c4be848d5c566c02c66f979d50b532380 100644
--- a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/src/components/IsolationCorrections_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/src/components/IsolationCorrections_entries.cxx
@@ -1,11 +1,4 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "IsolationCorrections/IsolationCorrectionTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( CP, IsolationCorrectionTool )
-DECLARE_FACTORY_ENTRIES( IsolationCorrections) {
- DECLARE_NAMESPACE_TOOL( CP, IsolationCorrectionTool )
-}
diff --git a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/src/components/IsolationCorrections_load.cxx b/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/src/components/IsolationCorrections_load.cxx
deleted file mode 100644
index 2cc5ae9b0611ac7613e7402074702c926114ac8b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/ElectronPhotonID/IsolationCorrections/src/components/IsolationCorrections_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( IsolationCorrections)
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/src/components/PhotonEfficiencyCorrection_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/src/components/PhotonEfficiencyCorrection_entries.cxx
index 965a745e060426cd94ceaa6c4b73ffa9dcc7e6fa..16931998bf3a66ffad894a1c3ab911ee5615b9d7 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/src/components/PhotonEfficiencyCorrection_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/src/components/PhotonEfficiencyCorrection_entries.cxx
@@ -1,7 +1,3 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "PhotonEfficiencyCorrection/AsgPhotonEfficiencyCorrectionTool.h"
#include "../testAthenaPhotonAlg.h"
@@ -10,9 +6,3 @@ DECLARE_TOOL_FACTORY( AsgPhotonEfficiencyCorrectionTool )
DECLARE_ALGORITHM_FACTORY( testAthenaPhotonAlg )
-DECLARE_FACTORY_ENTRIES( PhotonEfficiencyCorrection )
-{
- DECLARE_TOOL( AsgPhotonEfficiencyCorrectionTool )
- DECLARE_ALGORITHM( testAthenaPhotonAlg )
-
-}
\ No newline at end of file
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/src/components/PhotonEfficiencyCorrection_load.cxx b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/src/components/PhotonEfficiencyCorrection_load.cxx
deleted file mode 100644
index 7a66e563646b86a194c48f39b4bc4ce7341cea65..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/src/components/PhotonEfficiencyCorrection_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(PhotonEfficiencyCorrection)
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/src/components/PhotonVertexSelection_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/src/components/PhotonVertexSelection_entries.cxx
index a0f1052c8aeffe8310f64c7a1807664b7206223e..cf4e58806b1e16ccb9070d50fd48a61b59b89c74 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/src/components/PhotonVertexSelection_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/src/components/PhotonVertexSelection_entries.cxx
@@ -1,7 +1,3 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "PhotonVertexSelection/PhotonVertexSelectionTool.h"
#include "PhotonVertexSelection/ElectronRemovalTool.h"
#include "PhotonVertexSelection/PhotonPointingTool.h"
@@ -12,11 +8,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY(CP, ElectronRemovalTool)
DECLARE_NAMESPACE_TOOL_FACTORY(CP, PhotonPointingTool)
DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, PhotonVertexSelectionAlg )
-DECLARE_FACTORY_ENTRIES(PhotonVertexSelection) {
-
- DECLARE_NAMESPACE_TOOL(CP, PhotonVertexSelectionTool)
- DECLARE_NAMESPACE_TOOL(CP, ElectronRemovalTool)
- DECLARE_NAMESPACE_TOOL(CP, PhotonPointingTool)
- DECLARE_NAMESPACE_ALGORITHM( CP, PhotonVertexSelectionAlg )
-
-}
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/src/components/PhotonVertexSelection_load.cxx b/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/src/components/PhotonVertexSelection_load.cxx
deleted file mode 100644
index 50a7acfbe9e2321f0d343f57b9422a64230a3d72..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection/src/components/PhotonVertexSelection_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES(PhotonVertexSelection)
diff --git a/PhysicsAnalysis/EventTag/EventTagAlgs/src/components/EventTagBuilder_entries.cxx b/PhysicsAnalysis/EventTag/EventTagAlgs/src/components/EventTagBuilder_entries.cxx
old mode 100755
new mode 100644
index a0398660fc5baf0ff6cb10b010442525b771a98d..37807fa45768ed42b70ef7fd9c626026cac9deaf
--- a/PhysicsAnalysis/EventTag/EventTagAlgs/src/components/EventTagBuilder_entries.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagAlgs/src/components/EventTagBuilder_entries.cxx
@@ -11,7 +11,6 @@
#include "EventTagAlgs/EventSplitter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( AnalysisTagBuilder )
DECLARE_ALGORITHM_FACTORY( RawInfoSummaryTagBuilder )
@@ -27,18 +26,3 @@ DECLARE_ALGORITHM_FACTORY( MissingETTagBuilder )
DECLARE_ALGORITHM_FACTORY( EventSplitter )
-DECLARE_FACTORY_ENTRIES( EventTagAlgs ) {
-
- DECLARE_ALGORITHM( AnalysisTagBuilder )
- DECLARE_ALGORITHM( RawInfoSummaryTagBuilder )
- DECLARE_ALGORITHM( ElectronTagBuilder )
- DECLARE_ALGORITHM( GlobalEventTagBuilder )
- DECLARE_ALGORITHM( GlobalTriggerTagBuilder )
- DECLARE_ALGORITHM( MuonTagBuilder )
- DECLARE_ALGORITHM( PhotonTagBuilder )
- DECLARE_ALGORITHM( TauJetTagBuilder )
- DECLARE_ALGORITHM( ParticleJetTagBuilder )
- DECLARE_ALGORITHM( MissingETTagBuilder )
-
- DECLARE_ALGORITHM( EventSplitter )
-}
diff --git a/PhysicsAnalysis/EventTag/EventTagAlgs/src/components/EventTagBuilder_load.cxx b/PhysicsAnalysis/EventTag/EventTagAlgs/src/components/EventTagBuilder_load.cxx
deleted file mode 100755
index 7b5d1211b22e7791082a0d8de0bf20808ea7c2cd..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventTagAlgs/src/components/EventTagBuilder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( EventTagAlgs )
diff --git a/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/components/EventTagRawAlgs_entries.cxx b/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/components/EventTagRawAlgs_entries.cxx
old mode 100755
new mode 100644
index 7527178eea09ef183f173748d76c1256f369dac6..7972bf625d3a7087a58b16b9befe9bd72cda3e4d
--- a/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/components/EventTagRawAlgs_entries.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/components/EventTagRawAlgs_entries.cxx
@@ -1,8 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "EventTagRawAlgs/RawInfoSummaryForTagWriter.h"
DECLARE_ALGORITHM_FACTORY( RawInfoSummaryForTagWriter )
-DECLARE_FACTORY_ENTRIES( EventTagRawAlgs ) {
- DECLARE_ALGORITHM( RawInfoSummaryForTagWriter )
-}
+
diff --git a/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/components/EventTagRawAlgs_load.cxx b/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/components/EventTagRawAlgs_load.cxx
deleted file mode 100755
index d04f887a3dddbad0ff65d89043c7d1de1628b294..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventTagRawAlgs/src/components/EventTagRawAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(EventTagRawAlgs)
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/components/EventTagUtils_entries.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/components/EventTagUtils_entries.cxx
old mode 100755
new mode 100644
index 95fa11dc3cccb52154000841bc82812c67e17a20..624785ce87d846745182d3fa1712956c7ca2c211
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/components/EventTagUtils_entries.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/src/components/EventTagUtils_entries.cxx
@@ -6,7 +6,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( RawInfoSummaryForTagTool )
DECLARE_TOOL_FACTORY( EventInfoTagTool )
@@ -14,13 +13,4 @@ DECLARE_TOOL_FACTORY( GlobalEventTagTool )
DECLARE_TOOL_FACTORY( GlobalTriggerTagTool )
DECLARE_ALGORITHM_FACTORY( RegistrationStreamTrig )
-DECLARE_FACTORY_ENTRIES( EventTagUtils ) {
- DECLARE_TOOL( RawInfoSummaryForTagTool )
- DECLARE_TOOL( EventInfoTagTool )
- DECLARE_TOOL( GlobalEventTagTool )
- DECLARE_TOOL( GlobalTriggerTagTool )
- DECLARE_ALGORITHM( RegistrationStreamTrig )
-}
-
-
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/components/EventTagUtils_load.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/components/EventTagUtils_load.cxx
deleted file mode 100755
index f0cf3ccee5b3c60975d2a33d9c00ccb01cf8e643..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/components/EventTagUtils_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( EventTagUtils )
-
-
-
-
diff --git a/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/components/ExoticPhysTagTools_entries.cxx b/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/components/ExoticPhysTagTools_entries.cxx
old mode 100755
new mode 100644
index f0e8844df2afab3bd6c670f02bd1651a38f6bda3..37c34efb7d3331af31a3532dd3a44f8f611df97c
--- a/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/components/ExoticPhysTagTools_entries.cxx
+++ b/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/components/ExoticPhysTagTools_entries.cxx
@@ -1,12 +1,6 @@
#include "ExoticPhysTagTools/ExoticPhysTagTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( ExoticPhysTagTool )
-DECLARE_FACTORY_ENTRIES( ExoticPhysTagTools ) {
- DECLARE_TOOL( ExoticPhysTagTool )
-}
-
-
diff --git a/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/components/ExoticPhysTagTools_load.cxx b/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/components/ExoticPhysTagTools_load.cxx
deleted file mode 100755
index 8379161783a98d84b63ce00b29408b7e299ebfa5..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/components/ExoticPhysTagTools_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( ExoticPhysTagTools )
-
-
-
-
diff --git a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/src/components/HIEventUtils_entries.cxx b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/src/components/HIEventUtils_entries.cxx
old mode 100755
new mode 100644
index de012d247ebe91a0f0802687a94628e2ca4c7174..43a8e12d74422ffc299ad2236afe171636a788b0
--- a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/src/components/HIEventUtils_entries.cxx
+++ b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/src/components/HIEventUtils_entries.cxx
@@ -1,10 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "HIEventUtils/HIEventShapeSummaryTool.h"
DECLARE_TOOL_FACTORY(HIEventShapeSummaryTool)
-DECLARE_FACTORY_ENTRIES( HIEventUtils ) {
- DECLARE_TOOL(HIEventShapeSummaryTool)
-}
-
diff --git a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/src/components/HIEventUtils_load.cxx b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/src/components/HIEventUtils_load.cxx
deleted file mode 100755
index dcd1c942c22bbfc84e956928fd0c2678909b18a4..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/src/components/HIEventUtils_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( HIEventUtils )
-
-
diff --git a/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/components/HeavyIonPhysTagTools_entries.cxx b/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/components/HeavyIonPhysTagTools_entries.cxx
old mode 100755
new mode 100644
index 72f9b348db69b91b224c3b4b887f3df7d58edfa6..6c367729df01b289d662f1019cfa20ea866f414c
--- a/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/components/HeavyIonPhysTagTools_entries.cxx
+++ b/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/components/HeavyIonPhysTagTools_entries.cxx
@@ -1,11 +1,6 @@
#include "HeavyIonPhysTagTools/HeavyIonPhysTagTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( HeavyIonPhysTagTool )
-DECLARE_FACTORY_ENTRIES( HeavyIonPhysTagTools ) {
- DECLARE_TOOL( HeavyIonPhysTagTool )
-}
-
diff --git a/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/components/HeavyIonPhysTagTools_load.cxx b/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/components/HeavyIonPhysTagTools_load.cxx
deleted file mode 100755
index 436078c292a52d9ffa6eec26849a196dbd173949..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/components/HeavyIonPhysTagTools_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( HeavyIonPhysTagTools )
-
-
-
-
diff --git a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/src/components/HSG5DPDUtils_entries.cxx b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/src/components/HSG5DPDUtils_entries.cxx
index e7de69d24f8edd138ab04ecfe663f146060c3837..103cf3f1aaa38f9060658052c32fc6e7eb107c50 100644
--- a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/src/components/HSG5DPDUtils_entries.cxx
+++ b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/src/components/HSG5DPDUtils_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "HSG5DPDUtils/LeptonFilter.h"
#include "HSG5DPDUtils/LeptonJetsFilter.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( HSG5, LeptonFilter )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( HSG5, LeptonJetsFilter )
-DECLARE_FACTORY_ENTRIES(HSG5DPDUtils) {
- DECLARE_NAMESPACE_ALGORITHM( HSG5, LeptonFilter );
- DECLARE_NAMESPACE_ALGORITHM( HSG5, LeptonJetsFilter );
-}
diff --git a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/src/components/HSG5DPDUtils_load.cxx b/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/src/components/HSG5DPDUtils_load.cxx
deleted file mode 100644
index 8bc720b4f23f679ae66c305f34771626a10cf8d4..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils/src/components/HSG5DPDUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(HSG5DPDUtils)
diff --git a/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/components/HiggsPhysTagTools_entries.cxx b/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/components/HiggsPhysTagTools_entries.cxx
old mode 100755
new mode 100644
index 00aa8831d31f50dd4fde39c143f164fbcce39318..e474a5ece57eb5c2d765ff2b23373fcd3561a493
--- a/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/components/HiggsPhysTagTools_entries.cxx
+++ b/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/components/HiggsPhysTagTools_entries.cxx
@@ -1,12 +1,6 @@
#include "HiggsPhysTagTools/HiggsPhysTagTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( HiggsPhysTagTool )
-DECLARE_FACTORY_ENTRIES( HiggsPhysTagTools ) {
- DECLARE_TOOL( HiggsPhysTagTool )
-}
-
-
diff --git a/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/components/HiggsPhysTagTools_load.cxx b/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/components/HiggsPhysTagTools_load.cxx
deleted file mode 100755
index 6c7980d490c92050545038beab273ac7128c57f7..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/components/HiggsPhysTagTools_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( HiggsPhysTagTools )
-
-
-
-
diff --git a/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/src/components/ZMassConstraint_entries.cxx b/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/src/components/ZMassConstraint_entries.cxx
index 4cff64b7f51542569e994597647fa2f8daa4f39b..00333110e051aa889bbfd4de205d866766250e69 100644
--- a/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/src/components/ZMassConstraint_entries.cxx
+++ b/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/src/components/ZMassConstraint_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "ZMassConstraint/ConstraintFit.h"
#include "../TestAthenaConstraintFit.h"
DECLARE_NAMESPACE_TOOL_FACTORY( ZMassConstraint, ConstraintFit )
DECLARE_ALGORITHM_FACTORY( TestAthenaConstraintFit )
-
-DECLARE_FACTORY_ENTRIES( ElectronPhotonFourMomentumCorrection ){
- DECLARE_NAMESPACE_TOOL( ZMassConstraint, ConstraintFit )
- DECLARE_ALGORITHM( TestAthenaConstraintFit )
-}
diff --git a/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/src/components/ZMassConstraint_load.cxx b/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/src/components/ZMassConstraint_load.cxx
deleted file mode 100644
index be090a436a97d97c2c6fa79b892dcaa241472c7f..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/src/components/ZMassConstraint_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ZMassConstraint )
diff --git a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/components/JetMissingEtTagTools_entries.cxx b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/components/JetMissingEtTagTools_entries.cxx
old mode 100755
new mode 100644
index ffc8e946636bc66a74b4a3882ab1cf10f9fa3d08..d61b06f7c9bc3619ff63e10275d6c4c167aa8553
--- a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/components/JetMissingEtTagTools_entries.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/components/JetMissingEtTagTools_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "JetMissingEtTagTools/JetMissingEtIdentificationTagTool.h"
#include "JetMissingEtTagTools/JetMissingEtTagTool.h"
@@ -7,8 +5,4 @@
DECLARE_TOOL_FACTORY( JetMissingEtIdentificationTagTool )
DECLARE_TOOL_FACTORY( JetMetTagTool )
-DECLARE_FACTORY_ENTRIES( JetMissingEtTagTools ) {
- DECLARE_TOOL( JetMissingEtIdentificationTagTool )
- DECLARE_TOOL( JetMetTagTool )
-}
diff --git a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/components/JetMissingEtTagTools_load.cxx b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/components/JetMissingEtTagTools_load.cxx
deleted file mode 100755
index f4b0ab79548d1bd96ad2f8abfbb77c14b4a53e51..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/components/JetMissingEtTagTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( JetMissingEtTagTools )
-
-
diff --git a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/src/components/JetSelectorTools_entries.cxx b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/src/components/JetSelectorTools_entries.cxx
index ceb2a64492c39fd066e4202e1e7e07eaa15d64c6..145c4b95d8c818166fd6eb7683347da2558c659e 100644
--- a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/src/components/JetSelectorTools_entries.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/src/components/JetSelectorTools_entries.cxx
@@ -1,12 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "JetSelectorTools/JetCleaningTool.h"
DECLARE_TOOL_FACTORY( JetCleaningTool )
-DECLARE_FACTORY_ENTRIES( JetSelectorTools )
-{
- DECLARE_TOOL( JetCleaningTool );
-}
-
-
diff --git a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/src/components/JetSelectorTools_load.cxx b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/src/components/JetSelectorTools_load.cxx
deleted file mode 100644
index ec37ac93b29eb850d3595ea6fffdf8399101dd4f..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/src/components/JetSelectorTools_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(JetSelectorTools)
diff --git a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/components/MissingEtDQA_entries.cxx b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/components/MissingEtDQA_entries.cxx
index c6996319783ae1adb4309cb74e05f5471ef8c8e0..aeab8b85ec9b35f6b538d0d500ff5de0f5249231 100644
--- a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/components/MissingEtDQA_entries.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/components/MissingEtDQA_entries.cxx
@@ -1,14 +1,4 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "../PhysValMET.h"
DECLARE_NAMESPACE_TOOL_FACTORY( MissingEtDQA, PhysValMET )
-DECLARE_FACTORY_ENTRIES( MissingEtDQA ) {
-
- DECLARE_NAMESPACE_TOOL( MissingEtDQA, PhysValMET )
-
-}
-
diff --git a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/components/MissingEtDQA_load.cxx b/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/components/MissingEtDQA_load.cxx
deleted file mode 100644
index e49044e55b524033e0e5f8c880c51ad16bd65dfe..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetMissingEtID/MissingEtDQA/src/components/MissingEtDQA_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( MissingEtDQA )
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/components/BTagging_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/components/BTagging_entries.cxx
old mode 100755
new mode 100644
index 5b4517841216c02600e78f87234e07f693b32dc2..f753e432170f3a72a43441e9c095084c40e85c6d
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/components/BTagging_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/components/BTagging_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
//#include "BTagging/BJetBuilder.h"
//#include "BTagging/BJetBuilderFast.h"
#include "BTagging/BTagTool.h"
@@ -24,16 +23,4 @@ DECLARE_TOOL_FACTORY( BTagTool )
DECLARE_TOOL_FACTORY( JetBTaggerTool )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( BTagging )
-{
-// DECLARE_ALGORITHM( BJetBuilder );
-// DECLARE_ALGORITHM( BJetBuilderFast );
- DECLARE_ALGORITHM( StandAloneJetBTaggerAlg );
- DECLARE_TOOL( BTagLabeling );
- DECLARE_TOOL( BTagTrackAssociation );
- DECLARE_TOOL( BTagSecVertexing );
- DECLARE_TOOL( BTagJetPtScaling );
-// DECLARE_TOOL( BTagRemoving );
- DECLARE_TOOL( BTagTool );
- DECLARE_TOOL( JetBTaggerTool );
-}
+
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/components/BTagging_load.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/components/BTagging_load.cxx
deleted file mode 100755
index dae4f965658c5c59c82f36262319519dbb6920aa..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/components/BTagging_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( BTagging )
-
-
diff --git a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/components/JetTagCalibration_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/components/JetTagCalibration_entries.cxx
old mode 100755
new mode 100644
index 6627578d8be75cf62949f5ff850af738dbec63e2..4ecec38d25335ef84ad2c1c29ec347cab1a6d8d3
--- a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/components/JetTagCalibration_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/components/JetTagCalibration_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "JetTagCalibration/CalibrationBroker.h"
using namespace Analysis ;
DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, CalibrationBroker )
-/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( JetTagCalibration )
-{
- DECLARE_NAMESPACE_TOOL( Analysis, CalibrationBroker );
-}
diff --git a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/components/JetTagCalibration_load.cxx b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/components/JetTagCalibration_load.cxx
deleted file mode 100755
index 3398887c87b9b3f81563c5f0e10081e212f4dca9..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/components/JetTagCalibration_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( JetTagCalibration )
-
-
diff --git a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/components/JetTagMonitoring_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/components/JetTagMonitoring_entries.cxx
old mode 100755
new mode 100644
index 0b1cb9e4a01bebd2780396daeb862652a458ac9d..61440af014c7c1f7171f849b45ae63462d22bec7
--- a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/components/JetTagMonitoring_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/components/JetTagMonitoring_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "JetTagMonitoring/JetTagMonitoring.h"
DECLARE_TOOL_FACTORY( JetTagMonitoring )
-DECLARE_FACTORY_ENTRIES( JetTagMonitoring ) {
-
- DECLARE_ALGTOOL( JetTagMonitoring )
-
-}
diff --git a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/components/JetTagMonitoring_load.cxx b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/components/JetTagMonitoring_load.cxx
deleted file mode 100755
index e6e758a909385ec7b8d2531b7d341ecad8d4a321..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/components/JetTagMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( JetTagMonitoring )
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/src/components/CalibrationDataInterface_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/src/components/CalibrationDataInterface_entries.cxx
index fc6a63550be9ca8ccdad6211d25b6cf9eecbf87f..8a836da9239aa4adcf32b050b50479a2ab1d45e9 100644
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/src/components/CalibrationDataInterface_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/src/components/CalibrationDataInterface_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "CalibrationDataInterface/CalibrationDataInterfaceTool.h"
#include "CalibrationDataInterface/CalibrationDataUpdater.h"
#include "CalibrationDataInterface/CalibrationDataInterfaceTester.h"
@@ -7,10 +6,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( Analysis, CalibrationDataUpdater )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Analysis, CalibrationDataInterfaceTester )
DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, CalibrationDataInterfaceTool )
-DECLARE_FACTORY_ENTRIES( CalibrationDataInterface )
-{
- DECLARE_NAMESPACE_ALGORITHM( Analysis, CalibrationDataUpdater )
- DECLARE_NAMESPACE_ALGORITHM( Analysis, CalibrationDataInterfaceTester )
- DECLARE_NAMESPACE_TOOL( Analysis, CalibrationDataInterfaceTool )
-}
-
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/src/components/CalibrationDataInterface_load.cxx b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/src/components/CalibrationDataInterface_load.cxx
deleted file mode 100644
index f238a66b4b86048ed6a77eb6f827f0aabb886811..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/src/components/CalibrationDataInterface_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CalibrationDataInterface )
-
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/src/components/xAODBTaggingEfficiency_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/src/components/xAODBTaggingEfficiency_entries.cxx
index 90f112221489f7d85eccbbfb4f88c85ffc66d58a..8e937228c0e03ea7db08bc8203c18a111b559a45 100644
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/src/components/xAODBTaggingEfficiency_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/src/components/xAODBTaggingEfficiency_entries.cxx
@@ -1,7 +1,3 @@
-// $Id$
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "xAODBTaggingEfficiency/BTaggingEfficiencyTool.h"
#include "xAODBTaggingEfficiency/BTaggingSelectionTool.h"
@@ -13,10 +9,3 @@ DECLARE_TOOL_FACTORY( BTaggingSelectionTool)
DECLARE_ALGORITHM_FACTORY( BTagToolTester )
-DECLARE_FACTORY_ENTRIES( xAODBTaggingEfficiency ) {
-
- DECLARE_TOOL(BTaggingEfficiencyTool )
- DECLARE_TOOL(BTaggingSelectionTool )
- DECLARE_ALGORITHM(BTagToolTester )
-
-}
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/src/components/xAODBTaggingEfficiency_load.cxx b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/src/components/xAODBTaggingEfficiency_load.cxx
deleted file mode 100644
index 0adb8170dceb72e10e4c2f8a9ee828a1604c85a3..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/src/components/xAODBTaggingEfficiency_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( xAODBTaggingEfficiency )
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/components/JetTagTools_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/components/JetTagTools_entries.cxx
index 796dfa0479e0a44926bedba981ee2dbf47157e09..2fce81144a4b4d15346e8f2cab9808669c32633f 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/src/components/JetTagTools_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/src/components/JetTagTools_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "JetTagTools/IPTag.h"
#include "JetTagTools/RNNIPTag.h"
#include "JetTagTools/SVTag.h"
@@ -35,9 +33,7 @@
#include "JetTagTools/ExKtbbTag.h"
#include "JetTagTools/ExKtbbTagTool.h"
-//
//#include "JetTagTools/SharedHitMapper.h"
-//
//#include "JetTagTools/EmulTag.h"
#include "JetTagTools/DummyTag.h"
@@ -95,52 +91,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, ExKtbbTagTool )
//DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, EmulTag )
DECLARE_NAMESPACE_TOOL_FACTORY( Analysis, DummyTag )
-/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( JetTagTools )
-{
- // DECLARE_NAMESPACE_TOOL( Analysis, LifetimeTag );
- // DECLARE_NAMESPACE_TOOL( Analysis, SecVtxTag );
- DECLARE_NAMESPACE_TOOL( Analysis, IPTag );
- DECLARE_NAMESPACE_TOOL( Analysis, SVTag );
- DECLARE_NAMESPACE_TOOL( Analysis, MultiSVTag );
- // DECLARE_NAMESPACE_TOOL( Analysis, JetProbTag );
- // DECLARE_NAMESPACE_TOOL( Analysis, SoftElectronTag );
- DECLARE_NAMESPACE_TOOL( Analysis, SoftMuonTag );
- // DECLARE_NAMESPACE_TOOL( Analysis, CombinerTool );
- // DECLARE_NAMESPACE_TOOL( Analysis, LikelihoodTool );
- // DECLARE_NAMESPACE_TOOL( Analysis, CombinerToolTag );
- // DECLARE_NAMESPACE_TOOL( Analysis, LikelihoodMultiDTool );
- DECLARE_NAMESPACE_TOOL( Analysis, NewLikelihoodTool );
- DECLARE_NAMESPACE_TOOL( Analysis, TrackSelector );
- DECLARE_NAMESPACE_TOOL( Analysis, JetFitterTag );
- DECLARE_NAMESPACE_TOOL( Analysis, JetFitterNtupleWriter );
- // DECLARE_NAMESPACE_TOOL( Analysis, JetFitterLikelihood );
- DECLARE_NAMESPACE_TOOL( Analysis, JetFitterVariablesFactory );
- DECLARE_NAMESPACE_TOOL( Analysis, MSVVariablesFactory );
- // DECLARE_NAMESPACE_TOOL( Analysis, JetFitterCharmVariablesFactory );
- // DECLARE_NAMESPACE_TOOL( Analysis, GaiaVariablesFactory );
- DECLARE_NAMESPACE_TOOL( Analysis, JetFitterNNTool );
- // DECLARE_NAMESPACE_TOOL( Analysis, JetFitterCharmNNTool );
- //DECLARE_NAMESPACE_TOOL( Analysis, GaiaNNTool );
- DECLARE_NAMESPACE_TOOL( Analysis, DL1Tag );
- DECLARE_NAMESPACE_TOOL( Analysis, TagNtupleDumper );
- DECLARE_NAMESPACE_TOOL( Analysis, MultivariateTagManager );
- DECLARE_NAMESPACE_TOOL( Analysis, SVForIPTool );
- DECLARE_NAMESPACE_TOOL( Analysis, BasicTrackGradeFactory );
- DECLARE_NAMESPACE_TOOL( Analysis, DetailedTrackGradeFactory );
- // DECLARE_NAMESPACE_TOOL( Analysis, TrackCounting );
- // DECLARE_NAMESPACE_TOOL( Analysis, GbbNNTag );
- // DECLARE_NAMESPACE_TOOL( Analysis, HadFlavorTag )
- DECLARE_NAMESPACE_TOOL( Analysis, MV1Tag );
- DECLARE_NAMESPACE_TOOL( Analysis, MV2Tag );
- DECLARE_NAMESPACE_TOOL( Analysis, MyTag );
- // DECLARE_NAMESPACE_TOOL( Analysis, MV3Tag );
- DECLARE_NAMESPACE_TOOL( Analysis, JetVertexCharge );
- DECLARE_NAMESPACE_TOOL( Analysis, ExKtbbTag );
- DECLARE_NAMESPACE_TOOL( Analysis, ExKtbbTagTool );
- // //
- // DECLARE_ALGORITHM( SharedHitMapper );
- // //
- // DECLARE_NAMESPACE_TOOL( Analysis, EmulTag );
- DECLARE_NAMESPACE_TOOL( Analysis, DummyTag );
-}
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/components/JetTagTools_load.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/components/JetTagTools_load.cxx
deleted file mode 100644
index 071382318a7bb5048f531a34274895fd84964117..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetTagging/JetTagTools/src/components/JetTagTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( JetTagTools )
-
-
diff --git a/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/components/JetTagDQA_entries.cxx b/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/components/JetTagDQA_entries.cxx
index 7d7e8d3f7032eec9c140f8241e16ad83812626ac..3bb99f238d18aff6da7c2d5f4249b9328cc47394 100644
--- a/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/components/JetTagDQA_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/components/JetTagDQA_entries.cxx
@@ -1,13 +1,4 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "../PhysValBTag.h"
DECLARE_NAMESPACE_TOOL_FACTORY( JetTagDQA, PhysValBTag )
-DECLARE_FACTORY_ENTRIES( JetTagDQA ) {
-
- DECLARE_NAMESPACE_TOOL( JetTagDQA, PhysValBTag )
-
-}
diff --git a/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/components/JetTagDQA_load.cxx b/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/components/JetTagDQA_load.cxx
deleted file mode 100644
index 0612358d39c79677639747915d510023c6d29ee9..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetTagging/JetTagValidation/JetTagDQA/src/components/JetTagDQA_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( JetTagDQA )
diff --git a/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/components/JetTaggingTagTools_entries.cxx b/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/components/JetTaggingTagTools_entries.cxx
old mode 100755
new mode 100644
index 364597012e06ad3a3c42f8906a88efcdbd0d795e..3850fd0834c51545c4ad20e2a365b8d44999c66d
--- a/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/components/JetTaggingTagTools_entries.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/components/JetTaggingTagTools_entries.cxx
@@ -1,12 +1,6 @@
#include "JetTaggingTagTools/JetTaggingTagTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( JetTaggingTagTool )
-DECLARE_FACTORY_ENTRIES( JetTaggingTagTools ) {
- DECLARE_TOOL( JetTaggingTagTool )
-}
-
-
diff --git a/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/components/JetTaggingTagTools_load.cxx b/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/components/JetTaggingTagTools_load.cxx
deleted file mode 100755
index 6fe624736133ee2cbd7a9e8aae99f9150a30303a..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/components/JetTaggingTagTools_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( JetTaggingTagTools )
-
-
-
-
diff --git a/PhysicsAnalysis/JpsiUpsilonTools/src/components/JpsiUpsilonTools_entries.cxx b/PhysicsAnalysis/JpsiUpsilonTools/src/components/JpsiUpsilonTools_entries.cxx
index 70e9e45846e4dca5748ae995b59efd463318fe7f..e89d3c7bf6ca806d55b24807d110e5d76c65a2e2 100644
--- a/PhysicsAnalysis/JpsiUpsilonTools/src/components/JpsiUpsilonTools_entries.cxx
+++ b/PhysicsAnalysis/JpsiUpsilonTools/src/components/JpsiUpsilonTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "JpsiUpsilonTools/JpsiFinder.h"
#include "JpsiUpsilonTools/JpsiPlus1Track.h"
#include "JpsiUpsilonTools/JpsiPlus2Tracks.h"
@@ -23,16 +22,3 @@ DECLARE_ALGORITHM_FACTORY( JpsiExample )
//DECLARE_ALGORITHM_FACTORY( JpsiEEExample )
//DECLARE_ALGORITHM_FACTORY( JpsiJpsiEEExample )
-DECLARE_FACTORY_ENTRIES( JpsiUpsilonTools ) {
- DECLARE_ALGORITHM( JpsiAlg )
- //DECLARE_ALGORITHM( JpsiEEAlg )
- DECLARE_ALGORITHM( JpsiExample )
- //DECLARE_ALGORITHM( JpsiEEExample )
- //DECLARE_ALGORITHM( JpsiJpsiEEExample )
- DECLARE_TOOL( Analysis::JpsiFinder )
- DECLARE_TOOL( Analysis::JpsiPlus1Track )
- DECLARE_TOOL( Analysis::JpsiPlus2Tracks )
- //DECLARE_TOOL( Analysis::JpsiEEFinder )
- DECLARE_TOOL( Analysis::PrimaryVertexRefitter )
-}
-
diff --git a/PhysicsAnalysis/MCTruthClassifier/src/components/MCTruthClassifier_entries.cxx b/PhysicsAnalysis/MCTruthClassifier/src/components/MCTruthClassifier_entries.cxx
index 2be3bc9055fab389b910183a1a1e4675bff4788f..6b1e6fe6ef3ad4fa630693afd496f918bf36e03a 100644
--- a/PhysicsAnalysis/MCTruthClassifier/src/components/MCTruthClassifier_entries.cxx
+++ b/PhysicsAnalysis/MCTruthClassifier/src/components/MCTruthClassifier_entries.cxx
@@ -1,8 +1,4 @@
#include "MCTruthClassifier/MCTruthClassifier.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY ( MCTruthClassifier )
-DECLARE_FACTORY_ENTRIES(MCTruthClassifier) {
-DECLARE_TOOL ( MCTruthClassifier )
-}
diff --git a/PhysicsAnalysis/MCTruthClassifier/src/components/MCTruthClassifier_load.cxx b/PhysicsAnalysis/MCTruthClassifier/src/components/MCTruthClassifier_load.cxx
deleted file mode 100644
index 7dddcfbf0badd114ce2b38cab8d9333713ec73ca..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/MCTruthClassifier/src/components/MCTruthClassifier_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MCTruthClassifier)
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/src/components/MuonEfficiencyCorrections_entries.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/src/components/MuonEfficiencyCorrections_entries.cxx
index 1dc6e5db0af8a63adc71c744dc6cc7c65c93f4c4..fd457cb69c47fc0dba14b48d11907dde3be00bd8 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/src/components/MuonEfficiencyCorrections_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/src/components/MuonEfficiencyCorrections_entries.cxx
@@ -1,7 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "MuonEfficiencyCorrections/MuonEfficiencyScaleFactors.h"
#include "MuonEfficiencyCorrections/MuonTriggerScaleFactors.h"
@@ -19,15 +15,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, MuonEfficiencyCorrectionsProvider )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trig, TestTrigSF )
-DECLARE_FACTORY_ENTRIES( MuonEfficiencyCorrections ) {
-
- DECLARE_NAMESPACE_TOOL( CP, MuonEfficiencyScaleFactors )
-
- DECLARE_NAMESPACE_TOOL( CP, MuonTriggerScaleFactors )
-
- DECLARE_NAMESPACE_ALGORITHM( CP, MuonEfficiencyCorrections_TestAlg )
-
- DECLARE_NAMESPACE_ALGORITHM( CP, MuonEfficiencyCorrectionsProvider )
-
- DECLARE_NAMESPACE_ALGORITHM( Trig, TestTrigSF )
-}
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/src/components/MuonEfficiencyCorrections_load.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/src/components/MuonEfficiencyCorrections_load.cxx
deleted file mode 100644
index a490774da0e3061e2ef3c7d78253effe60c41a98..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/src/components/MuonEfficiencyCorrections_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( MuonEfficiencyCorrections)
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_entries.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_entries.cxx
index dfa980c1b5ca8d1652e028d47fbd0b96e1d04cb3..a98b39497443ab1ea9c99bc645088e09224ee13a 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_entries.cxx
@@ -1,7 +1,3 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "MuonMomentumCorrections/MuonCalibrationAndSmearingTool.h"
#include "../TestMCASTTool.h"
@@ -11,9 +7,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( CP, MuonCalibrationAndSmearingTool )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, TestMCASTTool )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( CP, CalibratedMuonsProvider )
-DECLARE_FACTORY_ENTRIES( MuonCalibrationAndSmearing ) {
- DECLARE_NAMESPACE_TOOL( CP, MuonCalibrationAndSmearingTool )
-
- DECLARE_NAMESPACE_ALGORITHM( CP, TestMCASTTool )
- DECLARE_NAMESPACE_ALGORITHM( CP, CalibratedMuonsProvider )
-}
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_load.cxx b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_load.cxx
deleted file mode 100644
index d7a10b104b0981f471b795aa13149bfd45571a62..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/src/components/MuonCalibrationAndSmearing_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( MuonCalibrationAndSmearing )
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonCalibrationFit/src/components/MuonCalibrationFit_entries.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonCalibrationFit/src/components/MuonCalibrationFit_entries.cxx
index 999fa2ae775071752036d67a8fc87f3ee9aac0e2..3f5c566794022264772861b01ed9e52f92711232 100644
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonCalibrationFit/src/components/MuonCalibrationFit_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonCalibrationFit/src/components/MuonCalibrationFit_entries.cxx
@@ -1,8 +1,4 @@
#include "MuonCalibrationFit/MuonCalibrationFit.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( MuonCalibrationFit )
-DECLARE_FACTORY_ENTRIES( MuonCalibrationFit ) {
- DECLARE_ALGORITHM( MuonCalibrationFit )
-}
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonCalibrationFit/src/components/MuonCalibrationFit_load.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonCalibrationFit/src/components/MuonCalibrationFit_load.cxx
deleted file mode 100644
index 4fe2656caf268f331bd183fa31e8f2f068d0b635..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonCalibrationFit/src/components/MuonCalibrationFit_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( MuonCalibrationFit )
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPerformanceAlgs/src/components/MuonPerformanceAlgs_entries.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPerformanceAlgs/src/components/MuonPerformanceAlgs_entries.cxx
index 98c63867b4fbbdbcd2a90c5a5b2cba12231e1abe..f19491ab6de95786612ff12e976e9818be9316ac 100644
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPerformanceAlgs/src/components/MuonPerformanceAlgs_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPerformanceAlgs/src/components/MuonPerformanceAlgs_entries.cxx
@@ -6,7 +6,6 @@
#include "../TrackIsolationDecorAlg.h"
#include "../MuonTPMetaDataAlg.h"
#include "../MuonTPJpsiVertexFittingAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(MuonTPAlg)
DECLARE_ALGORITHM_FACTORY(HighPtTrackPicker)
@@ -15,13 +14,3 @@ DECLARE_ALGORITHM_FACTORY(TrackIsolationDecorAlg)
DECLARE_ALGORITHM_FACTORY(MuonTPMetaDataAlg)
DECLARE_ALGORITHM_FACTORY(MuonTPJpsiVertexFittingAlg)
-
-DECLARE_FACTORY_ENTRIES(MuonPerformanceAlgs) {
- DECLARE_ALGORITHM(MuonTPMetaDataAlg );
- DECLARE_ALGORITHM(MuonTPAlg)
- DECLARE_ALGORITHM(MuonResonanceAlg)
- DECLARE_ALGORITHM(HighPtTrackPicker)
- DECLARE_ALGORITHM(TrackIsolationDecorAlg)
- DECLARE_ALGORITHM(MuonTPJpsiVertexFittingAlg)
-}
-
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPerformanceAlgs/src/components/MuonPerformanceAlgs_load.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPerformanceAlgs/src/components/MuonPerformanceAlgs_load.cxx
deleted file mode 100644
index 9bdce1b22e16fb69ab77435eceb20b138459e930..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPerformanceAlgs/src/components/MuonPerformanceAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// AsgExampleTools_load.cxx
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AsgExampleTools)
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/src/components/MuonPtCalibNtupleMaker_entries.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/src/components/MuonPtCalibNtupleMaker_entries.cxx
index c377fc69765a35a9e1fe9bb2aa3546bf68b92a27..48d3a66014378956f6d4e748c6129cad024c77b1 100644
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/src/components/MuonPtCalibNtupleMaker_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/src/components/MuonPtCalibNtupleMaker_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "MuonPtCalibNtupleMaker/CalibMuonsNtupleMaker.h"
#include "MuonPtCalibNtupleMaker/CalibMuonsSelectorTool.h"
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/src/components/MuonPtCalibNtupleMaker_load.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/src/components/MuonPtCalibNtupleMaker_load.cxx
deleted file mode 100644
index f7681b78acc2a3168b49b1e769d98c98ac16a92a..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonPtCalibNtupleMaker/src/components/MuonPtCalibNtupleMaker_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonPtCalibNtupleMaker )
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/src/components/MuonResonanceTools_entries.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/src/components/MuonResonanceTools_entries.cxx
index 8a55b75da8d019f6badb488f7c573e2e233012ff..e685dc181a4b9423d13be0ee67baef327b96c85c 100644
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/src/components/MuonResonanceTools_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/src/components/MuonResonanceTools_entries.cxx
@@ -1,6 +1,5 @@
// AsgExampleTools_entries.cxx
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "MuonResonanceTools/MuonResonanceTool.h"
#include "MuonResonanceTools/MuonResonanceSelectionTool.h"
@@ -11,11 +10,3 @@ DECLARE_TOOL_FACTORY(MuonResonanceTool)
DECLARE_TOOL_FACTORY(MuonResonanceSelectionTool)
DECLARE_TOOL_FACTORY(MuonResonancePairingTool)
-
-DECLARE_FACTORY_ENTRIES(MuonPerformanceTools) {
-
- DECLARE_TOOL(MuonResonanceTool)
- DECLARE_TOOL(MuonResonanceSelectionTool)
- DECLARE_TOOL(MuonResonancePairingTool)
-}
-
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/src/components/MuonResonanceTools_load.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/src/components/MuonResonanceTools_load.cxx
deleted file mode 100644
index d481398cd77c798044ed74bd1106c137a90ffd73..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/src/components/MuonResonanceTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// AsgExampleTools_load.cxx
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonResonanceTools)
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonTPTools/src/components/MuonTPTools_entries.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonTPTools/src/components/MuonTPTools_entries.cxx
index 53cd72799a40e5a18dccf2371fc2039a76404ce9..6c5ea6f3133d46145de2624c1b247c6a9ec7f629 100644
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonTPTools/src/components/MuonTPTools_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonTPTools/src/components/MuonTPTools_entries.cxx
@@ -22,7 +22,6 @@
#include "MuonTPTools/DiMuonTPTreeTool.h"
#include "MuonTPTools/MuonTPVertexHelper.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(MuonTPTool)
DECLARE_TOOL_FACTORY(MuonTPExtrapolationTool)
@@ -48,29 +47,9 @@ DECLARE_TOOL_FACTORY(DiMuonTPPlotTool)
// DECLARE_TOOL_FACTORY(MuonTPTreeTool)
DECLARE_TOOL_FACTORY(DiMuonTPTreeTool)
-DECLARE_FACTORY_ENTRIES(MuonTPTools) {
- DECLARE_TOOL(MuonTPTool)
- DECLARE_TOOL(MuonTPVertexHelper)
- DECLARE_TOOL(MuonTPExtrapolationTool)
- DECLARE_TOOL(IDTrackIsolationDecoratorTool)
- DECLARE_TOOL(IDTrackCaloDepositsDecoratorTool)
- DECLARE_TOOL(BadMuonVetoHelperTool)
- DECLARE_TOOL(MuonTPTrigUtils)
-// DECLARE_TOOL(MuonTPSelectionTool)
- DECLARE_TOOL(DiMuonTPSelectionTool)
- DECLARE_TOOL(HighPtSingleMuonSelectionTool)
-// DECLARE_TOOL(MuonTPEfficiencyTool)
- DECLARE_TOOL(MuonRecoTPEfficiencyTool)
- DECLARE_TOOL(MuonTrigTPEfficiencyTool)
- DECLARE_TOOL(MuonIsolTPEfficiencyTool)
-// DECLARE_TOOL(MuonTPPlotTool)
- DECLARE_TOOL(DiMuonTPPlotTool)
-// DECLARE_TOOL(MuonTPTreeTool)
- DECLARE_TOOL(DiMuonTPTreeTool)
-}
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonTPTools/src/components/MuonTPTools_load.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonTPTools/src/components/MuonTPTools_load.cxx
deleted file mode 100644
index 898756bb544dda447ac55608980caa2bed27d5c0..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonTPTools/src/components/MuonTPTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// MuonTPTools_load.cxx
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonTPTools)
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/src/components/MuonSelectorTools_entries.cxx b/PhysicsAnalysis/MuonID/MuonSelectorTools/src/components/MuonSelectorTools_entries.cxx
index 4f276d225a611ae5e607b5029b0d3cbbb3b17454..fcb7ee0804db550f124f93f0a554675b2bdf2126 100644
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/src/components/MuonSelectorTools_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonSelectorTools/src/components/MuonSelectorTools_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "MuonSelectorTools/MuonSelectionTool.h"
#include "../MuonSelectionAlg.h"
#include "../MuonQualityUpdaterAlg.h"
@@ -11,12 +9,5 @@ DECLARE_NAMESPACE_TOOL_FACTORY(CP, MuonSelectionTool )//DECLARE_TOOL_FACTORY( Mu
DECLARE_NAMESPACE_ALGORITHM_FACTORY(CP, MuonSelectionAlg )
DECLARE_NAMESPACE_ALGORITHM_FACTORY(CP, MuonQualityUpdaterAlg )
-DECLARE_FACTORY_ENTRIES( MuonSelectorTools )
-{
- DECLARE_NAMESPACE_ALGTOOL(CP,MuonSelectionTool)//DECLARE_ALGTOOL( CP::MuonSelectionTool )
- DECLARE_NAMESPACE_ALGORITHM( CP, MuonSelectionAlg )
- DECLARE_NAMESPACE_ALGORITHM( CP, MuonQualityUpdaterAlg )
-}
-
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/src/components/MuonSelectorTools_load.cxx b/PhysicsAnalysis/MuonID/MuonSelectorTools/src/components/MuonSelectorTools_load.cxx
deleted file mode 100644
index f56f4380949ca9a95b91542ca0292f8655bdd044..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/src/components/MuonSelectorTools_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(MuonSelectorTools)
diff --git a/PhysicsAnalysis/MuonID/MuonTagTools/src/components/MuonTagTools_entries.cxx b/PhysicsAnalysis/MuonID/MuonTagTools/src/components/MuonTagTools_entries.cxx
index 61108dda26d1f387ecbd219764775d83f4029e18..7ad97d987d4214255e4a15ba026d4efd2c451c01 100644
--- a/PhysicsAnalysis/MuonID/MuonTagTools/src/components/MuonTagTools_entries.cxx
+++ b/PhysicsAnalysis/MuonID/MuonTagTools/src/components/MuonTagTools_entries.cxx
@@ -1,13 +1,4 @@
#include "MuonTagTools/MuonTagTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
DECLARE_TOOL_FACTORY( MuonTagTool )
-DECLARE_FACTORY_ENTRIES( MuonTagTools ) {
- DECLARE_TOOL( MuonTagTool )
-}
-
-
-
-
diff --git a/PhysicsAnalysis/MuonID/MuonTagTools/src/components/MuonTagTools_load.cxx b/PhysicsAnalysis/MuonID/MuonTagTools/src/components/MuonTagTools_load.cxx
deleted file mode 100644
index de2bc680622754eeb3523dd96b47e3fe01b81f6e..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/MuonID/MuonTagTools/src/components/MuonTagTools_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( MuonTagTools )
-
-
-
-
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/components/PhysVal_entries.cxx b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/components/PhysVal_entries.cxx
index 05652cb95f2e2f54adffcc2884e37d83cc65f7c6..a53ee86ec582deac5975069c2d678b5b3b7f15e0 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/components/PhysVal_entries.cxx
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/components/PhysVal_entries.cxx
@@ -1,13 +1,4 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "../PhysValExample.h"
DECLARE_NAMESPACE_TOOL_FACTORY( PhysVal, PhysValExample )
-DECLARE_FACTORY_ENTRIES( PhysValMonitoring ) {
-
- DECLARE_NAMESPACE_TOOL( PhysVal, PhysValExample )
-
-}
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/components/PhysVal_load.cxx b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/components/PhysVal_load.cxx
deleted file mode 100644
index 6b880a8c65d5fb0621d1715347bb0608d06bcd86..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/src/components/PhysVal_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( PhysValMonitoring )
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_entries.cxx b/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_entries.cxx
index 9f6b654d910b1315bb8ac76416b1ca894c5c850f..4d39fd48e2aa8e0f505758ed8a744cf7ebd1986d 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_entries.cxx
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../PrimaryDPDPrescaler.h"
#include "PrimaryDPDMaker/ThinContainers.h"
#include "PrimaryDPDMaker/MBTSTimeFilterTool.h"
@@ -20,14 +18,3 @@ DECLARE_TOOL_FACTORY( CaloTimeFilterTool )
DECLARE_TOOL_FACTORY( BCIDFilterTool )
DECLARE_TOOL_FACTORY( CaloCellThinningTool )
-DECLARE_FACTORY_ENTRIES( PrimaryDPDMaker )
-{
- DECLARE_ALGORITHM( PrimaryDPDPrescaler );
- DECLARE_ALGORITHM( ThinContainers );
- DECLARE_ALGORITHM( CollisionFilterAlg );
- DECLARE_ALGORITHM( muonTrkTrackThinTool );
- DECLARE_TOOL( MBTSTimeFilterTool );
- DECLARE_TOOL( CaloTimeFilterTool );
- DECLARE_TOOL( BCIDFilterTool );
- DECLARE_TOOL( CaloCellThinningTool );
-}
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_load.cxx b/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_load.cxx
deleted file mode 100644
index 4eed178028239ff2e1d8043242fb80928ba35a82..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(PrimaryDPDMaker)
diff --git a/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/src/components/PyAnalysisExamples_entries.cxx b/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/src/components/PyAnalysisExamples_entries.cxx
old mode 100755
new mode 100644
index 1af62d687ab4dafe78860ce5b1ab1e1b22c5b8d9..eaa422c7151ede66d9d7799c34b0edb368c4989d
--- a/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/src/components/PyAnalysisExamples_entries.cxx
+++ b/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/src/components/PyAnalysisExamples_entries.cxx
@@ -1,13 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "PyAnalysisExamples/MyTool.h"
#include "PyAnalysisExamples/MySelectionAlg.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(AthPyEx, MySelectionAlg)
DECLARE_NAMESPACE_TOOL_FACTORY(AthPyEx, MyTool )
-DECLARE_FACTORY_ENTRIES(PyAnalysisExamples)
-{
- DECLARE_NAMESPACE_ALGORITHM(AthPyEx, MySelectionAlg)
- DECLARE_NAMESPACE_TOOL(AthPyEx, MyTool)
-}
diff --git a/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/src/components/PyAnalysisExamples_load.cxx b/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/src/components/PyAnalysisExamples_load.cxx
deleted file mode 100755
index db436e95cc79c8b2084a1551ae9d35b9cc33c417..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/src/components/PyAnalysisExamples_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(PyAnalysisExamples)
diff --git a/PhysicsAnalysis/RingerSelectorTools/src/components/RingerSelectorTools_entries.cxx b/PhysicsAnalysis/RingerSelectorTools/src/components/RingerSelectorTools_entries.cxx
index ba0e7d590115e3f4874bd4e25e27e7ae9db55c1f..c8e26a0e80ab7819a87ed593f554f5693fedf872 100644
--- a/PhysicsAnalysis/RingerSelectorTools/src/components/RingerSelectorTools_entries.cxx
+++ b/PhysicsAnalysis/RingerSelectorTools/src/components/RingerSelectorTools_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "RingerSelectorTools/AsgElectronRingerSelector.h"
using namespace Ringer;
@@ -7,7 +5,3 @@ using namespace Ringer;
DECLARE_TOOL_FACTORY( AsgElectronRingerSelector )
//DECLARE_TOOL_FACTORY( AsgPhotonRingerSelector )
-DECLARE_FACTORY_ENTRIES( RingerSelectorTools ){
- DECLARE_ALGTOOL( AsgElectronRingerSelector )
- //DECLARE_ALGTOOL( AsgPhotonRingerSelector )
-}
diff --git a/PhysicsAnalysis/RingerSelectorTools/src/components/RingerSelectorTools_load.cxx b/PhysicsAnalysis/RingerSelectorTools/src/components/RingerSelectorTools_load.cxx
deleted file mode 100644
index 88559f54226337af09164f343e141b2b75ece222..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/RingerSelectorTools/src/components/RingerSelectorTools_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(RingerSelectorTools)
diff --git a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/components/LongLivedParticleDPDMaker_entries.cxx b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/components/LongLivedParticleDPDMaker_entries.cxx
index 88a9ffe8a6af0636b503f8f9e8c6f7878ff496dd..2af36c54db4333912af8056e00144614c555f1fd 100644
--- a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/components/LongLivedParticleDPDMaker_entries.cxx
+++ b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/components/LongLivedParticleDPDMaker_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LongLivedParticleDPDMaker/RpvElectronD0Tool.h"
#include "LongLivedParticleDPDMaker/RpvMuonD0Tool.h"
#include "LongLivedParticleDPDMaker/RpvEgammaIDTool.h"
@@ -32,23 +30,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, HVJetMETFilterTool )
DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, EmergingJetsFilterTool )
DECLARE_NAMESPACE_TOOL_FACTORY( DerivationFramework, EmergingJetsHighPtFilterTool )
-DECLARE_FACTORY_ENTRIES( LongLivedParticleDPDMaker ) {
-
- DECLARE_NAMESPACE_TOOL( DerivationFramework, RpvElectronD0Tool );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, RpvMuonD0Tool );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, RpvEgammaIDTool );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, DiLepFilters );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, DiLepSkim );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, HnlSkimmingTool );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, DVMissingETFilterTool );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, DVMeffFilterTool );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, DVTracklessJetFilterTool );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, KinkTrkSingleJetMetFilterTool );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, KinkTrkZmumuTagTool );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, KinkTrkZmeeagTool );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, HVJetMETFilterTool );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, EmergingJetsFilterTool );
- DECLARE_NAMESPACE_TOOL( DerivationFramework, EmergingJetsHighPtFilterTool );
-
-}
-
diff --git a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/components/LongLivedParticleDPDMaker_load.cxx b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/components/LongLivedParticleDPDMaker_load.cxx
deleted file mode 100644
index f8829249b4dac1e5d24105931151565c6d115543..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/src/components/LongLivedParticleDPDMaker_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(LongLivedParticleDPDMaker)
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/components/SUSYPhysTagTools_entries.cxx b/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/components/SUSYPhysTagTools_entries.cxx
old mode 100755
new mode 100644
index b6b84472299b6d0fd6abe6262b26e562395f875f..f51eb338873461a2d1a19451b93bc29e315cf2ba
--- a/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/components/SUSYPhysTagTools_entries.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/components/SUSYPhysTagTools_entries.cxx
@@ -1,12 +1,6 @@
#include "SUSYPhysTagTools/SUSYPhysTagTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( SUSYPhysTagTool )
-DECLARE_FACTORY_ENTRIES( SUSYPhysTagTools ) {
- DECLARE_TOOL( SUSYPhysTagTool )
-}
-
-
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/components/SUSYPhysTagTools_load.cxx b/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/components/SUSYPhysTagTools_load.cxx
deleted file mode 100755
index 7581800b97f3ca9025ce9be10b2061fa20cd84ff..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/components/SUSYPhysTagTools_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( SUSYPhysTagTools )
-
-
-
-
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/components/SUSYTools_entries.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/components/SUSYTools_entries.cxx
index f5c9cdc1ebf2dbd12f8fa8ad2496176e0e404e99..d7dc65057799aa714964d7266ffc4fb8d4fe52bb 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/components/SUSYTools_entries.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/components/SUSYTools_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "SUSYTools/SUSYObjDef_xAOD.h"
#include "../SUSYToolsAlg.h"
#include "../ApplySUSYTools.h"
@@ -8,8 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY(ST, SUSYObjDef_xAOD)
DECLARE_ALGORITHM_FACTORY(SUSYToolsAlg)
DECLARE_NAMESPACE_ALGORITHM_FACTORY(ST, ApplySUSYTools)
-DECLARE_FACTORY_ENTRIES(SUSYTools) {
- DECLARE_NAMESPACE_TOOL(ST, SUSYObjDef_xAOD)
- DECLARE_ALGORITHM(SUSYToolsAlg)
- DECLARE_NAMESPACE_ALGORITHM(ST, ApplySUSYTools)
-}
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/components/SUSYTools_load.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/components/SUSYTools_load.cxx
deleted file mode 100644
index 504b0ac7ce3fea926931e51f4e9bcea89f8a7b6f..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/components/SUSYTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SUSYTools)
diff --git a/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/components/StandardModelPhysTagTools_entries.cxx b/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/components/StandardModelPhysTagTools_entries.cxx
old mode 100755
new mode 100644
index 565bd436fb15bdc8d4ef98b1fb6190c07034e6c1..da7a8b60a73e06817c164588fa176cd115463fee
--- a/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/components/StandardModelPhysTagTools_entries.cxx
+++ b/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/components/StandardModelPhysTagTools_entries.cxx
@@ -1,12 +1,6 @@
#include "StandardModelPhysTagTools/StandardModelPhysTagTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( StandardModelPhysTagTool )
-DECLARE_FACTORY_ENTRIES( StandardModelPhysTagTools ) {
- DECLARE_TOOL( StandardModelPhysTagTool )
-}
-
-
diff --git a/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/components/StandardModelPhysTagTools_load.cxx b/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/components/StandardModelPhysTagTools_load.cxx
deleted file mode 100755
index 3c438b368413641d5a52b6ab027cf51edbaf4dca..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/components/StandardModelPhysTagTools_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( StandardModelPhysTagTools )
-
-
-
-
diff --git a/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/components/ZeeValidation_entries.cxx b/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/components/ZeeValidation_entries.cxx
index 10d9a0a44c9beefc596fab2762956388c08d1306..1db49f25e39f12060f6ca9b5764438598661358d 100644
--- a/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/components/ZeeValidation_entries.cxx
+++ b/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/components/ZeeValidation_entries.cxx
@@ -1,8 +1,4 @@
#include "../../ZeeValidation/ZeeValidationMonitoringTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY( ZeeValidation, ZeeValidationMonitoringTool )
-DECLARE_FACTORY_ENTRIES( ZeeValidation ) {
- DECLARE_NAMESPACE_TOOL( ZeeValidation, ZeeValidationMonitoringTool )
-}
diff --git a/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/components/ZeeValidation_load.cxx b/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/components/ZeeValidation_load.cxx
deleted file mode 100644
index ca9091d6e6392da848a6aa4c88c98daed61d87ae..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/components/ZeeValidation_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( ZeeValidation )
diff --git a/PhysicsAnalysis/StandardModelPhys/WZBenchmarks/WZSkims/src/components/WZSkims_entries.cxx b/PhysicsAnalysis/StandardModelPhys/WZBenchmarks/WZSkims/src/components/WZSkims_entries.cxx
index 3dbcfcafb2bfd1b701207601459dead91c4204f7..136b14f049194412844367542aaecd2eba35dca0 100644
--- a/PhysicsAnalysis/StandardModelPhys/WZBenchmarks/WZSkims/src/components/WZSkims_entries.cxx
+++ b/PhysicsAnalysis/StandardModelPhys/WZBenchmarks/WZSkims/src/components/WZSkims_entries.cxx
@@ -1,6 +1,3 @@
#include "WZSkims/WZSkimsMain.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( WZSkimsMain )
-DECLARE_FACTORY_ENTRIES(WZSkims) {
-DECLARE_ALGORITHM( WZSkimsMain )
-}
+
diff --git a/PhysicsAnalysis/StandardModelPhys/WZBenchmarks/WZSkims/src/components/WZSkims_load.cxx b/PhysicsAnalysis/StandardModelPhys/WZBenchmarks/WZSkims/src/components/WZSkims_load.cxx
deleted file mode 100644
index a9d9fe9df782a8e7921cd8b4c9211cf14d6e6e4d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/StandardModelPhys/WZBenchmarks/WZSkims/src/components/WZSkims_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(WZSkims)
diff --git a/PhysicsAnalysis/TauID/DiTauMassTools/src/components/DiTauMassTools_entries.cxx b/PhysicsAnalysis/TauID/DiTauMassTools/src/components/DiTauMassTools_entries.cxx
index be9913f05feaf04d0ac1c744a0842065753f6a90..511716d4bbc9f99692e57e88a82b6e5af691d901 100644
--- a/PhysicsAnalysis/TauID/DiTauMassTools/src/components/DiTauMassTools_entries.cxx
+++ b/PhysicsAnalysis/TauID/DiTauMassTools/src/components/DiTauMassTools_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "DiTauMassTools/MissingMassTool.h"
DECLARE_TOOL_FACTORY( MissingMassTool )
-DECLARE_FACTORY_ENTRIES( DiTauMassTools )
-{
- DECLARE_TOOL( MissingMassTool );
-}
diff --git a/PhysicsAnalysis/TauID/DiTauMassTools/src/components/DiTauMassTools_load.cxx b/PhysicsAnalysis/TauID/DiTauMassTools/src/components/DiTauMassTools_load.cxx
deleted file mode 100644
index d61cc0a85be3136021c0ecc8e3522efdb4c49147..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TauID/DiTauMassTools/src/components/DiTauMassTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DiTauMassTools )
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/src/components/TauAnalysisTools_entries.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/src/components/TauAnalysisTools_entries.cxx
index b370b191cdbfd73d149aa14e9ee8ebea2ed1676b..09cb993867494ddcdbbba7cb549892e00f3767d9 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/src/components/TauAnalysisTools_entries.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/src/components/TauAnalysisTools_entries.cxx
@@ -1,57 +1,35 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
-#include "TauAnalysisTools/CommonEfficiencyTool.h"
-#include "TauAnalysisTools/CommonSmearingTool.h"
-#include "TauAnalysisTools/TauSelectionTool.h"
-#include "TauAnalysisTools/TauSmearingTool.h"
-#include "TauAnalysisTools/TauSmearingRun1Tool.h"
-#include "TauAnalysisTools/TauTruthMatchingTool.h"
-#include "TauAnalysisTools/TauTruthTrackMatchingTool.h"
-#include "TauAnalysisTools/TauEfficiencyCorrectionsTool.h"
-#include "TauAnalysisTools/TauEfficiencyContJetIDTool.h"
-#include "TauAnalysisTools/TauEfficiencyCorrectionsTool.h"
-#include "TauAnalysisTools/TauEfficiencyEleIDTool.h"
-#include "TauAnalysisTools/TauEfficiencyJetIDTool.h"
-#include "TauAnalysisTools/TauEfficiencyTriggerTool.h"
-#include "TauAnalysisTools/TauOverlappingElectronLLHDecorator.h"
-#include "../TauAnalysisToolsExampleAthena.h"
-#include "TauAnalysisTools/BuildTruthTaus.h"
-
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, CommonEfficiencyTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, CommonSmearingTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauSelectionTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauSmearingTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauSmearingRun1Tool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauTruthMatchingTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauTruthTrackMatchingTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyCorrectionsTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyContJetIDTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyEleIDTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyJetIDTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyTriggerTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauOverlappingElectronLLHDecorator )
-DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, BuildTruthTaus)
-
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( TauAnalysisTools, TauAnalysisToolsExampleAthena )
-
-DECLARE_FACTORY_ENTRIES( TauAnalysisTools )
-{
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, CommonEfficiencyTool )
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, CommonSmearingTool )
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, TauSelectionTool )
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, TauSmearingTool )
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, TauSmearingRun1Tool )
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, TauTruthMatchingTool )
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, TauTruthTrackMatchingTool )
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, TauEfficiencyCorrectionsTool )
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, TauEfficiencyContJetIDTool )
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, TauEfficiencyEleIDTool )
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, TauEfficiencyJetIDTool )
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, TauEfficiencyTriggerTool )
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, TauOverlappingElectronLLHDecorator )
- DECLARE_NAMESPACE_TOOL( TauAnalysisTools, BuildTruthTaus )
-
- DECLARE_NAMESPACE_ALGORITHM( TauAnalysisTools, TauAnalysisToolsExampleAthena )
-}
+#include "TauAnalysisTools/CommonEfficiencyTool.h"
+#include "TauAnalysisTools/CommonSmearingTool.h"
+#include "TauAnalysisTools/TauSelectionTool.h"
+#include "TauAnalysisTools/TauSmearingTool.h"
+#include "TauAnalysisTools/TauSmearingRun1Tool.h"
+#include "TauAnalysisTools/TauTruthMatchingTool.h"
+#include "TauAnalysisTools/TauTruthTrackMatchingTool.h"
+#include "TauAnalysisTools/TauEfficiencyCorrectionsTool.h"
+#include "TauAnalysisTools/TauEfficiencyContJetIDTool.h"
+#include "TauAnalysisTools/TauEfficiencyCorrectionsTool.h"
+#include "TauAnalysisTools/TauEfficiencyEleIDTool.h"
+#include "TauAnalysisTools/TauEfficiencyJetIDTool.h"
+#include "TauAnalysisTools/TauEfficiencyTriggerTool.h"
+#include "TauAnalysisTools/TauOverlappingElectronLLHDecorator.h"
+#include "../TauAnalysisToolsExampleAthena.h"
+#include "TauAnalysisTools/BuildTruthTaus.h"
+
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, CommonEfficiencyTool )
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, CommonSmearingTool )
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauSelectionTool )
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauSmearingTool )
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauSmearingRun1Tool )
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauTruthMatchingTool )
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauTruthTrackMatchingTool )
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyCorrectionsTool )
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyContJetIDTool )
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyEleIDTool )
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyJetIDTool )
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauEfficiencyTriggerTool )
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, TauOverlappingElectronLLHDecorator )
+DECLARE_NAMESPACE_TOOL_FACTORY( TauAnalysisTools, BuildTruthTaus)
+
+DECLARE_NAMESPACE_ALGORITHM_FACTORY( TauAnalysisTools, TauAnalysisToolsExampleAthena )
+
+
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/src/components/TauAnalysisTools_load.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/src/components/TauAnalysisTools_load.cxx
deleted file mode 100644
index 0cf96e45434f19db631cb6d05836539a96fb82e4..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/src/components/TauAnalysisTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( TauAnalysisTools )
diff --git a/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_entries.cxx b/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_entries.cxx
index e8e7a868cba14ca001ec8332839aab215c43abd5..74dff8583a46a2027842bd1663a5e036a4fabd51 100644
--- a/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_entries.cxx
+++ b/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_entries.cxx
@@ -1,13 +1,4 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "../../share/PhysValTau.h"
DECLARE_TOOL_FACTORY( PhysValTau )
-DECLARE_FACTORY_ENTRIES( TauDQA ) {
-
- DECLARE_ALGTOOL( PhysValTau )
-
-}
diff --git a/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_load.cxx b/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_load.cxx
deleted file mode 100644
index 2a06fb57fb1be1bfbd145755f7eda607364c9f2a..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TauID/TauDQA/src/components/TauDQA_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( TauDQA )
diff --git a/PhysicsAnalysis/TauID/TauDiscriminant/src/components/TauDiscri_entries.cxx b/PhysicsAnalysis/TauID/TauDiscriminant/src/components/TauDiscri_entries.cxx
old mode 100755
new mode 100644
index be7d0b2929891333159cb6c12c9bca5ae26ea04b..bfc97aecc8ec1dc05e695c71398b71238c317a82
--- a/PhysicsAnalysis/TauID/TauDiscriminant/src/components/TauDiscri_entries.cxx
+++ b/PhysicsAnalysis/TauID/TauDiscriminant/src/components/TauDiscri_entries.cxx
@@ -2,17 +2,9 @@
#include "TauDiscriminant/TauEleBDT.h"
#include "TauDiscriminant/TauMuonVeto.h"
#include "TauDiscriminant/TauScoreFlatteningTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( TauJetBDT )
DECLARE_TOOL_FACTORY( TauEleBDT )
DECLARE_TOOL_FACTORY( TauMuonVeto )
DECLARE_TOOL_FACTORY( TauScoreFlatteningTool )
-DECLARE_FACTORY_ENTRIES(TauDiscriminant)
-{
- DECLARE_TOOL( TauJetBDT )
- DECLARE_TOOL( TauEleBDT )
- DECLARE_TOOL( TauMuonVeto )
- DECLARE_TOOL( TauScoreFlatteningTool )
-}
diff --git a/PhysicsAnalysis/TauID/TauDiscriminant/src/components/TauDiscri_load.cxx b/PhysicsAnalysis/TauID/TauDiscriminant/src/components/TauDiscri_load.cxx
deleted file mode 100755
index e4cf8518b62a0cf004f4cfd7fbdd8bebcec77c6b..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TauID/TauDiscriminant/src/components/TauDiscri_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TauDiscriminant)
diff --git a/PhysicsAnalysis/TauID/TauTagTools/src/components/TauTagTools_entries.cxx b/PhysicsAnalysis/TauID/TauTagTools/src/components/TauTagTools_entries.cxx
old mode 100755
new mode 100644
index 326e61c1fd5092cd3655b2f086a0e6902d18f485..d49be6ad9188217fbbb800c594d3b0ce0587525a
--- a/PhysicsAnalysis/TauID/TauTagTools/src/components/TauTagTools_entries.cxx
+++ b/PhysicsAnalysis/TauID/TauTagTools/src/components/TauTagTools_entries.cxx
@@ -1,13 +1,8 @@
#include "TauTagTools/TauIdentificationTagTool.h"
#include "TauTagTools/TauJetTagTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( TauIdentificationTagTool )
DECLARE_TOOL_FACTORY( TauJetTagTool )
-DECLARE_FACTORY_ENTRIES( TauTagTools ) {
- DECLARE_TOOL( TauIdentificationTagTool )
- DECLARE_TOOL( TauJetTagTool )
-}
diff --git a/PhysicsAnalysis/TauID/TauTagTools/src/components/TauTagTools_load.cxx b/PhysicsAnalysis/TauID/TauTagTools/src/components/TauTagTools_load.cxx
deleted file mode 100755
index 3597f390c0e48f3afac59d5e318b7c29adc82e75..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TauID/TauTagTools/src/components/TauTagTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( TauTagTools )
-
-
diff --git a/PhysicsAnalysis/TileID/TileTripReader/src/components/TileTripReader_entries.cxx b/PhysicsAnalysis/TileID/TileTripReader/src/components/TileTripReader_entries.cxx
index fea383ae4f3e147611e5b7ffd80454c7eb121ee4..12b7a71b44d4c039142b1d9aef037df58ea34849 100644
--- a/PhysicsAnalysis/TileID/TileTripReader/src/components/TileTripReader_entries.cxx
+++ b/PhysicsAnalysis/TileID/TileTripReader/src/components/TileTripReader_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TileTripReader/AthTileTripReader.h"
DECLARE_TOOL_FACTORY(AthTileTripReader)
-DECLARE_FACTORY_ENTRIES(TileTripReader) {
- DECLARE_ALGTOOL(AthTileTripReader)
-}
diff --git a/PhysicsAnalysis/TileID/TileTripReader/src/components/TileTripReader_load.cxx b/PhysicsAnalysis/TileID/TileTripReader/src/components/TileTripReader_load.cxx
deleted file mode 100644
index d891e33763d2af0adee7595b09da69bf6822cc1d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TileID/TileTripReader/src/components/TileTripReader_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(TileTripReader)
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/src/components/QuickAna_entries.cxx b/PhysicsAnalysis/TopPhys/QuickAna/src/components/QuickAna_entries.cxx
index 5b4536351e0e5b152b97dfa4835b1651bb526890..f7e2f73837e6d90ef0e4b981d3ffdbe330a63ef9 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/src/components/QuickAna_entries.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/src/components/QuickAna_entries.cxx
@@ -1,14 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../AthExample.h"
#include <QuickAna/QuickAna.h>
DECLARE_ALGORITHM_FACTORY( ana::AthExample )
DECLARE_TOOL_FACTORY( ana::QuickAna )
-DECLARE_FACTORY_ENTRIES( QuickAna )
-{
- DECLARE_ALGORITHM( ana::AthExample );
- DECLARE_TOOL( ana::QuickAna );
-}
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/src/components/QuickAna_load.cxx b/PhysicsAnalysis/TopPhys/QuickAna/src/components/QuickAna_load.cxx
deleted file mode 100644
index 88e2f90cb13bb15bbe86c7ab868c75f4fec88cc9..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TopPhys/QuickAna/src/components/QuickAna_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(QuickAna)
diff --git a/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/src/components/TopPhysValMonitoring_entries.cxx b/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/src/components/TopPhysValMonitoring_entries.cxx
index 66691efb1c65d1b825628b57423a9fe11d0894b3..a34182795baae4451283d20cd7d212f88a5675e4 100644
--- a/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/src/components/TopPhysValMonitoring_entries.cxx
+++ b/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/src/components/TopPhysValMonitoring_entries.cxx
@@ -1,13 +1,4 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "TopPhysValMonitoring/TopPhysValMonitoring.h"
DECLARE_NAMESPACE_TOOL_FACTORY( TopPhysVal, TopPhysValMonitoring )
-DECLARE_FACTORY_ENTRIES( TopPhysValMonitoring ) {
-
- DECLARE_NAMESPACE_TOOL( TopPhysVal, TopPhysValMonitoring )
-
-}
diff --git a/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/src/components/TopPhysValMonitoring_load.cxx b/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/src/components/TopPhysValMonitoring_load.cxx
deleted file mode 100644
index 8927a23fdd9caf38337394f46adf31a94c210476..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TopPhys/TopPhysValMonitoring/src/components/TopPhysValMonitoring_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( TopPhysValMonitoring )
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/components/InDetTrackSystematicsTools_entries.cxx b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/components/InDetTrackSystematicsTools_entries.cxx
index afc7abc004055dce9cf91eaf5d5ef8d398b5a397..aa1ab57687fb2b58e0393a747e3c983178ee8f32 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/components/InDetTrackSystematicsTools_entries.cxx
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/components/InDetTrackSystematicsTools_entries.cxx
@@ -1,7 +1,3 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "InDetTrackSystematicsTools/InDetTrackSmearingTool.h"
#include "InDetTrackSystematicsTools/InDetTrackTruthOriginTool.h"
#include "InDetTrackSystematicsTools/InDetTrackTruthFilterTool.h"
@@ -17,13 +13,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackBiasingTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, JetTrackFilterTool )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetTrackSmearingToolTester )
-DECLARE_FACTORY_ENTRIES( InDetTrackSystematicsTools ) {
-
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrackSmearingTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrackTruthOriginTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrackTruthFilterTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrackBiasingTool )
- DECLARE_NAMESPACE_TOOL( InDet, JetTrackFilterTool )
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetTrackSmearingToolTester );
-
-}
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/components/InDetTrackSystematicsTools_load.cxx b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/components/InDetTrackSystematicsTools_load.cxx
deleted file mode 100644
index 30169b267f3e2f778bb7c8b2cb588621de8a7bf4..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/src/components/InDetTrackSystematicsTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( InDetTrackSystematicsTools )
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/components/McParticleAlgs_entries.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/components/McParticleAlgs_entries.cxx
old mode 100755
new mode 100644
index c5ffe16b29be030cbe4b55e0b46f386cfc0e24be..207980c6bfafef0062fe3c41af65e2258f8db947
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/components/McParticleAlgs_entries.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/components/McParticleAlgs_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../TruthParticleBuilder.h"
#include "../McAodFilter.h"
#include "../McAodValidationAlg.h"
@@ -16,13 +14,3 @@ DECLARE_ALGORITHM_FACTORY( GenEventAsciiWriter )
DECLARE_ALGORITHM_FACTORY( GenEventAsciiReader )
DECLARE_ALGORITHM_FACTORY( McAodTupleWriter )
-DECLARE_FACTORY_ENTRIES(McParticleAlgs) {
-
- DECLARE_ALGORITHM( TruthParticleBuilder )
- DECLARE_ALGORITHM( McAodFilter )
- DECLARE_ALGORITHM( McAodValidationAlg )
- DECLARE_ALGORITHM( GenEventTupleWriter )
- DECLARE_ALGORITHM( GenEventAsciiWriter )
- DECLARE_ALGORITHM( GenEventAsciiReader )
- DECLARE_ALGORITHM( McAodTupleWriter )
-}
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/components/McParticleAlgs_load.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/components/McParticleAlgs_load.cxx
deleted file mode 100755
index 3339ab51196a37fe9fbddbf7e4c50c904412d249..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/components/McParticleAlgs_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(McParticleAlgs)
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/components/McParticleTests_entries.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/components/McParticleTests_entries.cxx
old mode 100755
new mode 100644
index 2fca31bc05c8901747814e80f2947dacf6d54833..6fd9e89194508b39211abf635b08404034e99a78
--- a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/components/McParticleTests_entries.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/components/McParticleTests_entries.cxx
@@ -5,15 +5,9 @@
#include "McParticleKernel/IMcVtxFilterTool.h"
#include "McParticleKernel/ITruthParticleCnvTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( McAodSymLinkTests )
using namespace McAod;
DECLARE_ALGORITHM_FACTORY( McTopAna )
DECLARE_ALGORITHM_FACTORY( McTopAnaSolution )
-DECLARE_FACTORY_ENTRIES( McParticleTests ) {
- DECLARE_ALGORITHM( McAodSymLinkTests )
- DECLARE_ALGORITHM( McTopAna )
- DECLARE_ALGORITHM( McTopAnaSolution )
-}
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/components/McParticleTests_load.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/components/McParticleTests_load.cxx
deleted file mode 100755
index 2b0232bdbe9049df3a007b3904c8f69371904df7..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/components/McParticleTests_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( McParticleTests )
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/components/McParticleTools_entries.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/components/McParticleTools_entries.cxx
old mode 100755
new mode 100644
index aaf2dba6df8ef762ae076a2c9057caf3905efd3f..f3600b7a4fabd0e5bfa5c8bea6899e40c870b588
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/components/McParticleTools_entries.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/components/McParticleTools_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../TruthParticleCnvTool.h"
#include "../McVtxFilterTool.h"
@@ -42,26 +40,3 @@ DECLARE_TOOL_FACTORY( HepMcReaderTool )
DECLARE_TOOL_FACTORY( McAodWriterTool )
DECLARE_TOOL_FACTORY( McAodTupleWriterTool )
-DECLARE_FACTORY_ENTRIES(McParticleTools) {
-
- DECLARE_TOOL( TruthParticleCnvTool )
- DECLARE_TOOL( McVtxFilterTool )
-
- DECLARE_TOOL( NoopFilterTool )
- DECLARE_TOOL( OldSpclMcFilterTool )
- DECLARE_TOOL( PileupFilterTool )
- DECLARE_TOOL( EtaPtFilterTool )
- DECLARE_TOOL( VtxBasedFilterTool )
-
- DECLARE_TOOL( TruthIsolationTool )
-
- DECLARE_TOOL( GenAodValidationTool )
- DECLARE_TOOL( SpclMcValidationTool )
-
- DECLARE_TOOL( HepMcTupleWriterTool )
- DECLARE_TOOL( HepMcFloatWriterTool )
- DECLARE_TOOL( HepMcWriterTool )
- DECLARE_TOOL( HepMcReaderTool )
- DECLARE_TOOL( McAodWriterTool )
- DECLARE_TOOL( McAodTupleWriterTool )
-}
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/components/McParticleTools_load.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/components/McParticleTools_load.cxx
deleted file mode 100755
index fa9e9ced3c20fe47a4eaebbe770fd4c12b1504cc..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/components/McParticleTools_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(McParticleTools)