Merge branch 'trk_declarefactory_cleanup2' into 'master'

Remove obsolete factory entries for components in Tracking

See merge request !5868

Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_entries.cxx

-/***************************************************************************
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: TrkAmbiguitySolver_entries.cxx,v 1.1.1.1 2007-02-21 13:36:44 msiebel Exp $
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkAmbiguitySolver/TrkAmbiguitySolver.h"
 
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, TrkAmbiguitySolver )
-
-DECLARE_FACTORY_ENTRIES( TrkAmbiguitySolver )
-{
-	DECLARE_NAMESPACE_ALGORITHM( Trk, TrkAmbiguitySolver );
-}
-
-
-
-
+DECLARE_COMPONENT( Trk::TrkAmbiguitySolver )
 

Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/components/TrkAmbiguitySolver_load.cxx

-/***************************************************************************
- ATLAS Collaboration
- ***************************************************************************/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkAmbiguitySolver )
-

Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_entries.cxx

-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkCollectionAliasAlg/TrkCollectionAliasAlg.h"
 
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk , TrkCollectionAliasAlg )
+DECLARE_COMPONENT( Trk::TrkCollectionAliasAlg )
 
-DECLARE_FACTORY_ENTRIES( TrkCollectionAliasAlg ) {
-  DECLARE_NAMESPACE_ALGORITHM( Trk ,  TrkCollectionAliasAlg )
-}   

Tracking/TrkAlgorithms/TrkCollectionAliasAlg/src/components/TrkCollectionAliasAlg_load.cxx

-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkCollectionAliasAlg )
-

Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_entries.cxx

-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkTrackCollectionMerger/TrackCollectionMerger.h"
 
-using namespace Trk;
-
-DECLARE_ALGORITHM_FACTORY( TrackCollectionMerger )
-
-DECLARE_FACTORY_ENTRIES( TrkTrackCollectionMerger )
-{
-  DECLARE_ALGORITHM( TrackCollectionMerger )
-}
+DECLARE_COMPONENT( Trk::TrackCollectionMerger )
 

Tracking/TrkAlgorithms/TrkTrackCollectionMerger/src/components/TrkTrackCollectionMerger_load.cxx

-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrackCollectionMerger)
-

Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_entries.cxx

-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkTrackSlimmer/TrackSlimmer.h"
 
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk , TrackSlimmer )
+DECLARE_COMPONENT( Trk::TrackSlimmer )
 
-DECLARE_FACTORY_ENTRIES( TrkTrackSlimmer ) {
-  DECLARE_NAMESPACE_ALGORITHM( Trk ,  TrackSlimmer )
-}   

Tracking/TrkAlgorithms/TrkTrackSlimmer/src/components/TrkTrackSlimmer_load.cxx

-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTrackSlimmer )
-

Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_entries.cxx

-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkTruthAlgs/TrackTruthSelector.h"
 #include "TrkTruthAlgs/TrackTruthSimilaritySelector.h"
 #include "../TrackParticleTruthAlg.h"
 
-DECLARE_ALGORITHM_FACTORY( TrackTruthSelector )
-DECLARE_ALGORITHM_FACTORY( TrackTruthSimilaritySelector )
-DECLARE_ALGORITHM_FACTORY( TrackParticleTruthAlg )
+DECLARE_COMPONENT( TrackTruthSelector )
+DECLARE_COMPONENT( TrackTruthSimilaritySelector )
+DECLARE_COMPONENT( TrackParticleTruthAlg )
 
-DECLARE_FACTORY_ENTRIES( TrkTruthAlgs ) 
-{
-  DECLARE_ALGORITHM( TrackTruthSelector )
-  DECLARE_ALGORITHM( TrackTruthSimilaritySelector )
-  DECLARE_ALGORITHM( TrackParticleTruthAlg )
-}

Tracking/TrkAlgorithms/TrkTruthAlgs/src/components/TrkTruthAlgs_load.cxx

