Merge branch 'event_declarefactory_cleanup' into 'master'

Remove obsolete factory entries for components in Event

See merge request !5800

Event/ByteStreamCnvSvc/src/components/ByteStreamCnvSvc_entries.cxx

-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "ByteStreamCnvSvc/ByteStreamCnvSvc.h"
 #include "../EventSelectorByteStream.h"
 #include "../ByteStreamMergeOutputSvc.h"
@@ -28,18 +25,3 @@ DECLARE_SERVICE_FACTORY( ByteStreamAttListMetadataSvc )
 DECLARE_TOOL_FACTORY( ByteStreamOutputStreamCopyTool )
 DECLARE_TOOL_FACTORY( ByteStreamMetadataTool )
 
-DECLARE_FACTORY_ENTRIES( ByteStreamCnvSvc ) {
-    DECLARE_SERVICE    ( ByteStreamCnvSvc )
-    DECLARE_SERVICE    ( EventSelectorByteStream )
-    DECLARE_SERVICE    ( ByteStreamMergeOutputSvc )
-    DECLARE_SERVICE    ( ByteStreamRDP_OutputSvc )
-    DECLARE_CONVERTER  ( EventInfoByteStreamCnv )
-    DECLARE_SERVICE    ( ByteStreamEventStorageInputSvc )
-    DECLARE_SERVICE    ( ByteStreamEventStorageOutputSvc )
-    DECLARE_SERVICE    ( ByteStreamSingleEventInputSvc )
-    DECLARE_SERVICE    ( ByteStreamNavigationProviderSvc )
-    DECLARE_SERVICE    ( ByteStreamAttListMetadataSvc )
-
-    DECLARE_TOOL    ( ByteStreamOutputStreamCopyTool )
-    DECLARE_TOOL    ( ByteStreamMetadataTool )
-}

Event/ByteStreamCnvSvc/src/components/ByteStreamCnvSvc_load.cxx

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

Event/ByteStreamCnvSvcBase/src/components/ByteStreamCnvSvcBase_entries.cxx

-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "ByteStreamCnvSvcBase/ByteStreamCnvSvcBase.h"
 #include "ByteStreamCnvSvcBase/ByteStreamAddressProviderSvc.h"
 #include "ByteStreamCnvSvcBase/ROBDataProviderSvc.h"
@@ -9,8 +6,3 @@ DECLARE_SERVICE_FACTORY( ByteStreamCnvSvcBase )
 DECLARE_SERVICE_FACTORY( ByteStreamAddressProviderSvc )
 DECLARE_SERVICE_FACTORY( ROBDataProviderSvc )
 
-DECLARE_FACTORY_ENTRIES( ByteStreamCnvSvcBase ) {
-    DECLARE_SERVICE    ( ByteStreamCnvSvcBase )
-    DECLARE_SERVICE    ( ByteStreamAddressProviderSvc )
-    DECLARE_SERVICE    ( ROBDataProviderSvc )
-}

Event/ByteStreamCnvSvcBase/src/components/ByteStreamCnvSvcBase_load.cxx

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

Event/ByteStreamTest/src/components/ByteStreamTest_entries.cxx

 #include "../EvenEventsSelectorTool.h"
-#include "GaudiKernel/DeclareFactoryEntries.h"
 
 DECLARE_TOOL_FACTORY(EvenEventsSelectorTool)
 
-DECLARE_FACTORY_ENTRIES(ByteStreamTest) {
-   DECLARE_ALGTOOL(EvenEventsSelectorTool);
-}

Event/ByteStreamTest/src/components/ByteStreamTest_load.cxx

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

Event/DFStreamEventSelector/src/components/DFStreamEventSelector_entries.cxx

-/*
-
-Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-Author: Sami Kama 2017
-
-*/
-//====================================================================
-
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "../DFStreamEventSelector.h"
 
 DECLARE_SERVICE_FACTORY( DFStreamEventSelector )

Event/EventBookkeeperTools/src/components/EventBookkeeperTools_entries.cxx

-#include "GaudiKernel/DeclareFactoryEntries.h"
-
 #include "EventBookkeeperTools/myCppFilterTest.h"
 #include "../SkimDecisionMultiFilter.h"
 #include "../FileCutFlowSvc.h"
@@ -14,11 +12,3 @@ DECLARE_TOOL_FACTORY( BookkeeperTool )
 DECLARE_SERVICE_FACTORY( CutFlowSvc )
 DECLARE_SERVICE_FACTORY( FileCutFlowSvc )
 
-DECLARE_FACTORY_ENTRIES(EventBookkeeperTools) {
-  DECLARE_ALGORITHM( myCppFilterTest );
-  DECLARE_ALGORITHM( SkimDecisionMultiFilter );
-  DECLARE_ALGORITHM( EventCounterAlg );
-  DECLARE_ALGTOOL( BookkeeperTool );
-  DECLARE_SERVICE( CutFlowSvc );
-  DECLARE_SERVICE( FileCutFlowSvc );
-}

Event/EventBookkeeperTools/src/components/EventBookkeeperTools_load.cxx

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

Event/EventCommonAlgs/src/components/EventCommonAlgs_entries.cxx

@@ -2,14 +2,8 @@
 #include "../I4MomDumper.h"
 //#include "../INav4MomSymLinkBuilder.h"
 
-#include "GaudiKernel/DeclareFactoryEntries.h"
   
 DECLARE_ALGORITHM_FACTORY( I4MomDumper  )
 DECLARE_ALGORITHM_FACTORY( INav4MomDumper  )
 //DECLARE_ALGORITHM_FACTORY( INav4MomSymLinkBuilder  )
 
