diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_entries.cxx b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_entries.cxx
old mode 100755
new mode 100644
index 092705995231b5b311e2e066260996da4c964ea6..c018066d7c81369091f950fead0e7b6656d7ada7
--- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_entries.cxx
+++ b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetAlignGenAlgs/SiDistWriteAlg.h"
#include "InDetAlignGenAlgs/InDetAlignCog.h"
#include "InDetAlignGenAlgs/AddTRTMomConstr.h"
@@ -12,11 +11,3 @@ DECLARE_ALGORITHM_FACTORY( AddTRTMomConstr )
DECLARE_ALGORITHM_FACTORY( InDetAlignWrt )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDetAlignment, CreateMisalignAlg )
-DECLARE_FACTORY_ENTRIES( InDetAlignGenAlgs )
-{
- DECLARE_ALGORITHM( SiDistWriteAlg )
- DECLARE_ALGORITHM( InDetAlignCog )
- DECLARE_ALGORITHM( AddTRTMomConstr )
- DECLARE_ALGORITHM( InDetAlignWrt )
- DECLARE_NAMESPACE_ALGORITHM( InDetAlignment, CreateMisalignAlg )
-}
diff --git a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_load.cxx b/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_load.cxx
deleted file mode 100755
index c106f875888c59d53e6840a5ab69cb366d386adc..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetAlignAlgs/InDetAlignGenAlgs/src/components/InDetAlignGenAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAlignGenAlgs )
diff --git a/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_entries.cxx b/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_entries.cxx
old mode 100755
new mode 100644
index 66d5f6b463623f4731b0400c327e32373ba484ba..40f8fc62d3e3065478b00b29a92a9221c8b4f393
--- a/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_entries.cxx
+++ b/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_entries.cxx
@@ -1,30 +1,19 @@
#include "InDetAlignGenTools/InDetAlignDBTool.h"
#include "InDetAlignGenTools/InDetAlignTrackSelTool.h"
#include "InDetAlignGenTools/InDetAlignFillTrack.h"
-//**
+
#include "InDetAlignGenTools/InDetAlignOverlapTool.h"
#include "InDetAlignGenTools/InDetAlignFillSiCluster.h"
#include "InDetAlignGenTools/RefitSiOnlyTool.h"
#include "InDetAlignGenTools/InDetAlignHitQualSelTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( InDetAlignDBTool )
DECLARE_TOOL_FACTORY( InDetAlignTrackSelTool )
DECLARE_TOOL_FACTORY( InDetAlignFillTrack )
-//**
+
DECLARE_TOOL_FACTORY( InDetAlignOverlapTool )
DECLARE_TOOL_FACTORY( InDetAlignFillSiCluster )
DECLARE_TOOL_FACTORY( InDetAlignHitQualSelTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDetAlignment, RefitSiOnlyTool )
-DECLARE_FACTORY_ENTRIES(InDetAlignGenTools) {
- DECLARE_TOOL( InDetAlignDBTool );
- DECLARE_TOOL( InDetAlignTrackSelTool );
- DECLARE_TOOL( InDetAlignFillTrack );
- //**
- DECLARE_TOOL( InDetAlignOverlapTool );
- DECLARE_TOOL( InDetAlignFillSiCluster );
- DECLARE_TOOL( InDetAlignHitQualSelTool );
- DECLARE_NAMESPACE_TOOL( InDetAlignment, RefitSiOnlyTool );
-}
diff --git a/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_load.cxx b/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_load.cxx
deleted file mode 100755
index 1735bb29256a304d3fa0a7509cc15340d5a8cbb3..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetAlignTools/InDetAlignGenTools/src/components/InDetAlignGenTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAlignGenTools )
diff --git a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_entries.cxx b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_entries.cxx
old mode 100755
new mode 100644
index 1f14b5fb035afaa194188f8b46974b591e654d24..e9067992c3a4fd110eae615c250cb9a85b9af058
--- a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_entries.cxx
+++ b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_entries.cxx
@@ -1,11 +1,6 @@
#include "InDetSurveyConstraintTool/SurveyConstraint.h"
#include "InDetSurveyConstraintTool/SurveyConstraintTestAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( SurveyConstraintTestAlg )
DECLARE_TOOL_FACTORY( SurveyConstraint )
-DECLARE_FACTORY_ENTRIES(InDetSurveyConstraintTool) {
- DECLARE_TOOL( SurveyConstraint );
- DECLARE_ALGORITHM( SurveyConstraintTestAlg );
-}
diff --git a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_load.cxx b/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_load.cxx
deleted file mode 100755
index 9383d4b212a939efbf947f1c999a88a2ff2c8d5b..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetAlignTools/InDetSurveyConstraintTool/src/components/InDetSurveyConstraintTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetSurveyConstraintTool)
diff --git a/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_entries.cxx b/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_entries.cxx
index 4bf8e234fac146b77ca5a672ef16378071282f6d..224a87809ef14ae3948439c72dbad314a5d32f7e 100644
--- a/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_entries.cxx
+++ b/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetAlignDBTools/SiTrkAlignDBTool.h"
#include "InDetAlignDBTools/TRTTrkAlignDBTool.h"
#include "InDetAlignDBTools/InDetTrkAlignDBTool.h"
@@ -7,9 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SiTrkAlignDBTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRTTrkAlignDBTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrkAlignDBTool )
-DECLARE_FACTORY_ENTRIES( InDetAlignDBTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, SiTrkAlignDBTool )
- DECLARE_NAMESPACE_TOOL( InDet, TRTTrkAlignDBTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrkAlignDBTool )
-}
diff --git a/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_load.cxx b/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_load.cxx
deleted file mode 100644
index 6a63e8472c871d35033d71ff49a37dd3fc71de53..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetAlignment/InDetAlignDBTools/src/components/InDetAlignDBTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAlignDBTools )
diff --git a/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_entries.cxx b/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_entries.cxx
index ad6d90df0a1bf5bb4641915f2d3d076cc02e22b3..ef52743e96c9390d3a530762b39f6cb8155addb9 100644
--- a/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_entries.cxx
+++ b/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetAlignGeomTools/TRTGeometryManagerTool.h"
#include "InDetAlignGeomTools/PixelGeometryManagerTool.h"
#include "InDetAlignGeomTools/SCTGeometryManagerTool.h"
@@ -13,12 +12,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SiGeometryManagerTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetGeometryManagerTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetAlignModuleTool )
-DECLARE_FACTORY_ENTRIES( InDetAlignGeomTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, TRTGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( InDet, PixelGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( InDet, SCTGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( InDet, SiGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetGeometryManagerTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetAlignModuleTool )
-}
diff --git a/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_load.cxx b/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_load.cxx
deleted file mode 100644
index 341d339a95ff4c3bb9f254dd0cf219419153ffad..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetAlignment/InDetAlignGeomTools/src/components/InDetAlignGeomTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAlignGeomTools )
diff --git a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_entries.cxx b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_entries.cxx
index c247b9087a20bea39fb0a1dff4173814c6d19730..15758bb04827f5589692990717cd85e9571a6331 100644
--- a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_entries.cxx
+++ b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetAlignNtupleTools/SimpleIDNtupleTool.h"
#include "InDetAlignNtupleTools/DetailedIDNtupleTool.h"
@@ -6,9 +5,3 @@
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SimpleIDNtupleTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, DetailedIDNtupleTool )
-
-DECLARE_FACTORY_ENTRIES( InDetAlignNtupleTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, SimpleIDNtupleTool )
- DECLARE_NAMESPACE_TOOL( InDet, DetailedIDNtupleTool )
-}
diff --git a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_load.cxx b/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_load.cxx
deleted file mode 100644
index 664890139dd4a2642ba6169636cf8381f232d542..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetAlignment/InDetAlignNtupleTools/src/components/InDetAlignNtupleTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAlignNtupleTools )
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_entries.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_entries.cxx
index 66d496905bac47ff60a7ddc2fae70e9c0bd0dde7..c57c17c75c9323992c0c0288827dc5268520891c 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_entries.cxx
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_entries.cxx
@@ -3,17 +3,9 @@
#include "../InDetBeamSpotVertex.h"
#include "../RefitTracksAndVertex.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, InDetBeamSpotFinder )
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, InDetBeamSpotVertex)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, InDetBeamSpotRooFit)
DECLARE_ALGORITHM_FACTORY( RefitTracksAndVertex )
-DECLARE_FACTORY_ENTRIES(InDetBeamSpotFinder){
- DECLARE_NAMESPACE_ALGORITHM(InDet, InDetBeamSpotFinder)
- DECLARE_NAMESPACE_TOOL(InDet, InDetBeamSpotVertex)
- DECLARE_NAMESPACE_TOOL(InDet, InDetBeamSpotRooFit)
- DECLARE_ALGORITHM(RefitTracksAndVertex)
-}
-
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_load.cxx b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_load.cxx
deleted file mode 100644
index 106e891ab3cd50698d1b5005f9cb50f4cf1674c3..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetBeamSpotFinder)
-
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx
old mode 100755
new mode 100644
index 5183e2f8836c03229989d3f01388e50c5ab48db6..909c847dfef4b8a0d80c6ffa0822745fd49d9026
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_entries.cxx
@@ -1,5 +1,4 @@
#include "PixelCalibAlgs/PixelBarrelSurvey.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "PixelCalibAlgs/NoiseMapBuilder.h"
#include "PixelCalibAlgs/PixMapDBWriter.h"
#include "PixelCalibAlgs/PixMapOverlayWriter.h"
@@ -15,12 +14,3 @@ DECLARE_ALGORITHM_FACTORY( PixelChargeToTConversion )
DECLARE_ALGORITHM_FACTORY( CompareModulesTDAQandBytestream )
DECLARE_ALGORITHM_FACTORY( PixelCalibCondAlg )
-DECLARE_FACTORY_ENTRIES( PixelCalibAlgs ) {
- DECLARE_ALGORITHM( PixelBarrelSurvey )
- DECLARE_ALGORITHM( NoiseMapBuilder )
- DECLARE_ALGORITHM( PixMapDBWriter )
- DECLARE_ALGORITHM( PixMapOverlayWriter )
- DECLARE_ALGORITHM( PixelChargeToTConversion )
- DECLARE_ALGORITHM( CompareModulesTDAQandBytestream )
- DECLARE_ALGORITHM( PixelCalibCondAlg )
-}
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_load.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_load.cxx
deleted file mode 100755
index ca336aac7da9347e7eb716a51996ea77972f4b55..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/components/PixelCalibAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelCalibAlgs )
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_entries.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_entries.cxx
old mode 100755
new mode 100644
index 3ac79279436a4ab0a11d4e119e0698cd4dbe0831..cd4c4e87cb775cfa523c149a6e6790ea0e738413
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_entries.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SCT_CalibAlgs/SCTCalib.h"
#include "SCT_CalibAlgs/SCTCalibWriteSvc.h"
#include "../SCT_CalibHitmapSvc.h"
@@ -17,14 +16,5 @@ DECLARE_SERVICE_FACTORY( SCT_CalibLbSvc )
DECLARE_SERVICE_FACTORY( SCT_CalibModuleListSvc )
DECLARE_SERVICE_FACTORY( SCT_CalibEventInfo )
-DECLARE_FACTORY_ENTRIES( SCT_CalibAlgs ) {
- DECLARE_SERVICE( SCTCalibWriteSvc )
- DECLARE_SERVICE( SCT_CalibHitmapSvc )
- DECLARE_ALGORITHM( SCTCalib )
- DECLARE_SERVICE( SCT_CalibBsErrorSvc )
- DECLARE_SERVICE(SCT_CalibLbSvc)
- DECLARE_SERVICE(SCT_CalibEventInfo)
- DECLARE_SERVICE(SCT_CalibModuleListSvc)
-}
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_load.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_load.cxx
deleted file mode 100755
index 8b8feeec36bd9bd94313009d13c18c92c4c10812..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/components/SCT_CalibAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SCT_CalibAlgs )
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_entries.cxx b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_entries.cxx
old mode 100755
new mode 100644
index 27683b3ae8045c8704d3c0fb0017f6cd8c41d9cd..daa26e1c5e8ded802c784c35a92904c7f846a41f
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_entries.cxx
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_entries.cxx
@@ -1,19 +1,9 @@
#include "TRT_CalibAlgs/TRTCalibrationMgr.h"
#include "TRT_CalibAlgs/TRT_StrawStatus.h"
#include "TRT_CalibAlgs/TRTOccupancyInclude.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( TRTCalibrationMgr )
DECLARE_ALGORITHM_FACTORY( TRTOccupancyInclude )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_StrawStatus )
-DECLARE_FACTORY_ENTRIES( TRT_CalibAlgs )
-{
- DECLARE_ALGORITHM( TRTCalibrationMgr ) ;
- DECLARE_ALGORITHM( TRTOccupancyInclude ) ;
- DECLARE_NAMESPACE_ALGORITHM( InDet, TRT_StrawStatus );
-}
-
-
-
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_load.cxx b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_load.cxx
deleted file mode 100755
index f5b01310cad10af8fa0db1f2f805b4cf796a7b1a..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/components/TRT_CalibAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_CalibAlgs )
-
-
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_entries.cxx b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_entries.cxx
old mode 100755
new mode 100644
index 4cfc3abfcbce7cbe818325467bff0c638334409e..8e901c1e718660c2aec1f525e44ec0d4046facce
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_entries.cxx
+++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_entries.cxx
@@ -7,7 +7,6 @@
//#include "../TRTCalChipAccumulator.h"
//#include "../TRTCalModuleAccumulator.h"
//#include "../TRTCalStrawAccumulator.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( TRTCalibTrackSelectionTool )
DECLARE_TOOL_FACTORY( FillAlignTrkInfo )
@@ -19,16 +18,3 @@ DECLARE_TOOL_FACTORY( FitTool )
//DECLARE_TOOL_FACTORY( TRTCalModuleAccumulator )
//DECLARE_TOOL_FACTORY( TRTCalStrawAccumulator )
-
-DECLARE_FACTORY_ENTRIES( TRT_CalibTools )
-{
- DECLARE_TOOL( TRTCalibTrackSelectionTool )
- DECLARE_TOOL( FillAlignTrkInfo )
- DECLARE_TOOL( FillAlignTRTHits )
- DECLARE_TOOL( TRTCalibrator )
-// DECLARE_TOOL( TRTCalAccumulator )
- DECLARE_TOOL( FitTool )
-// DECLARE_TOOL( TRTCalChipAccumulator )
-// DECLARE_TOOL( TRTCalModuleAccumulator )
-// DECLARE_TOOL( TRTCalStrawAccumulator )
-}
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_load.cxx b/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_load.cxx
deleted file mode 100755
index d5b35a5dbe8deee2bbfa0d83adff675a7773c561..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/src/components/TRT_CalibTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_CalibTools )
-
-
diff --git a/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_entries.cxx b/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_entries.cxx
index 5df0b7e157871d69ce5dbf1e928e58ecb44443ae..6c3d9f04b1fe6e2af69893d049a69bb80b5a0702 100644
--- a/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_entries.cxx
+++ b/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../BeamCondSvc.h"
DECLARE_SERVICE_FACTORY( BeamCondSvc )
-DECLARE_FACTORY_ENTRIES( InDetBeamSpotService ) {
- DECLARE_SERVICE( BeamCondSvc )
-}
-
diff --git a/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_load.cxx b/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_load.cxx
deleted file mode 100644
index 2824722b7bf7af18d8a689240fde240b1925fa2c..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/InDetBeamSpotService/src/components/InDetBeamSpotService_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetBeamSpotService )
diff --git a/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx b/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx
old mode 100755
new mode 100644
index 1e4c3a50dd4aed622c4bdc0f0abd7de14fc8a3fb..202044c31d2dcd27480bf3e65d8951195bb252cd
--- a/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../PixelOfflineCalibSvc.h"
#include "../PixelCalibSvc.h"
#include "../PixelCalibServiceTest.h"
@@ -29,22 +28,3 @@ DECLARE_SERVICE_FACTORY( PixelTDAQSvc )
DECLARE_SERVICE_FACTORY( PixelRunConditionsDbSvc )
//DECLARE_SERVICE_FACTORY( PixelConnCoolDbSvc )
-DECLARE_FACTORY_ENTRIES( PixelConditionsServices )
-{
- DECLARE_SERVICE( PixelOfflineCalibSvc )
- DECLARE_SERVICE( PixelCalibSvc )
- DECLARE_ALGORITHM( PixelOfflineCalibServiceTest )
- DECLARE_ALGORITHM( PixelCalibServiceTest )
- DECLARE_SERVICE( SpecialPixelMapSvc )
- DECLARE_ALGORITHM( PixelMapTestAlg )
- DECLARE_ALGORITHM( PixelRunConditionsDbTest )
- DECLARE_SERVICE( PixelDCSSvc )
- DECLARE_ALGORITHM( PixelDCSTestSvc )
- DECLARE_SERVICE( PixelConditionsSummarySvc )
- DECLARE_SERVICE( PixelSiliconConditionsSvc )
- DECLARE_SERVICE( PixelByteStreamErrorsSvc )
- DECLARE_SERVICE( PixelTDAQSvc )
- DECLARE_SERVICE( PixelRunConditionsDbSvc )
- //DECLARE_SERVICE( PixelConnCoolDbSvc )
-}
-
diff --git a/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_load.cxx b/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_load.cxx
deleted file mode 100755
index b444960efffc932ec9bce10d21e60ef297c09379..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelConditionsServices )
-
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_entries.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_entries.cxx
old mode 100755
new mode 100644
index f281aa54675b51ee533a229231ab99225a2eac33..9c827b4783cbf65c0ce61cc1d9e04adc971c17b7
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_entries.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "src/PixelRecoDbTool.h"
#include "src/PixelRecoDbTestWriteRead.h"
#include "src/PixelCalibDbTool.h"
@@ -7,7 +6,6 @@
#include "src/PixelDCSTestReadWrite.h"
#include "src/PixelDistortionsTool.h"
#include "src/PixelDistortionsTestReadWrite.h"
-//using namespace PixelCalib;
DECLARE_TOOL_FACTORY( PixelRecoDbTool )
DECLARE_TOOL_FACTORY( PixelCalibDbTool )
@@ -18,14 +16,5 @@ DECLARE_ALGORITHM_FACTORY( PixelDCSTestReadWrite )
DECLARE_TOOL_FACTORY( PixelDistortionsTool )
DECLARE_ALGORITHM_FACTORY( PixelDistortionsTestReadWrite )
-DECLARE_FACTORY_ENTRIES( PixelConditionsTools ) {
- DECLARE_TOOL( PixelRecoDbTool )
- DECLARE_TOOL( PixelCalibDbTool )
- DECLARE_ALGORITHM( PixelCalibDbTestWriteRead )
- DECLARE_ALGORITHM( PixelRecoDbTestWriteRead )
- DECLARE_TOOL( PixelDCSTool )
- DECLARE_ALGORITHM( PixelDCSTestReadWrite )
- DECLARE_TOOL( PixelDistortionsTool )
- DECLARE_ALGORITHM( PixelDistortionsTestReadWrite )
-}
+
diff --git a/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_load.cxx b/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_load.cxx
deleted file mode 100755
index 928c0d0b8dd6c5b2ed04689480a98ec9836094a1..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/PixelConditionsTools/src/components/PixelConditionsTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelConditionsTools )
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_entries.cxx b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_entries.cxx
index 140065ba438cdd809800362f1c58aca9503364c8..16f7f85087bdaf8fc6e866c8b757608cb7d29fc5 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_entries.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../SCT_ConditionsSummarySvc.h"
#include "../SCT_ModuleVetoSvc.h"
#include "../SCT_StripVetoSvc.h"
@@ -112,57 +111,9 @@ DECLARE_SERVICE_FACTORY(SCT_RadDamageSummarySvc)
DECLARE_TOOL_FACTORY(SCT_ReadoutTool)
DECLARE_TOOL_FACTORY(SCT_ElectricFieldTool)
-DECLARE_FACTORY_ENTRIES(SCT_ConditionsServices) {
- DECLARE_SERVICE( SCT_RODVetoSvc );
-
- DECLARE_SERVICE( SCT_CachedSummarySvc);
- DECLARE_SERVICE( SCT_ConditionsSummarySvc);
- DECLARE_SERVICE( SCT_ModuleVetoSvc );
- DECLARE_SERVICE( SCT_StripVetoSvc );
- DECLARE_SERVICE( SCT_ConfigurationConditionsSvc );
- DECLARE_SERVICE( SCT_DCSConditionsSvc );
- DECLARE_SERVICE( SCT_ByteStreamErrorsSvc );
- DECLARE_SERVICE( SCT_MonitorConditionsSvc );
- DECLARE_SERVICE( SCT_FlaggedConditionSvc );
- DECLARE_SERVICE( SCT_ReadCalibDataSvc )
- DECLARE_SERVICE( SCT_ReadCalibChipDataSvc )
- DECLARE_SERVICE( SCT_SiliconConditionsSvc )
- DECLARE_SERVICE( SCT_LinkMaskingSvc )
- DECLARE_SERVICE( SCT_TdaqEnabledSvc )
- DECLARE_SERVICE( SCT_ConditionsParameterSvc )
- DECLARE_SERVICE( SCT_SensorsSvc )
- DECLARE_SERVICE( SCT_MajorityConditionsSvc )
- DECLARE_SERVICE( SCT_ChargeTrappingSvc )
- DECLARE_SERVICE( SCT_RadDamageSummarySvc )
-
- DECLARE_ALGORITHM( SCT_RODVetoTestAlg )
- DECLARE_ALGORITHM( SCT_ModuleVetoTestAlg )
- DECLARE_ALGORITHM( SCT_ConditionsSummaryTestAlg )
- DECLARE_ALGORITHM( SCT_CachedSummaryTestAlg )
-
- DECLARE_ALGORITHM( SCT_DCSConditionsHVCondAlg )
- DECLARE_ALGORITHM( SCT_DCSConditionsStatCondAlg )
- DECLARE_ALGORITHM( SCT_DCSConditionsTempCondAlg )
- DECLARE_ALGORITHM( SCT_DCSConditionsTestAlg )
- DECLARE_ALGORITHM( SCT_MonitorConditionsCondAlg )
- DECLARE_ALGORITHM( SCT_MonitorConditionsTestAlg )
- DECLARE_ALGORITHM( SCT_ReadCalibDataTestAlg )
- DECLARE_ALGORITHM( SCT_ReadCalibChipDataTestAlg )
- DECLARE_ALGORITHM( SCT_SiliconConditionsTestAlg )
- DECLARE_ALGORITHM( SCT_ReadoutTestAlg )
- DECLARE_ALGORITHM( SCT_LinkMaskingTestAlg )
- DECLARE_ALGORITHM( SCT_ConfigurationConditionsTestAlg )
- DECLARE_ALGORITHM( SCT_MajorityCondAlg )
- DECLARE_ALGORITHM( SCT_MajorityConditionsTestAlg )
- DECLARE_ALGORITHM( SCT_ConditionsParameterTestAlg )
- DECLARE_ALGORITHM( SCT_SensorsTestAlg )
- DECLARE_ALGORITHM(SCT_TdaqEnabledCondAlg)
- DECLARE_ALGORITHM(SCT_TdaqEnabledTestAlg)
-
-
- DECLARE_TOOL(SCT_ReadoutTool)
- DECLARE_TOOL(SCT_ElectricFieldTool)
-}
+
+
+
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_load.cxx b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_load.cxx
deleted file mode 100644
index c73f8e2fc14908805d4d4661f222dc5e366f6174..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/components/SCT_ConditionsServices_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SCT_ConditionsServices)
-
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx
index 9678b48e0d1161057fddb2e4af3f0b49edf5f000..47082db30e42c05c807255a7ef3e003e6d3dd993 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx
+++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiLorentzAngleSvc/SiLorentzAngleSvc.h"
DECLARE_SERVICE_FACTORY(SiLorentzAngleSvc)
-DECLARE_FACTORY_ENTRIES(SiLorentzAngleSvc) {
- DECLARE_SERVICE( SiLorentzAngleSvc)
-}
-
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_load.cxx b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_load.cxx
deleted file mode 100644
index 9e699003e0750c7c7b672ca040f63ec518af3be6..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiLorentzAngleSvc)
diff --git a/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_entries.cxx b/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_entries.cxx
index 76985efc57e7bb9876e598d61c566eb19162379d..d09775722c40b6d6b142f12109afa557e3db9cd9 100644
--- a/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_entries.cxx
+++ b/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiPropertiesSvc/SiPropertiesSvc.h"
DECLARE_SERVICE_FACTORY(SiPropertiesSvc)
-DECLARE_FACTORY_ENTRIES(SiPropertiesSvc) {
- DECLARE_SERVICE( SiPropertiesSvc)
-}
-
diff --git a/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_load.cxx b/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_load.cxx
deleted file mode 100644
index c5c0308a7a029527cda881d68df8b01b4f0ac9d3..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/SiPropertiesSvc/src/components/SiPropertiesSvc_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiPropertiesSvc)
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_entries.cxx b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_entries.cxx
old mode 100755
new mode 100644
index b35a85290e7b6cb62390733b4a701e0d8ccd8e3e..23761e2f5274a5e15cf738d30f46971d78a02904
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_entries.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_entries.cxx
@@ -1,18 +1,8 @@
#include "TRT_ConditionsAlgs/TRTCondWrite.h"
#include "TRT_ConditionsAlgs/TRTStrawAlign.h"
#include "TRT_ConditionsAlgs/TRTStrawStatusWrite.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( TRTCondWrite )
DECLARE_ALGORITHM_FACTORY( TRTStrawAlign )
DECLARE_ALGORITHM_FACTORY( TRTStrawStatusWrite )
-DECLARE_FACTORY_ENTRIES( TRT_ConditionsAlgs )
-{
- DECLARE_ALGORITHM( TRTCondWrite )
- DECLARE_ALGORITHM( TRTStrawAlign )
- DECLARE_ALGORITHM( TRTStrawStatusWrite )
-}
-
-
-
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_load.cxx b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_load.cxx
deleted file mode 100755
index fbf9d213567b269f2769fce827361f17923ba46b..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/components/TRT_ConditionsAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_ConditionsAlgs )
-
-
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx
index 678be9e606bbec21ee4770e28b6889713e6b39a4..2678c0ca52d148ebbf56375036ef4211a8c8e06b 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "src/TRT_ConditionsSummarySvc.h"
#include "src/TRT_ConditionsTestSvc.h"
#include "src/TRT_AlignDbSvc.h"
@@ -22,3 +21,4 @@ DECLARE_SERVICE_FACTORY( TRT_StrawNeighbourSvc )
DECLARE_SERVICE_FACTORY( TRT_StrawStatusSummarySvc )
DECLARE_SERVICE_FACTORY( TRT_ByteStream_ConditionsSvc )
DECLARE_SERVICE_FACTORY( TRT_DAQ_ConditionsSvc )
+
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_load.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_load.cxx
deleted file mode 100644
index d9c5fd8bf5fe6074c17fe8747f3214b9b23aced8..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/components/TRT_ConditionsServices_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_ConditionsServices)
diff --git a/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx
index 160952fc1c713284e690dd259a43b42e0e244584..430056d2fd5d11a3277215680a364a333c7bb572 100644
--- a/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx
+++ b/InnerDetector/InDetConditions/TRT_RecoConditionsServices/src/components/TRT_RecoConditionsServices_entries.cxx
@@ -1,4 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "src/TRT_ActiveFractionSvc.h"
DECLARE_SERVICE_FACTORY( TRT_ActiveFractionSvc )
+
diff --git a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_entries.cxx b/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_entries.cxx
old mode 100755
new mode 100644
index a82dd57700ceb762dfee7f4bc04f3ad04c4823ef..6980238b44f7e94ba4d3db30761243ca16e1384c
--- a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_entries.cxx
+++ b/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_entries.cxx
@@ -3,7 +3,6 @@
#include "InDetCosmicsEventPhase/InDetFixedWindowTrackTimeTool.h"
#include "InDetCosmicsEventPhase/InDetSlidingWindowTrackTimeTool.h"
#include "InDetCosmicsEventPhase/TRT_TrackTimingTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetCosmicsEventPhase )
@@ -13,14 +12,5 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetFixedWindowTrackTimeTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetSlidingWindowTrackTimeTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_TrackTimingTool )
-DECLARE_FACTORY_ENTRIES(InDetCosmicsEventPhase) {
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetCosmicsEventPhase);
- DECLARE_NAMESPACE_TOOL( InDet, InDetCosmicsEventPhaseTool );
- DECLARE_NAMESPACE_TOOL( InDet, InDetFixedWidnowTrackTimeTool );
- DECLARE_NAMESPACE_TOOL( InDet, InDetSlidingWidnowTrackTimeTool );
- DECLARE_NAMESPACE_TOOL( InDet, TRT_TrackTimingTool );
-
-}
-
diff --git a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_load.cxx b/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_load.cxx
deleted file mode 100755
index 391f45b8005a128c642dbc293cb33923e423df43..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetCosmics/InDetCosmicsEventPhase/src/components/InDetCosmicsEventPhase_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetCosmicsEventPhase)
-
-
diff --git a/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_entries.cxx b/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_entries.cxx
old mode 100755
new mode 100644
index 725cd466f62619280957bd3b51109196cb8781dc..e6667354f2cb12ffb1b3954e4d04e95fa5279ab0
--- a/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_entries.cxx
+++ b/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_entries.cxx
@@ -1,9 +1,5 @@
#include "InDetCosmicsFilters/TrackFilter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet , TrackFilter )
-DECLARE_FACTORY_ENTRIES( InDetCosmicsFilters )
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet , TrackFilter )
-}
+
diff --git a/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_load.cxx b/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_load.cxx
deleted file mode 100755
index 61a371c7e10a51359fb4d37b43dfc12850b99e7a..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetCosmics/InDetCosmicsFilters/src/components/InDetCosmicsFilters_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetCosmicsFilters )
-
-
diff --git a/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_entries.cxx b/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_entries.cxx
old mode 100755
new mode 100644
index c6d64cee3a951e86f212e54cfbcad0a1f98d5807..ce0633613545046d0fb50a50fe8a889ded66f41b
--- a/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_entries.cxx
+++ b/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_SegmentsToTrack/TRT_SegmentsToTrack.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_SegmentsToTrack )
-DECLARE_FACTORY_ENTRIES( TRT_SegmentsToTrack ){
- DECLARE_NAMESPACE_ALGORITHM( InDet, TRT_SegmentsToTrack )
-}
-
-
diff --git a/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_load.cxx b/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_load.cxx
deleted file mode 100755
index 9c95d659fb825f8f9a4db4f8e444bb35211d140a..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetCosmics/TRT_SegmentsToTrack/src/components/TRT_SegmentsToTrack_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_SegmentsToTrack )
diff --git a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_entries.cxx
old mode 100755
new mode 100644
index d3256fc447b688ede579920036b1aaa5a51e616c..211401ce04b39c152d6e249a74c4f42262b0155e
--- a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "BCM_GeoModel/BCM_Builder.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDetDD, BCM_Builder )
-DECLARE_FACTORY_ENTRIES( BCM_GeoModel )
-{
- DECLARE_NAMESPACE_TOOL( InDetDD, BCM_Builder )
-}
diff --git a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_load.cxx b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_load.cxx
deleted file mode 100755
index 7ad2e18a6ada3434e277d8089eb7378cfee6a265..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/components/BCM_GeoModel_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( BCM_GeoModel )
diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_entries.cxx
index d3e2e5617a0553a1ffb10906d9f8c660732ea468..ee30d2c4b9e8980fbec11f9079f043b599784e43 100644
--- a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "BLM_GeoModel/BLM_Builder.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDetDD, BLM_Builder )
-DECLARE_FACTORY_ENTRIES( BLM_GeoModel )
-{
- DECLARE_NAMESPACE_TOOL( InDetDD, BLM_Builder )
-}
diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_load.cxx b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_load.cxx
deleted file mode 100644
index 5e54864be1e968328d375a2ecdf70db0c3d74a70..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/components/BLM_GeoModel_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( BLM_GeoModel )
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_entries.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_entries.cxx
old mode 100755
new mode 100644
index ca12e3dcc559297e19a5430a547c80626566ac9c..d0f20efd9c38a016b09747c6c509d52e03a387f1
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_entries.cxx
+++ b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_entries.cxx
@@ -2,16 +2,9 @@
#include "InDetRegionSelector/SiRegionSelectorTable.h"
#include "InDetRegionSelector/FTK_RegionSelectorTable.h"
#include "InDetRegionSelector/TRT_RegionSelectorTable.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDetDD, InDetRegionSelectorLUT )
DECLARE_TOOL_FACTORY( SiRegionSelectorTable )
DECLARE_TOOL_FACTORY( TRT_RegionSelectorTable )
DECLARE_TOOL_FACTORY( FTK_RegionSelectorTable )
-DECLARE_FACTORY_ENTRIES(InDetRegionSelector) {
- DECLARE_NAMESPACE_ALGORITHM( InDetDD, InDetRegionSelectorLUT )
- DECLARE_TOOL( SiRegionSelectorTable )
- DECLARE_TOOL( TRT_RegionSelectorTable )
- DECLARE_TOOL( FTK_RegionSelectorTable )
-}
diff --git a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_load.cxx b/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_load.cxx
deleted file mode 100755
index 71df7a3006b97418b2a0e207f4b093a99fb4c68b..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDetDescr/InDetRegionSelector/src/components/InDetRegionSelector_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetRegionSelector)
-
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/components/InDetServMatGeoModel_entries.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/components/InDetServMatGeoModel_entries.cxx
old mode 100755
new mode 100644
index c91f319e7331e00afa2c31a9b3850fb4b6ec4d92..33849f2dec8bfb87ea712f5d8a4f83c5b72ef32c
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/components/InDetServMatGeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/components/InDetServMatGeoModel_entries.cxx
@@ -3,3 +3,4 @@
DECLARE_TOOL_FACTORY(InDetServMatTool)
DECLARE_TOOL_FACTORY(InDetServMatBuilderToolSLHC)
+
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_entries.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_entries.cxx
old mode 100755
new mode 100644
index 650dffe5ffb0a1824b8a68e63ae8a984c8622676..feb1ae6d55bf76602a5c35e6c03807f5fb218c61
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_entries.cxx
+++ b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-// Atlas AlgTools
#include "InDetTrackingGeometry/BeamPipeBuilder.h"
#include "InDetTrackingGeometry/SiLayerBuilder.h"
#include "InDetTrackingGeometry/TRT_LayerBuilder.h"
@@ -14,13 +12,3 @@ DECLARE_TOOL_FACTORY( TRT_LayerBuilder )
DECLARE_TOOL_FACTORY( RobustTrackingGeometryBuilder )
DECLARE_TOOL_FACTORY( StagedTrackingGeometryBuilder )
-DECLARE_FACTORY_ENTRIES( InDetTrackingGeometry )
-{
- DECLARE_TOOL( BeamPipeBuilder )
- DECLARE_TOOL( SiLayerBuilder )
- DECLARE_TOOL( TRT_LayerBuilder )
- DECLARE_TOOL( RobustTrackingGeometryBuilder )
- DECLARE_TOOL( StagedTrackingGeometryBuilder )
-}
-
-
diff --git a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_load.cxx b/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_load.cxx
deleted file mode 100755
index 0cee69c38032be9bbbb203c6ede5006f6c71c7bc..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDetDescr/InDetTrackingGeometry/src/components/InDetTrackingGeometry_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrackingGeometry )
-
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx b/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx
old mode 100755
new mode 100644
index 59bc6e21936fd1a502fbacd7b3abf65900a7659f..c3924de3185a323f0179491960bdf5eabebfec04
--- a/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx
+++ b/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_entries.cxx
@@ -2,15 +2,8 @@
#include "../PixelFillCablingData.h"
#include "../PixelCablingSvc.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( PixelFillCablingData_Final )
DECLARE_TOOL_FACTORY( PixelFillCablingData )
DECLARE_SERVICE_FACTORY(PixelCablingSvc)
-DECLARE_FACTORY_ENTRIES( PixelCabling )
-{
- DECLARE_TOOL( PixelFillCablingData )
- DECLARE_TOOL( PixelFillCablingData_Final )
- DECLARE_SERVICE(PixelCablingSvc)
-}
diff --git a/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_load.cxx b/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_load.cxx
deleted file mode 100755
index eecfee6149efc580b6cf47c6410edcff5db17a7d..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDetDescr/PixelCabling/src/components/PixelCabling_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelCabling )
-
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/components/PixelGeoModel_entries.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/components/PixelGeoModel_entries.cxx
index 85f9743044830ea87eb6ac8d21ff6e0b733c43ac..68b6391402cf4f28a2d0ece78f1219f41d0d3057 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/components/PixelGeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/components/PixelGeoModel_entries.cxx
@@ -3,3 +3,4 @@
DECLARE_TOOL_FACTORY(PixelDetectorTool)
DECLARE_SERVICE_FACTORY(IBLParameterSvc)
+
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_entries.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_entries.cxx
index f75a32327c199ee2e8eb01439e12fbf162f93d51..aaa0c75e35898a968b0214d2293bd085869252f8 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_entries.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SCT_Cabling/SCT_CablingSvc.h"
#include "../SCT_FillCablingFromText.h"
#include "../SCT_FillCablingFromCoraCool.h"
@@ -9,10 +8,3 @@ DECLARE_SERVICE_FACTORY(SCT_FillCablingFromText)
DECLARE_SERVICE_FACTORY(SCT_FillCablingFromCoraCool)
DECLARE_ALGORITHM_FACTORY(SCT_TestCablingAlg)
-DECLARE_FACTORY_ENTRIES(SCT_Cabling) {
- DECLARE_SERVICE( SCT_CablingSvc)
- DECLARE_SERVICE( SCT_FillCablingFromText)
- DECLARE_SERVICE( SCT_FillCablingFromCoraCool)
- DECLARE_ALGORITHM( SCT_TestCablingAlg )
-}
-
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_load.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_load.cxx
deleted file mode 100644
index eccdf1bd2205b989929a5d527b0d515f4a36b90e..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/components/SCT_Cabling_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SCT_Cabling)
-
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/components/SCT_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/components/SCT_GeoModel_entries.cxx
old mode 100755
new mode 100644
index ecf5eb4199e0afe52c52a5fd10ac3c39f90e968c..1a82db644bba6b7501987a5a0fdc45d270fdf671
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/components/SCT_GeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/components/SCT_GeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "SCT_GeoModel/SCT_DetectorTool.h"
DECLARE_TOOL_FACTORY(SCT_DetectorTool)
+
diff --git a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_entries.cxx b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_entries.cxx
index 20986fcd5be67f638a4a4445fa34645b57a50355..bf065da41bd59508588dfaead8d226759f6d66f7 100644
--- a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_entries.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../SCT_DistortionsTool.h"
#include "../SCT_TestDistortionsTool.h"
DECLARE_TOOL_FACTORY(SCT_DistortionsTool)
DECLARE_ALGORITHM_FACTORY(SCT_TestDistortionsTool)
-DECLARE_FACTORY_ENTRIES(SCT_ModuleDistortions) {
- DECLARE_TOOL( SCT_DistortionsTool )
- DECLARE_ALGORITHM( SCT_TestDistortionsTool )
-}
-
diff --git a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_load.cxx b/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_load.cxx
deleted file mode 100644
index 7ffd320eecd5c8406fe92114e189af0cd98617d6..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDetDescr/SCT_ModuleDistortions/src/components/SCT_ModuleDistortions_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SCT_ModuleDistortions)
-
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/components/SCT_SLHC_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/components/SCT_SLHC_GeoModel_entries.cxx
old mode 100755
new mode 100644
index cbaafb41221ef378358b044da8d5c5b5fe1343e0..09c43d6755ce21dd09ae62931753442041d7dba6
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/components/SCT_SLHC_GeoModel_entries.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/components/SCT_SLHC_GeoModel_entries.cxx
@@ -1,3 +1,4 @@
#include "SCT_SLHC_GeoModel/SCT_SLHC_DetectorTool.h"
DECLARE_TOOL_FACTORY(SCT_SLHC_DetectorTool)
+
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_entries.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_entries.cxx
index 2ad87729272ea82f6d709517f1e2bb0544059172..5394988c4946822f9e7b105d0c756f6582452582 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_entries.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_entries.cxx
@@ -6,7 +6,6 @@
#include "../TRT_FillCablingData_DC2.h"
#include "../TRT_FillCablingData_DC3.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_SERVICE_FACTORY( TRT_CablingSvc )
@@ -17,15 +16,3 @@ DECLARE_TOOL_FACTORY( TRT_FillCablingData_SR1 )
DECLARE_TOOL_FACTORY( TRT_FillCablingData_TB04 )
DECLARE_TOOL_FACTORY( TRT_FillCablingData_SR1_ECC )
-
-
-DECLARE_FACTORY_ENTRIES( TRT_Cabling )
-{
- DECLARE_SERVICE( TRT_CablingSvc )
- DECLARE_TOOL( TRT_FillCablingData_DC1 )
- DECLARE_TOOL( TRT_FillCablingData_DC2 )
- DECLARE_TOOL( TRT_FillCablingData_DC3 )
- DECLARE_TOOL( TRT_FillCablingData_SR1 )
- DECLARE_TOOL( TRT_FillCablingData_TB04 )
- DECLARE_TOOL( TRT_FillCablingData_SR1_ECC )
-}
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_load.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_load.cxx
deleted file mode 100644
index 6c2893f5ee8aa9d9787708f7e06e43e826ab06ad..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/components/TRT_Cabling_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_Cabling )
-
diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/src/components/TRT_GeoModel_entries.cxx b/InnerDetector/InDetDetDescr/TRT_GeoModel/src/components/TRT_GeoModel_entries.cxx
old mode 100755
new mode 100644
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
old mode 100755
new mode 100644
index 82cea747fd583354497fc19c1210a02700024958..1c559c85c6b5e58528963745206aaa1ddffd65d6
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
@@ -1,10 +1,3 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "PixelIDDetDescrCnv.h"
#include "SCT_IDDetDescrCnv.h"
#include "SiliconIDDetDescrCnv.h"
@@ -15,9 +8,3 @@ DECLARE_CONVERTER_FACTORY(PixelIDDetDescrCnv)
DECLARE_CONVERTER_FACTORY(SiliconIDDetDescrCnv)
DECLARE_CONVERTER_FACTORY(TRT_IDDetDescrCnv)
-DECLARE_FACTORY_ENTRIES ( InDetIdCnv ) {
- DECLARE_CONVERTER ( PixelIDDetDescrCnv );
- DECLARE_CONVERTER ( SCT_IDDetDescrCnv );
- DECLARE_CONVERTER ( SiliconIDDetDescrCnv );
- DECLARE_CONVERTER ( TRT_IDDetDescrCnv );
-}
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_load.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_load.cxx
deleted file mode 100755
index 3d266fd0f1d557f3c09a01284b162b7ea2a01059..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_load.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetIdCnv )
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_entries.cxx b/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_entries.cxx
index aa82c7b9cf3104a945ce2386b07ec7cfe69bb8f7..903f1f20986bc5822080c9599ae34fce104dccfb 100644
--- a/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_entries.cxx
@@ -1,12 +1,6 @@
#include "../BCM_Digitization.h"
#include "../BCM_DigitizationTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( BCM_Digitization )
DECLARE_TOOL_FACTORY( BCM_DigitizationTool )
-DECLARE_FACTORY_ENTRIES( BCM_Digitization ) {
- DECLARE_ALGORITHM( BCM_Digitization )
- DECLARE_ALGTOOL( BCM_DigitizationTool )
-}
-
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_load.cxx b/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_load.cxx
deleted file mode 100644
index 1e287535877da74c85cf87488ef51aa9ffe0c22b..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDigitization/BCM_Digitization/src/components/BCM_Digitization_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( BCM_Digitization )
-
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx
index bcd688e324d2f50e916a27d6124f3a318abea62a..12f00953b3026e7835f146130405275ff85691ae 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "FastSiDigitization/PixelFastDigitizationTool.h"
#include "FastSiDigitization/PixelFastDigitization.h"
#include "FastSiDigitization/IPixelFastDigitizationTool.h"
@@ -19,14 +17,3 @@ DECLARE_TOOL_FACTORY(PixelFastDigitizationTool)
DECLARE_TOOL_FACTORY(SiSmearedDigitizationTool)
DECLARE_TOOL_FACTORY(SCT_FastDigitizationTool)
-DECLARE_FACTORY_ENTRIES(FastSiDigitization) {
- DECLARE_ALGORITHM(PixelFastDigitization)
- DECLARE_ALGORITHM(SCT_FastDigitization)
- DECLARE_ALGORITHM(SiSmearedDigitization)
- DECLARE_TOOL(PixelFastDigitizationTool)
- DECLARE_TOOL(SiSmearedDigitizationTool)
- DECLARE_TOOL(SCT_FastDigitizationTool)
-
-}
-
-
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_load.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_load.cxx
deleted file mode 100644
index 2fb3306cc1871584c906587dfc43d2ac836cd4bb..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( FastSiDigitization )
-
-
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx
index 9b827675a53211d02b3e9ffcb50ef1fba193336e..e6f6ed06dc32f8ec5a89fca007e976abe8bc6312 100644
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx
@@ -1,14 +1,8 @@
#include "../../FastTRT_Digitization/TRTFastDigitization.h"
#include "../../FastTRT_Digitization/TRTFastDigitizationTool.h"
#include "../../FastTRT_Digitization/ITRTFastDigitizationTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( TRTFastDigitization )
DECLARE_TOOL_FACTORY(TRTFastDigitizationTool)
-DECLARE_FACTORY_ENTRIES( FastTRT_Digitization ) {
- DECLARE_ALGORITHM( TRTFastDigitization )
- DECLARE_ALGTOOL( TRTFastDigitizationTool )
-}
-
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_load.cxx b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_load.cxx
deleted file mode 100644
index 28a3b3b952f0be13ee868d41e76aea140790a834..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( FastTRT_Digitization )
-
-
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_entries.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_entries.cxx
old mode 100755
new mode 100644
index cb5298648d96050bf4ca0036389cfec7866d656c..e7bf072e5d59f40f249246e4bed1113a6586159d
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "src/PixelDigitization.h"
#include "src/PixelDigitizationTool.h"
#include "src/PixelNoisyCellGenerator.h"
@@ -28,19 +26,3 @@ DECLARE_TOOL_FACTORY(FEI4SimTool)
DECLARE_TOOL_FACTORY(FEI3SimTool)
DECLARE_SERVICE_FACTORY(ChargeCollProbSvc)
-DECLARE_FACTORY_ENTRIES(PixelDigitization) {
- DECLARE_ALGORITHM(PixelDigitization)
- DECLARE_TOOL(EnergyDepositionTool)
- DECLARE_TOOL(PixelDigitizationTool)
- DECLARE_TOOL(PixelNoisyCellGenerator)
- DECLARE_TOOL(PixelChargeSmearer)
- DECLARE_TOOL(PixelDiodeCrossTalkGenerator)
- DECLARE_TOOL(PixelRandomDisabledCellGenerator)
- DECLARE_TOOL(SensorSimPlanarTool)
- DECLARE_TOOL(SensorSim3DTool)
- DECLARE_TOOL(RD53SimTool)
- DECLARE_TOOL(FEI4SimTool)
- DECLARE_TOOL(FEI3SimTool)
- DECLARE_SERVICE(ChargeCollProbSvc)
-}
-
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_load.cxx b/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_load.cxx
deleted file mode 100755
index e044f4a24c825c6a739338f0c111225c67c71f1c..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/components/PixelDigitization_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelDigitization )
-LOAD_FACTORY_ENTRIES( ChargeCollProbSvc )
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_entries.cxx b/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_entries.cxx
index d550d12e77efd19be0826077775718755d359b22..222e1ac133fc231b4c28a7f6c3cb9196795e68b5 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../SCT_Amp.h"
#include "../SCT_FrontEnd.h"
#include "SCT_Digitization/SCT_Digitization.h"
@@ -16,14 +14,3 @@ DECLARE_TOOL_FACTORY(SCT_SurfaceChargesGenerator)
DECLARE_TOOL_FACTORY(SCT_DetailedSurfaceChargesGenerator)
DECLARE_TOOL_FACTORY(SCT_RandomDisabledCellGenerator)
-
-DECLARE_FACTORY_ENTRIES(SCT_Digitization) {
- DECLARE_ALGORITHM(SCT_Digitization)
- DECLARE_ALGTOOL(SCT_Amp)
- DECLARE_ALGTOOL(SCT_FrontEnd)
- DECLARE_ALGTOOL(SCT_DigitizationTool)
- DECLARE_ALGTOOL(SCT_SurfaceChargesGenerator)
- DECLARE_ALGTOOL(SCT_DetailedSurfaceChargesGenerator)
- DECLARE_ALGTOOL(SCT_RandomDisabledCellGenerator)
-}
-
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_load.cxx b/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_load.cxx
deleted file mode 100644
index 232f0a0f9f8b4b85b5a8c9b448be52c27be011c4..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDigitization/SCT_Digitization/src/components/SCT_Digitization_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SCT_Digitization )
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_entries.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_entries.cxx
index f1a8885a66c502003a3240c0cf31c7383c5069be..ed3a18fbae26d250f93ff1da0b2705cc5561dbbf 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_entries.cxx
@@ -1,16 +1,9 @@
#include "../TRTDigitization.h"
#include "../TRTDigitizationTool.h"
#include "../TRT_SimDriftTimeTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( TRTDigitization )
DECLARE_TOOL_FACTORY(TRTDigitizationTool)
DECLARE_TOOL_FACTORY( TRT_SimDriftTimeTool )
-DECLARE_FACTORY_ENTRIES( TRT_Digitization ) {
- DECLARE_ALGORITHM( TRTDigitization )
- DECLARE_ALGTOOL( TRTDigitizationTool )
- DECLARE_ALGTOOL( TRT_SimDriftTimeTool )
-}
-
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_load.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_load.cxx
deleted file mode 100644
index 53abb6e6d251ac5d9bab6ece70ffeae0a7bf9b87..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/components/TRTDigitization_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_Digitization )
-
-
diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_entries.cxx b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_entries.cxx
index 5b17e98c60bdfdcd057510845314a7baf39d0b8e..4db96fd431526be671eff3807e9540aec6d3313b 100644
--- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_entries.cxx
+++ b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "BCM_RawDataByteStreamCnv/BCM_RawContByteStreamCnv.h"
DECLARE_CONVERTER_FACTORY( BCM_RawContByteStreamCnv )
@@ -15,13 +13,3 @@ DECLARE_TOOL_FACTORY( BCM_RawDataProviderTool)
#include "BCM_RawDataByteStreamCnv/BCM_RodDecoder.h"
DECLARE_TOOL_FACTORY( BCM_RodDecoder )
-DECLARE_FACTORY_ENTRIES(BCM_RawDataByteStreamCnv) {
- DECLARE_CONVERTER( BCM_RawContByteStreamCnv )
- DECLARE_TOOL ( BCM_RawContByteStreamTool )
- DECLARE_ALGORITHM( BCM_RawDataProvider )
- DECLARE_TOOL ( BCM_RawDataProviderTool )
- DECLARE_TOOL ( BCM_RodDecoder )
-}
-
-
-
diff --git a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_load.cxx b/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_load.cxx
deleted file mode 100644
index 302bb82e09f8b2f642b4f0c27cfa20bc43ff89ce..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetEventCnv/BCM_RawDataByteStreamCnv/src/components/BCM_RawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(BCM_RawDataByteStreamCnv)
diff --git a/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_entries.cxx b/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_entries.cxx
old mode 100755
new mode 100644
index e6ee96ff46d40a77165aa7c443a860cd98ced490..d95cda3436097c421875239dd31986fda36708ea
--- a/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_entries.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_entries.cxx
@@ -1,16 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetEventCnvTools/InDetEventCnvTool.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( InDetEventCnvTool )
-DECLARE_FACTORY_ENTRIES( InDetEventCnvTools )
-{
- DECLARE_TOOL( InDetEventCnvTool )
-}
-
-
-
-
diff --git a/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_load.cxx b/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_load.cxx
deleted file mode 100755
index 413a43a91505b808f6c67f15dadff77cabcf4047..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetEventCnv/InDetEventCnvTools/src/components/InDetEventCnvTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetEventCnvTools )
-
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_entries.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_entries.cxx
old mode 100755
new mode 100644
index c507e203d39277d4de90cc8505b80462fe80122b..78a9e8f5069b55631fac8fa6ff513499b53efeb5
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_entries.cxx
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_entries.cxx
@@ -6,7 +6,6 @@
#include "InDetJiveXML/PixelRDORetriever.h"
#include "InDetJiveXML/InDetGeoModelTool.h"
#include "InDetJiveXML/BeamSpotRetriever.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace JiveXML;
@@ -19,13 +18,3 @@ DECLARE_TOOL_FACTORY(PixelRDORetriever)
DECLARE_TOOL_FACTORY(InDetGeoModelTool)
DECLARE_TOOL_FACTORY(BeamSpotRetriever)
-DECLARE_FACTORY_ENTRIES(InDetJiveXML) {
- DECLARE_ALGTOOL(SiSpacePointRetriever)
- DECLARE_ALGTOOL(TRTRetriever)
- DECLARE_ALGTOOL(SiClusterRetriever)
- DECLARE_ALGTOOL(PixelClusterRetriever)
- DECLARE_ALGTOOL(SCTRDORetriever)
- DECLARE_ALGTOOL(PixelRDORetriever)
- DECLARE_ALGTOOL(InDetGeoModelTool)
- DECLARE_ALGTOOL(BeamSpotRetriever)
-}
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_load.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_load.cxx
deleted file mode 100755
index c96f0acbf40ef749e73928883e187b56f0bf067f..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/components/InDetJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetJiveXML)
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_entries.cxx b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_entries.cxx
old mode 100755
new mode 100644
index f931e8db2113041afa538d8d2d657e48884ac059..76bc59bfa76ac7a35b16fcb771040e3b4ba5f35a
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_entries.cxx
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_entries.cxx
@@ -1,21 +1,10 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "../TRT_PrepDataToxAOD.h"
#include "../SCT_PrepDataToxAOD.h"
#include "../SCT_RawDataToxAOD.h"
#include "../PixelPrepDataToxAOD.h"
-
-//using namespace InDet;
-
DECLARE_ALGORITHM_FACTORY( TRT_PrepDataToxAOD )
DECLARE_ALGORITHM_FACTORY( SCT_PrepDataToxAOD )
DECLARE_ALGORITHM_FACTORY( SCT_RawDataToxAOD )
DECLARE_ALGORITHM_FACTORY( PixelPrepDataToxAOD )
-DECLARE_FACTORY_ENTRIES( InDetPrepRawDataToxAOD )
-{
- DECLARE_ALGORITHM( TRT_PrepDataToxAOD )
- DECLARE_ALGORITHM( SCT_PrepDataToxAOD )
- DECLARE_ALGORITHM( SCT_RawDataToxAOD )
- DECLARE_ALGORITHM( PixelPrepDataToxAOD )
-}
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_load.cxx b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_load.cxx
deleted file mode 100755
index 249ab411bec8788c83f85cb6aaf02cadfca6c7de..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/components/InDetPrepRawDataToxAOD_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetPrepRawDataToxAOD )
-
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx
index c0753dcbb91435387aa028b465a5d8dbd8f7899f..d21cfdf3f628ec8fa3b7aeecc835822c7aedb7c0 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../PixelRawContByteStreamCnv.h"
DECLARE_CONVERTER_FACTORY( PixelRawContByteStreamCnv )
@@ -15,11 +13,3 @@ DECLARE_TOOL_FACTORY( PixelRawDataProviderTool)
#include "../PixelRodDecoder.h"
DECLARE_TOOL_FACTORY( PixelRodDecoder )
-
-DECLARE_FACTORY_ENTRIES(PixelRawDataByteStreamCnv) {
- DECLARE_CONVERTER( PixelRawContByteStreamCnv )
- DECLARE_TOOL ( PixelRawContByteStreamTool )
- DECLARE_ALGORITHM( PixelRawDataProvider )
- DECLARE_TOOL ( PixelRawDataProviderTool )
- DECLARE_TOOL ( PixelRodDecoder )
-}
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_load.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_load.cxx
deleted file mode 100644
index b367f431bae9656dc3cc8c2e6df276c6e7d2c2fe..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/components/PixelRawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(PixelRawDataByteStreamCnv)
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_entries.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_entries.cxx
index dea3f283fbc4c6528e19cbc2db8ee4971762fd07..77aabbfa3ec01c320b6d868d7eb144f03c967ecf 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_entries.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../SCTRawContByteStreamCnv.h"
DECLARE_CONVERTER_FACTORY( SCTRawContByteStreamCnv )
@@ -18,11 +16,3 @@ DECLARE_TOOL_FACTORY( SCT_RodDecoder )
#include "../SCT_RodEncoder.h"
DECLARE_TOOL_FACTORY( SCT_RodEncoder )
-DECLARE_FACTORY_ENTRIES(SCT_RawDataByteStreamCnv) {
- DECLARE_CONVERTER( SCTRawContByteStreamCnv )
- DECLARE_SERVICE ( SCTRawContByteStreamService )
- DECLARE_ALGORITHM( SCTRawDataProvider )
- DECLARE_TOOL ( SCTRawDataProviderTool )
- DECLARE_TOOL ( SCT_RodDecoder )
- DECLARE_TOOL ( SCT_RodEncoder )
-}
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_load.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_load.cxx
deleted file mode 100644
index 9acfa28db8487c7020a6d6eb1bab4c8e9d57ce1a..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/components/SCT_RawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(SCT_RawDataByteStreamCnv)
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_entries.cxx b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_entries.cxx
index e5ceb2117f36b7da8360967095adee20b8f6b841..d1892562b775dd0a4db95588409a4f10f2c7cffe 100644
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_entries.cxx
+++ b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_entries.cxx
@@ -1,5 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../TRTRawContByteStreamCnv.h"
DECLARE_CONVERTER_FACTORY( TRTRawContByteStreamCnv )
@@ -15,10 +13,3 @@ DECLARE_TOOL_FACTORY( TRTRawDataProviderTool)
#include "../TRT_RodDecoder.h"
DECLARE_TOOL_FACTORY( TRT_RodDecoder )
-DECLARE_FACTORY_ENTRIES(TRT_RawDataByteStreamCnv) {
- DECLARE_CONVERTER( TRTRawContByteStreamCnv )
- DECLARE_TOOL ( TRTRawContByteStreamTool )
- DECLARE_ALGORITHM( TRTRawDataProvider )
- DECLARE_TOOL ( TRTRawDataProviderTool )
- DECLARE_TOOL ( TRT_RodDecoder )
-}
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_load.cxx b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_load.cxx
deleted file mode 100644
index 02893a7d49e50cff5cd83db01e67435d79306cc6..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/components/TRT_RawDataByteStreamCnv_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_RawDataByteStreamCnv)
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_entries.cxx b/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_entries.cxx
old mode 100755
new mode 100644
index 5931713ceb43135540b479f4a77d2041ae1027c2..8855fd3c6057365a475c06623eba50fadf5cb338
--- a/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_entries.cxx
+++ b/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_entries.cxx
@@ -4,7 +4,6 @@
#include "InDetDetDescrExample/TestTRT_Alignment.h"
#include "InDetDetDescrExample/InDetUpdateCaches.h"
#include "InDetDetDescrExample/PrintSiElements.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( ReadSiDetectorElements )
DECLARE_ALGORITHM_FACTORY( ReadTRT_DetectorElements )
@@ -13,12 +12,3 @@ DECLARE_ALGORITHM_FACTORY( TestTRT_Alignment )
DECLARE_ALGORITHM_FACTORY( InDetUpdateCaches )
DECLARE_ALGORITHM_FACTORY( PrintSiElements )
-DECLARE_FACTORY_ENTRIES(InDetDetDescrExample) {
- DECLARE_ALGORITHM( ReadSiDetectorElements )
- DECLARE_ALGORITHM( ReadTRT_DetectorElements )
- DECLARE_ALGORITHM( TestSiAlignment )
- DECLARE_ALGORITHM( TestTRT_Alignment )
- DECLARE_ALGORITHM( InDetUpdateCaches )
- DECLARE_ALGORITHM( PrintSiElements )
-}
-
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_load.cxx b/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_load.cxx
deleted file mode 100755
index 3c1d48c688e270b346ba90d3d15426009179f178..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetExample/InDetDetDescrExample/src/components/InDetDetDescrExample_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetDetDescrExample)
-
diff --git a/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_entries.cxx b/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_entries.cxx
index 6c9a82863093bb8c1960fef119cc7b3b416c94be..3ccebbc3d6a63aa874422be5bd74e96bc283bbf3 100644
--- a/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../BCMSensorSDTool.h"
DECLARE_TOOL_FACTORY( BCMSensorSDTool )
-DECLARE_FACTORY_ENTRIES( BCM_G4_SD ) {
- DECLARE_TOOL( BCMSensorSDTool )
-}
diff --git a/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_load.cxx b/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_load.cxx
deleted file mode 100644
index 95fbe726059a292824691d02106fca3114761112..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetG4/BCM_G4_SD/src/components/BCM_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( BCM_G4_SD )
diff --git a/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_entries.cxx b/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_entries.cxx
index cdec3f529320c8785c1ac30e1690e6888968ad58..81b6eaf481e4badd89fd795e79a17da3f739c6e6 100644
--- a/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../BLMSensorSDTool.h"
DECLARE_TOOL_FACTORY( BLMSensorSDTool )
-DECLARE_FACTORY_ENTRIES( BLM_G4_SD ) {
- DECLARE_TOOL( BLMSensorSDTool )
-}
diff --git a/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_load.cxx b/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_load.cxx
deleted file mode 100644
index 75fa2e8cc1d32c7cef76878756074eebc188da8f..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetG4/BLM_G4_SD/src/components/BLM_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( BLM_G4_SD )
\ No newline at end of file
diff --git a/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_entries.cxx b/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_entries.cxx
index 3579d67979a7468f36c51cd01b60080f335ea44b..88734839b2d62b92b75b86cba1498103d14f9aed 100644
--- a/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../PixelSensorSDTool.h"
DECLARE_TOOL_FACTORY( PixelSensorSDTool )
-DECLARE_FACTORY_ENTRIES( PixelG4_SD ) {
- DECLARE_TOOL( PixelSensorSDTool )
-}
diff --git a/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_load.cxx b/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_load.cxx
deleted file mode 100644
index 7a0160d13700dc96659d8ba15a02aadfb6d375d7..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetG4/PixelG4_SD/src/components/PixelG4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( PixelG4_SD )
diff --git a/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_entries.cxx b/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_entries.cxx
index 3cfd4b2ff108009dc92a49fc658813b812dd3977..ad69db55dd7793070b495af0ca996bab19cc512e 100644
--- a/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../SctSensorSDTool.h"
#include "../SctSensor_CTBTool.h"
DECLARE_TOOL_FACTORY( SctSensorSDTool )
DECLARE_TOOL_FACTORY( SctSensor_CTBTool )
-DECLARE_FACTORY_ENTRIES( SCT_G4_SD ) {
- DECLARE_TOOL( SctSensorSDTool )
- DECLARE_TOOL( SctSensor_CTBTool )
-}
diff --git a/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_load.cxx b/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_load.cxx
deleted file mode 100644
index 8c34a89c9ac261c0f27ef5d486063e7013d6bd12..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetG4/SCT_G4_SD/src/components/SCT_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( SCT_G4_SD )
diff --git a/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_entries.cxx b/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_entries.cxx
index 117aa0549a25698cccca92224fe0ea147541c4e5..fbc0082ed235c75bba933ef53dd82519884d1159 100644
--- a/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_entries.cxx
+++ b/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../TRTSensitiveDetectorTool.h"
DECLARE_TOOL_FACTORY( TRTSensitiveDetectorTool )
-DECLARE_FACTORY_ENTRIES( TRT_G4_SD ) {
- DECLARE_TOOL( TRTSensitiveDetectorTool )
-}
diff --git a/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_load.cxx b/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_load.cxx
deleted file mode 100644
index dab1b50b5a8fd96c9fbd3ff242ad12ecca8132f6..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetG4/TRT_G4_SD/src/components/TRT_G4_SD_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( TRT_G4_SD )
\ No newline at end of file
diff --git a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_entries.cxx b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_entries.cxx
old mode 100755
new mode 100644
index f1d81b6e27ded10496a2d5cb83dc5caa7fd716cd..00d92d6d341e88c3b468931c01923b87973fe223
--- a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_entries.cxx
+++ b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_entries.cxx
@@ -1,17 +1,8 @@
#include "InDetSimpleVisual/GetDetectorPositions.h"
#include "InDetSimpleVisual/GetDetectorLocalFrames.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( GetDetectorPositions )
DECLARE_ALGORITHM_FACTORY( GetDetectorLocalFrames )
-DECLARE_FACTORY_ENTRIES( InDetSimpleVisual )
-{
- DECLARE_ALGORITHM( GetDetectorPositions ) ;
- DECLARE_ALGORITHM( GetDetectorLocalFrames ) ;
-}
-
-
-
diff --git a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_load.cxx b/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_load.cxx
deleted file mode 100755
index 867958ecd9b0a3e82028708521c8a24c65a889e8..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetGraphics/InDetAlignVisual/InDetSimpleVisual/src/components/InDetSimpleVisual_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetSimpleVisual )
-
-
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_entries.cxx
old mode 100755
new mode 100644
index fa24b07274904db7a10a6158b78ac8af5724c0b4..ba8bd102944e2eb3696afbcc92ba61ba1c5c23c4
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_entries.cxx
@@ -10,7 +10,6 @@
#include "src/TrackSelectionAlg.h"
#include "src/IDAlignMonPVBiases.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(IDAlignMonPVBiases)
DECLARE_TOOL_FACTORY(IDAlignMonEfficiencies)
DECLARE_TOOL_FACTORY(IDAlignMonGenericTracks)
@@ -23,6 +22,3 @@ DECLARE_TOOL_FACTORY(IDAlignMonSivsTRT)
DECLARE_NAMESPACE_TOOL_FACTORY(InDetAlignMon, TrackSelectionTool)
DECLARE_ALGORITHM_FACTORY(TrackSelectionAlg)
-DECLARE_FACTORY_ENTRIES(InDetAlignmentMonitoring) {
- DECLARE_NAMESPACE_TOOL(InDetAlignMon, TrackSelectionTool);
-}
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_load.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_load.cxx
deleted file mode 100755
index eac941c639118b15e8354b7a810a7462cfc5a0d5..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/components/InDetAlignmentMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetAlignmentMonitoring)
diff --git a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_entries.cxx
index d4443bceaf006f5c931346903f99265b6a978f7c..c412615068640f5a8ee438ea975815ebc8eda6dd 100644
--- a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_entries.cxx
@@ -1,4 +1,3 @@
#include "InDetDiMuonMonitoring/DiMuMon.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( DiMuMon )
diff --git a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_load.cxx b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_load.cxx
deleted file mode 100644
index 3f4443bd2366d36250c546fb88c930e56f2f1a7e..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/components/InDetDiMuonMonitoring_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(InDetDiMuonMonitoring)
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_entries.cxx
old mode 100755
new mode 100644
index 9ff8bf31c124a679332e451ed314c34cc5612918..718de63eeab2ffd4e7acd912867861f0b148779f
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_entries.cxx
@@ -10,7 +10,6 @@
#include "../InDetGlobalBeamSpotMonTool.h"
#include "../InDetGlobalPrimaryVertexMonTool.h"
#include "../InDetGlobalErrorMonTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY(InDetGlobalManager)
DECLARE_TOOL_FACTORY(InDetGlobalHitsMonTool)
@@ -24,19 +23,3 @@ DECLARE_TOOL_FACTORY(InDetGlobalBeamSpotMonTool)
DECLARE_TOOL_FACTORY(InDetGlobalPrimaryVertexMonTool)
DECLARE_TOOL_FACTORY(InDetGlobalErrorMonTool)
-
-
-DECLARE_FACTORY_ENTRIES(InDetGlobalMonitoring) {
- DECLARE_ALGORITHM(InDetGlobalManager);
- DECLARE_ALGTOOL(InDetGlobalHitsMonTool);
- DECLARE_ALGTOOL(InDetGlobalMotherMonTool);
- DECLARE_ALGTOOL(InDetGlobalSynchMonTool);
- DECLARE_ALGTOOL(InDetGlobalNoiseOccupancyMonTool);
- DECLARE_ALGTOOL(InDetGlobalTrackMonTool);
- DECLARE_ALGTOOL(InDetGlobalBCMTool);
- DECLARE_ALGTOOL(InDetGlobalPixelTool);
- DECLARE_ALGTOOL(InDetGlobalBeamSpotMonTool);
- DECLARE_ALGTOOL(InDetGlobalPrimaryVertexMonTool);
- DECLARE_ALGTOOL(InDetGlobalErrorMonTool);
-}
-
diff --git a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_load.cxx b/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_load.cxx
deleted file mode 100755
index 5eb103db0a6ae2ecdd4030a3f6a548f0d84020ce..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetMonitoring/InDetGlobalMonitoring/src/components/InDetGlobalMonitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetGlobalMonitoring)
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_entries.cxx
old mode 100755
new mode 100644
index 8cdacf1e6a41bd5d5e1ecd64eab075550a6ef5d0..caffe46a382b71eddf3af7dd4da650beb02e5aa8
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_entries.cxx
@@ -6,7 +6,6 @@
#include "InDetPerformanceMonitoring/IDPerfMonEoverP.h"
#include "InDetPerformanceMonitoring/IDPerfMuonRefitter.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(IDPerfMonZee)
DECLARE_TOOL_FACTORY(IDPerfMonWenu)
@@ -16,4 +15,3 @@ DECLARE_TOOL_FACTORY(TRT_Electron_Monitoring_Tool)
DECLARE_ALGORITHM_FACTORY( IDPerfMonEoverP )
DECLARE_ALGORITHM_FACTORY(IDPerfMuonRefitter)
-
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_load.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_load.cxx
deleted file mode 100755
index 2b481cac13065b83120fd14d4b02ab99702f0d13..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/components/InDetPerformanceMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetPerformanceMonitoring)
diff --git a/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_entries.cxx
old mode 100755
new mode 100644
index 6b5a355fc0f1000ec6a44b941e563251619b6318..0224b47a12fcaf4ddb81ec84cb30fb59c2d4cca7
--- a/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_entries.cxx
@@ -1,8 +1,4 @@
#include "../InDetVertexMonitoring.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( InDetVertexMonitoring )
-DECLARE_FACTORY_ENTRIES( InDetVertexMonitoring ){
- DECLARE_ALGTOOL( InDetVertexMonitoring )
-}
diff --git a/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_load.cxx b/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_load.cxx
deleted file mode 100755
index 1bbacde8c83c676e2643f2a63038850821beef96..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetMonitoring/InDetVertexMonitoring/src/components/InDetVertexMonitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(AthenaMonitoring)
-
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx
old mode 100755
new mode 100644
index 9ddd038fdac7b8220f2af010e996e2359060618a..468b7e27b7d921854180c05f73aa7ba27ee7bf60
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx
@@ -1,14 +1,5 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
#include "PixelMonitoring/PixelMainMon.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( PixelMainMon )
-DECLARE_FACTORY_ENTRIES( PixelMonitoring ) {
- DECLARE_TOOL( PixelMainMon )
-}
-
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_load.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_load.cxx
deleted file mode 100755
index 7eb778034a5bce7a6cd87b417888ec7f180b30c0..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelMonitoring )
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_entries.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_entries.cxx
old mode 100755
new mode 100644
index 4a60451dc29c783aeb7dc7ab8167aca0c8fca75f..0d198e8e6a1079ef725b1f976c42faaa1c0c334c
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SCT_Monitoring/SCTMotherTrigMonTool.h"
#include "SCT_Monitoring/SCTTracksMonTool.h"
#include "SCT_Monitoring/SCTLorentzMonTool.h"
@@ -19,15 +18,3 @@ DECLARE_TOOL_FACTORY(SCTHitEffMonTool)
DECLARE_TOOL_FACTORY(SCTHitsNoiseMonTool)
DECLARE_TOOL_FACTORY(SCTSummaryMonTool)
-
-DECLARE_FACTORY_ENTRIES(SCT_Monitoring) {
- DECLARE_ALGTOOL(SCTMotherTrigMonTool)
- DECLARE_ALGTOOL(SCTTracksMonTool)
- DECLARE_ALGTOOL(SCTLorentzMonTool)
- DECLARE_ALGTOOL(SCTRatioNoiseMonTool)
- DECLARE_ALGTOOL(SCTErrMonTool)
- DECLARE_ALGTOOL(SCTHitEffMonTool)
- DECLARE_ALGTOOL(SCTHitsNoiseMonTool)
- DECLARE_ALGTOOL(SCTSummaryMonTool)
-}
-
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_load.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_load.cxx
deleted file mode 100755
index f22c6cb0edd1eaae42f9ca8d320575ac82d49b69..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/components/SCT_Monitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SCT_Monitoring)
diff --git a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_entries.cxx b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_entries.cxx
index 1ed477874d7af14c2677f194462d7624e668a404..1ddbcfa7af93072dfea301a44a4cfc58133d63ec 100644
--- a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_entries.cxx
@@ -1,16 +1,11 @@
#include "TRT_Monitoring/TRT_Monitoring_Tool.h"
#include "TRT_Monitoring/TRT_Hits_Monitoring_Tool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(TRT_Monitoring_Tool)
#ifdef ONLINE
DECLARE_TOOL_FACTORY(TRT_Hits_Monitoring_Tool)
#endif
-DECLARE_FACTORY_ENTRIES(TRT_Monitoring)
-{
- DECLARE_ALGTOOL(TRT_Monitoring_Tool);
#ifdef ONLINE
- DECLARE_ALGTOOL(TRT_Hits_Monitoring_Tool);
#endif
-}
+
diff --git a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_load.cxx b/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_load.cxx
deleted file mode 100644
index 436160ed9a9e8187d3171102692097c5bdbc448d..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetMonitoring/TRT_Monitoring/src/components/TRT_Monitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_Monitoring)
diff --git a/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_entries.cxx b/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_entries.cxx
index 6fdc25527aaef752813c3cb50abebebc3319427c..5e6a1d16725e3ad0cbad6e4664e55691f8cff862 100644
--- a/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_entries.cxx
+++ b/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_entries.cxx
@@ -1,6 +1,3 @@
#include "SCTExtension/SCTExtensionAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( SCTExtensionAlg )
-DECLARE_FACTORY_ENTRIES(SCTExtension) {
-DECLARE_ALGORITHM( SCTExtensionAlg )
-}
+
diff --git a/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_load.cxx b/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_load.cxx
deleted file mode 100644
index 9e181d924d74e1c654e44be9f7d117c5e5554dac..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetPerformance/SCTExtension/src/components/SCTExtension_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(SCTExtension)
diff --git a/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_entries.cxx b/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_entries.cxx
index 68f779cbd575ed229b9c698945717e7a60e2cc8a..ab2069c00a4f1ad9deafa9a25691f02700a1e600 100644
--- a/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_entries.cxx
+++ b/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_entries.cxx
@@ -1,9 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "BCM_ZeroSuppression/BCM_ZeroSuppression.h"
DECLARE_ALGORITHM_FACTORY( BCM_ZeroSuppression )
-DECLARE_FACTORY_ENTRIES(BCM_ZeroSuppression) {
- DECLARE_ALGORITHM(BCM_ZeroSuppression)
-}
diff --git a/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_load.cxx b/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_load.cxx
deleted file mode 100644
index 9b05e08b81beda84388dffb33446fd5ad7e71921..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRawAlgs/BCM_ZeroSuppression/src/components/BCM_ZeroSuppression_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(BCM_ZeroSuppression)
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_entries.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_entries.cxx
old mode 100755
new mode 100644
index 910c0fc60c5b7ae36e4b9cf6edc919071d5838f4..3f46a1e2a50df01d6c602c1e8bb92b46948d7d34
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_entries.cxx
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_entries.cxx
@@ -1,11 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetOverlay/InDetOverlay.h"
#include "InDetOverlay/InDetSDOOverlay.h"
DECLARE_ALGORITHM_FACTORY( InDetOverlay )
DECLARE_ALGORITHM_FACTORY( InDetSDOOverlay )
-DECLARE_FACTORY_ENTRIES( InDetOverlay ) {
- DECLARE_ALGORITHM( InDetOverlay )
- DECLARE_ALGORITHM( InDetSDOOverlay )
-}
+
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_load.cxx b/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_load.cxx
deleted file mode 100755
index b5381e578f9ae0d0e430af7412eea1ef23225698..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/src/components/InDetOverlay_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetOverlay)
diff --git a/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_entries.cxx b/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_entries.cxx
index 48d62b0c2ba47fce33c19dc3c96aa0d03aafee4b..e59eb99310c4650b59a01cb75f3b484aa360d4ef 100644
--- a/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_entries.cxx
@@ -1,7 +1,3 @@
#include "BCM_BackgroundAlgs/BcmCollisionTimeAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_ALGORITHM_FACTORY( BcmCollisionTimeAlg )
-DECLARE_FACTORY_ENTRIES(BCM_BackgroundAlgs) {
-DECLARE_ALGORITHM( BcmCollisionTimeAlg )
-}
diff --git a/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_load.cxx b/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_load.cxx
deleted file mode 100644
index 72752da3f91a5d564524a3156596c7df4dae6f10..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/BCM_BackgroundAlgs/src/components/BCM_BackgroundAlgs_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(BCM_BackgroundAlgs)
diff --git a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_entries.cxx b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_entries.cxx
index ad10c2b761feff73c5636973720252d8c145ac1d..85dcd7fb1044b7ca1ee92e61b6ef375ca1498e41 100644
--- a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_entries.cxx
@@ -1,12 +1,7 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetCaloClusterROISelector/CaloClusterROI_Selector.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( CaloClusterROI_Selector )
-DECLARE_FACTORY_ENTRIES( InDetCaloClusterROISelector )
-{
- DECLARE_ALGORITHM( CaloClusterROI_Selector )
-}
+
diff --git a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_load.cxx b/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_load.cxx
deleted file mode 100644
index 38fed34af54d9a6bad632c4fb06d4c78113858ae..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/InDetCaloClusterROISelector/src/components/InDetCaloClusterROISelector_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetCaloClusterROISelector )
diff --git a/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_entries.cxx b/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_entries.cxx
old mode 100755
new mode 100644
index 02004276b296165b25c970e8047c906dbcefa3a9..ab7a45b90d4c6759f0c6df8bec5e7471e74d4836
--- a/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_entries.cxx
@@ -1,11 +1,6 @@
#include "InDetConversionFinder/ConversionFinder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( ConversionFinder )
-DECLARE_FACTORY_ENTRIES(InDetConversionFinder)
-{
- DECLARE_ALGORITHM( ConversionFinder )
-}
diff --git a/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_load.cxx b/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_load.cxx
deleted file mode 100755
index 11ff1b0dec63ae00ba3540a6dd021092cdf687e8..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/InDetConversionFinder/src/components/InDetConversionFinder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetConversionFinder )
diff --git a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_entries.cxx b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_entries.cxx
old mode 100755
new mode 100644
index 45cb36c794723c969b5d7dd17b011c597e5c2236..60465a2b9120f37ac5b05ccc5fe965817e240c73
--- a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_entries.cxx
@@ -1,13 +1,5 @@
#include "InDetExtensionProcessor/InDetExtensionProcessor.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetExtensionProcessor )
-DECLARE_FACTORY_ENTRIES(InDetExtensionProcessor) {
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetExtensionProcessor)
-}
-
-
-
-
diff --git a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_load.cxx b/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_load.cxx
deleted file mode 100755
index dc4d6133a41f8be123b5a7a1e412180ccaa49d33..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/InDetExtensionProcessor/src/components/InDetExtensionProcessor_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetExtensionProcessor)
-
-
diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_entries.cxx b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_entries.cxx
index 36722a279fbaf9c51df01bf303e118f412a0a2b1..e53c7c00eebd9a2635bc4e5aefb4cbd419bfcb8a 100644
--- a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_entries.cxx
@@ -1,10 +1,6 @@
#include "InDetLowBetaFinder/LowBetaAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( LowBetaAlg )
-
-DECLARE_FACTORY_ENTRIES(InDetLowBetaFinder) {
- DECLARE_ALGORITHM( LowBetaAlg )
- }
+
diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_load.cxx b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_load.cxx
deleted file mode 100644
index 957d81087e4fe277e3b9ac96ac843f011eb1ce50..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/src/components/InDetLowBetaFinder_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(InDetLowBetaFinder)
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_entries.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_entries.cxx
old mode 100755
new mode 100644
index 036a7f6a216e30ae60942d42732b7c637b911dee..69e09e0d8df041cc3602d82358437327f132040c
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_entries.cxx
@@ -3,7 +3,6 @@
#include "InDetPrepRawDataFormation/TRT_RIO_Maker.h"
#include "InDetPrepRawDataFormation/CacheCreator.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
@@ -12,21 +11,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, SCT_Clusterization )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_RIO_Maker )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, CacheCreator )
-DECLARE_FACTORY_ENTRIES( InDetPrepRawDataFormation )
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet, PixelClusterization)
- DECLARE_NAMESPACE_ALGORITHM( InDet, SCT_Clusterization )
- DECLARE_NAMESPACE_ALGORITHM( InDet, TRT_RIO_Maker )
- DECLARE_NAMESPACE_ALGORITHM( InDet, CacheCreator )
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_load.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_load.cxx
deleted file mode 100755
index 1f9deb31883ad12a7f5124f2fd58104aa4f8d67b..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/components/InDetPrepRawDataFormation_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetPrepRawDataFormation )
-
-
diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_entries.cxx b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_entries.cxx
old mode 100755
new mode 100644
index dcf64c23bb631353501c3ecf5d459c6dbfcbb49c..a85485c151bd6d3ca2e966799856f2cbc6e27445
--- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetPriVxFinder/InDetPriVxFinder.h"
#include "InDetPriVxFinder/InDetPriVxDummyFinder.h"
#include "InDetPriVxFinder/InDetVxLinksToTrackParticles.h"
@@ -7,10 +6,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetPriVxFinder )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetPriVxDummyFinder )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetVxLinksToTrackParticles )
-DECLARE_FACTORY_ENTRIES( InDetPriVxFinder )
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetPriVxFinder )
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetPriVxDummyFinder )
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetVxLinksToTrackParticles )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_load.cxx b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_load.cxx
deleted file mode 100755
index 7a2378abd8a4aa06dfb2606fd0a415314c15fb42..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/components/InDetPriVxFinder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetPriVxFinder )
diff --git a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_entries.cxx b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_entries.cxx
old mode 100755
new mode 100644
index 9faacf8b545166b82c85b4f515226d3a4a5e0ee3..3636efbf526ae37c7dd26ff712290aee00ddb16f
--- a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrackPRD_Association/InDetTrackPRD_Association.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( InDetTrackPRD_Association )
-DECLARE_FACTORY_ENTRIES( InDetTrackPRD_Association )
-{
- DECLARE_ALGORITHM( InDetTrackPRD_Association )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_load.cxx b/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_load.cxx
deleted file mode 100755
index 6da85f8d4d78b766ef5d1c064c1aeba9b11df86b..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/InDetTrackPRD_Association/src/components/InDetTrackPRD_Association_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrackPRD_Association)
-
diff --git a/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_entries.cxx b/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_entries.cxx
old mode 100755
new mode 100644
index b073bea300b979bfc17190946a3052a3f5ccfd5c..150a3d63e301e2dfcb48d4639ac7766333141178
--- a/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetV0Finder/InDetV0FinderTool.h"
#include "InDetV0Finder/InDetV0Finder.h"
//#include "InDetV0Finder/InDetSimpleV0Finder.h"
@@ -7,20 +6,7 @@ using namespace InDet;
DECLARE_TOOL_FACTORY( InDetV0FinderTool )
-DECLARE_FACTORY_ENTRIES( InDetV0FinderTool )
-{
- DECLARE_TOOL( InDetV0FinderTool )
-}
DECLARE_ALGORITHM_FACTORY( InDetV0Finder )
//DECLARE_ALGORITHM_FACTORY( InDetSimpleV0Finder )
-DECLARE_FACTORY_ENTRIES( InDetV0Finder )
-{
- DECLARE_ALGORITHM( InDetV0Finder );
-}
-
-//DECLARE_FACTORY_ENTRIES( InDetSimpleV0Finder )
-//{
-// DECLARE_ALGORITHM( InDetSimpleV0Finder );
-//}
diff --git a/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_load.cxx b/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_load.cxx
deleted file mode 100755
index 81c4d96fe84efa26f7a31e3d9e11b6f1251dad71..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/InDetV0Finder/src/components/InDetV0Finder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetV0Finder)
-
diff --git a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_entries.cxx b/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_entries.cxx
old mode 100755
new mode 100644
index 12cf2a1d58ba1d42f83deaa0c1c58d644a0eb37d..841ff268c7b9b72e819bf74fe044fb5c9632527b
--- a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_entries.cxx
@@ -1,11 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetZVTOP_Alg/InDetZVTOP_Alg.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( InDetZVTOP_Alg )
-DECLARE_FACTORY_ENTRIES( InDetZVTOP_Alg )
-{
- DECLARE_ALGORITHM( InDetZVTOP_Alg )
-}
diff --git a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_load.cxx b/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_load.cxx
deleted file mode 100755
index af817606869b2559eecc96a89e31b3f875a2cb53..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/InDetZVTOP_Alg/src/components/InDetZVTOP_Alg_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetZVTOP_Alg )
-
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_entries.cxx b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_entries.cxx
old mode 100755
new mode 100644
index a7e410232bb88cf96a6666a2dab442a4d82ae835..b21701ffc65e3f92b3ce0eb17fc7c2b816129241
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiSPSeededTrackFinder/SiSPSeededTrackFinder.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( SiSPSeededTrackFinder )
-DECLARE_FACTORY_ENTRIES( SiSPSeededTrackFinder )
-{
- DECLARE_ALGORITHM( SiSPSeededTrackFinder )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_load.cxx b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_load.cxx
deleted file mode 100755
index 9c08bc0646b1c2b852fe951987f4e760af5048e5..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/components/SiSPSeededTrackFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SiSPSeededTrackFinder)
-
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_entries.cxx b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_entries.cxx
old mode 100755
new mode 100644
index bdf42503ed76177957340b0004b970a2dd50eacd..83e52a96999a4b58d3d7b65daf048f775ebe172e
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_entries.cxx
@@ -1,11 +1,4 @@
-
#include "SiSpacePointFormation/SiTrackerSpacePointFinder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, SiTrackerSpacePointFinder)
-DECLARE_FACTORY_ENTRIES( SiSpacePointFormation )
-{
- DECLARE_NAMESPACE_ALGORITHM(InDet, SiTrackerSpacePointFinder )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_load.cxx b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_load.cxx
deleted file mode 100755
index fa5a18c01c424b39693a146506d149410e884ce9..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/components/SiSpacePointFormation_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiSpacePointFormation)
diff --git a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_entries.cxx b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_entries.cxx
old mode 100755
new mode 100644
index 449bba827303c170018421c242a186f49697bdda..cca4895330b756ad64ac528657bfee92a50c87bc
--- a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_SeededTrackFinder/TRT_SeededTrackFinder.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TRT_SeededTrackFinder )
-DECLARE_FACTORY_ENTRIES( TRT_SeededTrackFinder )
-{
- DECLARE_ALGORITHM( TRT_SeededTrackFinder )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_load.cxx b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_load.cxx
deleted file mode 100755
index cc4978127cdee6af95130ffb2c9d602be0a75872..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/components/TRT_SeededTrackFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_SeededTrackFinder)
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_entries.cxx b/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_entries.cxx
old mode 100755
new mode 100644
index cc7dec67539ca12c5d7349920d6055dd488ae6f6..c538cb0b5d00faddcae58ec30bb8379888fd2b9c
--- a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_StandaloneTrackFinder/TRT_StandaloneTrackFinder.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TRT_StandaloneTrackFinder )
-DECLARE_FACTORY_ENTRIES( TRT_StandaloneTrackFinder )
-{
- DECLARE_ALGORITHM( TRT_StandaloneTrackFinder )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_load.cxx b/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_load.cxx
deleted file mode 100755
index 5d9003ae9d6df23e9e177beea36cc814c370adcb..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/TRT_StandaloneTrackFinder/src/components/TRT_StandaloneTrackFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_StandaloneTrackFinder)
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_entries.cxx b/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_entries.cxx
old mode 100755
new mode 100644
index 0e66fa88d9f610a22f3774c602337e2e5cf85998..5ceec201e55df8eadc79d4b7adb1a60618c21821
--- a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrackExtensionAlg/TRT_TrackExtensionAlg.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, TRT_TrackExtensionAlg )
-DECLARE_FACTORY_ENTRIES( TRT_TrackExtensionAlg )
-{
- DECLARE_NAMESPACE_ALGORITHM(InDet, TRT_TrackExtensionAlg )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_load.cxx b/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_load.cxx
deleted file mode 100755
index e0be0f0e1e56396fcb80d6a9a145c155d6f72ef7..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/TRT_TrackExtensionAlg/src/components/TRT_TrackExtensionAlg_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrackExtensionAlg )
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_entries.cxx b/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_entries.cxx
old mode 100755
new mode 100644
index a11fbb75e347e8dddafebaa82339464f540f41ef..b316c2131b01709988b156061ed994c4f0715cd8
--- a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_entries.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrackSegmentsFinder/TRT_TrackSegmentsFinder.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TRT_TrackSegmentsFinder )
-DECLARE_FACTORY_ENTRIES( TRT_TrackSegmentsFinder )
-{
- DECLARE_ALGORITHM( TRT_TrackSegmentsFinder )
-}
-
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_load.cxx b/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_load.cxx
deleted file mode 100755
index d6b12d7e87237f472b41ddd0534ebaf60137bf2f..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/components/TRT_TrackSegmentsFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrackSegmentsFinder)
-
diff --git a/InnerDetector/InDetRecEvent/BCM_CollisionTime/src/components/BCM_CollisionTime_load.cxx b/InnerDetector/InDetRecEvent/BCM_CollisionTime/src/components/BCM_CollisionTime_load.cxx
deleted file mode 100644
index 9586c8e749b39236ec1441e8b88dfdc0cfa733df..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecEvent/BCM_CollisionTime/src/components/BCM_CollisionTime_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(BCM_CollisionTime)
diff --git a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_entries.cxx b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_entries.cxx
old mode 100755
new mode 100644
index e1b3ae297f578fd85aa88e6d5ce8434c851ed74a..aa622f97ec2c736d2012806b147fcdb4719304ec
--- a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetAmbiTrackSelectionTool/InDetAmbiTrackSelectionTool.h"
#include "InDetAmbiTrackSelectionTool/InDetDenseEnvAmbiTrackSelectionTool.h"
@@ -6,10 +5,3 @@
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetAmbiTrackSelectionTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetDenseEnvAmbiTrackSelectionTool )
-
-DECLARE_FACTORY_ENTRIES( InDetAmbiTrackSelectionTool )
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetAmbiTrackSelectionTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetDenseEnvAmbiTrackSelectionTool )
-}
-
diff --git a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_load.cxx b/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_load.cxx
deleted file mode 100755
index ef60d4952e99e5f7588daa754d9fe8e51bdcff9f..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetAmbiTrackSelectionTool/src/components/InDetAmbiTrackSelectionTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAmbiTrackSelectionTool )
-
diff --git a/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_entries.cxx b/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_entries.cxx
old mode 100755
new mode 100644
index 38342c6c41b7b263ab54784da09c85bb7caad05b..91d4b2e889c585890a58c6827e4b93e00d49bdb8
--- a/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetAssociationTools/InDetPRD_AssociationToolGangedPixels.h"
#include "InDetAssociationTools/InDetPRD_Provider.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetPRD_AssociationToolGangedPixels )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetPRD_Provider )
-DECLARE_FACTORY_ENTRIES( InDetAssociationTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetPRD_AssociationToolGangedPixels )
- DECLARE_NAMESPACE_TOOL( InDet, InDetPRD_Provider )
-}
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_load.cxx b/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_load.cxx
deleted file mode 100755
index c09cb6e637d78aa45825373a3f213422263ca3e4..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetAssociationTools/src/components/InDetAssociationTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetAssociationTools )
-
diff --git a/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_entries.cxx b/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_entries.cxx
old mode 100755
new mode 100644
index 904ba7eb73b95e42ba677d33036cef098d8642c5..3110c1e2b137046aeed523a74e70703ec71bc6ec
--- a/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_entries.cxx
@@ -1,11 +1,7 @@
#include "../CaloClusterROI_Builder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_TOOL_FACTORY (CaloClusterROI_Builder)
-DECLARE_FACTORY_ENTRIES(InDetCaloClusterROIBuilder) {
- DECLARE_TOOL ( CaloClusterROI_Builder )
-}
diff --git a/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_load.cxx b/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_load.cxx
deleted file mode 100755
index 8fc00905ac49030bd19e853d73a160476e5b2951..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetCaloClusterROIBuilder/src/components/InDetCaloClusterROIBuilder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetCaloClusterROIBuilder)
-
diff --git a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_entries.cxx b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_entries.cxx
old mode 100755
new mode 100644
index fbfdd52d76f15beb05a4edccfec2436646cf45f3..2c560e0bcebf53159e325491be139cbc8fa00909
--- a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_entries.cxx
@@ -1,17 +1,8 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetCompetingRIOsOnTrackTool/CompetingTRT_DriftCirclesOnTrackTool.h"
#include "InDetCompetingRIOsOnTrackTool/CompetingPixelClustersOnTrackTool.h"
#include "InDetCompetingRIOsOnTrackTool/CompetingSCT_ClustersOnTrackTool.h"
-//using namespace InDet;
-
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, CompetingTRT_DriftCirclesOnTrackTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, CompetingPixelClustersOnTrackTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, CompetingSCT_ClustersOnTrackTool )
-DECLARE_FACTORY_ENTRIES(InDetCompetingRIOsOnTrackTool)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_TOOL(InDet, CompetingTRT_DriftCirclesOnTrackTool)
- DECLARE_NAMESPACE_TOOL(InDet, CompetingPixelClustersOnTrackTool)
- DECLARE_NAMESPACE_TOOL(InDet, CompetingSCT_ClustersOnTrackTool)
-}
diff --git a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_load.cxx b/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_load.cxx
deleted file mode 100755
index 0c3c466e6e8fd77cb458e179bb8079ba07e1a9fb..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetCompetingRIOsOnTrackTool/src/components/CompetingTRT_DriftCirclesOnTrackTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetCompetingRIOsOnTrackTool)
diff --git a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_entries.cxx b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_entries.cxx
old mode 100755
new mode 100644
index 76123168387fb8775d0d09acec2bdf7d76148cdb..076a16391f03ee786e603425153bb4ce52519f4c
--- a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetConversionFinderTools/InDetConversionFinderTools.h"
#include "InDetConversionFinderTools/TrackPairsSelector.h"
#include "InDetConversionFinderTools/ConversionFinderUtils.h"
@@ -14,13 +13,3 @@ DECLARE_TOOL_FACTORY( VertexPointEstimator )
DECLARE_TOOL_FACTORY( ConversionPostSelector )
DECLARE_TOOL_FACTORY( SingleTrackConversionTool )
-DECLARE_FACTORY_ENTRIES( InDetConversionFinderTools )
-{
- DECLARE_TOOL( InDetConversionFinderTools )
- DECLARE_TOOL( TrackPairsSelector )
- DECLARE_TOOL( ConversionFinderUtils )
- DECLARE_TOOL( VertexPointEstimator )
- DECLARE_TOOL( ConversionPostSelector )
- DECLARE_TOOL( SingleTrackConversionTool )
-
-}
diff --git a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_load.cxx b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_load.cxx
deleted file mode 100755
index 9efba0af330172aa4369f19d86f307db28fe7004..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/components/InDetConversionFinderTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetConversionFinderTools )
diff --git a/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_entries.cxx b/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_entries.cxx
index a42b1cec5d096f24d2a5ef92d827ae13384bf12a..101d112ecdeb5ecfe3f6512643c3726d5e44c1ea 100644
--- a/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetDNASeparator/InDetDNASeparator.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetDNASeparator )
-DECLARE_FACTORY_ENTRIES( InDetDNASeparator )
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetDNASeparator )
-}
-
diff --git a/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_load.cxx b/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_load.cxx
deleted file mode 100644
index c9847b34399ab50c7e8c634f0d17628163907799..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetDNASeparator/src/components/InDetDNASeparator_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetDNASeparator )
-
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_entries.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_entries.cxx
index 161aa272391321f7d0462acf79821f94da9213e9..68398ec6acf37122d057dcf891e344bd789da400 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetMultipleVertexSeedFinder/SlidingWindowMultiSeedFinder.h"
#include "InDetMultipleVertexSeedFinder/DivisiveMultiSeedFinder.h"
#include "InDetMultipleVertexSeedFinder/HistogrammingMultiSeedFinder.h"
@@ -9,9 +8,3 @@ DECLARE_TOOL_FACTORY( SlidingWindowMultiSeedFinder )
DECLARE_TOOL_FACTORY( DivisiveMultiSeedFinder )
DECLARE_TOOL_FACTORY( HistogrammingMultiSeedFinder )
-DECLARE_FACTORY_ENTRIES( TrkMultipleVertexSeedFinder )
-{
- DECLARE_TOOL( SlidingWindowMultiSeedFinder );
- DECLARE_TOOL( DivisiveMultiSeedFinder );
- DECLARE_TOOL( HistogrammingMultiSeedFinder );
-}
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_load.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_load.cxx
deleted file mode 100644
index 74a2fbb614fe87c446e98a80bf94c26b7644a04c..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinder/src/components/InDetMultipleVertexSeedFinder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetMultipleVertexSeedFinder )
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_entries.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_entries.cxx
index 40e85f7b470395f39c1709e26be835f6a1850896..694453f3be39ddf30cbf91ca2982f45fb09a7c4c 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetMultipleVertexSeedFinderUtils/InDetTrackZ0SortingTool.h"
#include "InDetMultipleVertexSeedFinderUtils/InDetTrackClusterCleaningTool.h"
@@ -7,8 +6,3 @@ using namespace InDet;
DECLARE_TOOL_FACTORY( InDetTrackZ0SortingTool )
DECLARE_TOOL_FACTORY( InDetTrackClusterCleaningTool )
-DECLARE_FACTORY_ENTRIES( InDetMultipleVertexSeedFinderUtils )
-{
- DECLARE_TOOL( InDetTrackZ0SortingTool );
- DECLARE_TOOL( InDetTrackClusterCleaningTool );
-}
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_load.cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_load.cxx
deleted file mode 100644
index df867e443f60f5b9d26fa11d65a579c30159cb55..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/components/InDetMultipleVertexSeedFinderUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetMultipleVertexSeedFinderUtils )
diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_entries.cxx b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_entries.cxx
old mode 100755
new mode 100644
index 4d79b4ccdc739df778a04da127b8f3fcca627eb2..6f564930778a55ffe7cc7a143ca38ddcdf2dafb6
--- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetPriVxFinderTool/InDetPriVxFinderTool.h"
#include "InDetPriVxFinderTool/InDetAdaptivePriVxFinderTool.h"
#include "InDetPriVxFinderTool/InDetIterativePriVxFinderTool.h"
@@ -15,13 +14,3 @@ DECLARE_TOOL_FACTORY( InDetIterativePriVxFinderTool )
DECLARE_TOOL_FACTORY( InDetAdaptiveMultiPriVxFinderTool )
DECLARE_TOOL_FACTORY( InDetMultiPriVxFinderTool )
-DECLARE_FACTORY_ENTRIES( InDetPriVxFinderTool )
-{
- DECLARE_TOOL( InDetPriVxFinderTool )
- DECLARE_TOOL( InDetAdaptivePriVxFinderTool )
- DECLARE_TOOL( InDetIterativePriVxFinderTool )
- DECLARE_TOOL( InDetAdaptiveMultiPriVxFinderTool )
- DECLARE_TOOL( InDetMultiPriVxFinderTool )
-
-}
-
diff --git a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_load.cxx b/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_load.cxx
deleted file mode 100755
index 252cae7ea25c16abef8cd683fb39d5df1044e6a5..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetPriVxFinderTool/src/components/InDetPriVxFinderTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetPriVxFinderTool )
diff --git a/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_entries.cxx b/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_entries.cxx
old mode 100755
new mode 100644
index 164520bb9b7d721a3919329f03a725690f4fa7a3..f55a52823d47bac470446e7ede4377a7400ca4af
--- a/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_entries.cxx
@@ -1,9 +1,4 @@
#include "../SCT_ResidualPullCalculator.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SCT_ResidualPullCalculator )
-DECLARE_FACTORY_ENTRIES(InDetTrackValidation){
- DECLARE_NAMESPACE_TOOL(InDet, SCT_ResidualPullCalculator)
-}
-
diff --git a/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_load.cxx b/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_load.cxx
deleted file mode 100755
index 79e11dd51fadc63382cf24c6650df57f68c64efc..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetResidualPullCalculators/src/components/InDetResidualPullCalculators_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetResidualPullCalculators)
diff --git a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_entries.cxx b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_entries.cxx
old mode 100755
new mode 100644
index ce24dcbc1fa62d48833df5b77b8ea269b2eafa30..58fa9a1e15ce4d1a00a40ffa94643f4cc01966af
--- a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_entries.cxx
@@ -1,19 +1,6 @@
#include "InDetSVWithMuonTool/InDetSVWithMuonTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( InDetSVWithMuonTool )
-DECLARE_FACTORY_ENTRIES( InDetSVWithMuonTool ) {
- DECLARE_TOOL( InDetSVWithMuonTool );
-}
-//Notes:
-//
-//1. The argument to the DECLARE_FACTORY_ENTRIES(XXX) is the name of the
-// component library (libXXX.so).
-//2. Each Algorithm that is contained in the library should be declared
-// by the DECLARE_ALGORITHM() statement.
-//3. Each Service that is contained in the library should be declared
-// by the DECLARE_SERVICE() statement.
-//
-// See Athena User Guide for more information
+
diff --git a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_load.cxx b/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_load.cxx
deleted file mode 100755
index e32e02194dc115ad01bc1c6ca375dc1d1a17e2e9..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetSVWithMuonTool/src/components/InDetSVWithMuonTool_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( InDetSVWithMuonTool )
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx
old mode 100755
new mode 100644
index a615a4b48609f877d6de43de2fa61ac985e19ee1..1724022f60df3409bbe38c0ccaea6b014c0d943f
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetSecVxFinderTool/InDetJetFitterVxFinder.h"
#include "InDetSecVxFinderTool/InDetJetFitterUtils.h"
#include "InDetSecVxFinderTool/InDetImprovedJetFitterVxFinder.h"
@@ -9,9 +8,3 @@ DECLARE_TOOL_FACTORY( InDetJetFitterVxFinder )
DECLARE_TOOL_FACTORY( InDetJetFitterUtils )
DECLARE_TOOL_FACTORY( InDetImprovedJetFitterVxFinder )
-DECLARE_FACTORY_ENTRIES( InDetSecVxFinderTool )
-{
- DECLARE_TOOL( InDetJetFitterVxFinder );
- DECLARE_TOOL( InDetJetFitterUtils );
- DECLARE_TOOL( InDetImprovedJetFitterVxFinder );
-}
diff --git a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_load.cxx b/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_load.cxx
deleted file mode 100755
index 860b56e4f556369158e3a0830d77b9bb439ec8a3..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetSecVxFinderTool/src/components/InDetSecVxFinderTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetSecVxFinderTool )
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_entries.cxx b/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_entries.cxx
old mode 100755
new mode 100644
index cebf4e42d2878c3dadb937e7596eba1d4cb5a548..458c6085c61faab2d11ccd6f9c9a28968eb9e97b
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTestBLayer/InDetTestBLayerTool.h"
@@ -8,8 +7,4 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTestBLayerTool )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( InDetTestBLayer )
-{
- DECLARE_NAMESPACE_TOOL( InDet, inDetTestBLayerTool );
-}
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_load.cxx b/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_load.cxx
deleted file mode 100755
index fde9d02609f3afe4f959d8499777dc6520058fe2..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/src/components/InDetTestBLayer_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTestBLayer )
-
-
diff --git a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_entries.cxx b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_entries.cxx
old mode 100755
new mode 100644
index 01cdd776aa1148cf88ffe4fef5d8419f2a76419b..4bf1cf617b7d3efaf6865f526e01b6a76b9361df
--- a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTestPixelLayer/InDetTestPixelLayerTool.h"
@@ -8,8 +7,4 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTestPixelLayerTool )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( InDetTestPixelLayer )
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetTestPixelLayerTool );
-}
diff --git a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_load.cxx b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_load.cxx
deleted file mode 100755
index c789328224c96c1282cb524d31b36bd8eddca9ca..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/components/InDetTestPixelLayer_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTestPixelLayer )
-
-
diff --git a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_entries.cxx
index 10cda84b38ba8bcdbc5a914b757044c6b39fb81c..b791dadebc9a96a39637067eff5ac2bb15635d13 100644
--- a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_entries.cxx
@@ -1,10 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrackHoleSearch/InDetTrackHoleSearchTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackHoleSearchTool )
-DECLARE_FACTORY_ENTRIES( InDetTrackHoleSearch )
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrackHoleSearchTool )
-}
-
diff --git a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_load.cxx b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_load.cxx
deleted file mode 100644
index bafe132af638887cf6c8d8ff4880eebaf466c208..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/components/InDetTrackHoleSearch_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrackHoleSearch )
-
diff --git a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx
old mode 100755
new mode 100644
index 7fbb5de4aa13bac20661e197daee7a53fcf37483..b9f639fd5adced6953e28f5ca774b784bbdbd012
--- a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx
@@ -1,5 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrackScoringTools/InDetAmbiScoringTool.h"
#include "InDetTrackScoringTools/InDetCosmicScoringTool.h"
#include "InDetTrackScoringTools/InDetTrtTrackScoringTool.h"
@@ -8,13 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetAmbiScoringTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetCosmicScoringTool )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrtTrackScoringTool )
-DECLARE_FACTORY_ENTRIES( InDetTrackScoringTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetAmbiScoringTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetCosmicScoringTool )
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrtTrackScoringTool )
-}
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_load.cxx b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_load.cxx
deleted file mode 100755
index ac59d6b8abb5064a15d160cf814189fb32c5e638..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrackScoringTools )
-
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_entries.cxx
index 9284f454ed1b64078032a2c96b31836e410c3043..954f4767a9b4b3aeb1ae6245fd99edcd3f5a35ea 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_entries.cxx
@@ -1,7 +1,3 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
#include "InDetTrackSelectionTool/InDetTrackSelectionTool.h"
#include "../ToolTester.h"
@@ -10,11 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackSelectionTool )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, ToolTester )
-DECLARE_FACTORY_ENTRIES( InDetTrackSelectionTool ) {
-
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrackSelectionTool );
-
- //the athena tool tester library src/ToolTester
- DECLARE_NAMESPACE_ALGORITHM( InDet, ToolTester );
-
-}
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_load.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_load.cxx
deleted file mode 100644
index 0276600e24188021b1318ac73299b5d17ea125d3..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/src/components/InDetTrackSelectionTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( InDetTrackSelectionTool )
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_entries.cxx
index f48544f66c1e303a8fa67e5a61c579e9f3ffe385..05ebb86baf0703dcc02ff2acecfedea26b83fa07 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrackSelectorTool/InDetTrackSelectorTool.h"
#include "InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h"
#include "InDetTrackSelectorTool/InDetCosmicTrackSelectorTool.h"
@@ -15,12 +14,3 @@ DECLARE_TOOL_FACTORY( InDetDetailedTrackSelectorTool )
DECLARE_TOOL_FACTORY( InDetConversionTrackSelectorTool )
DECLARE_TOOL_FACTORY( InDetTrtDriftCircleCutTool )
-DECLARE_FACTORY_ENTRIES( InDetTrackSelectorTool )
-{
- DECLARE_TOOL( InDetTrackSelectorTool );
- DECLARE_TOOL( InDetIsoTrackSelectorTool );
- DECLARE_TOOL( InDetCosmicTrackSelectorTool );
- DECLARE_TOOL( InDetDetailedTrackSelectorTool );
- DECLARE_TOOL( InDetConversionTrackSelectorTool );
- DECLARE_TOOL( InDetTrtDriftCircleCutTool );
-}
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_load.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_load.cxx
deleted file mode 100644
index 4877876e80610c106b60ec1d33422248c96f79c0..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/components/InDetTrackSelectorTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrackSelectorTool )
diff --git a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_entries.cxx
old mode 100755
new mode 100644
index 1f4ca7fa4636d40e21d3fc180647d40828e8109d..b3f32aad539fcf4799bc3530a1022568f73181fb
--- a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_entries.cxx
@@ -1,16 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrackSummaryHelperTool/InDetTrackSummaryHelperTool.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( InDetTrackSummaryHelperTool )
-DECLARE_FACTORY_ENTRIES( InDetTrackSummaryHelperTool )
-{
- DECLARE_TOOL( InDetTrackSummaryHelperTool )
-}
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_load.cxx b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_load.cxx
deleted file mode 100755
index 16a38bf245d86f4fd9a272173b17c9b28dc856db..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/components/InDetTrackSummaryHelperTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrackSummaryHelperTool )
-
diff --git a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_entries.cxx b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_entries.cxx
old mode 100755
new mode 100644
index ab76d0ca685fcff3b050e139a475d4d894dc2cfc..09a43271f505c14d1bcb14651e301a1f6a44aa41
--- a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_entries.cxx
@@ -1,19 +1,6 @@
#include "InDetVKalPriVxFinderTool/InDetVKalPriVxFinderTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( InDetVKalPriVxFinderTool )
-DECLARE_FACTORY_ENTRIES( InDetVKalPriVxFinderTool ) {
- DECLARE_TOOL( InDetVKalPriVxFinderTool );
-}
-//Notes:
-//
-//1. The argument to the DECLARE_FACTORY_ENTRIES(XXX) is the name of the
-// component library (libXXX.so).
-//2. Each Algorithm that is contained in the library should be declared
-// by the DECLARE_ALGORITHM() statement.
-//3. Each Service that is contained in the library should be declared
-// by the DECLARE_SERVICE() statement.
-//
-// See Athena User Guide for more information
+
diff --git a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_load.cxx b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_load.cxx
deleted file mode 100755
index 907bc4af0932420aa7f724f087496019aeee4de6..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/components/InDetVKalPriVxFinderTool_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( InDetVKalPriVxFinderTool )
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_entries.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_entries.cxx
old mode 100755
new mode 100644
index bb2ab4c60384b6187a806159be5706c9968a2237..c6ee63e8e9b7e44390e6de9a54d0ce2a531c4aa8
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_entries.cxx
@@ -1,19 +1,6 @@
#include "InDetVKalVxInJetTool/InDetVKalVxInJetTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( InDetVKalVxInJetTool )
-DECLARE_FACTORY_ENTRIES( InDetVKalVxInJetTool ) {
- DECLARE_TOOL( InDetVKalVxInJetTool );
-}
-//Notes:
-//
-//1. The argument to the DECLARE_FACTORY_ENTRIES(XXX) is the name of the
-// component library (libXXX.so).
-//2. Each Algorithm that is contained in the library should be declared
-// by the DECLARE_ALGORITHM() statement.
-//3. Each Service that is contained in the library should be declared
-// by the DECLARE_SERVICE() statement.
-//
-// See Athena User Guide for more information
+
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_load.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_load.cxx
deleted file mode 100755
index 1c8627cd2664ca23bd339d496c8235b15a97b519..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/components/InDetVKalVxInJetTool_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( InDetVKalVxInJetTool )
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
diff --git a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_entries.cxx b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_entries.cxx
old mode 100755
new mode 100644
index ac1ecc1cd22e11088c74ff3b9d5f30e7a12f5b9d..933c7e5521eea826aa63e22a5ab71d13d108aefd
--- a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetZVTOPVxFinder/ZVTOP_Tool.h"
#include "InDetZVTOPVxFinder/ZVTOP_SecVtxTool.h"
#include "InDetZVTOPVxFinder/ZVTOP_SpatialPointFinder.h"
@@ -15,14 +14,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ZVTOP_TrkProbTubeCalc )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ZVTOP_SimpleVtxProbCalc )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, ZVTOP_AmbiguitySolver )
-DECLARE_FACTORY_ENTRIES( InDetZVTOPVxFinder )
-{
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_Tool )
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_SecVtxTool )
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_SpatialPointFinder )
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_SlowSpatialPointFinder )
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_TrkProbTubeCalc )
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_SimpleVtxProbCalc )
- DECLARE_NAMESPACE_TOOL( InDet, ZVTOP_AmbiguitySolver)
-}
-
diff --git a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_load.cxx b/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_load.cxx
deleted file mode 100755
index cd14b7e1e729dafbc002c909880d36fde93dcd23..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/InDetZVTOPVxFinder/src/components/InDetZVTOPVxFinder_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetZVTOPVxFinder )
-
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx
index 786004b806330bac1cfff52f04fcc5e024c7ec9d..6787b15f6c8bcd343b75ebaabf14a20f9ef494e6 100644
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "PixelToTPIDTool/PixelToTPIDTool.h"
#include "PixelToTPIDTool/PixeldEdxTestAlg.h"
#include "PixelToTPIDTool/PixeldEdxAODFix.h"
@@ -7,11 +6,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, PixelToTPIDTool )
DECLARE_ALGORITHM_FACTORY(PixeldEdxTestAlg)
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet,PixeldEdxAODFix)
-DECLARE_FACTORY_ENTRIES( PixelToTPIDTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, PixelToTPIDTool )
- DECLARE_ALGORITHM(PixeldEdxTestAlg)
- DECLARE_NAMESPACE_ALGORITHM(InDet, PixeldEdxAODFix)
-
-}
-
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_load.cxx b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_load.cxx
deleted file mode 100644
index 5dc3cb45eefd37903ae7e712fb96c5fdede40b03..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PixelToTPIDTools )
-
diff --git a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_entries.cxx b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_entries.cxx
index f865989284a5548a369a9f127901d0d9478f68d7..8c815df9e332c5fccc7d8cb29ee6631915a13e64 100644
--- a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SeedToTrackConversionTool/SeedToTrackConversionTool.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( SeedToTrackConversionTool )
-DECLARE_FACTORY_ENTRIES( SeedToTrackConversionTool )
-{
- DECLARE_TOOL( SeedToTrackConversionTool )
-}
-
diff --git a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_load.cxx b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_load.cxx
deleted file mode 100644
index 9669612b30661d47b0f948719214bf91c00817d1..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/components/SeedToTrackConversionTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SeedToTrackConversionTool )
-
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_entries.cxx b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_entries.cxx
old mode 100755
new mode 100644
index 4df7ac15dfb9541d2ffeada0b58146db76a50227..ecbcbbb355049bdfdb8e8c04cffcb624e68296b4
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_entries.cxx
@@ -1,14 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiClusterOnTrackTool/PixelClusterOnTrackTool.h"
#include "SiClusterOnTrackTool/SCT_ClusterOnTrackTool.h"
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PixelClusterOnTrackTool)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, SCT_ClusterOnTrackTool)
-DECLARE_FACTORY_ENTRIES(SiClusterOnTrackTool) {
- DECLARE_NAMESPACE_TOOL(InDet, PixelClusterOnTrackTool)
- DECLARE_NAMESPACE_TOOL(InDet, SCT_ClusterOnTrackTool)
-}
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_load.cxx b/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_load.cxx
deleted file mode 100755
index f9e36344f64fa61d55e1560de95f52cc80f22398..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/SiClusterOnTrackTool/src/components/SiClusterOnTrackTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiClusterOnTrackTool )
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_entries.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_entries.cxx
old mode 100755
new mode 100644
index 91db630a96ff91159cdbd4fcef5bb04d5c986884..9dec14c2ca19fa24036ff2dc28aa337f2bfaa1a6
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_entries.cxx
@@ -7,7 +7,6 @@
#include "SiClusterizationTool/SCT_ReClustering.h"
#include "SiClusterizationTool/ClusterMakerTool.h"
#include "SiClusterizationTool/PixelGangedAmbiguitiesFinder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiClusterizationTool/TotPixelClusterSplitter.h"
#include "SiClusterizationTool/NnPixelClusterSplitter.h"
#include "SiClusterizationTool/NnClusterizationFactory.h"
@@ -30,28 +29,6 @@ DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TruthPixelClusterSplitter )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TruthClusterizationFactory )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TruthPixelClusterSplitProbTool )
-DECLARE_FACTORY_ENTRIES( SiClusterizationTool ){
- DECLARE_NAMESPACE_TOOL( InDet, MergedPixelsTool )
- DECLARE_NAMESPACE_TOOL( InDet, SCT_ClusteringTool )
- DECLARE_NAMESPACE_TOOL( InDet, PixelGangedAmbiguitiesFinder )
- DECLARE_NAMESPACE_TOOL( InDet, ClusterMakerTool )
- DECLARE_NAMESPACE_TOOL( InDet, TotPixelClusterSplitter )
- DECLARE_NAMESPACE_TOOL( InDet, NnPixelClusterSplitter )
- DECLARE_NAMESPACE_TOOL( InDet, NnClusterizationFactory )
- DECLARE_NAMESPACE_TOOL( InDet, NnPixelClusterSplitProbTool )
- DECLARE_NAMESPACE_TOOL( InDet, TruthPixelClusterSplitter )
- DECLARE_NAMESPACE_TOOL( InDet, TruthClusterizationFactory )
- DECLARE_NAMESPACE_TOOL( InDet, TruthPixelClusterSplitProbTool )
-}
-
-
-
-
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_load.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_load.cxx
deleted file mode 100755
index 5dc884f17d4afc16dea766f389229714628bf9a7..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/components/SiClusterizationTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SiClusterizationTool )
-
-
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_entries.cxx
old mode 100755
new mode 100644
index 96343f924be984559028f21e4bb40626d0752ff5..00f9e7d3e04e9d69b58e71ccdbcdfadb02ab58ce
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( SiCombinatorialTrackFinder_xk)
-DECLARE_FACTORY_ENTRIES( SiCombinatorialTrackFinderTool_xk )
-{
- DECLARE_TOOL( SiCombinatorialTrackFinder_xk )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_load.cxx b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_load.cxx
deleted file mode 100755
index d5cd861d038a0ba882e6cbd184ed71d765bcffc5..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/components/SiCombinatorialTrackFinderTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiCombinatorialTrackFinderTool_xk)
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_entries.cxx
old mode 100755
new mode 100644
index 2b0268fbe190082e6781c117598de6f2bb98304d..34c2aa13f8227fb5e62b0bf7f28ec0d4add86cc8
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiDetElementsRoadTool_xk/SiDetElementsRoadMaker_xk.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( SiDetElementsRoadMaker_xk)
-DECLARE_FACTORY_ENTRIES( SiDetElementsRoadTool_xk )
-{
- DECLARE_TOOL( SiDetElementsRoadMaker_xk )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_load.cxx b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_load.cxx
deleted file mode 100755
index 43908602a267fd447553a10031df5f30ba345be6..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/components/SiDetElementsRoadTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiDetElementsRoadTool_xk)
diff --git a/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_entries.cxx b/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_entries.cxx
old mode 100755
new mode 100644
index e920fb20571ff0c45c534bd72ac8d1e7a647e6b8..b306838c01a505622f69734bafb661593d0ef1a2
--- a/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_entries.cxx
@@ -1,12 +1,4 @@
-
#include "SiSpacePointTool/SiSpacePointMakerTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SiSpacePointMakerTool )
-DECLARE_FACTORY_ENTRIES( SiSpacePointTool ){
-
- DECLARE_NAMESPACE_TOOL( InDet, SiSpacePointMakerTool )
-
-}
-
diff --git a/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_load.cxx b/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_load.cxx
deleted file mode 100755
index eb068bd0f3537e52bea17d0975090efcb9d3c706..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/SiSpacePointTool/src/components/SiSpacePointTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SiSpacePointTool )
-
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx
old mode 100755
new mode 100644
index f7de97bc61fe46542d4c534473c2dba1b19f745e..70014883eb1a7532515833582490902974f5a0a2
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_entries.cxx
@@ -1,5 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h"
#include "SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h"
#include "SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h"
@@ -18,18 +16,3 @@ DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_HeavyIon )
DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_Trigger )
DECLARE_TOOL_FACTORY( SiSpacePointsSeedMaker_ITK )
-DECLARE_FACTORY_ENTRIES( SiSpacePointsSeedTool_xk )
-{
- DECLARE_TOOL( SiSpacePointsSeedMaker_ATLxk )
- DECLARE_TOOL( SiSpacePointsSeedMaker_LowMomentum)
- DECLARE_TOOL( SiSpacePointsSeedMaker_BeamGas )
- DECLARE_TOOL( SiSpacePointsSeedMaker_Cosmic )
- DECLARE_TOOL( SiSpacePointsSeedMaker_HeavyIon )
- DECLARE_TOOL( SiSpacePointsSeedMaker_Trigger )
- DECLARE_TOOL( SiSpacePointsSeedMaker_ITK )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_load.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_load.cxx
deleted file mode 100755
index 2a5d0978ece58b1618dbb64850c0fa760bb89c19..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/components/SiSpacePointsSeedTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiSpacePointsSeedTool_xk)
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_entries.cxx
old mode 100755
new mode 100644
index 511e7807afaa10b0cbee831d35b56f8c8e2e1a33..dcd12ed87e194a4aee7532dc5157827b646b6039
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiTrackMakerTool_xk/SiTrackMaker_xk.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( SiTrackMaker_xk)
-DECLARE_FACTORY_ENTRIES( SiTrackMakerTool_xk )
-{
- DECLARE_TOOL( SiTrackMaker_xk )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_load.cxx b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_load.cxx
deleted file mode 100755
index ebdf5a4b11d6594a6d5bccc108e2ecae7bc21be2..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/components/SiTrackMakerTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiTrackMakerTool_xk)
diff --git a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_entries.cxx b/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_entries.cxx
old mode 100755
new mode 100644
index 3337d41244f09b4786c6b28789111515baf35f69..f161eadcc9d6ec69a38d95272b48df438c7e8488
--- a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiZvertexTool_xk/SiZvertexMaker_xk.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( SiZvertexMaker_xk )
-DECLARE_FACTORY_ENTRIES( SiZvertexTool_xk )
-{
- DECLARE_TOOL( SiZvertexMaker_xk )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_load.cxx b/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_load.cxx
deleted file mode 100755
index 4e4e9693140c1023a3adaba95a8f2e55c7e2b9e7..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/components/SiZvertexTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiZvertexTool_xk)
diff --git a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_entries.cxx b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_entries.cxx
old mode 100755
new mode 100644
index 6665911a63e638c09af82376b685b2b0936af186..b7a991e90d4101cff2e2ef7cd09cdb65f3165497
--- a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_DetElementsRoadTool_xk/TRT_DetElementsRoadMaker_xk.h"
using namespace InDet;
DECLARE_TOOL_FACTORY(TRT_DetElementsRoadMaker_xk)
-DECLARE_FACTORY_ENTRIES( TRT_DetElementsRoadTool_xk )
-{
- DECLARE_TOOL( TRT_DetElementsRoadMaker_xk )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_load.cxx b/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_load.cxx
deleted file mode 100755
index 84bb40250cc6bfe73c502b14dbc6e3ff58aa3b10..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TRT_DetElementsRoadTool_xk/src/components/TRT_DetElementsRoadTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_DetElementsRoadTool_xk)
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_entries.cxx
old mode 100755
new mode 100644
index eec1cb29f5e84bd3f2dd26d556d42e1374e329d2..d265ef6d324eb53fc822672d731aa40c28a97917
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_DriftCircleOnTrackTool/TRT_DriftCircleOnTrackTool.h"
#include "TRT_DriftCircleOnTrackTool/TRT_DriftCircleOnTrackUniversalTool.h"
#include "TRT_DriftCircleOnTrackTool/TRT_DriftCircleOnTrackRecalibrateTool.h"
@@ -9,10 +8,3 @@ DECLARE_NAMESPACE_TOOL_FACTORY(InDet, TRT_DriftCircleOnTrackUniversalTool)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, TRT_DriftCircleOnTrackRecalibrateTool)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, TRT_DriftCircleOnTrackNoDriftTimeTool)
-DECLARE_FACTORY_ENTRIES(TRT_DriftCircleOnTrackTool) {
- DECLARE_NAMESPACE_TOOL(InDet, TRT_DriftCircleOnTrackTool)
- DECLARE_NAMESPACE_TOOL(InDet, TRT_DriftCircleOnTrackUniversalTool)
- DECLARE_NAMESPACE_TOOL(InDet, TRT_DriftCircleOnTrackRecalibrateTool)
- DECLARE_NAMESPACE_TOOL(InDet, TRT_DriftCircleOnTrackNoDriftTimeTool)
-}
-
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_load.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_load.cxx
deleted file mode 100755
index 64828e823591e532bd6982f9cfa0ff524d62ec96..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/src/components/TRT_DriftCircleOnTrackTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_DriftCircleOnTrackTool )
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_entries.cxx
old mode 100755
new mode 100644
index dc3e0bc69eb2c85f06e5ddfeb21bbb2805db6493..945976590543acfa2d08d40f432bb21ca0cf531f
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_DriftCircleTool/TRT_DriftCircleTool.h"
#include "TRT_DriftCircleTool/TRT_DriftCircleToolCosmics.h"
@@ -6,8 +5,3 @@
DECLARE_NAMESPACE_TOOL_FACTORY(InDet,TRT_DriftCircleTool)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet,TRT_DriftCircleToolCosmics)
-DECLARE_FACTORY_ENTRIES(TRT_DriftCircleTool) {
-DECLARE_NAMESPACE_TOOL(InDet,TRT_DriftCircleTool)
-DECLARE_NAMESPACE_TOOL(InDet,TRT_DriftCircleToolCosmics)
-}
-
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_load.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_load.cxx
deleted file mode 100755
index 540841663be28c4812d32ce9c2c7782243a695ff..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/components/TRT_DriftCircleTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_DriftCircleTool )
diff --git a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx
old mode 100755
new mode 100644
index 5ef6ced3c1592bcefb8a07ef450f6fb13315202a..5f1f4b60afed7ba3f7b9ce27f9e1938b1d4f505c
--- a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx
@@ -1,12 +1,4 @@
#include "TRT_DriftFunctionTool/TRT_DriftFunctionTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY( TRT_DriftFunctionTool )
-DECLARE_FACTORY_ENTRIES( TRT_DriftFunctionTool )
-{
- DECLARE_TOOL( TRT_DriftFunctionTool )
-}
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_load.cxx b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_load.cxx
deleted file mode 100755
index 65caec1dc4d0bf71535b37da69bd08ff749a0392..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_DriftFunctionTool )
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_entries.cxx b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_entries.cxx
index 3a50e011267282d5e51656adf2c9dd5dd7ad56d9..d6e52af58d0e113c136ab2e070c43c9c07684738 100644
--- a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_ElectronPidTools/BaseTRTPIDCalculator.h"
#include "TRT_ElectronPidTools/TRT_ElectronPidToolRun2.h"
#include "TRT_ElectronPidTools/TRT_LocalOccupancy.h"
@@ -6,10 +5,3 @@
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_ElectronPidToolRun2 )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_LocalOccupancy )
-DECLARE_FACTORY_ENTRIES( TRT_ElectronPidTools )
-{
- DECLARE_NAMESPACE_TOOL( InDet, BaseTRTPIDCalculator)
- DECLARE_NAMESPACE_TOOL( InDet, TRT_ElectronPidToolRun2 )
- DECLARE_NAMESPACE_TOOL( InDet, TRT_LocalOccupancy )
-}
-
diff --git a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_load.cxx b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_load.cxx
deleted file mode 100644
index b4dbb3cdedc1d4cec2cbe97b25524982486e792a..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/components/TRT_ElectronPidTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_ElectronPidTools )
-
diff --git a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_entries.cxx
old mode 100755
new mode 100644
index 2caaf14bc0fccf761356de959a69952aa5c48389..4f37cd36b00968d58e76d475382640bc4fc275b0
--- a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_entries.cxx
@@ -1,5 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_SeededSpacePointFinderTool/TRT_SeededSpacePointFinder_ATL.h"
#include "TRT_SeededSpacePointFinderTool/SimpleTRT_SeededSpacePointFinder_ATL.h"
@@ -8,13 +6,3 @@ using namespace InDet;
DECLARE_TOOL_FACTORY( TRT_SeededSpacePointFinder_ATL )
DECLARE_TOOL_FACTORY( SimpleTRT_SeededSpacePointFinder_ATL )
-DECLARE_FACTORY_ENTRIES( TRT_SeededSpacePointFinderTool)
-{
- DECLARE_TOOL( TRT_SeededSpacePointFinder_ATL )
- DECLARE_TOOL( SimpleTRT_SeededSpacePointFinder_ATL )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_load.cxx b/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_load.cxx
deleted file mode 100755
index e6a8bc38ab1207427ac813d72d49729b0f53ba5f..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TRT_SeededSpacePointFinderTool/src/components/TRT_SeededSpacePointFinderTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_SeededSpacePointFinderTool)
-LOAD_FACTORY_ENTRIES(SimpleTRT_SeededSpacePointFinderTool)
diff --git a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_entries.cxx
old mode 100755
new mode 100644
index 42a1bb4de7a303f16c36fab3bf4937b1592c9b82..fed16ec1513b2bcff78d48488152125544207d73
--- a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_entries.cxx
@@ -1,17 +1,6 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_SeededTrackFinderTool/TRT_SeededTrackFinder_ATL.h"
using namespace InDet;
DECLARE_TOOL_FACTORY( TRT_SeededTrackFinder_ATL)
-DECLARE_FACTORY_ENTRIES( TRT_SeededTrackFinderTool )
-{
- DECLARE_TOOL( TRT_SeededTrackFinder_ATL )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_load.cxx b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_load.cxx
deleted file mode 100755
index 2a958535c67093c8688883fc6931d41e46d969ce..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/components/TRT_SeededTrackFinderTool_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_SeededTrackFinderTool)
diff --git a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_entries.cxx
index f59fa1bb41969b81361cb65c52a823aa34dd84af..4fc9d6bdad6bb8ca54e04e91508152df1717c39b 100644
--- a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_entries.cxx
@@ -1,11 +1,5 @@
#include "TRT_SegmentToTrackTool/TRT_SegmentToTrackTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_SegmentToTrackTool )
-DECLARE_FACTORY_ENTRIES( TRT_SegmentToTrackTool ) {
-
- DECLARE_NAMESPACE_TOOL( InDet, TRT_SegmentToTrackTool )
-
-}
diff --git a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_load.cxx b/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_load.cxx
deleted file mode 100644
index a773c81f9621dfc43c0e05f2e8d73ea72aa2ed9c..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TRT_SegmentToTrackTool/src/components/TRT_SegmentToTrackTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_SegmentToTrackTool )
diff --git a/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_entries.cxx b/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_entries.cxx
index dd1d26275112db702cabba9eaf2e46d15588895d..d3f069e9bbe08dd493b663548d5856008c0f503c 100644
--- a/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_entries.cxx
@@ -1,8 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "TRT_ToT_Tools/TRT_ToT_dEdx.h"
DECLARE_TOOL_FACTORY( TRT_ToT_dEdx )
-DECLARE_FACTORY_ENTRIES( TRT_ToT_Tools ) {
- DECLARE_TOOL( TRT_ToT_dEdx )
-}
diff --git a/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_load.cxx b/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_load.cxx
deleted file mode 100644
index b469583008953d771165e54fd205e921dd2f6dbb..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TRT_ToT_Tools/src/components/TRT_ToT_tools_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(TRT_ToT_Tools)
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_entries.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_entries.cxx
old mode 100755
new mode 100644
index 1308b7569d6ed9472dab69f19ebc5027d6bdeb43..3d882b7bb7dad4a302644348f77cb3d82b7839f9
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_entries.cxx
@@ -1,17 +1,4 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrackExtensionTool_DAF/TRT_TrackExtensionTool_DAF.h"
-//using namespace InDet;
-
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TRT_TrackExtensionTool_DAF )
-DECLARE_FACTORY_ENTRIES(TRT_TrackExtensionTool_DAF)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_TOOL(InDet, TRT_TrackExtensionTool_DAF)
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_load.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_load.cxx
deleted file mode 100755
index 472be5d56ad97090bd1473c1ab1b56df030c6f32..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_DAF/src/components/TRT_TrackExtensionTool_DAF_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_TrackExtensionTool_DAF)
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_entries.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_entries.cxx
old mode 100755
new mode 100644
index bcd38e35ef4a5d429220fd4d34ab3a3280f0237d..6a55bc845261f647e0c6ce6a0a106b291c3b983c
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_entries.cxx
@@ -1,5 +1,3 @@
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrackExtensionTool_xk/TRT_TrackExtensionTool_xk.h"
#include "TRT_TrackExtensionTool_xk/TRT_TrackExtensionToolCosmics.h"
@@ -8,13 +6,3 @@ using namespace InDet;
DECLARE_TOOL_FACTORY(TRT_TrackExtensionTool_xk)
DECLARE_TOOL_FACTORY(TRT_TrackExtensionToolCosmics)
-DECLARE_FACTORY_ENTRIES( TRT_TrackExtensionTool_xk )
-{
- DECLARE_TOOL( TRT_TrackExtensionTool_xk )
- DECLARE_TOOL( TRT_TrackExtensionToolCosmics )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_load.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_load.cxx
deleted file mode 100755
index 583a8342745a0eff3c99d57e178cecf35a1e23af..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/components/TRT_TrackExtensionTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_TrackExtensionTool_xk)
diff --git a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_entries.cxx b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_entries.cxx
old mode 100755
new mode 100644
index bf5e389d8183b6dbba076f23368ced569755aff0..69586eb55c8fa4600b8cae90cb0b35eaebb688da
--- a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_entries.cxx
@@ -1,13 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrackHoleSearch/TRTTrackHoleSearchTool.h"
#include "TRT_TrackHoleSearch/TRTStrawEfficiency.h"
DECLARE_TOOL_FACTORY( TRTTrackHoleSearchTool )
DECLARE_ALGORITHM_FACTORY( TRTStrawEfficiency )
-DECLARE_FACTORY_ENTRIES( TRT_CalibAlgs )
-{
- DECLARE_TOOL( TRTTrackHoleSearchTool )
- DECLARE_ALGORITHM( TRTStrawEfficiency )
-}
diff --git a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_load.cxx b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_load.cxx
deleted file mode 100755
index 28998e04978b801846b4346ee3cd65600299e177..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/src/components/TRT_TrackHoleSearch_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrackHoleSearch )
-
diff --git a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_entries.cxx b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_entries.cxx
old mode 100755
new mode 100644
index 0fd8f367ebda59331e351c43c25a93e8d884c204..4a7fb285f276e4b1f2f5052f99d1743706eb7fcf
--- a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsMaker_ATLxk.h"
#include "TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsMaker_ECcosmics.h"
#include "TRT_TrackSegmentsTool_xk/TRT_TrackSegmentsMaker_BarrelCosmics.h"
@@ -9,14 +8,3 @@ DECLARE_TOOL_FACTORY( TRT_TrackSegmentsMaker_ATLxk )
DECLARE_TOOL_FACTORY( TRT_TrackSegmentsMaker_ECcosmics )
DECLARE_TOOL_FACTORY( TRT_TrackSegmentsMaker_BarrelCosmics )
-DECLARE_FACTORY_ENTRIES( TRT_TrackSegmentsTool_xk )
-{
- DECLARE_TOOL( TRT_TrackSegmentsMaker_ATLxk )
- DECLARE_TOOL( TRT_TrackSegmentsMaker_ECcosmics )
- DECLARE_TOOL( TRT_TrackSegmentsMaker_BarrelCosmics )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_load.cxx b/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_load.cxx
deleted file mode 100755
index cba0df201f9b42a552ce456698cc4eb311e3932b..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk/src/components/TRT_TrackSegmentsTool_xk_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TRT_TrackSegmentsTool_xk)
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_entries.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_entries.cxx
index c078640f76c8cb5ec017791f885f0a33c9b0c323..9c6ab9c22dc79bb9088028f14d8370ebf2007b25 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_entries.cxx
@@ -1,13 +1,9 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Top level tool
#include "TrackVertexAssociationTool/LooseTrackVertexAssociationTool.h"
#include "TrackVertexAssociationTool/TightTrackVertexAssociationTool.h"
#include "TrackVertexAssociationTool/BaseTrackVertexAssociationTool.h"
#include "TrackVertexAssociationTool/ElectronTrackVertexAssociationTool.h"
#include "TrackVertexAssociationTool/MuonTrackVertexAssociationTool.h"
-// Algs
#include "../TrackVertexAssoTestAlg.h"
using namespace xAOD;
@@ -18,14 +14,4 @@ DECLARE_NAMESPACE_TOOL_FACTORY(CP,BaseTrackVertexAssociationTool)
DECLARE_NAMESPACE_TOOL_FACTORY(CP,ElectronTrackVertexAssociationTool)
DECLARE_NAMESPACE_TOOL_FACTORY(CP,MuonTrackVertexAssociationTool)
DECLARE_ALGORITHM_FACTORY(TrackVertexAssoTestAlg)
-//
-DECLARE_FACTORY_ENTRIES(TrackVertexAssociationTool) {
- DECLARE_NAMESPACE_TOOL(CP,LooseTrackVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL(CP,TightTrackVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL(CP,BaseTrackVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL(CP,ElectronTrackVertexAssociationTool)
- DECLARE_NAMESPACE_TOOL(CP,MuonTrackVertexAssociationTool)
- // Algs
- DECLARE_ALGORITHM(TrackVertexAssoTestAlg)
-}
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_load.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_load.cxx
deleted file mode 100644
index 2ecc63f07c6afdbac56e0dbd986df84ca925d0fc..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/components/TrackVertexAssociationTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrackVertexAssociationTool)
diff --git a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_entries.cxx b/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_entries.cxx
old mode 100755
new mode 100644
index 1d95e2fffa8223a83c274791a8ca01629e7c519b..d818e0b75517bbaf6ef15861d74c1d59728993ed
--- a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_entries.cxx
+++ b/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_entries.cxx
@@ -1,11 +1,5 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_PAI_Process/TRT_PAI_Process.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
DECLARE_TOOL_FACTORY( TRT_PAI_Process )
-DECLARE_FACTORY_ENTRIES( TRT_PAI_Process )
-{
- DECLARE_TOOL( TRT_PAI_Process )
-}
-
diff --git a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_load.cxx b/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_load.cxx
deleted file mode 100755
index da13e26faa8eb764f083636c217973845c88a6ea..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetSimUtils/TRT_PAI_Process/src/components/TRT_PAI_Process_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_PAI_Process )
-
diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_entries.cxx b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_entries.cxx
index aa9bed19e1f7cd0e9eb7ec9237b6ef15f437a618..6a9731e808d90006f8c6bc68dd03de3c4a3e5637 100644
--- a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_entries.cxx
+++ b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_entries.cxx
@@ -1,11 +1,7 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "../TRTPhysicsTool.h"
DECLARE_TOOL_FACTORY( TRTPhysicsTool )
-DECLARE_FACTORY_ENTRIES( TRT_TR_Process ) {
- DECLARE_TOOL( TRTPhysicsTool )
-}
+
diff --git a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_load.cxx b/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_load.cxx
deleted file mode 100644
index 6cac7df5a8dec8cc342f82659373ccb2896edb7c..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetSimUtils/TRT_TR_Process/src/components/TRT_TR_Process_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( TRT_TR_Process )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_entries.cxx
old mode 100755
new mode 100644
index 6a0dc6743dcfadb595232569cb688a674680a037..503e564f919f85aa5370c692bb935fa16114e235
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigAmbiguitySolver/InDetTrigAmbiguitySolver.h"
#include "TrkTrack/Track.h"
@@ -6,12 +5,3 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( InDetTrigAmbiguitySolver )
-DECLARE_FACTORY_ENTRIES( InDetTrigAmbiguitySolver )
-{
- DECLARE_ALGORITHM( InDetTrigAmbiguitySolver )
-}
-
-
-
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_load.cxx
deleted file mode 100755
index 39d8140b8f714eaaee9c94c9d3dad28f1c1d2409..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigAmbiguitySolver/src/components/InDetTrigAmbiguitySolver_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigAmbiguitySolver )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_entries.cxx
old mode 100755
new mode 100644
index a52b3666c3381c1439ccb1aa30eb9cf14620cbd6..5aeda17ecb1b9b7dc82df0c1a8fdb743eb5eb4aa
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_entries.cxx
@@ -1,11 +1,6 @@
#include "InDetTrigConversionFinder/TrigConversionFinder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TrigConversionFinder )
-DECLARE_FACTORY_ENTRIES(InDetTrigConversionFinder)
-{
- DECLARE_ALGORITHM( TrigConversionFinder )
-}
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_load.cxx
deleted file mode 100755
index a00cf05a05d93f34e6cc94bcbcd2d969e2f2aeef..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigConversionFinder/src/components/InDetTrigConversionFinder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigConversionFinder )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_entries.cxx
old mode 100755
new mode 100644
index 27bf8e6f2117eb3156b70a4c1b74a6ee0271fd54..e317c818ddeb10d1b812e6a47786c3b17320d889
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_entries.cxx
@@ -1,13 +1,5 @@
#include "InDetTrigExtensProcessor/InDetTrigExtensProcessor.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetTrigExtensProcessor )
-DECLARE_FACTORY_ENTRIES(InDetTrigExtensProcessor) {
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetTrigExtensProcessor)
-}
-
-
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_load.cxx
deleted file mode 100755
index 89072fdaaf724eb2dbeece221bfd1a6c20e41a10..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigExtensProcessor/src/components/InDetTrigExtensProcessor_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrigExtensProcessor)
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_entries.cxx
old mode 100755
new mode 100644
index 17d6de6d0ac315ee5915f4c80add7813ce30f62b..56ca04c30a21017e8b33310433303d05d7a6d6d7
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigParticleCreation/TrigParticleCreator.h"
#include "InDetTrigParticleCreation/TrigTrackingxAODCnv.h"
#include "../TrigTrackingxAODCnvMT.h"
@@ -13,10 +12,4 @@ DECLARE_ALGORITHM_FACTORY( TrigTrackingxAODCnvMT )
DECLARE_ALGORITHM_FACTORY( TrigVertexxAODCnv )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( InDetTrigParticleCreation )
-{
- DECLARE_ALGORITHM( TrigParticleCreator )
- DECLARE_ALGORITHM( TrigTrackingxAODCnv )
- DECLARE_ALGORITHM( TrigTrackingxAODCnvMT )
- DECLARE_ALGORITHM( TrigVertexxAODCnv )
-}
+
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_load.cxx
deleted file mode 100755
index 1709e0d7b6b453bdbc650d6e98ed27ad276b93a8..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/components/InDetTrigParticleCreation_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigParticleCreation )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_entries.cxx
old mode 100755
new mode 100644
index 8f32d8c8c8fd7e8f1278a0e866032ac64e64c2f5..9063069c382b5ee5154f98e09965c6332018b796
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_entries.cxx
@@ -3,7 +3,6 @@
#include "InDetTrigPrepRawDataFormat/TRT_TrgRIO_Maker.h"
#include "InDetTrigPrepRawDataFormat/FTK_TrackMaker.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
@@ -12,12 +11,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, Pixel_TrgClusterization )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_TrgRIO_Maker )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, FTK_TrackMaker )
-DECLARE_FACTORY_ENTRIES( InDetTrigPrepRawDataFormat )
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet, SCT_TrgClusterization )
- DECLARE_NAMESPACE_ALGORITHM( InDet, Pixel_TrgClusterization )
- DECLARE_NAMESPACE_ALGORITHM( InDet, TRT_TrgRIO_Maker )
- DECLARE_NAMESPACE_ALGORITHM( InDet, FTK_TrackMaker )
-}
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_load.cxx
deleted file mode 100755
index 9cd2df319ed2e199c1b60a326b00fe79e96d25c8..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/components/InDetTrigPrepRawDataFormat_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrigPrepRawDataFormat)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_entries.cxx
old mode 100755
new mode 100644
index ea1b37919e92e91a245f8a406d43d0a63b0f6d3c..bf8a84450a81c74c3d786c7425d2269b74b54a27
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigPriVxFinder/TrigVxPrimary.h"
#include "InDetTrigPriVxFinder/TrigVxPrimaryAllTE.h"
#include "TrkTrack/Track.h"
@@ -8,9 +7,3 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TrigVxPrimary )
DECLARE_ALGORITHM_FACTORY( TrigVxPrimaryAllTE )
-DECLARE_FACTORY_ENTRIES( InDetTrigPriVxFinder )
-{
- DECLARE_ALGORITHM( TrigVxPrimary )
- DECLARE_ALGORITHM( TrigVxPrimaryAllTE )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_load.cxx
deleted file mode 100755
index f2c83bfcfba798d7d0a853cca49b115bda1fc339..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder/src/components/InDetTrigPriVxFinder_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigPriVxFinder )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_entries.cxx
old mode 100755
new mode 100644
index 628ff0384f958ef332be629229d33fc62b385b6e..e1525c007b8999b4cd7a8f1f267cbf3957cd9e49
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_entries.cxx
@@ -2,19 +2,7 @@
#include "InDetTrigRawDataProvider/TrigPixRawDataProvider.h"
#include "InDetTrigRawDataProvider/TrigSCTRawDataProvider.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-//using namespace InDet;
-
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TrigPixRawDataProvider )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TrigSCTRawDataProvider )
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, TrigTRTRawDataProvider )
-DECLARE_FACTORY_ENTRIES( InDetTrigRawDataProvider )
-{
- DECLARE_NAMESPACE_TOOL( InDet, TrigPixRawDataProvider )
- DECLARE_NAMESPACE_TOOL( InDet, TrigSCTRawDataProvider )
- DECLARE_NAMESPACE_TOOL( InDet, TrigTRTRawDataProvider )
-}
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_load.cxx
deleted file mode 100755
index 1a0eebbe13451962f1fcb0a287ac6562f7d7627c..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/components/InDetTrigRawDataProvider_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrigRawDataProvider)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_entries.cxx
index 0f877177f826d60d69386afbf43d204f50e4c1a1..653ac56e5c47472baa1a5a90f0d6d1de459ca57b 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigTrackCollectionMerger/TrigTrackCollectionMerger.h"
#include "InDetTrigTrackCollectionMerger/SimpleTrigTrackCollMerger.h"
#include "TrkTrack/Track.h"
@@ -12,9 +11,3 @@ using namespace Trk;
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, TrigTrackCollectionMerger )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, SimpleTrigTrackCollMerger )
-DECLARE_FACTORY_ENTRIES( InDetTrigTrackCollectionMerger )
-{
- DECLARE_NAMESPACE_ALGORITHM( Trk, TrigTrackCollectionMerger )
- DECLARE_NAMESPACE_ALGORITHM( Trk, SimpleTrigTrackCollMerger )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_load.cxx
deleted file mode 100644
index 6758c62aeb0982dcc6c533072bad10ebe11f7883..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackCollectionMerger/src/components/TrkTrigTrackCollectionMerger_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrigTrackCollectionMerger)
-LOAD_FACTORY_ENTRIES( SimpleTrigTrackCollMerger)
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_entries.cxx
old mode 100755
new mode 100644
index 3bf4f01dc68022828e60323d464f9e734b662017..a9ffce7aba2395949931a296ddcd296f96c7f9ce
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigTrackPRD_Association/InDetTrigTrackPRD_Association.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( InDetTrigTrackPRD_Association )
-DECLARE_FACTORY_ENTRIES( InDetTrigTrackPRD_Association )
-{
- DECLARE_ALGORITHM( InDetTrigTrackPRD_Association )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_load.cxx
deleted file mode 100755
index f87894d9233466a538cf62526b2081cc21b41674..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackPRD_Association/src/components/InDetTrigTrackPRD_Association_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrigTrackPRD_Association)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_entries.cxx
old mode 100755
new mode 100644
index 13d0f6f63d99197aaf108776d19f2505ba74a654..b837bc5a3bf09e13f069034f290f12e50a3d87a3
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigTrackResidualMonitor/TrigTrackResidualMonitor.h"
#include "TrkTrack/Track.h"
@@ -7,7 +6,4 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TrigTrackResidualMonitor )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( InDetTrigTrackResidualMonitor )
-{
- DECLARE_ALGORITHM( TrigTrackResidualMonitor )
-}
+
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_load.cxx
deleted file mode 100755
index 727bb5d3b6ea2c646204ca924070a4a67def201e..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackResidualMonitor/src/components/InDetTrigTrackResidualMonitor_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigTrackResidualMonitor )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_entries.cxx
old mode 100755
new mode 100644
index 6e816dd8b55eb963fef294fbe4acda57ebe3b593..0f739395cb02b2b5313f73be52014ce6a711aa6d
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigTrackSlimmer/TrigTrackSlimmer.h"
#include "TrkTrack/Track.h"
@@ -7,7 +6,4 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TrigTrackSlimmer )
/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( InDetTrigTrackSlimmer )
-{
- DECLARE_ALGORITHM( TrigTrackSlimmer )
-}
+
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_load.cxx
deleted file mode 100755
index df5d366f723fda2ec8c06f4911c06fa19daa073a..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTrackSlimmer/src/components/InDetTrigTrackSlimmer_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigTrackSlimmer )
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_entries.cxx
old mode 100755
new mode 100644
index d84aff19ed8fcb74380b347203730f0681bde8fa..ae91bb0ed94c596b2f2aeb4ccda13ccf65f68294
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigTruthAlgs/TrigTrackParticleTruthMaker.h"
#include "InDetTrigTruthAlgs/PRD_TrigMultiTruthMaker.h"
#include "InDetTrigTruthAlgs/InDetTrigDetailedTrackTruthMaker.h"
@@ -10,9 +9,3 @@ DECLARE_ALGORITHM_FACTORY( TrigTrackParticleTruthMaker )
DECLARE_ALGORITHM_FACTORY( PRD_TrigMultiTruthMaker )
DECLARE_ALGORITHM_FACTORY( InDetTrigDetailedTrackTruthMaker )
-DECLARE_FACTORY_ENTRIES( InDetTrigTruthAlgs )
-{
- DECLARE_ALGORITHM( TrigTrackParticleTruthMaker )
- DECLARE_ALGORITHM( PRD_TrigMultiTruthMaker )
- DECLARE_ALGORITHM( InDetTrigDetailedTrackTruthMaker )
-}
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_load.cxx
deleted file mode 100755
index c5b7307d092d57db6feca8d9907949cf733c8dd8..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigTruthAlgs/src/components/InDetTrigTruthAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigTruthAlgs )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_entries.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_entries.cxx
old mode 100755
new mode 100644
index bb7591963867bdf08b951645a38923c22d12b54a..353c9782ac2c3a65f092fd022516e3e79266f5b3
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrigVxSecondary/TrigVxSecondary.h"
#include "InDetTrigVxSecondary/TrigVxSecondaryCombo.h"
@@ -7,8 +6,3 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TrigVxSecondary )
DECLARE_ALGORITHM_FACTORY( TrigVxSecondaryCombo )
- DECLARE_FACTORY_ENTRIES( InDetTrigVxSecondary ) {
- DECLARE_ALGORITHM( TrigVxSecondary )
- DECLARE_ALGORITHM( TrigVxSecondaryCombo )
- }
-
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_load.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_load.cxx
deleted file mode 100755
index 025bd6b2a4ca603adddb3f071abd2bf7eed3c3f5..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/components/InDetTrigVxSecondary_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrigVxSecondary )
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx
old mode 100755
new mode 100644
index e4623c42dcc9f08ce9cad12d5735e875da63e8b4..049993c01cc3721941db122c9ffcf6fe5e91ce9f
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "SiTrigSPSeededTrackFinder/SiTrigSPSeededTrackFinder.h"
#include "InDetRecToolInterfaces/ISiSpacePointsSeedMaker.h"
@@ -10,8 +9,3 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( SiTrigSPSeededTrackFinder )
-DECLARE_FACTORY_ENTRIES( SiTrigSPSeededTrackFinder )
-{
- DECLARE_ALGORITHM( SiTrigSPSeededTrackFinder )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_load.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_load.cxx
deleted file mode 100755
index 25fcf32636bdd861d5eddb22a10de602e8ab744f..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/components/SiTrigSPSeededTrackFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( SiTrigSPSeededTrackFinder)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_entries.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_entries.cxx
old mode 100755
new mode 100644
index 02248e9c3df626fc88a507079a7f3b1c4075494e..63ac69e7e9ba597b78a104f59559e41809be8284
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_entries.cxx
@@ -1,17 +1,8 @@
#include "SCT_TrigSpacePointTool.h"
#include "SiTrigSpacePointFormation/SiTrigSpacePointFinder.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, SCT_TrigSpacePointTool )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, SiTrigSpacePointFinder )
-DECLARE_FACTORY_ENTRIES(SiTrigSpacePointFormation)
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet, SiTrigSpacePointFinder )
- DECLARE_NAMESPACE_TOOL( InDet, SCT_TrigSpacePointTool )
-
-}
-
-
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_load.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_load.cxx
deleted file mode 100755
index bd3eb9e89852886f91f756a122ea49c1de1034f4..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSpacePointFormation/src/components/SiTrigSpacePointFormation_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(SiTrigSpacePointFormation)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_entries.cxx
old mode 100755
new mode 100644
index a94e93cb1a63a5f022ef447821e3a20d5a054b25..98eab4ed8b6f95ed92c909671006752f62f569b2
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrigSeededTrackFinder/TRT_TrigSeededTrackFinder.h"
#include "IRegionSelector/IRegSelSvc.h"
@@ -6,8 +5,3 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TRT_TrigSeededTrackFinder )
-DECLARE_FACTORY_ENTRIES( TRT_TrigSeededTrackFinder )
-{
- DECLARE_ALGORITHM( TRT_TrigSeededTrackFinder )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_load.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_load.cxx
deleted file mode 100755
index 3745b56790140cb2ed0f854560cfd4d14309c0b3..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/components/TRT_TrigSeededTrackFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrigSeededTrackFinder)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_entries.cxx
old mode 100755
new mode 100644
index b4afe715fe14a48b19faf6192c96535948b8fe7d..5710295254b4b3e055e5a4ca26226dfd702220e4
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrigStandaloneTrackFinder/TRT_TrigStandaloneTrackFinder.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TRT_TrigStandaloneTrackFinder )
-DECLARE_FACTORY_ENTRIES( TRT_TrigStandaloneTrackFinder )
-{
- DECLARE_ALGORITHM( TRT_TrigStandaloneTrackFinder )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_load.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_load.cxx
deleted file mode 100755
index 30cf8ee1ea15e781ad055611dd56c79d53e1dfcf..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigStandaloneTrackFinder/src/components/TRT_TrigStandaloneTrackFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrigStandaloneTrackFinder)
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_entries.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_entries.cxx
old mode 100755
new mode 100644
index 1d0c56c870a1ca234bb95ee7db29bbb152e056e4..f40a858785b19b2d25c8882351dead1617b2e425
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrigTrackExtensionAlg/TRT_TrigTrackExtensionAlg.h"
#include "InDetRecToolInterfaces/ITRT_TrackExtensionTool.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, TRT_TrigTrackExtensionAlg )
-DECLARE_FACTORY_ENTRIES( TRT_TrigTrackExtensionAlg )
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet, TRT_TrigTrackExtensionAlg )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_load.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_load.cxx
deleted file mode 100755
index 115841ae8a73098b6d640d09d44402c47bc7111c..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackExtensionAlg/src/components/TRT_TrigTrackExtensionAlg_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrigTrackExtensionAlg )
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx
old mode 100755
new mode 100644
index 1614d8c717a79541043a58effe931978766d2349..d00342032698971e483bfe84feada384cc125b3f
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TRT_TrigTrackSegmentsFinder/TRT_TrigTrackSegmentsFinder.h"
#include "IRegionSelector/IRegSelSvc.h"
@@ -6,8 +5,3 @@ using namespace InDet;
DECLARE_ALGORITHM_FACTORY( TRT_TrigTrackSegmentsFinder )
-DECLARE_FACTORY_ENTRIES( TRT_TrigTrackSegmentsFinder )
-{
- DECLARE_ALGORITHM( TRT_TrigTrackSegmentsFinder )
-}
-
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_load.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_load.cxx
deleted file mode 100755
index 2270882a101479a57a2e61932edc62d272d4142e..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigTrackSegmentsFinder/src/components/TRT_TrigTrackSegmentsFinder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_TrigTrackSegmentsFinder)
-
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_entries.cxx b/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_entries.cxx
old mode 100755
new mode 100644
index f5fb54528586048d1a1a59786820b950b5e418cf..5e621d3ca79259c1c1b39ee36561151f77d7e458
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_entries.cxx
+++ b/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTruthAlgs/PRD_MultiTruthMaker.h"
#include "InDetTruthAlgs/InDetDetailedTrackTruthMaker.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetDetailedTrackTruthMaker )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, PRD_MultiTruthMaker )
-DECLARE_FACTORY_ENTRIES( InDetTruthAlgs )
-{
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetDetailedTrackTruthMaker )
- DECLARE_NAMESPACE_ALGORITHM( InDet, PRD_MultiTruthMaker )
-}
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_load.cxx b/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_load.cxx
deleted file mode 100755
index beeb6f009d9b1b2cd8fadd68891aaf771bed7938..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/src/components/InDetTruthAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTruthAlgs )
-
diff --git a/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_entries.cxx b/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_entries.cxx
old mode 100755
new mode 100644
index 7e1963181ba776be9a86b2df519bf5f1075865cf..fcf7829950d0a1c104ae960589c210a2c78322e7
--- a/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_entries.cxx
+++ b/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_entries.cxx
@@ -2,16 +2,9 @@
#include "InDetTruthTools/PRD_TruthTrajectorySorterID.h"
#include "InDetTruthTools/PRD_TruthTrajectoryManipulatorID.h"
#include "InDetTruthTools/PRD_TruthTrajectorySelectorID.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PRD_MultiTruthBuilder)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PRD_TruthTrajectorySorterID)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PRD_TruthTrajectoryManipulatorID)
DECLARE_NAMESPACE_TOOL_FACTORY(InDet, PRD_TruthTrajectorySelectorID)
-DECLARE_FACTORY_ENTRIES(InDetTruthTools) {
-DECLARE_NAMESPACE_TOOL(InDet, PRD_MultiTruthBuilder)
-DECLARE_NAMESPACE_TOOL(InDet, PRD_TruthTrajectorySorterID)
-DECLARE_NAMESPACE_TOOL(InDet, PRD_TruthTrajectoryManipulatorID)
-DECLARE_NAMESPACE_TOOL(InDet, PRD_TruthTrajectorySelectorID)
-}
diff --git a/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_load.cxx b/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_load.cxx
deleted file mode 100755
index c93797062ea024c924d124b870c7a6b4aada6499..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetTruth/InDetTruthTools/src/components/InDetTruthTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTruthTools)
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_entries.cxx b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_entries.cxx
old mode 100755
new mode 100644
index 6ce9414bb7b00b7c009f5180fce93a8bfa6ae198..51daa4030ba35ccca5d735137a558746ce6511c8
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_entries.cxx
@@ -1,6 +1,5 @@
#include "InDetPerformanceRTT/IDStandardPerformance.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_TOOL_FACTORY(IDStandardPerformance)
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_load.cxx b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_load.cxx
deleted file mode 100755
index 6858111c0458180e07d385c5a919ba64935531e0..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/components/InDetPerformanceRTT_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetPerformanceRTT)
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_entries.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_entries.cxx
index d39857ac45778528aff1524c9198c324321cde7b..1374ce8448ba8bad511c4c685a53994fab3bccf1 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetPhysValMonitoring/InDetPhysValMonitoringTool.h"
#include "InDetPhysValMonitoring/InDetPhysValLargeD0Tool.h"
#include "../InDetPhysValTruthDecoratorTool.h"
@@ -32,22 +31,3 @@ DECLARE_TOOL_FACTORY(TrackSelectionTool)
DECLARE_TOOL_FACTORY( DummyTrackSlimmingTool)
DECLARE_TOOL_FACTORY( AthTruthSelectionTool)
-DECLARE_FACTORY_ENTRIES(InDetPhysValMonitoring){
- DECLARE_ALGORITHM( InDetPhysValDecoratorAlg )
- DECLARE_ALGORITHM( AlgTestHistoDefSvc )
- DECLARE_SERVICE(HistogramDefinitionSvc)
- DECLARE_TOOL(InDetPhysValMonitoringTool)
- DECLARE_TOOL(InDetPhysValLargeD0Tool)
- DECLARE_TOOL(ToolTestMonitoringPlots)
- DECLARE_TOOL(InDetPhysValTruthDecoratorTool)
- DECLARE_TOOL(InDetPhysHitDecoratorTool)
- DECLARE_TOOL(ParameterErrDecoratorTool)
- DECLARE_TOOL(TruthClassDecoratorTool)
- DECLARE_TOOL(TrackTruthSelectionTool)
- DECLARE_TOOL(dRMatchingTool)
- DECLARE_TOOL(TrackSelectionTool)
- DECLARE_TOOL( DummyTrackSlimmingTool)
- DECLARE_TOOL( AthTruthSelectionTool)
-
-}
-
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_load.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_load.cxx
deleted file mode 100644
index bdea3a3d2ab1a3d25e9ed5f3b4cb31fbb583c90a..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/components/InDetPhysValMonitoring_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetPhysValMonitoring)
-
\ No newline at end of file
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_entries.cxx b/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_entries.cxx
old mode 100755
new mode 100644
index 2bc9a384ba5b13f0e495838ef68769698d5f9fa7..87166c3306f6646f26681f1a45c7988925c3a685
--- a/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_entries.cxx
@@ -1,8 +1,4 @@
#include "InDetRecStatistics/InDetRecStatisticsAlg.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetRecStatisticsAlg)
-DECLARE_FACTORY_ENTRIES(InDetRecStatistics) {
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetRecStatisticsAlg )
-}
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_load.cxx b/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_load.cxx
deleted file mode 100755
index ceb672214b398a8dd0a1d04773a2305872f08a4c..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetValidation/InDetRecStatistics/src/components/InDetRecStatistics_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetRecStatistics)
diff --git a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_entries.cxx b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_entries.cxx
old mode 100755
new mode 100644
index cb250e21836b23adfb51e0fe287580217c4d0635..2db92704671a1697214bf99b8466f55bb1c6bfc1
--- a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_entries.cxx
@@ -1,11 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetSegmentDriftCircleAssValidation/SegmentDriftCircleAssValidation.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, SegmentDriftCircleAssValidation )
-DECLARE_FACTORY_ENTRIES( InDetSegmentDriftCircleAssValidation )
-{
- DECLARE_NAMESPACE_ALGORITHM(InDet, SegmentDriftCircleAssValidation )
-}
-
-
diff --git a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_load.cxx b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_load.cxx
deleted file mode 100644
index d6dcb2224aab46b060c4aaa06b84c2d5f03e7c08..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/components/InDetSegmentDriftCircleAssValidation_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetSegmentDriftCircleAssValidation)
-
diff --git a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_entries.cxx b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_entries.cxx
old mode 100755
new mode 100644
index bfa47680ed66f56f9e04592afc9bac11a1052d7a..35072cd63de52ca8c769d51306b95b2d74df4c90
--- a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_entries.cxx
@@ -1,11 +1,4 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "InDetTrackClusterAssValidation/TrackClusterAssValidation.h"
DECLARE_NAMESPACE_ALGORITHM_FACTORY(InDet, TrackClusterAssValidation )
-DECLARE_FACTORY_ENTRIES( InDetTrackClusterAssValidation )
-{
- DECLARE_NAMESPACE_ALGORITHM(InDet, TrackClusterAssValidation )
-}
-
-
diff --git a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_load.cxx b/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_load.cxx
deleted file mode 100755
index 3ddf7544d4e0c91afe26e26dc1f2fc3d92a6fff2..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetValidation/InDetTrackClusterAssValidation/src/components/InDetTrackClusterAssValidation_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrackClusterAssValidation)
-
diff --git a/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_entries.cxx b/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_entries.cxx
index 525458f8e1141615ac3486fc301f56d9890a91bf..721160e6c0c9b001960ccc849d60c101dfee2381 100644
--- a/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_entries.cxx
@@ -1,7 +1,3 @@
#include "InDetTrackSplitterTool/InDetTrackSplitterTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
DECLARE_NAMESPACE_TOOL_FACTORY( InDet, InDetTrackSplitterTool )
-DECLARE_FACTORY_ENTRIES(InDetTrackSplitterTool)
-{
- DECLARE_NAMESPACE_TOOL( InDet, InDetTrackSplitterTool );
-}
+
diff --git a/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_load.cxx b/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_load.cxx
deleted file mode 100644
index c512c6b0624198626cd87fd024f96959e4303324..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetValidation/InDetTrackSplitterTool/src/components/InDetTrackSplitterTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetTrackSplitterTool )
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_entries.cxx b/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_entries.cxx
old mode 100755
new mode 100644
index bc84e751e9bae008d8bcbf1f07704b947e496502..52f1c38d6c5d6219fa0f85d5c41ca5eefa602423
--- a/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_entries.cxx
@@ -1,19 +1,8 @@
-
#include "InDetTrackValidation/SCT_ClusterValidationNtupleWriter.h"
#include "InDetTrackValidation/InDetSplittedTracksCreator.h"
#include "InDetTrackValidation/HoleSearchValidation.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-//using namespace InDet;
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, SCT_ClusterValidationNtupleWriter )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, InDetSplittedTracksCreator )
DECLARE_NAMESPACE_ALGORITHM_FACTORY( InDet, HoleSearchValidation )
-DECLARE_FACTORY_ENTRIES(InDetTrackValidation)
-{ // in this package name these methods are registered
- DECLARE_NAMESPACE_ALGORITHM( InDet, SCT_ClusterValidationNtupleWriter)
- DECLARE_NAMESPACE_ALGORITHM( InDet, InDetSplittedTracksCreator )
- DECLARE_NAMESPACE_ALGORITHM( InDet, HoleSearchValidation )
-}
-
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_load.cxx b/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_load.cxx
deleted file mode 100755
index 8fcefee86940ce6f8c69dd0adaaebee70e129024..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetValidation/InDetTrackValidation/src/components/InDetTrackValidation_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(InDetTrackValidation)
diff --git a/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_entries.cxx b/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_entries.cxx
index 3ace98bcaee51c20120e4121da6cee5b85afe5ca..09883e02df4e76be8731d751e71831fe96602dcd 100644
--- a/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_entries.cxx
+++ b/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_entries.cxx
@@ -1,14 +1,8 @@
#include "../InDetVertexSplitter.h"
#include "../InDetVertexSplitterHist.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
using namespace InDet;
DECLARE_ALGORITHM_FACTORY( InDetVertexSplitter )
DECLARE_ALGORITHM_FACTORY( InDetVertexSplitterHist )
-DECLARE_FACTORY_ENTRIES ( InDetVertexSplitter )
-{
- DECLARE_ALGORITHM( InDetVertexSplitter )
- DECLARE_ALGORITHM( InDetVertexSplitterHist )
-}
diff --git a/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_load.cxx b/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_load.cxx
deleted file mode 100644
index 5a0eddf7f1aaa0dd65634ec506032313ead25457..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetValidation/InDetVertexSplitter/src/components/InDetVertexSplitter_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( InDetVertexSplitter )
-
diff --git a/Reconstruction/DiTauRec/src/components/DiTauRec_load.cxx b/Reconstruction/DiTauRec/src/components/DiTauRec_load.cxx
deleted file mode 100644
index f4bcb00c12f8ccf1aa4340964646b7374b4ec944..0000000000000000000000000000000000000000
--- a/Reconstruction/DiTauRec/src/components/DiTauRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(DiTauRec)
diff --git a/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_load.cxx b/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_load.cxx
deleted file mode 100755
index acc53fbd19751d7917410f9ac7c89f137cb313d6..0000000000000000000000000000000000000000
--- a/Reconstruction/EventShapes/EventShapeTools/src/components/EventShapeTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(EventShapeTools)
diff --git a/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_load.cxx b/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_load.cxx
deleted file mode 100755
index 82b0ba27ee4de80025729e41e7667fc7a8f92270..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIGlobal/src/components/HIGlobal_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( HIGlobal )
-
-
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_load.cxx b/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_load.cxx
deleted file mode 100644
index 341628605e10464b4b1036ed19cfd873c9a927d7..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIJetRec/src/components/HIJetRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(HIJetRec)
-
diff --git a/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_load.cxx b/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_load.cxx
deleted file mode 100644
index 72fe5c813a40543b96351548f27501b912b37334..0000000000000000000000000000000000000000
--- a/Reconstruction/HeavyIonRec/HIMonitoring/src/components/HIMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(HIMonitoring)
\ No newline at end of file
diff --git a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_load.cxx b/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_load.cxx
deleted file mode 100644
index ecb4b8cdbf87282d0dd80e29f544b1b20d313ebe..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/src/components/JetTileCorrection_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(JetTileCorrection)
diff --git a/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_load.cxx b/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_load.cxx
deleted file mode 100644
index f835c23a550c3657a7884006f883fceb378b80c2..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetCalibTools/src/components/JetCalibTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetCalibTools)
-
-
diff --git a/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_load.cxx b/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_load.cxx
deleted file mode 100644
index aedca1c6f7c105876e55bf1436f67a77b0b09ed2..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetJvtEfficiency/src/components/JetJvtEfficiency_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( JetJvtEfficiency)
diff --git a/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_load.cxx b/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_load.cxx
deleted file mode 100644
index 0e6ec8f4140bb557f316dd8af9bb14528d190fc8..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// JetRec_load.cxx
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetMomentTools)
diff --git a/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_load.cxx b/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_load.cxx
deleted file mode 100755
index d1a1ecf37ec852e37f902f8c943212080879e2a8..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetMonitoring/src/components/JetMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetMonitoring)
diff --git a/Reconstruction/Jet/JetRec/src/components/JetRec_load.cxx b/Reconstruction/Jet/JetRec/src/components/JetRec_load.cxx
deleted file mode 100644
index af1315591b0d4c9899f928aba1b70e5e486fd4d4..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetRec/src/components/JetRec_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// JetRec_load.cxx
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetRec)
diff --git a/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_load.cxx b/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_load.cxx
deleted file mode 100644
index 25da647123d3ccbd8c6858445b9ef651825209a4..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetRecCalo/src/components/JetRecCalo_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetRecCalo)
diff --git a/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_load.cxx b/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_load.cxx
deleted file mode 100755
index 7744bcf9d09fdbd97bbe84dbf95fcaf7f5e3b66a..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetRecTools/src/components/JetRecTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetRecTools)
diff --git a/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_load.cxx b/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_load.cxx
deleted file mode 100644
index 910312475073c3f6abc96045fd3fdd1db8bf45c1..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetReclustering/src/components/JetReclustering_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(JetReclustering)
diff --git a/Reconstruction/Jet/JetResolution/src/components/JetResolution_load.cxx b/Reconstruction/Jet/JetResolution/src/components/JetResolution_load.cxx
deleted file mode 100644
index eb2bae660a90a8504c0fd00e878de912bb022b7f..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/src/components/JetResolution_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena includes
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure
-LOAD_FACTORY_ENTRIES( JetResolution )
diff --git a/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_load.cxx b/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_load.cxx
deleted file mode 100755
index 25ff83d6cea4083a5cabf46f26b3bac643df2df2..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetSimTools/src/components/JetSimTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetSimTools)
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_load.cxx b/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_load.cxx
deleted file mode 100644
index 9aff038f171e63e77e5636552b4fee370210111a..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetSubStructureMomentTools/src/components/JetSubStructure_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// JetSubStructureMomentTools_load.cxx
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(JetSubStructureMomentTools)
diff --git a/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_load.cxx b/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_load.cxx
deleted file mode 100644
index ec42422977bc229dc83a5f868ed1393988b69eb8..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetUncertainties/src/components/JetUncertainties_load.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES(JetUncertainties)
diff --git a/Reconstruction/Jet/JetValidation/src/components/JetValidation_load.cxx b/Reconstruction/Jet/JetValidation/src/components/JetValidation_load.cxx
deleted file mode 100644
index 038179a47045f79e73fb4d4fc9f4ff7ab9f83b1b..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetValidation/src/components/JetValidation_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(JetValidation)
diff --git a/Reconstruction/MET/METReconstruction/src/components/METReconstruction_load.cxx b/Reconstruction/MET/METReconstruction/src/components/METReconstruction_load.cxx
deleted file mode 100644
index ec06f87ad6e4f80a47ee5c322dd63973cd1de0d4..0000000000000000000000000000000000000000
--- a/Reconstruction/MET/METReconstruction/src/components/METReconstruction_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(METReconstruction)
diff --git a/Reconstruction/MET/METUtilities/src/components/METUtilities_load.cxx b/Reconstruction/MET/METUtilities/src/components/METUtilities_load.cxx
deleted file mode 100644
index b0c3390521cf946492b86c99116854360db2a2e8..0000000000000000000000000000000000000000
--- a/Reconstruction/MET/METUtilities/src/components/METUtilities_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(METUtilities)
diff --git a/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_load.cxx b/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_load.cxx
deleted file mode 100644
index a4c4033e431bd88be323334040dae08575f03008..0000000000000000000000000000000000000000
--- a/Reconstruction/MissingETGoodness/src/components/MissingETGoodness_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MissingETGoodness)
-
diff --git a/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_load.cxx b/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_load.cxx
deleted file mode 100755
index 967aa3f132fd1917b1ee7a3d0fd38f693c56f2c2..0000000000000000000000000000000000000000
--- a/Reconstruction/MissingETMonitoring/src/components/MissingETMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MissingETMonitoring)
diff --git a/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_load.cxx b/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_load.cxx
deleted file mode 100755
index b7ae4d41940c4193dd4ccec9147bf6ae36b62503..0000000000000000000000000000000000000000
--- a/Reconstruction/MissingETPerformance/src/components/MissingETPerformance_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES ( MissingETPerformance )
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_load.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_load.cxx
deleted file mode 100755
index aef4db52da85c07095296126e586b6f17fd118c4..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CaloTrkMuIdTools )
diff --git a/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_load.cxx b/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_load.cxx
deleted file mode 100644
index 6b7ff242a098205cf60c845176b44454f21f77fe..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/CombinedMuonRefit/src/components/CombinedMuonRefit_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrkRefitAlg)
-
-
diff --git a/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_load.cxx b/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_load.cxx
deleted file mode 100644
index 7f0f898cf90bb998548053c65c125d6b70a19a86..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirl/src/components/MuGirl_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuGirl)
diff --git a/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_load.cxx b/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_load.cxx
deleted file mode 100644
index ba491661b5effb686b004001390fccf80402b2df..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirlCandidate/src/components/MuGirlCandidate_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlCandidate )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_load.cxx b/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_load.cxx
deleted file mode 100644
index 7d2c46196ba98a68542ea8683c06c4616d5b66e0..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirlGlobalFit/src/components/MuGirlGlobalFit_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlGlobalFit )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_load.cxx b/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_load.cxx
deleted file mode 100644
index 89cfbf50c04e1840441eef4adc7c743fb7e9db2e..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirlParticleCreatorTool/src/components/MuGirlParticleCreatorTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlParticleCreatorTool )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_load.cxx b/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_load.cxx
deleted file mode 100644
index 6d56e1d2ecb2c272beb1001b3ca5bb48197d3119..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirlPerformanceTools/src/components/MuGirlPerformanceTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlPerformanceTools )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_load.cxx b/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_load.cxx
deleted file mode 100644
index 1db364e34c15e44b342dc27906406c1ef0ef984a..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirlSelection/src/components/MuGirlSelection_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlSelection )
-
diff --git a/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_load.cxx b/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_load.cxx
deleted file mode 100644
index 7668371b9ab7ddf3f5aaae7ca7eb543739f3ac3c..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuGirlStau/src/components/MuGirlStau_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuGirlStau )
-
diff --git a/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_load.cxx b/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_load.cxx
deleted file mode 100755
index d8ef51577bfec2fa76ed498d81f65ce68e9e6d42..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuidCaloEnergyTools/src/components/MuidCaloEnergyTools_load.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuidCaloEnergyTools)
-
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
-
-
diff --git a/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_load.cxx b/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_load.cxx
deleted file mode 100755
index efb3842c5f7174b7068093be68401a84122fdb96..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuidCaloIsolationTools/src/components/MuidCaloIsolationTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuidCaloIsolationTools )
diff --git a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_load.cxx b/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_load.cxx
deleted file mode 100755
index effee9176f4e1d3d882ce2381979080a8c693320..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuidCaloScatteringTools/src/components/MuidCaloScatteringTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuidCaloScatteringTools )
-
diff --git a/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_load.cxx b/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_load.cxx
deleted file mode 100644
index 2b9bb67dc0a45b06c4756e9df6103214755b4320..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuidCombinedTools/src/components/MuidCombinedTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuidMuidCombinedTools )
diff --git a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_load.cxx b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_load.cxx
deleted file mode 100755
index 115d97a692254db53a2492dc6057e10d37fef81e..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/components/MuidTrackBuilder_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuidTrackBuilder)
-
diff --git a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_load.cxx b/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_load.cxx
deleted file mode 100644
index 3aab1722bd46fa06d6fa4037d8ecf4f68d6485c5..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCollectionBuilding/MuonCombinedEventStoreAlgs/src/components/MuonCombinedEventStoreAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedEventStoreAlgs )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_load.cxx
deleted file mode 100644
index 9e8e1737663402808e21883163be5bf8d68a90dd..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/components/MuonCombinedAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedAlgs )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_load.cxx
deleted file mode 100644
index 9e8e1737663402808e21883163be5bf8d68a90dd..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/components/MuonCombinedBaseTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedAlgs )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_load.cxx
deleted file mode 100644
index 7da912d5682e6a4704ed3368bd4b1d128c363db5..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/components/MuonCombinedEvaluationTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedEvaluationTools )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_load.cxx
deleted file mode 100644
index 9cf28e1fc58b682c0dce14e636ca17c37a9d793b..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedTestTools/src/components/MuonCombinedTestTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedTestTools )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_load.cxx
deleted file mode 100644
index 894b821dc1bfb4dd2fb6d9b3c9e57d84d45fa1f3..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedTimingTools/src/components/MuonCombinedTimingTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedTimingTools )
-
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_load.cxx b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_load.cxx
deleted file mode 100755
index fcd623b1d26bb491f57549947845627dc5013fad..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/components/MuonCombinedTrackFindingTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( MuonCombinedTrackFindingTools )
diff --git a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_load.cxx b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_load.cxx
deleted file mode 100644
index f83ebc4f784cba1aee1e73c0b02d6b9465dfee0d..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/components/MuonSegmentTaggerTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(MuonSegmentTaggerTools)
diff --git a/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_load.cxx b/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_load.cxx
deleted file mode 100644
index c23283887dabb7f0ab04d3c199b1da1acc4d94db..0000000000000000000000000000000000000000
--- a/Reconstruction/MuonIdentification/MuonSpShowerBuilderAlgs/src/components/MuonSpShowerBuilderAlgs_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( MuonSpShowerBuilderAlgs )
diff --git a/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_load.cxx b/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_load.cxx
deleted file mode 100644
index eba0afe240ab0c84704902a0011abffd6a410520..0000000000000000000000000000000000000000
--- a/Reconstruction/PFlow/PFlowUtils/src/components/PFlowUtils_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(PFlowUtils)
diff --git a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_load.cxx b/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_load.cxx
deleted file mode 100644
index f9017ac5d815e974990d9b2d088edd53a122c694..0000000000000000000000000000000000000000
--- a/Reconstruction/PFlow/PFlowValidation/PFODQA/src/components/PFODQA_load.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES( PFODQA)
diff --git a/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_load.cxx b/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_load.cxx
deleted file mode 100644
index 5316f811bd9e551ec77f021714845293a35bbb6a..0000000000000000000000000000000000000000
--- a/Reconstruction/PanTau/PanTauAlgs/src/components/PanTauAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( PanTauAlgs )
-
diff --git a/Reconstruction/RecAlgs/src/components/RecAlgs_load.cxx b/Reconstruction/RecAlgs/src/components/RecAlgs_load.cxx
deleted file mode 100755
index 36c0d478e781c6e5d9d226172d90f8bfa52dc094..0000000000000000000000000000000000000000
--- a/Reconstruction/RecAlgs/src/components/RecAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( RecAlgs )
-
diff --git a/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_load.cxx b/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_load.cxx
deleted file mode 100755
index 187039bef228ad28621947942b35967c098953d8..0000000000000000000000000000000000000000
--- a/Reconstruction/RecBackground/RecBackgroundAlgs/src/components/RecBackgroundAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RecBackgroundAlgs)
diff --git a/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_load.cxx b/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_load.cxx
deleted file mode 100755
index 71e306fea4a7177b16fd5e5ba461a651c5e8cc67..0000000000000000000000000000000000000000
--- a/Reconstruction/RecExample/RecExAlgs/src/components/RecExAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( RecExAlgs )
-
diff --git a/Reconstruction/RecJiveXML/src/components/RecJiveXML_load.cxx b/Reconstruction/RecJiveXML/src/components/RecJiveXML_load.cxx
deleted file mode 100755
index df21b4bcc6713b94161aae59f4f0a17a5c635998..0000000000000000000000000000000000000000
--- a/Reconstruction/RecJiveXML/src/components/RecJiveXML_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(RecJiveXML)
diff --git a/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_load.cxx b/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_load.cxx
deleted file mode 100644
index d03c7eed3c079f38e16bfb285bad233eb628ff4c..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoAlgs/CaloRingerAlgs/src/components/CaloRingerAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CaloRingerAlgs )
-
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_load.cxx b/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_load.cxx
deleted file mode 100644
index 89d79ccd5065bf5c93e26672a4e94968093c5c95..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoAlgs/IsolationAlgs/src/components/IsolationAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(IsolationAlgs)
diff --git a/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_load.cxx b/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_load.cxx
deleted file mode 100644
index a4b13428ba2daa92d1195130d92e8a025e4c8487..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/src/components/TrackParticleAssociationAlgs_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrackParticleAssociationAlgs )
-
diff --git a/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_load.cxx b/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_load.cxx
deleted file mode 100644
index 0cc31f085346b1bae89a5b30fd7d234db1bd04bd..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/CaloClusterMatching/src/components/CaloClusterMatching_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(CaloCusterMatching)
diff --git a/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_load.cxx b/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_load.cxx
deleted file mode 100644
index 6d6b06cbb70d61f73f2f6621822bdbb654233d01..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/CaloRingerTools/src/components/CaloRingerTool_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( CaloRingerTools )
-
diff --git a/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_load.cxx b/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_load.cxx
deleted file mode 100644
index e61116c8e26cdc677107270297ddc486bf524a74..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/IsolationTool/src/components/IsolationTool_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id: IsolationTool_load.cxx 770003 2016-08-25 08:54:14Z krasznaa $
-
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( IsolationTool )
diff --git a/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_load.cxx b/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_load.cxx
deleted file mode 100644
index f34bf991a4f18fbf2b1ef14b1700d4fd0fdef658..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/ParticlesInConeTools/src/components/ParticlesInConeTools_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( ParticlesInConeTools )
-
diff --git a/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_load.cxx b/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_load.cxx
deleted file mode 100755
index 1bc4de99b78379302ebb515112ae5735f11d0532..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/TrackToCalo/src/components/TrackToCalo_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-//====================================================================
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrackToCalo )
diff --git a/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_load.cxx b/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_load.cxx
deleted file mode 100755
index 0656f41487f743e07294810729423dbf2dafa89b..0000000000000000000000000000000000000000
--- a/Reconstruction/RecoTools/TrackToVertex/src/components/TrackToVertex_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrackToVertex )
-
diff --git a/Reconstruction/TRT_Rec/src/components/TRT_Rec_load.cxx b/Reconstruction/TRT_Rec/src/components/TRT_Rec_load.cxx
deleted file mode 100755
index ca273b50eb9e5e462bbf1928e81ce9d930e8bc2e..0000000000000000000000000000000000000000
--- a/Reconstruction/TRT_Rec/src/components/TRT_Rec_load.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-/***************************************************************************
- TRT_Rec
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: TRT_Rec_load.cxx,v 1.1 2004-02-13 17:00:14 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TRT_Rec )
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_load.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_load.cxx
deleted file mode 100644
index 41254fc6c5c639f870bd5f1e506236f3ab1f1eb0..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecAlgs/src/components/TrackCaloClusterRecAlgs_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrackCaloClusterRecAlgs)
\ No newline at end of file
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_load.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_load.cxx
deleted file mode 100644
index 6d0003695c1e4ee375a9526f02e6d7063adaf5f5..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecTools/src/components/ParticleToCaloExtrapolationTool_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrackCaloClusterRecTools)
\ No newline at end of file
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_load.cxx b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_load.cxx
deleted file mode 100644
index 269de5f44d1fcc0922606af8cc6800052b753b99..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/src/components/TrackCaloClusterRecValidation_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(TrackCaloClusterRecValidation)
\ No newline at end of file
diff --git a/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_load.cxx b/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_load.cxx
deleted file mode 100755
index be3fd6ca6ed46cdb398d25ecae67ca4233047f7e..0000000000000000000000000000000000000000
--- a/Reconstruction/VKalVrt/VrtSecInclusive/src/components/VrtSecInclusive_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-LOAD_FACTORY_ENTRIES(VrtSecInclusive)
- //Notes:
- //
- //1. The argument to the LOAD_FACTORY_ENTRIES() is the name of the
- // component library (libXXX.so).
- //
- // See Athena User Guide for more information
diff --git a/Reconstruction/eflowRec/src/components/eflowRec_load.cxx b/Reconstruction/eflowRec/src/components/eflowRec_load.cxx
deleted file mode 100644
index f6e676c5d9cf6ee60b0ace1f54c6b735612de5f3..0000000000000000000000000000000000000000
--- a/Reconstruction/eflowRec/src/components/eflowRec_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(eflowRec)
diff --git a/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_load.cxx b/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_load.cxx
deleted file mode 100644
index 70a2c4d5306ea9cff8fa4604e3b980bcd784e3d8..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/EgammaPhysValMonitoring/src/components/EgammaPhysValMonitoring_load.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-// Gaudi/Athena include(s):
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-// Declare the library to the infrastructure:
-LOAD_FACTORY_ENTRIES( EgammaMonitoring )
diff --git a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_load.cxx b/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_load.cxx
deleted file mode 100755
index fcd37bbd6080ff485e4d37346e26370f19d60153..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaAlgs)
-
diff --git a/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_load.cxx b/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_load.cxx
deleted file mode 100755
index 554dc55e852200df5db0ecce5e99d20323aa5088..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaCaloTools/src/components/egammaCaloTools_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaCaloTools)
diff --git a/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_load.cxx b/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_load.cxx
deleted file mode 100644
index 6eea1c496f381480267296a874155e6fc32c1b39..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaMVACalib/src/components/egammaMVACalib_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( egammaMVACalib )
-
diff --git a/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_load.cxx b/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_load.cxx
deleted file mode 100755
index d9cd5e3ac9713f318d65deb80813564c08a9f125..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaPerformance)
-
diff --git a/Reconstruction/egamma/egammaTools/src/components/egammaTools_load.cxx b/Reconstruction/egamma/egammaTools/src/components/egammaTools_load.cxx
deleted file mode 100755
index 17c91b8ae805d5f7bf48c43b9e894c00739e399c..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaTools/src/components/egammaTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaTools)
-
diff --git a/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_load.cxx b/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_load.cxx
deleted file mode 100755
index 17c91b8ae805d5f7bf48c43b9e894c00739e399c..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaTrackTools/src/components/egammaTrackTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(egammaTools)
-
diff --git a/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_load.cxx b/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_load.cxx
deleted file mode 100755
index 731caa2266d39b1130c0680c0c62821231c93543..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatGeometryTools/src/components/iPatGeometryTools_load.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-/***************************************************************************
- iPatGeometryTools
- ATLAS Collaboration
- ***************************************************************************/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatGeometryTools )
diff --git a/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_load.cxx b/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_load.cxx
deleted file mode 100755
index 0cb5e5227da4800bd8e444adc8758bb78ce3f79a..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatQuality/src/components/iPatQuality_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatQuality )
diff --git a/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_load.cxx b/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_load.cxx
deleted file mode 100755
index 47ab7fedd222a3819e2bb24cfd95a78f1d74305c..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatRecAlgs/src/components/iPatRecAlgs_load.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-/***************************************************************************
- iPatRecAlgs
- -----------
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatRecAlgs_load.cxx,v 1.1.1.1 2002-09-10 14:09:45 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatRecAlgs )
diff --git a/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_load.cxx b/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_load.cxx
deleted file mode 100755
index 6a0c360794fc7d4a7ea6a6d65e55bacee4644ff8..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatTrackFinder/src/components/iPatTrackFinder_load.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-/***************************************************************************
- iPatTrackFinder
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatTrackFinder_load.cxx,v 1.1 2004-07-27 12:22:57 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatTrackFinder )
diff --git a/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_load.cxx b/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_load.cxx
deleted file mode 100755
index 98b8f17fbe136656769d2fbf0b905ee11b4cd118..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatTrackFitter/src/components/iPatTrackFitter_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatTrackFitter )
-
diff --git a/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_load.cxx b/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_load.cxx
deleted file mode 100755
index c6876ccefa7d176379a4002037a0d49ef41d7c35..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatTrackFollower/src/components/iPatTrackFollower_load.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-/***************************************************************************
- iPatTrackFollower
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatTrackFollower_load.cxx,v 1.1 2004-07-05 16:57:57 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatTrackFollower )
diff --git a/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_load.cxx b/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_load.cxx
deleted file mode 100755
index f946c511bb57684de236c73ea3fedf7039a57202..0000000000000000000000000000000000000000
--- a/Reconstruction/iPat/iPatTruthTrajectory/src/components/iPatTruthTrajectory_load.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-/***************************************************************************
- iPatTruthTrajectory
-
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: iPatTruthTrajectory_load.cxx,v 1.1 2003-10-07 15:56:49 pop Exp $
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( iPatTruthTrajectory )
diff --git a/Reconstruction/tauMonitoring/src/components/tauMonitoring_load.cxx b/Reconstruction/tauMonitoring/src/components/tauMonitoring_load.cxx
deleted file mode 100644
index 4a0c370aafb7bf70662e69818e7a714bafc2377f..0000000000000000000000000000000000000000
--- a/Reconstruction/tauMonitoring/src/components/tauMonitoring_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(tauMonitoring)
diff --git a/Reconstruction/tauRec/src/components/tauRec_load.cxx b/Reconstruction/tauRec/src/components/tauRec_load.cxx
deleted file mode 100755
index 84f141f229697d96091655254891da3c42d3baed..0000000000000000000000000000000000000000
--- a/Reconstruction/tauRec/src/components/tauRec_load.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(tauRec)
-
-
-
diff --git a/Reconstruction/tauRecTools/src/components/tauRecTools_load.cxx b/Reconstruction/tauRecTools/src/components/tauRecTools_load.cxx
deleted file mode 100644
index 6b1c2188830c28bd0ce8c55d51143773b065ebdd..0000000000000000000000000000000000000000
--- a/Reconstruction/tauRecTools/src/components/tauRecTools_load.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(tauRecTools)
-