-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkTruthAlgs )

Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_entries.cxx

-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkAlignGenAlgs/AlignAlg.h"
 #include "TrkAlignGenAlgs/SelectEventNumber.h"
 #include "TrkAlignGenAlgs/AlignSolve.h"
 #include "TrkAlignGenAlgs/AlignTrackCollSplitter.h"
 
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, AlignAlg )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, SelectEventNumber )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, AlignSolve )
-DECLARE_NAMESPACE_ALGORITHM_FACTORY( Trk, AlignTrackCollSplitter )
+DECLARE_COMPONENT( Trk::AlignAlg )
+DECLARE_COMPONENT( Trk::SelectEventNumber )
+DECLARE_COMPONENT( Trk::AlignSolve )
+DECLARE_COMPONENT( Trk::AlignTrackCollSplitter )
 
-DECLARE_FACTORY_ENTRIES( TrkAlignGenAlgs )
-{
-  DECLARE_NAMESPACE_ALGORITHM( Trk, AlignAlg )
-  DECLARE_NAMESPACE_ALGORITHM( Trk, SelectEventNumber )
-  DECLARE_NAMESPACE_ALGORITHM( Trk, AlignSolve )
-  DECLARE_NAMESPACE_ALGORITHM( Trk, AlignTrackCollSplitter )
-}

Tracking/TrkAlignment/TrkAlignGenAlgs/src/components/TrkAlignGenAlgs_load.cxx

-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkAlignGenAlgs )
-

Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_entries.cxx

-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkAlignGenTools/MatrixTool.h"
 #include "TrkAlignGenTools/IPCMatrixTool.h"
 #include "TrkAlignGenTools/TrkAlignDBTool.h"
@@ -14,36 +13,18 @@
 #include "TrkAlignGenTools/BeamspotVertexPreProcessor.h"
 #include "TrkAlignGenTools/ConstrainedTrackProvider.h"
 
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, MatrixTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, IPCMatrixTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TrkAlignDBTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, AnalyticalDerivCalcTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, ShiftingDerivCalcTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, AlignTrackPreProcessor )
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, TrackCollectionProvider )
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, MSConstraintTracksProvider )
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, AlignTrackCreator )
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, AlignTrackDresser )
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, AlignModuleTool )
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, AlignResidualCalculator )
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, BeamspotVertexPreProcessor )
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, ConstrainedTrackProvider )
+DECLARE_COMPONENT( Trk::MatrixTool )
+DECLARE_COMPONENT( Trk::IPCMatrixTool )
+DECLARE_COMPONENT( Trk::TrkAlignDBTool )
+DECLARE_COMPONENT( Trk::AnalyticalDerivCalcTool )
+DECLARE_COMPONENT( Trk::ShiftingDerivCalcTool )
+DECLARE_COMPONENT( Trk::AlignTrackPreProcessor )
+DECLARE_COMPONENT( Trk::TrackCollectionProvider )
+DECLARE_COMPONENT( Trk::MSConstraintTracksProvider )
+DECLARE_COMPONENT( Trk::AlignTrackCreator )
+DECLARE_COMPONENT( Trk::AlignTrackDresser )
+DECLARE_COMPONENT( Trk::AlignModuleTool )
+DECLARE_COMPONENT( Trk::AlignResidualCalculator )
+DECLARE_COMPONENT( Trk::BeamspotVertexPreProcessor )
+DECLARE_COMPONENT( Trk::ConstrainedTrackProvider )
 