-DECLARE_FACTORY_ENTRIES( EventCommonAlgs ) {
-  DECLARE_ALGORITHM( I4MomDumper )
-  DECLARE_ALGORITHM( INav4MomDumper )
-    //DECLARE_ALGORITHM( INav4MomSymLinkBuilder )
-}

Event/EventCommonAlgs/src/components/EventCommonAlgs_load.cxx

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

Event/EventInfoMgt/CMakeLists.txt

@@ -22,7 +22,6 @@ atlas_depends_on_subdirs( PUBLIC
 atlas_add_component( EventInfoMgt
                      src/TagInfoMgr.cxx
                      src/EventInfoMgt_entries.cxx
-                     src/EventInfoMgt_load.cxx
                      LINK_LIBRARIES AthenaKernel GaudiKernel CxxUtils SGTools StoreGateLib SGtests AthenaBaseComps AthenaPoolUtilities EventInfo )
 
 # Install files from the package:

Event/EventInfoMgt/src/EventInfoMgt_entries.cxx

-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file EventInfoMgt_entries.cxx
- *
- * @brief Declare a gaudi service in EventInfoMgr component
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Id: EventInfoMgt_entries.cxx,v 1.5 2007-01-03 09:44:09 dquarrie Exp $
- */
-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "TagInfoMgr.h"
 
 DECLARE_SERVICE_FACTORY(TagInfoMgr)
 
-
-DECLARE_FACTORY_ENTRIES(EventInfoMgt) {
-  DECLARE_SERVICE(TagInfoMgr)
-
-    
-
-}

Event/EventInfoMgt/src/EventInfoMgt_load.cxx

-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file EventInfoMgt_load.cxx
- *
- * @brief Declare EventInfoMgr component
- *
- * @author RD Schaffer <R.D.Schaffer@cern.ch>
- *
- * $Id: EventInfoMgt_load.cxx,v 1.2 2005-01-13 11:20:43 schaffer Exp $
- */
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( EventInfoMgt )
-
-

Event/EventOverlay/OverlayCommonAlgs/src/components/OverlayCommonAlgs_entries.cxx

-#include "GaudiKernel/DeclareFactoryEntries.h"
 #include "../CopyMcEventCollection.h"
 #include "../CopyObjects.h"
 #include "../CopyTimings.h"
@@ -26,19 +25,3 @@ DECLARE_ALGORITHM_FACTORY( RemoveTempBkgObjects )
 
 DECLARE_TOOL_FACTORY( ByteStreamMultipleOutputStreamCopyTool )
 
-DECLARE_FACTORY_ENTRIES( OverlayCommonAlgs ) {
-  DECLARE_ALGORITHM( CopyMcEventCollection )
-  DECLARE_ALGORITHM( CopyObjects )
-  DECLARE_ALGORITHM( CopyTimings )
-  DECLARE_ALGORITHM( CopyTruthInfo )
-  DECLARE_ALGORITHM( SaveInDetObjects )
-  DECLARE_ALGORITHM( RemoveObjects )
-  DECLARE_ALGORITHM( UpdateEventInfo )
-  DECLARE_ALGORITHM( BSFilter )
-  DECLARE_ALGORITHM( G4HitMerger )
-  DECLARE_ALGORITHM( DeepCopyObjects )  
-  DECLARE_ALGORITHM( RemoveTempBkgObjects )
-
-  DECLARE_TOOL( ByteStreamMultipleOutputStreamCopyTool )
-}
-

Event/EventOverlay/OverlayCommonAlgs/src/components/OverlayCommonAlgs_load.cxx

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

Event/EventOverlay/OverlayExamples/src/components/OverlayExamples_entries.cxx

 #include "../HitRdoOverlayExample.h"
 
-#include "GaudiKernel/DeclareFactoryEntries.h"
 
 DECLARE_ALGORITHM_FACTORY( HitRdoOverlayExample )
 
-DECLARE_FACTORY_ENTRIES( OverlayExamples ) {
-  DECLARE_ALGORITHM( HitRdoOverlayExample )
-
-}
-
-

Event/EventOverlay/OverlayExamples/src/components/OverlayExamples_load.cxx

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

Event/xAOD/xAODBTaggingCnv/src/components/xAODBTaggingCnv_entries.cxx

-// Gaudi/Athena include(s):
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
-// Local include(s):
 #include "../BTaggingCnvAlg.h"
 #include "../BTaggingReader.h"
 #include "../TrigBjetCnvAlg.h"
@@ -13,10 +9,3 @@ DECLARE_NAMESPACE_ALGORITHM_FACTORY( xAODReader, BTaggingReader )
 DECLARE_NAMESPACE_ALGORITHM_FACTORY( xAODMaker, TrigBjetCnvAlg )
 DECLARE_NAMESPACE_TOOL_FACTORY( xAODMaker, TrigBjetCnvTool )
 
-DECLARE_FACTORY_ENTRIES( xAODBTaggingCnv ) {
-  DECLARE_NAMESPACE_ALGORITHM( xAODMaker, BTaggingCnvAlg )
-  DECLARE_NAMESPACE_ALGORITHM( xAODReader, BTaggingReader )
-
-  DECLARE_NAMESPACE_ALGORITHM( xAODMaker, TrigBJetCnvAlg )
-  DECLARE_NAMESPACE_TOOL( xAODMaker, TrigBJetCnvTool )
-}

Event/xAOD/xAODBTaggingCnv/src/components/xAODBTaggingCnv_load.cxx

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