-
-DECLARE_FACTORY_ENTRIES( TrkAlignGenTools )
-{
-  DECLARE_NAMESPACE_TOOL( Trk, MatrixTool )
-  DECLARE_NAMESPACE_TOOL( Trk, IPCMatrixTool )
-  DECLARE_NAMESPACE_TOOL( Trk, TrkAlignDBTool )
-  DECLARE_NAMESPACE_TOOL( Trk, AnalyticalDerivCalcTool )
-  DECLARE_NAMESPACE_TOOL( Trk, ShiftingDerivCalcTool )
-  DECLARE_NAMESPACE_TOOL( Trk, TrackCollectionProvider )
-  DECLARE_NAMESPACE_TOOL( Trk, MSConstraintTracksProvider )
-  DECLARE_NAMESPACE_TOOL( Trk, AlignTrackPreProcessor )
-  DECLARE_NAMESPACE_TOOL( Trk, AlignTrackCreator )
-  DECLARE_NAMESPACE_TOOL( Trk, AlignTrackDresser )
-  DECLARE_NAMESPACE_TOOL( Trk, AlignModuleTool )
-  DECLARE_NAMESPACE_TOOL( Trk, AlignResidualCalculator )
-  DECLARE_NAMESPACE_TOOL( Trk, BeamspotVertexPreProcessor )
-  DECLARE_NAMESPACE_TOOL( Trk, ConstrainedTrackProvider )
-}

Tracking/TrkAlignment/TrkAlignGenTools/src/components/TrkAlignGenTools_load.cxx

-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkAlignGenTools )
-

Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_entries.cxx

-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkGlobalChi2AlignTools/GlobalChi2AlignTool.h"
 
-DECLARE_NAMESPACE_TOOL_FACTORY( Trk, GlobalChi2AlignTool )
+DECLARE_COMPONENT( Trk::GlobalChi2AlignTool )
 
-DECLARE_FACTORY_ENTRIES( TrkGlobalChi2AlignTools )
-{
-    DECLARE_NAMESPACE_ALGORITHM( Trk, GlobalChi2AlignTool );
-}

Tracking/TrkAlignment/TrkGlobalChi2AlignTools/src/components/TrkGlobalChi2AlignTools_load.cxx

-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkGlobalChi2AlignTools )

Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_entries.cxx

-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TrkDetDescrAlgs/MaterialMapping.h"
 #include "TrkDetDescrAlgs/MaterialManipulation.h"
 #include "TrkDetDescrAlgs/MaterialValidation.h"
 
 using namespace Trk;
 
-DECLARE_ALGORITHM_FACTORY( MaterialMapping )
-DECLARE_ALGORITHM_FACTORY( MaterialManipulation )
-DECLARE_ALGORITHM_FACTORY( MaterialValidation )
+DECLARE_COMPONENT( MaterialMapping )
+DECLARE_COMPONENT( MaterialManipulation )
+DECLARE_COMPONENT( MaterialValidation )
 
-
-/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkDetDescrAlgs )
-{
-    DECLARE_ALGORITHM( MaterialMapping )
-    DECLARE_ALGORITHM( MaterialManipulation )
-    DECLARE_ALGORITHM( MaterialValidation )
-}

Tracking/TrkDetDescr/TrkDetDescrAlgs/src/components/TrkDetDescrAlgs_load.cxx

-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( TrkDetDescrAlgs )
-

Tracking/TrkDetDescr/TrkDetDescrSvc/TrkDetDescrSvc/TrackingGeometrySvc.h

@@ -69,8 +69,6 @@ namespace Trk {
       //!< Returns the name of the TrackingGeometry built with this Svc
       const std::string& trackingGeometryName() const;
   
-    protected:
-  
       friend class SvcFactory<TrackingGeometrySvc>;
   
       //!< Standard Constructor

Tracking/TrkDetDescr/TrkDetDescrSvc/TrkDetDescrSvc/TrackingVolumesSvc.h

@@ -62,8 +62,6 @@ namespace Trk {
       /** @copydoc ITrackingVolumesSvc::volumeName() */
       const std::string& volumeName(const TrackingVolumeIdentifier& volumeId) const;
   
-    protected:
-  
       friend class SvcFactory<TrackingVolumesSvc>;
   
       /** Standard Constructor */